merge master

src/container/BudgetTahunan.js

@@ -753,9 +753,9 @@ export default class BudgetTahunan extends Component {
                                         borderColor: 'transparent'
                                     }}
                                     onClick={() =>
-                                        // tableMeta.rowData[5] == true ?
+                                        tableMeta.rowData[5] == true ?
                                             this.clickDetail(tableMeta.rowData[1], tableMeta.rowData[4], tableMeta.rowData[2], tableMeta.rowData[3])
-                                        // : null
+                                        : null
                                     }
                                 >
                                     {/* {this.state.isApprover == true ? 
@@ -1032,7 +1032,8 @@ export default class BudgetTahunan extends Component {
                                         </div>
                                         {!this.state.isApprover && (this.state.lastStatus === 'SUBMIT' || this.state.lastStatus === 'REVISION') && (
                                             <div style={{ width: '50%' }}>
-                                                {this.state.listAttachment.length > 0 ?
+                                                {
+                                                this.state.listAttachment.length > 0 ?
                                                     this.state.listAttachment.map((item) => {
                                                         return (
                                                             <button

src/container/DocumentManagement/CreateManagementDoc.js

@@ -327,7 +327,7 @@ export default class CreateManagementDoc extends Component {
         );
         return (
             <div>
-                <div className="test app-popup-show" style={{ zIndex: 120 }}>
+                <div className="test app-popup-show">
                     <div className="popup-content background-white border-radius" style={{ borderRadius: 8 }}>
                         <div className="popup-panel grid grid-2x main-color" style={{ height: 64, borderTopRightRadius: 8, borderTopLeftRadius: 8 }}>
                             <div className="col-1" style={{ maxWidth: "inherit", display: 'flex', alignItems: 'center' }}>

src/container/DocumentManagement/DocumentManagement.js

@@ -93,7 +93,7 @@ export default class DocumentManagement extends Component {
     }
 
     createDocument(payload, settingID, menuName) {
-        // this.setState({ visibleCreate: false, loading: true })
+        this.setState({ loading: true })
         api.create().uploadDocument(payload).then(response => {
             console.log(response)
             if (response.data) {
@@ -227,7 +227,7 @@ export default class DocumentManagement extends Component {
 
     render() {
         const loadingComponent = (
-            <div style={{ position: 'absolute', zIndex: 110, top: 0, left: 0, width: '100%', height: '100%', display: 'flex', justifyContent: 'center', alignItems: 'center', background: 'rgba(255,255,255,0.8)' }}>
+            <div style={{ position: 'absolute', zIndex: 1500, top: 0, left: 0, width: '100%', height: '100%', display: 'flex', justifyContent: 'center', alignItems: 'center', background: 'rgba(255,255,255,0.8)' }}>
                 <PropagateLoader
                     // css={override}
                     size={20}

src/container/OutlookPA/TaxPlanningOLPA.js

@@ -721,22 +721,6 @@ export default class TaxPlanningOLPA extends Component {
         }
     }
 
-    // async downloadAllData() {
-    //     let url = `https://tia.eksad.com/tia-reporting-dev/public/transaction/outlook_pa/export_outlook_pa?outlook_pa_id=${this.props.outlook_pa_id}&&report_id=${this.props.report_id}&&company_id=${this.props.company.company_id}&&year=${this.props.periode}&&revision=${this.props.revision}`
-    //     console.log(url);
-    //     let res = await fetch(
-    //         `https://tia.eksad.com/tia-reporting-dev/public/transaction/outlook_pa/export_outlook_pa?outlook_pa_id=${this.props.outlook_pa_id === null ? "" : this.props.submissionID}&&report_id=${this.props.report_id}&&company_id=${this.props.company.company_id}&&year=${this.props.periode}&&revision=${this.props.revision}`
-    //     )
-    //     res = await res.blob()
-    //     this.setState({ loading: false })
-    //     if (res.size > 0) {
-    //         let url = window.URL.createObjectURL(res);
-    //         let a = document.createElement('a');
-    //         a.href = url;
-    //         a.download = 'Outlook Performance Appraisal Tax Planning.xlsx';
-    //         a.click();
-    //     }
-    // }
     async downloadAllData() {
         let url = `https://tia.eksad.com/tia-reporting-dev/public/transaction/outlook_pa/export_outlook_pa?outlook_pa_id=${this.props.outlook_pa_id}&&report_id=${this.props.report_id}&&company_id=${this.props.company.company_id}&&year=${this.props.periode}&&revision=${this.props.revision}`
         let sub_null = `https://tia.eksad.com/tia-reporting-dev/public/transaction/outlook_pa/export_outlook_pa?outlook_pa_id=&&report_id=${this.props.report_id}&&company_id=${this.props.company.company_id}&&year=${this.props.periode}&&revision=${this.props.revision}`
@@ -3017,7 +3001,7 @@ export default class TaxPlanningOLPA extends Component {
                                     this.setState({ uploadStatus: 'idle', percentage: '0' })
                                 }}
                                 onUpload={() => {
-                                    this.state.judul === "MASTER BUDGET - TAX PLANNING" ?
+                                    this.state.judul === "OUTLOOK PA - TAX PLANNING" ?
                                         this.checkUpload() :
                                         this.setState({ alert: true, messageAlert: "Invalid Template", tipeAlert: 'warning' })
                                 }}