Merge branch 'rifka' into 'master'

add managdoc qreview dan visualisasi

See merge request !285

src/container/ApprovalMatrix/VisualisasiAM.js

@@ -220,7 +220,7 @@ export default class VisualisasiAM extends Component {
                                         {this.state.listApproval.sort((a,b) => a.orderId - b.orderId).map((item, index) => (
                                             <li key={index} style={{color: '#4b4b4b', fontSize: 14}}>
                                                 <a href='#' style={{ color: '#4b4b4b', fontSize: '14px', cursor: 'auto', outline: 'none' }}>
-                                                    <div className="grid grid-3x grid-mobile-none gap-20px margin-bottom-20px" style={{width: '75%'}}>
+                                                    <div className="grid grid-4x grid-mobile-none gap-20px margin-bottom-20px" style={{width: '75%'}}>
                                                         {item.data.map((items, indexs) => {return(<label>{items.fullname}</label>)})}
                                                         <label>{item.data.length == 1? '' : item.data[0].operator_type_name}</label>
                                                     </div>
@@ -231,20 +231,20 @@ export default class VisualisasiAM extends Component {
                                     </ReactDragListView>
                                 </div>
                             </div>
-                            <div className="row" style={{ display: 'flex', flexDirection: 'row', justifyContent: 'space-between', paddingRight: 15, paddingLeft: 15, paddingBottom: 25 }}>
-                                <div onClick={() => this.props.onClickClose()} style={{ width: 102, height: 30, marginLeft: 25, backgroundColor: 'dodgerblue', borderRadius: 5, alignItems: 'center', display: 'flex', justifyContent: 'center', cursor:"pointer" }}>
+                            <div className="row" style={{ float: 'right', display: 'flex', flexDirection: 'row', justifyContent: 'space-between', paddingRight: 15, paddingLeft: 15, paddingBottom: 25 }}>
+                                {/* <div onClick={() => this.props.onClickClose()} style={{ width: 102, height: 30, marginLeft: 25, backgroundColor: 'dodgerblue', borderRadius: 5, alignItems: 'center', display: 'flex', justifyContent: 'center', cursor:"pointer" }}>
                                     <span style={{ color: '#fff', fontSize: 11 }}>Back</span>
-                                </div>
-                                {this.props.btnedit && (
+                                </div> */}
                                 <div className="row" style={{ float: 'right', marginRight: 25 }}>
                                     <div onClick={() => this.props.onClickClose()} style={{ width: 102, height: 30, border: 'solid 1px #354960', borderRadius: 5, alignItems: 'center', display: 'flex', justifyContent: 'center', cursor:"pointer" }}>
                                         <span style={{ color: '#354960', fontSize: 11 }} >Cancel</span>
                                     </div>
+                                    {this.props.btnedit && (
                                     <div onClick={() => this.handleSave()} style={{ width: 102, height: 30, marginLeft: 25, backgroundColor: '#354960', borderRadius: 5, alignItems: 'center', display: 'flex', justifyContent: 'center', cursor:"pointer" }}>
                                         <span style={{ color: '#fff', fontSize: 11 }}>Save</span>
                                     </div>
+                                    )}
                                 </div>
-                                )}
                             </div>
                         </div>
                 </div>

src/container/BudgetTahunan.js

@@ -677,6 +677,8 @@ export default class BudgetTahunan extends Component {
                         company={this.state.company}
                         revision={this.state.revisionTable}
                         periode={this.state.periode.periode}
+                        submissionID={this.state.submissionID}
+                        saveToMasterBudget={this.saveToMasterBudget.bind(this)}
                         onClickClose={() => this.setState({ visibleTP: false, visibleBudgetTahunan: true })}
                     />
                 )}

src/container/DocumentManagement/BOD.js

+import React, { Component } from 'react'
+import MUIDataTable from 'mui-datatables'
+import { createMuiTheme, MuiThemeProvider } from '@material-ui/core';
+import api from '../../api';
+import CreateManagementDoc from './CreateManagementDoc';
+
+
+var ct = require("../../library/CustomTable");
+const getMuiTheme = () => createMuiTheme(ct.customTable());
+const options = ct.customOptionsManagementDocument();
+
+export default class AuditTahunan extends Component {
+    constructor(props) {
+        super(props)
+        this.state = {
+            dataTable: [],
+            visibleCreate: false
+        }
+    }
+
+    componentDidMount() {
+        console.log(this.props.data)
+        this.getData()
+    }
+
+    getData() {
+        let payload = {
+            "company_id": 1,
+            "document_category_id": 4
+        }
+
+        api.create().getAllDocument(payload).then(respone => {
+            let dataTable = respone.data.data.map(item => {
+                return [
+                    item.document_name,
+                    item.description,
+                    item.company_name,
+                    "",
+                    item.document_type,
+                    String(Number(item.document_size) / 1000 + ' MB'),
+                    item.created_by,
+                    item.created_at,
+                ]
+            })
+            this.setState({ dataTable })
+        })
+    }
+
+    render() {
+        let columns = [
+            "Nama File", "Keterangan", "Perusahaan", "Periode", "Tipe", "Ukuran", "Ditambahkan Oleh", "Ditambahkan Tanggal"
+        ]
+        return (
+            <div style={{ width: '100%' }}>
+                <div style={{ padding: 25 }}>
+                    <MuiThemeProvider theme={getMuiTheme()}>
+                        <MUIDataTable
+                            theme={getMuiTheme()}
+                            data={this.state.dataTable}
+                            columns={columns}
+                            options={options}
+                        />
+                    </MuiThemeProvider>
+                </div>
+            </div>
+        )
+    }
+}

src/container/DocumentManagement/DocumentManagement.js

@@ -106,7 +106,7 @@ export default class DocumentManagement extends Component {
                                     this.state.id === 68541 ?
                                         <ManualBookTia />
                                         :
-                                        this.state.id === 3 ?
+                                        this.state.id === 68544 ?
                                             <QReview
                                                 data={this.state.listData[this.state.tab]}
                                             />

src/container/DocumentManagement/QReview.js

@@ -14,23 +14,35 @@ export default class AuditTahunan extends Component {
         super(props)
         this.state = {
             dataTable: [],
-            visibleCreate: false
+            visibleCreate: false,
+            refresh: ''
         }
     }
 
     componentDidMount() {
-        console.log(this.props.data)
+        // console.log(this.props.data)
         this.getData()
     }
 
+    componentWillReceiveProps(props) {
+        // console.log(props);
+        const { refresh, id } = this.props;
+        if (props.refresh !== refresh) {
+            this.getData()
+        }
+      }
+
     getData() {
         let payload = {
-            "company_id": 1,
-            "document_category_id": 3
+            "setting_id": this.props.data.setting_id
         }
 
-        api.create().getAllDocument(payload).then(respone => {
-            let dataTable = respone.data.data.map(item => {
+        api.create().getAllDocument(payload).then(response => {
+            console.log(response)
+            if (response.problem){
+                alert(response.problem)
+            } else {
+            let dataTable = response.data.data.map(item => {
                 return [
                     item.document_name,
                     item.description,
@@ -43,6 +55,7 @@ export default class AuditTahunan extends Component {
                 ]
             })
             this.setState({ dataTable })
+            }
         })
     }