Merge branch 'dev-riri' into 'ENV-DEV'

Issue Subco

See merge request !2269

.env_staging

 // contents of .env 
 
 REACT_APP_URL_MAIN_BE=https://tia.eksad.com/tia-reporting-staging
-REACT_APP_URL_MAIN_FE=/web
+REACT_APP_URL_MAIN_FE=/web-staging
\ No newline at end of file

src/assets/sass/app.css

@@ -2,6 +2,11 @@
   background-color: #273b80 !important;
 }
 
+/* for staging */
+/* .main-color{
+  background-color: #0b6b24 !important;
+} */
+
 /* .main-color{
   background-color: #1474CA !important;
 } */

src/container/BudgetTahunan/CorporateAnnualTarget.js

@@ -219,7 +219,7 @@ export default class CorporateAnnualTarget extends Component {
                                 item.level,
                                 "",
                                 item.description,
-                                item.type_report_id == 1 ? (`${String(item.weight).includes('%') ? String(item.weight) : String((fixNumber(Number(item.weight) * 100)) + '% ')}`) : (String(Number(String(item.cat.weight).substr(0, String(item.cat.weight).length - 1))) + '%'),
+                                item.type_report_id == 1 ? (`${String(item.weight).includes('%') ? String(item.weight) : String(fixNumber((Number(item.weight) * 100)) + '% ')}`) : (String(Number(String(item.cat.weight).substr(0, String(item.cat.weight).length - 1))) + '%'),
                                 item.cat.uom,
                                 item.kpi_type == "" ? null : { value: item.kpi_type },
                                 item.max_ach == "" ? null : { value: titleCase(item.max_ach) },

src/container/Reports/SubHolding.js

@@ -4326,6 +4326,10 @@ export default class SubHolding extends Component {
                                         {...this.state.listPeriode}
                                         id="periode"
                                         onChange={(event, newInputValue) => this.setState({ periode: newInputValue, loading: true, previewTable: false }, () => {
+                                            let tahun = Number(this.state.periode.periode)
+                                            let bizpar = tahun >= 2024 && defaultCurrencyID == 2 && newInputValue.id == 1 ? defaultReport.filter(e => e.report === 2) : defaultReport
+                                            this.setState({ report: bizpar[0], reportType: bizpar })
+                                            this.getCurrency(this.state.company.company_id)
                                             this.getReportType()
                                         })}
                                         disabled={this.state.intent === 'Home' ? true : false}
@@ -4345,7 +4349,8 @@ export default class SubHolding extends Component {
                                         onChange={(event, newInputValue) => this.setState({ company: newInputValue, loading: true, previewTable: false }, () => {
                                             this.getReportType()
                                             this.getCurrency(newInputValue.company_id)
-                                            let bizpar = this.state.usdBefore2024 == false && defaultCurrencyID == 2 && newInputValue.id == 1 ? defaultReport.filter(e => e.report === 2) : defaultReport
+                                            let tahun = Number(this.state.periode.periode)
+                                            let bizpar = tahun >= 2024 && defaultCurrencyID == 2 && newInputValue.id == 1 ? defaultReport.filter(e => e.report === 2) : defaultReport
                                             this.setState({ report: bizpar[0], reportType: bizpar })
                                         })}
                                         disableClearable
@@ -4385,7 +4390,8 @@ export default class SubHolding extends Component {
                                             //     })
                                             //     console.log("report 2");
                                             // }
-                                            let bizpar = this.state.usdBefore2024 == false && defaultCurrencyID == 2 && newInputValue.id == 1 ? defaultReport.filter(e => e.report === 2) : defaultReport
+                                            let tahun = Number(this.state.periode.periode)
+                                            let bizpar = tahun >= 2024 && defaultCurrencyID == 2 && newInputValue.id == 1 ? defaultReport.filter(e => e.report === 2) : defaultReport
                                             this.setState({ report: bizpar[0], reportType: bizpar })
                                             this.getReportType()
 

src/container/RollingOutlook/RollingOutlook.js

@@ -2192,7 +2192,10 @@ export default class RollingOutlook extends Component {
                                         </div>
                                     )}
                                     {this.state.checkApprover === true ?
-                                        this.state.lastStatus === 'WAITING FOR REVIEW' ?
+                                        this.state.lastStatus === 'SUBMITTED' ?
+                                            <div style={{ width: '100%', padding: '10px 20px', backgroundColor: 'yellow', textAlign: 'center', marginTop: 20 }}>
+                                                <span>{this.state.lastStatus}</span>
+                                            </div> : this.state.lastStatus === 'WAITING FOR REVIEW' ?
                                             <div style={{ width: '100%', padding: '10px 20px', backgroundColor: 'yellow', textAlign: 'center', marginTop: 20 }}>
                                                 <span>{this.state.lastStatus}</span>
                                             </div> : this.state.lastStatus === 'WAITING FOR YOUR APPROVAL' ?
@@ -2213,6 +2216,14 @@ export default class RollingOutlook extends Component {
                                             <div style={{ width: '100%', padding: '10px 20px', backgroundColor: 'yellow', textAlign: 'center', marginTop: 20 }}>
                                                 <span>{this.state.lastStatus}</span>
                                             </div> :
+                                            this.state.lastStatus === 'WAITING FOR REVIEW' ?
+                                                <div style={{ width: '100%', padding: '10px 20px', backgroundColor: 'yellow', textAlign: 'center', marginTop: 20 }}>
+                                                    <span>{`${this.state.lastStatus} - ${this.state.pic}`}</span>
+                                                </div> :
+                                                this.state.lastStatus === 'WAITING FOR YOUR APPROVAL' ?
+                                                    <div style={{ width: '100%', padding: '10px 20px', backgroundColor: 'yellow', textAlign: 'center', marginTop: 20 }}>
+                                                        <span>{`${this.state.lastStatus} - ${this.state.pic}`}</span>
+                                                    </div> :
                                                     this.state.lastStatus === 'WAITING FOR APPROVAL' ?
                                                         <div style={{ width: '100%', padding: '10px 20px', backgroundColor: 'yellow', textAlign: 'center', marginTop: 20 }}>
                                                             <span>{`${this.state.lastStatus} - ${this.state.pic}`}</span>