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

src/api/index.js

@@ -184,10 +184,10 @@ const create = (type = "") => {
   const deleteParameter = (id) => api.post(`setting/delete_setting/${id}`)
 
   //Transaction
-  const getReportTypeBody = (body) => api.post('transaction/get_all_report', body)
-  const getMasterBudgetAtt = (body) => api.post('transaction/get_report_attachment', body)
-  const uploadAttachment = (body) => api.post('transaction/upload_attachment', body)
-  const getRevision = (body) => api.post('transaction/get_revision', body)
+  const getReportTypeBody = (body) => api.post('transaction/master_budget/get_all_report', body)
+  const getMasterBudgetAtt = (body) => api.post('transaction/master_budget/get_report_attachment', body)
+  const uploadAttachment = (body) => api.post('transaction/master_budget/upload_attachment', body)
+  const getRevision = (body) => api.post('transaction/master_budget/get_revision', body)
   const getPeriodeTransaction = () => api.get('transaction/get_periode')
   const deleteAttachment = (id) => api.post(`transaction/delete_attachment/${id}`)
   const getDetailReportMB = (body) => api.post('/transaction/master_budget/get_report_hierarki', body)
@@ -203,8 +203,8 @@ const create = (type = "") => {
   const checkIsSubmit = (body) => api.post('transaction/master_budget/is_can_submit', body)
   const checkApprover = () => api.get('transaction/master_budget/is_approver')
   const approvalSubmission = (body) => api.post('transaction/master_budget/approval_submission', body)
-  const getCompanySubmitted = (body) => api.post('transaction/get_company_submitted', body)
-  const getLastPeriod = (idCompany) => api.get(`transaction/get_last_periode/${idCompany}`) 
+  const getCompanySubmitted = (body) => api.post('transaction/master_budget/get_company_submitted', body)
+  const getLastPeriod = (idCompany) => api.get(`transaction/master_budget/get_last_periode/${idCompany}`) 
 
   const getIdDeleteFromExcel = (body) => api.post('transaction/master_budget/delete_from_excel', body)
   const getOpetratingIndID = (body) => api.post('transaction/get_operating_indicator_id', body)

src/container/BudgetTahunan.js

@@ -351,7 +351,7 @@ export default class BudgetTahunan extends Component {
                         })
                     })
                 } else {
-                    this.setState({ submissionID: null, loading: null })
+                    this.setState({ submissionID: null, loading: false })
                 }
             }
         })
@@ -550,10 +550,10 @@ export default class BudgetTahunan extends Component {
         let length = name.split(".").length
         let fileType = name.split(".")[length - 1]
         console.log(fileType);
-        let url = `https://tia.eksad.com/tia-reporting-dev/public/transaction/download_attachment?fileName=${fileurl}&&fileType=${fileType}`
+        let url = `https://tia.eksad.com/tia-reporting-dev/public/transaction/master_budget/download_attachment?fileName=${fileurl}&&fileType=${fileType}`
         // console.log(url);
         let res = await fetch(
-            `https://tia.eksad.com/tia-reporting-dev/public/transaction/download_attachment?fileName=${fileurl}&&fileType=${fileType}`
+            `https://tia.eksad.com/tia-reporting-dev/public/transaction/master_budget/download_attachment?fileName=${fileurl}&&fileType=${fileType}`
         )
         res = await res.blob()
         this.setState({ loading: false })

src/container/BudgetTahunan/CorporateAnnualTarget.js

@@ -2028,7 +2028,7 @@ export default class CorporateAnnualTarget extends Component {
                                 </div>
                                 {!this.props.isApprover && <div style={{ width: '50%' }}>
                                     <div style={{ justifyContent: 'flex-end', display: 'flex', flexFlow: 'wrap' }}>
-                                        <a data-tip={'Download Template'} data-for="template">
+                                        {((this.props.lastStatus == 'SUBMIT' || this.props.lastStatus == 'REVISION') && this.props.prevRevision === false ) && <a data-tip={'Download Template'} data-for="template">
                                             <button
                                                 style={{
                                                     backgroundColor: 'transparent',
@@ -2040,7 +2040,7 @@ export default class CorporateAnnualTarget extends Component {
                                             >
                                                 <img src={Images.template} />
                                             </button>
-                                        </a>
+                                        </a>}
                                         <ReactTooltip border={true} id="template" place="bottom" type="light" effect="solid" />
                                         {((this.props.lastStatus == 'SUBMIT' || this.props.lastStatus == 'REVISION') && this.props.prevRevision === false ) && <a data-tip={'Upload'} data-for="upload">
                                             <button
@@ -2114,7 +2114,7 @@ export default class CorporateAnnualTarget extends Component {
                                 </button>
                             </div>
                             {!this.props.isApprover && <div className="col-2" style={{ display: 'flex', justifyContent: 'flex-end', maxWidth: '100%' }}>
-                                <button
+                                {((this.props.lastStatus == 'SUBMIT' || this.props.lastStatus == 'REVISION') && this.props.prevRevision === false ) && <button
                                     className="button"
                                     type="button"
                                     style={{
@@ -2135,7 +2135,7 @@ export default class CorporateAnnualTarget extends Component {
                                     <div style={{ backgroundColor: '#fff', width: 105, height: 25, borderRadius: 3, justifyContent: 'center', display: 'flex', alignItems: 'center', border: 'solid 1px #354960' }}>
                                         <Typography style={{ fontSize: '11px', color: '#354960', textAlign: 'center' }}>Calculate</Typography>
                                     </div>
-                                </button>
+                                </button>}
                                 {((this.props.lastStatus == 'SUBMIT' || this.props.lastStatus == 'REVISION') && this.props.prevRevision === false ) && <button
                                     className="button"
                                     type="button"

src/container/BudgetTahunan/FixedAssetsMovement.js

@@ -2026,7 +2026,7 @@ export default class FixedAssetsMovement extends Component {
                                     <div style={{ width: '50%' }}>
                                         {this.props.isApprover == true || this.state.dataTable.length == 0 ? null :
                                             <div style={{ justifyContent: 'flex-end', display: 'flex', flexFlow: 'wrap' }}>
-                                                {(this.props.lastStatus === 'SUBMIT' || this.props.lastStatus === 'REVISION') && (
+                                                {((this.props.lastStatus === 'SUBMIT' || this.props.lastStatus === 'REVISION') && this.props.prevRevision === false ) && (
                                                 <div>
                                                 <a data-tip={'Download Template'} data-for="template">
                                                     <button
@@ -2044,7 +2044,7 @@ export default class FixedAssetsMovement extends Component {
                                                 <ReactTooltip border={true} id="template" place="bottom" type="light" effect="solid" />
                                                 </div>
                                                 )}
-                                                {(this.props.lastStatus === 'SUBMIT' || this.props.lastStatus === 'REVISION') && (
+                                                {((this.props.lastStatus === 'SUBMIT' || this.props.lastStatus === 'REVISION') && this.props.prevRevision === false ) && (
                                                 <div>
                                                 <a data-tip={'Upload'} data-for="upload">
                                                     <button
@@ -2122,7 +2122,7 @@ export default class FixedAssetsMovement extends Component {
                                     </button>
                                 </div>
                                 {this.props.isApprover === true || this.state.dataTable.length == 0 ? null :
-                                    this.props.lastStatus === 'SUBMIT' || this.props.lastStatus === 'REVISION' ?
+                                    ((this.props.lastStatus == 'SUBMIT' || this.props.lastStatus == 'REVISION') && this.props.prevRevision === false ) &&
                                     <div className="col-2" style={{ display: 'flex', justifyContent: 'flex-end', maxWidth: '100%'}}>                                    
                                         <button
                                             className="button"
@@ -2191,7 +2191,7 @@ export default class FixedAssetsMovement extends Component {
                                                 <Typography style={{ fontSize: '11px', color: '#fff', textAlign: 'center' }}>Save & Complete</Typography>
                                             </div>
                                         </button>
-                                    </div> : null
+                                    </div>
                                 }
                             </div>
                         </Paper>