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

src/container/BudgetTahunan/FixedAssetsMovement.js

@@ -327,7 +327,7 @@ export default class FixedAssetsMovement extends Component {
                             item.total_current_year,
                             item.total_next_year,
                             item.total_more_year,
-                            item.order,
+                            item.orders,
                             item.error
                         ]
                     })
@@ -527,6 +527,8 @@ export default class FixedAssetsMovement extends Component {
                     }
                 }
             })
+            // console.log(baru)
+            // console.log(anjay)
 
             let total = 0
             let opt = ""

src/container/MonthlyReport.js

@@ -32,7 +32,8 @@ export default class MonthlyReport extends Component {
             visibleFAM: false,
             visibleCAT: false,
             listAttachment: [],
-            visibleUpload: false
+            visibleUpload: false,
+            lastRevision: 0
         }
         this.fileHandler = this.fileHandler.bind(this);
     }
@@ -64,7 +65,7 @@ export default class MonthlyReport extends Component {
             "report_type": "Monthly Report",
         }
         api.create().getReportTypeBody(payload).then(response => {
-            // console.log(response);
+            console.log(response);
             if (response.data) {
                 if (response.data.status === "success") {
                     let dataTable = response.data.data.map((item, index) => {
@@ -296,10 +297,20 @@ export default class MonthlyReport extends Component {
                         return (
                             <div style={{ display: 'flex' }}>
                                 {val === "submitted" || val === "approved" ?
-                                    <img src={Images.ceklis} style={{ width: 31, height: 24 }} /> :
+                                    <span>COMPLETED</span> :
+                                    val === "draft" ?
+                                        <span>DRAFT</span> :
                                         val === "revision" ?
-                                        <span>Revisi</span> :
-                                        null
+                                            <span>REVISION</span> :
+                                            val === "approval_proccess" ?
+                                                <span>APPROVAL PROCCESS</span> :
+                                                val === "approval_review" ?
+                                                    <span>APPROVAL REVIEW</span> :
+                                                    val === "not-yet" ?
+                                                        <span>OPEN</span> :
+                                                        val === "CLOSED" ?
+                                                            <span>CLOSED</span> :
+                                                            <img src={Images.cross} style={{ width: 31, height: 24 }} />
                                 }
                             </div >
                         );
@@ -335,54 +346,19 @@ export default class MonthlyReport extends Component {
                 name: "",
                 options: { display: false }
             }]
-        // const dataTable = [
-        //     ["1", "Balance Sheet", "done"],
-        //     ["2", "Profit & Loss", ""],
-        //     ["3", "CAT", "done"],
-        //     ["4", "Fixed Assets Movement", ""],
-        //     ["5", "Tax Planning", "done"],
-        //     ["6", "Balance Sheet", "done"],
-        //     ["7", "Profit & Loss", ""],
-        //     ["8", "CAT", "done"],
-        //     ["9", "Fixed Assets Movement", ""],
-        //     ["10", "Tax Planning", "done"],
-        //     ["11", "Balance Sheet", "done"],
-        //     ["12", "Profit & Loss", "done"],
-        //     ["13", "CAT", "done"],
-        //     ["14", "Fixed Assets Movement", "done"],
-        //     ["15", "Tax Planning", "done"],
-        // ]
+
         const options = {
             filter: false,
             sort: false,
-            responsive: "scroll",
+            // responsive: "scroll",
             print: false,
             download: false,
             selectableRows: false,
             viewColumns: false,
-            rowsPerPage: 5,
-            rowsPerPageOptions: [5, 25, 100],
+            pagination: false,
             search: false
         }
-        const periode = [
-            { value: '2021', label: '2021' },
-            { value: '2020', label: '2020' },
-            { value: '2019', label: '2019' },
-            { value: '2018', label: '2018' },
-            { value: '2017', label: '2017' },
-            { value: '2016', label: '2016' },
-        ]
-        const perusahaan = [
-            { value: 'TAP Group', label: 'TAP Group' },
-            { value: '2019', label: '2019' },
-            { value: '2018', label: '2018' },
-            { value: '2017', label: '2017' },
-            { value: '2016', label: '2016' },
-        ]
-        const revisi = [
-            { value: '0', label: '0' },
-            { value: '1', label: '1' },
-        ]
+
         return (
             <div style={{ flex: 1, backgroundColor: '#f8f8f8' }}>
                 {this.state.visibleMonthlyReport && (
@@ -393,7 +369,7 @@ export default class MonthlyReport extends Component {
                         <div style={{ padding: 20, width: '100%' }}>
                             <Paper style={{ paddingTop: 10 }}>
                                 <div style={{ borderBottom: 'solid 1px #c4c4c4' }} >
-                                    <Typography style={{ fontSize: '12px', color: '#4b4b4b', margin: 10 }}>MonthlyReport</Typography>
+                                    <Typography style={{ fontSize: '12px', color: '#4b4b4b', margin: 10 }}>Monthly Report</Typography>
                                 </div>
                                 <div style={{ padding: 20 }}>
                                     <div>
@@ -427,7 +403,7 @@ export default class MonthlyReport extends Component {
                                         />
                                     </div>
                                     <div style={{ marginTop: 20 }}>
-                                        <Autocomplete
+                                        {/* <Autocomplete
                                             {...this.state.listRevision}
                                             id="revision"
                                             onChange={(event, newInputValue) => this.setState({ revision: newInputValue }, () => {
@@ -439,7 +415,8 @@ export default class MonthlyReport extends Component {
                                             style={{ width: 250 }}
                                             renderInput={(params) => <TextField {...params} label="Revision" margin="normal" style={{ marginTop: 7 }} />}
                                             value={this.state.revision}
-                                        />
+                                        /> */}
+                                        <TextField disabled={true} label="Revision" margin="normal" style={{ marginTop: 7, width: 250 }} value={this.state.lastRevision} />
                                     </div>
 
                                     <div style={{ marginTop: 20 }}>