Skip to content

T
Tia-dev
Commit 4da0ef32 authored by qorri_di's avatar qorri_di
Browse files
Options

Merge branch 'ENV-DEV' into 'ENV-DEPLOYMENT' 

From ENV-DEV into ENV-DEPLOYMENT

See merge request !1648
parents 50477d52 d29f2f6c
Show whitespace changes
Inline Side-by-side
Showing with 119 additions and 70 deletions
src/container/Auth/Login.js
View file @ 4da0ef32
......@@ -97,7 +97,10 @@ class Login extends Component {
if (response.data) {
if (response.ok) {
if (response.data.status === 'success') {
// console.log(response.data.data)
// console.log(response.data.data
if (response.data.data.role_id === 185 || response.data.data.role_id === 1){
this.props.history.push('/maintenance')
} else {
localStorage.setItem(Constant.TOKEN, response.data.data.token)
localStorage.setItem(Constant.USER, response.data.data.user_id)
if (this.state.rememberMe) {
......@@ -109,6 +112,7 @@ class Login extends Component {
localStorage.setItem(Constant.PASSWORD, '')
}
this.props.history.push('/home/beranda')
}
} else {
if (response.data.message == 'Password is Not Correct') {
this.setState({ errorPassword: true, msgPassword: 'Incorrect Password' })
......
src/container/Auth/Maintenance.js 0 → 100644
View file @ 4da0ef32
import React, { Component } from 'react';
import Images from '../../assets/Images';
class Maintenance extends Component {
constructor(props) {
super(props)
this.state = {
width: 0,
height: 0
}
}
getWindowDimensions() {
const { innerWidth: width, innerHeight: height } = window;
this.setState({
width,
height
})
}
render() {
return (
<div style={{ flex: 1, display: 'flex' }}>
<div style={{ width: '50%', display: 'grid' }}>
<img src={Images.meeting} style={{ objectFit: 'fill', width: '100%', height: '100%' }} alt={'TIA 4.0'}/>
</div>
<div style={{ width: '50%', height: '100vh', backgroundColor: '#4B0082', display: 'flex', justifyContent: 'center', alignItems: 'left', flexDirection: 'column', padding: '5vh'}}>
<p style={{fontSize: '1rem'}}>
<span style={{color: 'white', fontWeight:'bold'}}>
TIA 4.0 is down for Maintenance!<br/>
Thank you for your patience, we expect to be back shortly.<br/>
<br/>
We apologize for any inconvenience.<br/>
For more information, please contact our email : <a style={{color: 'white'}} href={'mailto:tia4.0@triputra-group.com'}>tia4.0@triputra-group.com</a>.
</span>
</p>
</div>
</div >
);
}
}
export default Maintenance;
\ No newline at end of file
src/container/OutlookPA/CashFlowOLPA.js
View file @ 4da0ef32
......@@ -173,7 +173,6 @@ export default class CashFlow extends Component {
item.type_report_id == 5 || item.type_report_id == 6 || item.type_report_id == 7 ? { value: item.cash_flow.october, formula: item.cash_flow.october_formula } : item.cash_flow.october,
item.type_report_id == 5 || item.type_report_id == 6 || item.type_report_id == 7 ? { value: item.cash_flow.november, formula: item.cash_flow.november_formula } : item.cash_flow.november,
item.type_report_id == 5 || item.type_report_id == 6 || item.type_report_id == 7 ? { value: item.cash_flow.december, formula: item.cash_flow.december_formula } : item.cash_flow.december,
item.cash_flow.current_total,
item.order,
item.condition_it_should_be,
item.condition_if_wrong,
......@@ -207,7 +206,6 @@ export default class CashFlow extends Component {
item.type_report_id == 5 || item.type_report_id == 6 || item.type_report_id == 7 ? { value: item.cash_flow.october, formula: item.cash_flow.october_formula } : item.cash_flow.october,
item.type_report_id == 5 || item.type_report_id == 6 || item.type_report_id == 7 ? { value: item.cash_flow.november, formula: item.cash_flow.november_formula } : item.cash_flow.november,
item.type_report_id == 5 || item.type_report_id == 6 || item.type_report_id == 7 ? { value: item.cash_flow.december, formula: item.cash_flow.december_formula } : item.cash_flow.december,
item.cash_flow.current_total,
item.order,
item.condition_it_should_be,
item.condition_if_wrong,
......@@ -330,7 +328,7 @@ export default class CashFlow extends Component {
"october": String(item[15].value == undefined ? item[15] : Number(item[15].value).toFixed(1)),
"november": String(item[16].value == undefined ? item[16] : Number(item[16].value).toFixed(1)),
"december": String(item[17].value == undefined ? item[17] : Number(item[17].value).toFixed(1)),
"current_total": String(item[18].value == undefined ? item[18] : Number(item[18].value).toFixed(1)),
"total_current_year": String(item[18]= '' ? Number(item[18]).toFixed(1) : item[19]),
}
)
})
......@@ -821,13 +819,14 @@ export default class CashFlow extends Component {
<div className="column-3" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, borderRight: "1px #fff solid", backgroundColor: '#07a7d0' }}>
<span>{"11"}</span>
</div>
<div className="column-4" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, borderRight: "1px #fff solid" , backgroundColor: '#07a7d0' }}>
<div className="column-4" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, borderRight: "1px #fff solid", backgroundColor: '#07a7d0' }}>
<span>{"12"}</span>
</div>
<div className="column-5" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, backgroundColor: '#07a7d0' }}>
<span>{"Current Total"}</span>
</div>
</div>
</div>
</th>
),
......@@ -835,7 +834,7 @@ export default class CashFlow extends Component {
customBodyRender: (val, tableMeta, updateValue) => {
return (
<div>
<div className="grid grid-4x content-center">
<div className="grid grid-3x content-center">
<div className="grid grid-4x content-center">
<div className="col-1">
{
......@@ -1762,8 +1761,7 @@ export default class CashFlow extends Component {
type="text"
placeholder=""
disabled={true}
value={this.props.PLBSFAMSubmitted ? Number(tableMeta.rowData[17].value).toFixed(1) : Number(handleValueFormula(tableMeta.rowData[17], tableMeta, 17)).toFixed(1)}
// value={Number(handleValueFormula(tableMeta.rowData[17], tableMeta, 17)).toFixed(1)}
value={Number(tableMeta.rowData[18]).toFixed(1)}
/>
</span>
:
......@@ -1775,12 +1773,11 @@ export default class CashFlow extends Component {
type="text"
placeholder=""
disabled={true}
value={this.props.PLBSFAMSubmitted ? Number(tableMeta.rowData[17].value).toFixed(1) : Number(handleValueFormula(tableMeta.rowData[17], tableMeta, 17)).toFixed(1)}
// value={Number(handleValueFormula(tableMeta.rowData[17], tableMeta, 17)).toFixed(1)}
value={Number(tableMeta.rowData[18]).toFixed(1)}
/>
:
tableMeta.rowData[0] === 7 ?
((this.props.PLBSFAMSubmitted ? Number(tableMeta.rowData[17].value).toFixed(1) : Number(handleValueFormula(tableMeta.rowData[17], tableMeta, 17)).toFixed(1)) >= Number(this.state.minValue) && (this.props.PLBSFAMSubmitted ? Number(tableMeta.rowData[17].value).toFixed(1) : Number(handleValueFormula(tableMeta.rowData[17], tableMeta, 17)).toFixed(1)) <= Number(this.state.maxValue)) ?
((Number(tableMeta.rowData[18]).toFixed(1))) ?
<NumberFormat
thousandSeparator={true}
style={{
......@@ -1795,8 +1792,7 @@ export default class CashFlow extends Component {
type="text"
placeholder=""
disabled={true}
value={this.props.PLBSFAMSubmitted ? Number(tableMeta.rowData[17].value).toFixed(1) : Number(handleValueFormula(tableMeta.rowData[17], tableMeta, 17)).toFixed(1)}
// value={Number(handleValueFormula(tableMeta.rowData[17], tableMeta, 17)).toFixed(1)}
value={Number(tableMeta.rowData[18]).toFixed(1)}
/> :
<LightTooltip title={this.state.minValue === null ? `Value Should be ${tableMeta.rowData[23]}` : `Value Should be (${this.state.minValue}) up to (${this.state.maxValue})`} arrow>
<NumberFormat
......@@ -1813,8 +1809,7 @@ export default class CashFlow extends Component {
type="text"
placeholder=""
disabled={true}
value={this.props.PLBSFAMSubmitted ? Number(tableMeta.rowData[17].value).toFixed(1) : Number(handleValueFormula(tableMeta.rowData[17], tableMeta, 17)).toFixed(1)}
// value={Number(handleValueFormula(tableMeta.rowData[17], tableMeta, 17)).toFixed(1)}
value={Number(tableMeta.rowData[18]).toFixed(1)}
/>
</LightTooltip>
:
......
src/router/homeRoutes.js
View file @ 4da0ef32
......@@ -22,6 +22,7 @@ import MasterDataCAT from '../container/MasterData/MasterDataCAT/MasterDataCAT';
import ProgressReport from '../container/ProgressReport/ProgressReport';
import CafrmDocument from "../container/CAFRM/CafrmDocument";
import ReportCafrm from "../container/ReportCarfm/RepotrCafrm";
import Maintenance from "../container/Auth/Maintenance";
const routes = [
{
......@@ -131,6 +132,10 @@ const routes = [
{
path: "*",
main: screen404
},
{
path:"/maintenance",
main: Maintenance
}
];
......
src/router/index.js
View file @ 4da0ef32
......@@ -15,6 +15,7 @@ import SetPassword from '../container/Auth/SetPassword'
import EmailVerification from "../container/Auth/EmailVerification";
import Constant from "../library/Constant";
import ShadowScreen from "../container/ShadowScreen";
import Maintenance from "../container/Auth/Maintenance";
export default function BasicExample() {
......@@ -35,6 +36,7 @@ export default function BasicExample() {
<Route path="/email-verification" component={EmailVerification} />
<Route path="/register" component={Register}/>
<Route path="/cronjob/:type" component={ShadowScreen}/>
<Route path="/maintenance" component={Maintenance}/>
<PrivateRoute path="/home">
<Home/>
</PrivateRoute>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment