Merge branch 'master' of http://103.44.149.204/d.arizona/tia-dev into faisal

src/api/index.js

@@ -282,6 +282,7 @@ const create = (type = "") => {
   const submitRollingOutlook = (body) => api.post('transaction/rolling_outlook/submit_rolling_outlook', body)
   const getRollingOutlookCompanySubmitted = (body) => api.post('transaction/rolling_outlook/get_company_submitted', body)
   const getRollingOutlookCF = (body) => api.post('transaction/cash_flow/rolling_outlook/get_report_hierarki', body)
+  const createRollingOutlookCF = (body) => api.post('transaction/cash_flow/rolling_outlook/create_rolling_outlook', body)
 
   //REPORT NEW
   const getAllReportBS = (body) => api.post('/transaction/db_balance_sheet/get_report_hierarki', body)
@@ -784,7 +785,8 @@ const create = (type = "") => {
     approvalRolling,
     createPeriodeRevisionRO,
     historyApprovalRO,
-    getRollingOutlookCF
+    getRollingOutlookCF,
+    createRollingOutlookCF
   }
 }
 

src/container/OprIndicator/OperatingIndicator.js

@@ -508,10 +508,10 @@ export default class OperatingIndicator extends Component {
                                         borderColor: 'transparent'
                                     }}
                                     onClick={() =>
-                                        tableMeta.rowData[4] ? 
+                                        // tableMeta.rowData[4] ? 
                                         this.clickDetail(tableMeta.rowData, tableMeta.rowData[1], tableMeta.rowData[3], tableMeta.rowData[2])
-                                        : 
-                                        null
+                                        // : 
+                                        // null
                                     }
                                 >
                                     <Typography style={{ color: tableMeta.rowData[4] ? '#5198ea' : 'GrayText', fontSize: 12, }}>Detail</Typography>

src/container/RollingOutlook.js

@@ -890,9 +890,11 @@ export default class RollingOutlook extends Component {
                                     <span>COMPLETED</span> :
                                     val === "draft" ?
                                         <span>DRAFT</span> :
+                                        val === "incomplete" ?
+                                            <span>INCOMPLETE</span> :
                                             val === "revision" ?
                                                 <span>REVISION</span> :
-                                            val === "approval_proccess" ?
+                                                val === "approval_process" ?
                                                     <span>APPROVAL PROCCESS</span> :
                                                     val === "approval_review" ?
                                                         <span>APPROVAL REVIEW</span> :

src/container/RollingOutlook/BalanceSheetRO.js

@@ -62,6 +62,7 @@ export default class BalanceSheetRO extends Component {
     }
 
     componentDidMount() {
+        console.log(this.props);
         // this.getItemHierarki()
         this.getLatestUpdate()
         this.getSettingControl()
@@ -1065,6 +1066,7 @@ export default class BalanceSheetRO extends Component {
                                                 />
                                             </div> :
                                             tableMeta.rowData[0] === 7 ?
+                                            this.props.quarter === 'q1' || this.props.quarter === 'q2' || this.props.quarter === 'q3' ? null :
                                                 (Number(handleValueFormula(tableMeta, 6)).toFixed(1) >= Number(this.state.minValue) && Number(handleValueFormula(tableMeta, 6)).toFixed(1) <= Number(this.state.maxValue)) ?
                                                     <NumberFormat
                                                         thousandSeparator={true}
@@ -1196,6 +1198,7 @@ export default class BalanceSheetRO extends Component {
                                                 />
                                             </div> :
                                             tableMeta.rowData[0] === 7 ?
+                                            this.props.quarter === 'q1' || this.props.quarter === 'q2' || this.props.quarter === 'q3' ? null :
                                                 (Number(handleValueFormula(tableMeta, 7)).toFixed(1) >= Number(this.state.minValue) && Number(handleValueFormula(tableMeta, 7)).toFixed(1) <= Number(this.state.maxValue)) ?
                                                     <NumberFormat
                                                         thousandSeparator={true}
@@ -1327,6 +1330,7 @@ export default class BalanceSheetRO extends Component {
                                                 />
                                             </div> :
                                             tableMeta.rowData[0] === 7 ?
+                                            this.props.quarter === 'q1' || this.props.quarter === 'q2' || this.props.quarter === 'q3' ? null :
                                                 (Number(handleValueFormula(tableMeta, 8)).toFixed(1) >= Number(this.state.minValue) && Number(handleValueFormula(tableMeta, 8)).toFixed(1) <= Number(this.state.maxValue)) ?
                                                     <NumberFormat
                                                         thousandSeparator={true}
@@ -1458,6 +1462,7 @@ export default class BalanceSheetRO extends Component {
                                                 />
                                             </div> :
                                             tableMeta.rowData[0] === 7 ?
+                                            this.props.quarter === 'q1' || this.props.quarter === 'q2' || this.props.quarter === 'q3' ? null :
                                                 (Number(handleValueFormula(tableMeta, 9)).toFixed(1) >= Number(this.state.minValue) && Number(handleValueFormula(tableMeta, 9)).toFixed(1) <= Number(this.state.maxValue)) ?
                                                     <NumberFormat
                                                         thousandSeparator={true}
@@ -1589,6 +1594,7 @@ export default class BalanceSheetRO extends Component {
                                                 />
                                             </div> :
                                             tableMeta.rowData[0] === 7 ?
+                                            this.props.quarter === 'q2' || this.props.quarter === 'q3' ? null :
                                                 (Number(handleValueFormula(tableMeta, 10)).toFixed(1) >= Number(this.state.minValue) && Number(handleValueFormula(tableMeta, 10)).toFixed(1) <= Number(this.state.maxValue)) ?
                                                     <NumberFormat
                                                         thousandSeparator={true}
@@ -1720,6 +1726,7 @@ export default class BalanceSheetRO extends Component {
                                                 />
                                             </div> :
                                             tableMeta.rowData[0] === 7 ?
+                                             this.props.quarter === 'q2' || this.props.quarter === 'q3' ? null :
                                                 (Number(handleValueFormula(tableMeta, 11)).toFixed(1) >= Number(this.state.minValue) && Number(handleValueFormula(tableMeta, 11)).toFixed(1) <= Number(this.state.maxValue)) ?
                                                     <NumberFormat
                                                         thousandSeparator={true}
@@ -1851,6 +1858,7 @@ export default class BalanceSheetRO extends Component {
                                                 />
                                             </div> :
                                             tableMeta.rowData[0] === 7 ?
+                                            this.props.quarter === 'q2' || this.props.quarter === 'q3' ? null :
                                                 (Number(handleValueFormula(tableMeta, 12)).toFixed(1) >= Number(this.state.minValue) && Number(handleValueFormula(tableMeta, 12)).toFixed(1) <= Number(this.state.maxValue)) ?
                                                     <NumberFormat
                                                         thousandSeparator={true}
@@ -1982,6 +1990,7 @@ export default class BalanceSheetRO extends Component {
                                                 />
                                             </div> :
                                             tableMeta.rowData[0] === 7 ?
+                                            this.props.quarter === 'q3' ? null :
                                                 (Number(handleValueFormula(tableMeta, 13)).toFixed(1) >= Number(this.state.minValue) && Number(handleValueFormula(tableMeta, 13)).toFixed(1) <= Number(this.state.maxValue)) ?
                                                     <NumberFormat
                                                         thousandSeparator={true}
@@ -2113,6 +2122,7 @@ export default class BalanceSheetRO extends Component {
                                                 />
                                             </div> :
                                             tableMeta.rowData[0] === 7 ?
+                                            this.props.quarter === 'q3' ? null :
                                                 (Number(handleValueFormula(tableMeta, 14)).toFixed(1) >= Number(this.state.minValue) && Number(handleValueFormula(tableMeta, 14)).toFixed(1) <= Number(this.state.maxValue)) ?
                                                     <NumberFormat
                                                         thousandSeparator={true}
@@ -2244,6 +2254,7 @@ export default class BalanceSheetRO extends Component {
                                                 />
                                             </div> :
                                             tableMeta.rowData[0] === 7 ?
+                                            this.props.quarter === 'q3' ? null :
                                                 (Number(handleValueFormula(tableMeta, 15)).toFixed(1) >= Number(this.state.minValue) && Number(handleValueFormula(tableMeta, 15)).toFixed(1) <= Number(this.state.maxValue)) ?
                                                     <NumberFormat
                                                         thousandSeparator={true}

src/container/RollingOutlook/OperatingIndicatorRO.js

@@ -2138,7 +2138,7 @@ export default class OperatingIndicatorRO extends Component {
                                     </button>
                                 </div>
                                 {!this.state.emptyData && (this.props.permission.create || this.props.permission.edit) && <div className="col-2" style={{ display: 'flex', justifyContent: 'flex-end', maxWidth: '100%', paddingRight: 2 }}>
-                                    {this.state.get_for == 'view' && this.state.viewOnly &&
+                                    {this.state.get_for == 'view' && 
                                         <button
                                             type="button"
                                             onClick={() => {

src/container/RollingOutlook/ProfitLossRO.js

@@ -444,7 +444,7 @@ export default class ProfitLossROO extends Component {
                             orders: i[0] === undefined ? "" : String(i[0]).trim(),
                             "item_report_id": i[1] === undefined ? 0 : i[1],
                             "item_report": i[2] === undefined ? "" : String(i[2]).trim(),
-                            "notes": i[3] === undefined ? "0" : reg.test(String(i[3])) === false ? "0" : String(i[3]).trim(),
+                            "notes": i[3] === undefined ? "" : reg.test(String(i[3])) === false ? "" : String(i[3]).trim(),
                             "january": i[4] === undefined ? "0" : reg.test(String(i[4])) === false ? "0" : String(i[4]).trim(),
                             "february": i[5] === undefined ? "0" : reg.test(String(i[5])) === false ? "0" : String(i[5]).trim(),
                             "march": i[6] === undefined ? "0" : reg.test(String(i[6])) === false ? "0" : String(i[6]).trim(),