ordo
/
surveyor_indonesia_frontend
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Labels Milestones
New Pull Request

staging #4

Merged
farhantock merged 2 commits from staging into master 6 months ago
Conversation 0 Commits 2 Files Changed 2
2 changed files with 28 additions and 28 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 52
      src/components/CardDashboard/CardDashboard.js
  2. 4
      src/views/Dashboard/DashboardBOD.js

52
src/components/CardDashboard/CardDashboard.js
Unescape View File

@ -199,7 +199,7 @@ const optionsScheduleHealthPerDivision = {
} }
}, },
datalabels: { datalabels: {
color: '#FFFFFF' color: '#000'
} }
} }
} }
@ -215,30 +215,30 @@ export const ContentLoaderChart = ({ type }) => {
backgroundColor="#f3f3f3" backgroundColor="#f3f3f3"
foregroundColor="#ecebeb" foregroundColor="#ecebeb"
> >
{/* <rect x="6" y="88" rx="4" ry="4" width="18" height="105" /> {/* <rect x="6" y="88" rx="4" ry="4" width="18" height="105" />
<rect x="36" y="64" rx="4" ry="4" width="18" height="129" /> <rect x="36" y="64" rx="4" ry="4" width="18" height="129" />
<rect x="64" y="130" rx="4" ry="4" width="18" height="62" /> <rect x="64" y="130" rx="4" ry="4" width="18" height="62" />
<rect x="91" y="87" rx="4" ry="4" width="18" height="105" /> <rect x="91" y="87" rx="4" ry="4" width="18" height="105" />
<rect x="118" y="107" rx="4" ry="4" width="18" height="85" /> <rect x="118" y="107" rx="4" ry="4" width="18" height="85" />
<rect x="147" y="92" rx="4" ry="4" width="18" height="100" /> <rect x="147" y="92" rx="4" ry="4" width="18" height="100" />
<rect x="176" y="120" rx="4" ry="4" width="18" height="72" /> <rect x="176" y="120" rx="4" ry="4" width="18" height="72" />
<rect x="207" y="54" rx="4" ry="4" width="18" height="138" /> <rect x="207" y="54" rx="4" ry="4" width="18" height="138" />
<rect x="267" y="94" rx="4" ry="4" width="18" height="98" /> <rect x="267" y="94" rx="4" ry="4" width="18" height="98" />
<rect x="235" y="56" rx="4" ry="4" width="18" height="136" /> <rect x="235" y="56" rx="4" ry="4" width="18" height="136" />
<rect x="298" y="68" rx="4" ry="4" width="18" height="124" /> <rect x="298" y="68" rx="4" ry="4" width="18" height="124" />
<rect x="330" y="77" rx="4" ry="4" width="18" height="114" /> <rect x="330" y="77" rx="4" ry="4" width="18" height="114" />
<rect x="360" y="106" rx="4" ry="4" width="18" height="84" /> <rect x="360" y="106" rx="4" ry="4" width="18" height="84" />
<rect x="388" y="155" rx="4" ry="4" width="18" height="35" /> <rect x="388" y="155" rx="4" ry="4" width="18" height="35" />
<rect x="417" y="108" rx="4" ry="4" width="18" height="81" /> <rect x="417" y="108" rx="4" ry="4" width="18" height="81" />
<rect x="450" y="82" rx="4" ry="4" width="18" height="107" /> */} <rect x="450" y="82" rx="4" ry="4" width="18" height="107" /> */}
{/* <rect x="13" y="47" rx="4" ry="4" width="39" height="140" /> {/* <rect x="13" y="47" rx="4" ry="4" width="39" height="140" />
<rect x="61" y="9" rx="4" ry="4" width="39" height="178" /> <rect x="61" y="9" rx="4" ry="4" width="39" height="178" />
<rect x="112" y="28" rx="4" ry="4" width="39" height="160" /> <rect x="112" y="28" rx="4" ry="4" width="39" height="160" />
<rect x="186" y="45" rx="4" ry="4" width="39" height="140" /> <rect x="186" y="45" rx="4" ry="4" width="39" height="140" />
<rect x="234" y="7" rx="4" ry="4" width="39" height="178" /> <rect x="234" y="7" rx="4" ry="4" width="39" height="178" />
<rect x="284" y="27" rx="4" ry="4" width="39" height="160" /> <rect x="284" y="27" rx="4" ry="4" width="39" height="160" />
<rect x="358" y="45" rx="4" ry="4" width="39" height="140" /> <rect x="358" y="45" rx="4" ry="4" width="39" height="140" />
<rect x="406" y="7" rx="4" ry="4" width="39" height="178" /> <rect x="406" y="7" rx="4" ry="4" width="39" height="178" />
<rect x="456" y="27" rx="4" ry="4" width="39" height="160" /> */} <rect x="456" y="27" rx="4" ry="4" width="39" height="160" /> */}
<rect x="13" y="87" rx="4" ry="4" width="39" height="106" /> <rect x="13" y="87" rx="4" ry="4" width="39" height="106" />
<rect x="61" y="21" rx="4" ry="4" width="39" height="171" /> <rect x="61" y="21" rx="4" ry="4" width="39" height="171" />
@ -288,7 +288,7 @@ export const ContentLoaderChart = ({ type }) => {
} }
} }
// export const FullCard = // export const FullCard =
export const CardDashboard = ({ title, subtitle, chartType, chartData, chartOption, isReady }) => { export const CardDashboard = ({ title, subtitle, chartType, chartData, chartOption, isReady }) => {
let chart = null; let chart = null;
@ -387,4 +387,4 @@ export const NoDataChart = ({ message }) => {
{message ? message : "No Data Available"} {message ? message : "No Data Available"}
</div> </div>
) )
} }

4
src/views/Dashboard/DashboardBOD.js
Unescape View File

@ -492,7 +492,7 @@ const DashboardBOD = (props) => {
display: false, display: false,
}, },
datalabels: { datalabels: {
color: '#FFFFFF', color: '#000',
formatter: function (value, context) { formatter: function (value, context) {
return value ? toRupiah(value, { useUnit: 'jt' }) : 0; return value ? toRupiah(value, { useUnit: 'jt' }) : 0;
} }
@ -767,7 +767,7 @@ const DashboardBOD = (props) => {
display: false, display: false,
}, },
datalabels: { datalabels: {
color: '#FFFFFF' color: '#000'
} }
} }
}} }}

Write Preview
Loading…
Cancel
Save