Merge branch 'deni-dev(pc)' into 'master'

Deni dev(pc)

See merge request !531

src/container/BudgetTahunan/FixedAssetsMovement.js

@@ -351,18 +351,18 @@ export default class FixedAssetsMovement extends Component {
             data.push({
                 item_report_id: i[1],
                 total_actual_before: String(Number(i[6]).toFixed(1)),
-                january: String(Number(i[7]).toFixed(1)),
-                february: String(Number(i[8]).toFixed(1)),
-                march: String(Number(i[9]).toFixed(1)),
-                april: String(Number(i[10]).toFixed(1)),
-                may: String(Number(i[11]).toFixed(1)),
-                june: String(Number(i[12]).toFixed(1)),
-                july: String(Number(i[13]).toFixed(1)),
-                august: String(Number(i[14]).toFixed(1)),
-                september: String(Number(i[15]).toFixed(1)),
-                october: String(Number(i[16]).toFixed(1)),
-                november: String(Number(i[17]).toFixed(1)),
-                december: String(Number(i[18]).toFixed(1)),
+                january: i[0] === 5 || i[0] === 6 ? String(Number(i[7].value).toFixed(1)) : String(Number(i[7]).toFixed(1)),
+                february: i[0] === 5 || i[0] === 6 ? String(Number(i[8].value).toFixed(1)) : String(Number(i[8]).toFixed(1)),
+                march: i[0] === 5 || i[0] === 6 ? String(Number(i[9].value).toFixed(1)) : String(Number(i[9]).toFixed(1)),
+                april: i[0] === 5 || i[0] === 6 ? String(Number(i[10].value).toFixed(1)) : String(Number(i[10]).toFixed(1)),
+                may: i[0] === 5 || i[0] === 6 ? String(Number(i[11].value).toFixed(1)) : String(Number(i[11]).toFixed(1)),
+                june: i[0] === 5 || i[0] === 6 ? String(Number(i[12].value).toFixed(1)) : String(Number(i[12]).toFixed(1)),
+                july: i[0] === 5 || i[0] === 6 ? String(Number(i[13].value).toFixed(1)) : String(Number(i[13]).toFixed(1)),
+                august: i[0] === 5 || i[0] === 6 ? String(Number(i[14].value).toFixed(1)) : String(Number(i[14]).toFixed(1)),
+                september: i[0] === 5 || i[0] === 6 ? String(Number(i[15].value).toFixed(1)) : String(Number(i[15]).toFixed(1)),
+                october: i[0] === 5 || i[0] === 6 ? String(Number(i[16].value).toFixed(1)) : String(Number(i[16]).toFixed(1)),
+                november: i[0] === 5 || i[0] === 6 ? String(Number(i[17].value).toFixed(1)) : String(Number(i[17]).toFixed(1)),
+                december: i[0] === 5 || i[0] === 6 ? String(Number(i[18].value).toFixed(1)) : String(Number(i[18]).toFixed(1)),
                 total_current_year: String(Number(i[19]).toFixed(1)),
                 total_next_year: String(Number(i[20]).toFixed(1)),
                 total_more_year: String(Number(i[21]).toFixed(1))
@@ -376,7 +376,7 @@ export default class FixedAssetsMovement extends Component {
             fixed_asset_movement: data,
             status: type
         }
-        // console.log(data);
+        console.log(JSON.stringify(body));
         api.create('UPLOAD').uploadMasterBudget(body).then(response => {
             console.log(response);
             if (response.data) {

src/container/BudgetTahunan/TaxPlanning.js

@@ -480,64 +480,64 @@ export default class TaxPlanning extends Component {
             data.push({
                 item_report_id: i[4],
                 january: {
-                    tbc: String(Number(i[9].tbc).toFixed(1)),
-                    fcp: String(Number(i[9].fcp).toFixed(1)),
-                    tbf: String(Number(i[9].tbf).toFixed(1))
+                    tbc: i[1] === 3 && i[9].tbc === "" ? "0" : i[1] === 5 || i[1] === 6 || i[1] === 7 ? String(i[9].tbc.value) : String(i[9].tbc),
+                    fcp: i[2] === 3 && i[9].fcp === "" ? "0" : i[2] === 5 || i[2] === 6 || i[2] === 7 ? String(i[9].fcp.value) : String(i[9].fcp),
+                    tbf: i[3] === 3 && i[9].tbf === "" ? "0" : i[3] === 5 || i[3] === 6 || i[3] === 7 ? String(i[9].tbf.value) : String(i[9].tbf)
                 },
                 february: {
-                    tbc: String(Number(i[10].tbc).toFixed(1)),
-                    fcp: String(Number(i[10].fcp).toFixed(1)),
-                    tbf: String(Number(i[10].tbf).toFixed(1))
+                    tbc: i[1] === 3 && i[10].tbc === "" ? "0" : i[1] === 5 || i[1] === 6 || i[1] === 7 ? String(i[10].tbc.value) : String(i[10].tbc),
+                    fcp: i[2] === 3 && i[10].fcp === "" ? "0" : i[2] === 5 || i[2] === 6 || i[2] === 7 ? String(i[10].fcp.value) : String(i[10].fcp),
+                    tbf: i[3] === 3 && i[10].tbf === "" ? "0" : i[3] === 5 || i[3] === 6 || i[3] === 7 ? String(i[10].tbf.value) : String(i[10].tbf)
                 },
                 march: {
-                    tbc: String(Number(i[11].tbc).toFixed(1)),
-                    fcp: String(Number(i[11].fcp).toFixed(1)),
-                    tbf: String(Number(i[11].tbf).toFixed(1))
+                    tbc: i[1] === 3 && i[11].tbc === "" ? "0" : i[1] === 5 || i[1] === 6 || i[1] === 7 ? String(i[11].tbc.value) : String(i[11].tbc),
+                    fcp: i[2] === 3 && i[11].fcp === "" ? "0" : i[2] === 5 || i[2] === 6 || i[2] === 7 ? String(i[11].fcp.value) : String(i[11].fcp),
+                    tbf: i[3] === 3 && i[11].tbf === "" ? "0" : i[3] === 5 || i[3] === 6 || i[3] === 7 ? String(i[11].tbf.value) : String(i[11].tbf)
                 },
                 april: {
-                    tbc: String(Number(i[12].tbc).toFixed(1)),
-                    fcp: String(Number(i[12].fcp).toFixed(1)),
-                    tbf: String(Number(i[12].tbf).toFixed(1))
+                    tbc: i[1] === 3 && i[12].tbc === "" ? "0" : i[1] === 5 || i[1] === 6 || i[1] === 7 ? String(i[12].tbc.value) : String(i[12].tbc),
+                    fcp: i[2] === 3 && i[12].fcp === "" ? "0" : i[2] === 5 || i[2] === 6 || i[2] === 7 ? String(i[12].fcp.value) : String(i[12].fcp),
+                    tbf: i[3] === 3 && i[12].tbf === "" ? "0" : i[3] === 5 || i[3] === 6 || i[3] === 7 ? String(i[12].tbf.value) : String(i[12].tbf)
                 },
                 may: {
-                    tbc: String(Number(i[13].tbc).toFixed(1)),
-                    fcp: String(Number(i[13].fcp).toFixed(1)),
-                    tbf: String(Number(i[13].tbf).toFixed(1))
+                    tbc: i[1] === 3 && i[13].tbc === "" ? "0" : i[1] === 5 || i[1] === 6 || i[1] === 7 ? String(i[13].tbc.value) : String(i[13].tbc),
+                    fcp: i[2] === 3 && i[13].fcp === "" ? "0" : i[2] === 5 || i[2] === 6 || i[2] === 7 ? String(i[13].fcp.value) : String(i[13].fcp),
+                    tbf: i[3] === 3 && i[13].tbf === "" ? "0" : i[3] === 5 || i[3] === 6 || i[3] === 7 ? String(i[13].tbf.value) : String(i[13].tbf)
                 },
                 june: {
-                    tbc: String(Number(i[14].tbc).toFixed(1)),
-                    fcp: String(Number(i[14].fcp).toFixed(1)),
-                    tbf: String(Number(i[14].tbf).toFixed(1))
+                    tbc: i[1] === 3 && i[14].tbc === "" ? "0" : i[1] === 5 || i[1] === 6 || i[1] === 7 ? String(i[14].tbc.value) : String(i[14].tbc),
+                    fcp: i[2] === 3 && i[14].fcp === "" ? "0" : i[2] === 5 || i[2] === 6 || i[2] === 7 ? String(i[14].fcp.value) : String(i[14].fcp),
+                    tbf: i[3] === 3 && i[14].tbc === "" ? "0" : i[3] === 5 || i[3] === 6 || i[3] === 7 ? String(i[14].tbf.value) : String(i[14].tbf)
                 },
                 july: {
-                    tbc: String(Number(i[15].tbc).toFixed(1)),
-                    fcp: String(Number(i[15].fcp).toFixed(1)),
-                    tbf: String(Number(i[15].tbf).toFixed(1))
+                    tbc: i[1] === 3 && i[15].tbc === "" ? "0" : i[1] === 5 || i[1] === 6 || i[1] === 7 ? String(i[15].tbc.value) : String(i[15].tbc),
+                    fcp: i[2] === 3 && i[15].fcp === "" ? "0" : i[2] === 5 || i[2] === 6 || i[2] === 7 ? String(i[15].fcp.value) : String(i[15].fcp),
+                    tbf: i[3] === 3 && i[15].tbf === "" ? "0" : i[3] === 5 || i[3] === 6 || i[3] === 7 ? String(i[15].tbf.value) : String(i[15].tbf)
                 },
                 august: {
-                    tbc: String(Number(i[16].tbc).toFixed(1)),
-                    fcp: String(Number(i[16].fcp).toFixed(1)),
-                    tbf: String(Number(i[16].tbf).toFixed(1))
+                    tbc: i[1] === 3 && i[16].tbc === "" ? "0" : i[1] === 5 || i[1] === 6 || i[1] === 7 ? String(i[16].tbc.value) : String(i[16].tbc),
+                    fcp: i[2] === 3 && i[16].fcp === "" ? "0" : i[2] === 5 || i[2] === 6 || i[2] === 7 ? String(i[16].fcp.value) : String(i[16].fcp),
+                    tbf: i[3] === 3 && i[16].tbf === "" ? "0" : i[3] === 5 || i[3] === 6 || i[3] === 7 ? String(i[16].tbf.value) : String(i[16].tbf)
                 },
                 september: {
-                    tbc: String(Number(i[17].tbc).toFixed(1)),
-                    fcp: String(Number(i[17].fcp).toFixed(1)),
-                    tbf: String(Number(i[17].tbf).toFixed(1))
+                    tbc: i[1] === 3 && i[17].tbc === "" ? "0" : i[1] === 5 || i[1] === 6 || i[1] === 7 ? String(i[17].tbc.value) : String(i[17].tbc),
+                    fcp: i[2] === 3 && i[17].fcp === "" ? "0" : i[2] === 5 || i[2] === 6 || i[2] === 7 ? String(i[17].fcp.value) : String(i[17].fcp),
+                    tbf: i[3] === 3 && i[17].tbf === "" ? "0" : i[3] === 5 || i[3] === 6 || i[3] === 7 ? String(i[17].tbf.value) : String(i[17].tbf)
                 },
                 october: {
-                    tbc: String(Number(i[18].tbc).toFixed(1)),
-                    fcp: String(Number(i[18].fcp).toFixed(1)),
-                    tbf: String(Number(i[18].tbf).toFixed(1))
+                    tbc: i[1] === 3 && i[18].tbc === "" ? "0" : i[1] === 5 || i[1] === 6 || i[1] === 7 ? String(i[18].tbc.value) : String(i[18].tbc),
+                    fcp: i[2] === 3 && i[18].fcp === "" ? "0" : i[2] === 5 || i[2] === 6 || i[2] === 7 ? String(i[18].fcp.value) : String(i[18].fcp),
+                    tbf: i[3] === 3 && i[18].tbf === "" ? "0" : i[3] === 5 || i[3] === 6 || i[3] === 7 ? String(i[18].tbf.value) : String(i[18].tbf)
                 },
                 november: {
-                    tbc: String(Number(i[19].tbc).toFixed(1)),
-                    fcp: String(Number(i[19].fcp).toFixed(1)),
-                    tbf: String(Number(i[19].tbf).toFixed(1))
+                    tbc: i[1] === 3 && i[19].tbc === "" ? "0" : i[1] === 5 || i[1] === 6 || i[1] === 7 ? String(i[19].tbc.value) : String(i[19].tbc),
+                    fcp: i[2] === 3 && i[19].fcp === "" ? "0" : i[2] === 5 || i[2] === 6 || i[2] === 7 ? String(i[19].fcp.value) : String(i[19].fcp),
+                    tbf: i[3] === 3 && i[19].tbf === "" ? "0" : i[3] === 5 || i[3] === 6 || i[3] === 7 ? String(i[19].tbf.value) : String(i[19].tbf)
                 },
                 december: {
-                    tbc: String(Number(i[20].tbc).toFixed(1)),
-                    fcp: String(Number(i[20].fcp).toFixed(1)),
-                    tbf: String(Number(i[20].tbf).toFixed(1))
+                    tbc: i[1] === 3 && i[20].tbc === "" ? "0" : i[1] === 5 || i[1] === 6 || i[1] === 7 ? String(i[20].tbc.value) : String(i[20].tbc),
+                    fcp: i[2] === 3 && i[20].fcp === "" ? "0" : i[2] === 5 || i[2] === 6 || i[2] === 7 ? String(i[20].fcp.value) : String(i[20].fcp),
+                    tbf: i[3] === 3 && i[20].tbf === "" ? "0" : i[3] === 5 || i[3] === 6 || i[3] === 7 ? String(i[20].tbf.value) : String(i[20].tbf)
                 },
                 total_current_year: String(Number(i[21]).toFixed(1)),
                 total_next_year: {