push

src/container/BudgetTahunan.js

@@ -1002,6 +1002,7 @@ export default class BudgetTahunan extends Component {
                         onClickClose={() => this.setState({ visibleTP: false, visibleBudgetTahunan: true })}
                         getReport={this.getCompanyActive.bind(this)}
                         status={this.state.status}
+                        isApprover={this.state.isApprover}
                     />
                 )}
                 {this.state.visibleFAM && (

src/container/BudgetTahunan/TaxPlanning.js

@@ -170,9 +170,9 @@ export default class TaxPlanning extends Component {
                         }
                     }
                 })
-                this.setState({ dataTable, loading: false, buttonError: true })
+                this.setState({ dataTable, loading: false, buttonError: true, editable: true })
             } else {
-                this.setState({ dataTable, loading: false, buttonError: true })   
+                this.setState({ dataTable, loading: false, buttonError: true, editable: true })   
             }
         })
     }
@@ -693,7 +693,7 @@ export default class TaxPlanning extends Component {
         api.create().validateSubmitReport(payload).then((response) => {
             console.log(response)
             if (response.data.data.result) {
-                this.setState({ loading: false, buttonError: false, editable: true, })
+                this.setState({ loading: false, buttonError: false, editable: false })
                 // alert("Type Input Can't be Empty")
             } else {
                 this.setState({ loading: false, buttonError: true, editable: true })
@@ -4825,6 +4825,7 @@ export default class TaxPlanning extends Component {
                                         <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>in IDR mn</Typography>
                                     </div>
                                     <div style={{ width: '50%' }}>
+                                    {this.props.isApprover == true ? null :
                                         <div style={{ justifyContent: 'flex-end', display: 'flex', flexFlow: 'wrap' }}>
                                             <a data-tip={'Download Template'} data-for="template">
                                                 <button
@@ -4874,6 +4875,7 @@ export default class TaxPlanning extends Component {
                                             </a>
                                             <ReactTooltip border={true} id="download" place="bottom" type="light" effect="solid" />
                                         </div>
+                                    }
                                     </div>
                                 </div>
 
@@ -4910,6 +4912,7 @@ export default class TaxPlanning extends Component {
                                         </div>
                                     </button>
                                 </div>
+                                {this.props.isApprover === true ? null :
                                 <div className="col-2" style={{ display: 'flex', justifyContent: 'flex-end', maxWidth: '100%' }}>
                                     <button
                                         className="button"
@@ -4939,20 +4942,16 @@ export default class TaxPlanning extends Component {
                                         className="button"
                                         type="button"
                                         onClick={() => this.state.editable === true ?
+                                            null :
                                             this.setState({ loading: true }, () => {
                                                 setTimeout(() => {
                                                     this.backToMasterBudget('draft')
                                                 }, 100);
-                                            }) :
-                                            this.setState({ loading: true }, () => {
-                                                setTimeout(() => {
-                                                    this.props.onClickClose()
-                                                }, 100);
                                             })
                                         }
                                         style={{
                                             backgroundColor: 'transparent',
-                                            cursor: 'pointer',
+                                            cursor: this.state.editable !== true ? 'pointer' : 'default',
                                             borderColor: 'transparent',
                                             outline: 'none',
                                             marginRight: 20
@@ -4973,7 +4972,9 @@ export default class TaxPlanning extends Component {
                                                         this.setState({ alert: true, messageAlert: 'Data is not complete !', tipeAlert: 'warning', loading: false })
                                                     }, 100);
                                                 })
-                                                : this.backToMasterBudget('submitted')
+                                                : this.setState({ loading: true }, () => {
+                                                    this.backToMasterBudget('submitted')
+                                                })
                                         }}
                                         style={{
                                             backgroundColor: 'transparent',
@@ -4987,6 +4988,7 @@ export default class TaxPlanning extends Component {
                                         </div>
                                     </button>
                                 </div>
+                                }
                             </div>
                         </Paper>
                     :

src/container/DocumentManagement/CreateManagementDoc.js

@@ -45,7 +45,7 @@ export default class CreateManagementDoc extends Component {
             fileType: '',
             konfirmasi: false,
             docId:'',
-            sizeUpload: "1"
+            // sizeUpload: ""
         }
     }
 
@@ -55,7 +55,6 @@ export default class CreateManagementDoc extends Component {
         this.getPeriode()
         this.getMonth()
         this.getFileSize()
-        console.log(this.props.setting_id)
         console.log(this.props.name)
     }
 
@@ -69,9 +68,15 @@ export default class CreateManagementDoc extends Component {
             console.log(response);
             if (response.data) {
                 if (response.data.status === "success") {
+                    if(response.data.data.length == 0){
                         this.setState({
-                        sizeUpload: response.data.data[0] ? response.data.data[0].value === undefined ? "1" : response.data.data[0].value : "1"
+                            sizeUpload: "1"
                         })
+                    } else
+                    this.setState({
+                        sizeUpload: response.data.data[0].value
+                    })
+                    console.log(this.state.sizeUpload)
                 }
             }
         })
@@ -121,7 +126,7 @@ export default class CreateManagementDoc extends Component {
 
         // }
         api.create().getDocumentCategory().then(response => {
-            console.log(response);
+            // console.log(response);
             if (response.data) {
                 if (response.data.status == 'success') {
                     let data = response.data.data
@@ -155,7 +160,7 @@ export default class CreateManagementDoc extends Component {
     getPeriode() {
         api.create().getPeriodeTransaction().then(response => {
             let dateNow = new Date
-            console.log(dateNow)
+            // console.log(dateNow)
             let year = format(dateNow, 'yyyy')
             if (response.data) {
                 if (response.data.status === "success") {
@@ -179,7 +184,6 @@ export default class CreateManagementDoc extends Component {
     getMonth(){
         api.create().getMonthTransaction().then(response => {
             let dateNow = new Date
-            console.log(dateNow)
             // let bulan = format(dateNow, 'MMMM')
             if (response.data) {
                 if (response.data.status === "success") {
@@ -220,7 +224,7 @@ export default class CreateManagementDoc extends Component {
         let length = event.name.split(".").length
         let fileType = event.name.split(".")[length - 1]
         ExcelRenderer(fileObj, (err, resp) => {
-            console.log(fileType)
+            // console.log(fileType)
             if (err) {
                 console.log(err);
             }
@@ -248,7 +252,7 @@ export default class CreateManagementDoc extends Component {
                 formData.append("documentPeriode", null);
                 formData.append("documentMonth", null);
                 this.setState({ formData }, ()=> {
-                    this.props.createDocument(this.state.formData, this.props.setting_id)
+                    this.props.createDocument(this.state.formData, this.props.setting_id, this.props.name)
                 })
             }
         
@@ -274,7 +278,7 @@ export default class CreateManagementDoc extends Component {
                 formData.append("documentPeriode", this.state.periode.periode);
                 formData.append("documentMonth", this.state.monthId.month_id);
                 this.setState({ formData }, ()=> {
-                    this.props.createDocument(this.state.formData, this.props.setting_id)
+                    this.props.createDocument(this.state.formData, this.props.setting_id, this.props.name)
                 })
             }
         } 

src/container/DocumentManagement/DocumentManagement.js

@@ -37,7 +37,7 @@ export default class DocumentManagement extends Component {
             menu: "document management"
         }
         api.create().getPermission(payload).then(response => {
-            console.log(response)
+            // console.log(response)
             if (response.data) {
                 if (response.data.status === "success") {
                     this.setState({
@@ -95,7 +95,7 @@ export default class DocumentManagement extends Component {
         })
     }
 
-    createDocument(payload, settingID) {
+    createDocument(payload, settingID, menuName) {
         api.create().uploadDocument(payload).then(response => {
             console.log(response)
             if (response.data) {
@@ -106,8 +106,8 @@ export default class DocumentManagement extends Component {
                         })
                     }
                     else if (response.data.message === "Upload Document Success") {
-                        this.getDataDocument(settingID)
-                        this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'success', settingID, visibleCreate: false })
+                        this.getDataDocument(settingID, menuName)
+                        this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'success', settingID, menuName, visibleCreate: false })
                     }
                     else {
                         this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
@@ -146,7 +146,7 @@ export default class DocumentManagement extends Component {
             if (response.data) {
                 if (response.ok) {
                     if (response.data.status === "success") {
-                        this.getDataDocument(this.state.settingID)
+                        this.getDataDocument(this.state.settingID, this.state.menuName)
                         this.setState({ konfirmasi: false, alert: true, messageAlert: response.data.message, tipeAlert: 'success', visibleCreate: false })
                     } else {
                         this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {

src/container/DocumentManagement/EditManagementDoc.js

@@ -57,7 +57,6 @@ export default class EditManagementDoc extends Component {
         this.getFileSize()
         if (this.props.type === 'edit') {
             this.getDetailDoc()
-            console.log(this.props.data)
         }
     }
 
@@ -265,12 +264,11 @@ export default class EditManagementDoc extends Component {
     }
 
     fileHandler = (event) => {
-        console.log(event)
         let fileObj = event
         let length = event.name.split(".").length
         let fileType = event.name.split(".")[length - 1]
         ExcelRenderer(fileObj, (err, resp) => {
-            console.log(fileType)
+            // console.log(fileType)
             if (err) {
                 console.log(err);
             }
@@ -321,12 +319,6 @@ export default class EditManagementDoc extends Component {
             this.setState({ formData }, () => {
                 this.props.updateDocument(this.state.formData)
             })
-            var object = {};
-            formData.forEach(function(value, key){
-                object[key] = value;
-            });
-            var json = JSON.stringify(object);
-            console.log(json)
         }
     }