Skip to content

T
Tia-dev
Commit 0d3445df authored by Riri Novita's avatar Riri Novita
Browse files
Options

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

Update UI

See merge request !1696
parents 2f583041 f1426500
Show whitespace changes
Inline Side-by-side
Showing with 49 additions and 49 deletions
src/container/GeneralSetting/MaintenanceMode.js
View file @ 0d3445df
...@@ -169,34 +169,34 @@ class MaintenanceMode extends Component { ...@@ -169,34 +169,34 @@ class MaintenanceMode extends Component {
"maintenance_headline": this.state.headline, "maintenance_headline": this.state.headline,
"maintenance_content": this.state.maintenanceContent, "maintenance_content": this.state.maintenanceContent,
"maintenance_status": this.state.maintenanceStatus, "maintenance_status": this.state.maintenanceStatus,
// "maintenance_mail": [
// {
// "mail_type": "MAINTENANCE_MODE_ACTIVE",
// "mail_subject": "TIA 4.0 Is Under Maintenance",
// "mail_body": "",
// "mail_status": 0
// },
// {
// "mail_type": "MAINTENANCE_MODE_INACTIVE",
// "mail_subject": "TIA 4.0 is Back",
// "mail_body": "",
// "mail_status": 0
// }
// ]
"maintenance_mail": [ "maintenance_mail": [
{ {
"mail_type": "MAINTENANCE_MODE_ACTIVE", "mail_type": "MAINTENANCE_MODE_ACTIVE",
"mail_subject": this.state.subjectMailActive, "mail_subject": "TIA 4.0 Is Under Maintenance",
"mail_body": this.state.mailcontentModeActive, "mail_body": "",
"mail_status": this.state.mailStatusActive "mail_status": 0
}, },
{ {
"mail_type": "MAINTENANCE_MODE_INACTIVE", "mail_type": "MAINTENANCE_MODE_INACTIVE",
"mail_subject": this.state.subjectMailNonActive, "mail_subject": "TIA 4.0 is Back",
"mail_body": this.state.mailcontentModeNonActive, "mail_body": "",
"mail_status": this.state.mailStatusNonActive "mail_status": 0
} }
] ]
// "maintenance_mail": [
// {
// "mail_type": "MAINTENANCE_MODE_ACTIVE",
// "mail_subject": this.state.subjectMailActive,
// "mail_body": this.state.mailcontentModeActive,
// "mail_status": this.state.mailStatusActive
// },
// {
// "mail_type": "MAINTENANCE_MODE_INACTIVE",
// "mail_subject": this.state.subjectMailNonActive,
// "mail_body": this.state.mailcontentModeNonActive,
// "mail_status": this.state.mailStatusNonActive
// }
// ]
} }
console.log(payload); console.log(payload);
api.create().createMaintenanceMode(payload).then((response) => { api.create().createMaintenanceMode(payload).then((response) => {
...@@ -234,34 +234,34 @@ class MaintenanceMode extends Component { ...@@ -234,34 +234,34 @@ class MaintenanceMode extends Component {
"maintenance_headline": this.state.headline, "maintenance_headline": this.state.headline,
"maintenance_content": this.state.maintenanceContent, "maintenance_content": this.state.maintenanceContent,
"maintenance_status": this.state.maintenanceStatus, "maintenance_status": this.state.maintenanceStatus,
// "maintenance_mail": [
// {
// "mail_type": "MAINTENANCE_MODE_ACTIVE",
// "mail_subject": "TIA 4.0 Is Under Maintenance",
// "mail_body": "",
// "mail_status": 0
// },
// {
// "mail_type": "MAINTENANCE_MODE_INACTIVE",
// "mail_subject": "TIA 4.0 is Back",
// "mail_body": "",
// "mail_status": 0
// }
// ]
"maintenance_mail": [ "maintenance_mail": [
{ {
"mail_type": "MAINTENANCE_MODE_ACTIVE", "mail_type": "MAINTENANCE_MODE_ACTIVE",
"mail_subject": this.state.subjectMailActive, "mail_subject": "TIA 4.0 Is Under Maintenance",
"mail_body": this.state.mailcontentModeActive, "mail_body": "",
"mail_status": this.state.mailStatusActive "mail_status": 0
}, },
{ {
"mail_type": "MAINTENANCE_MODE_INACTIVE", "mail_type": "MAINTENANCE_MODE_INACTIVE",
"mail_subject": this.state.subjectMailNonActive, "mail_subject": "TIA 4.0 is Back",
"mail_body": this.state.mailcontentModeNonActive, "mail_body": "",
"mail_status": this.state.mailStatusNonActive "mail_status": 0
} }
] ]
// "maintenance_mail": [
// {
// "mail_type": "MAINTENANCE_MODE_ACTIVE",
// "mail_subject": this.state.subjectMailActive,
// "mail_body": this.state.mailcontentModeActive,
// "mail_status": this.state.mailStatusActive
// },
// {
// "mail_type": "MAINTENANCE_MODE_INACTIVE",
// "mail_subject": this.state.subjectMailNonActive,
// "mail_body": this.state.mailcontentModeNonActive,
// "mail_status": this.state.mailStatusNonActive
// }
// ]
} }
console.log(payload); console.log(payload);
api.create().updateMaintenanceMode(payload).then((response) => { api.create().updateMaintenanceMode(payload).then((response) => {
...@@ -490,8 +490,8 @@ class MaintenanceMode extends Component { ...@@ -490,8 +490,8 @@ class MaintenanceMode extends Component {
<Typography style={{ fontSize: '16px', color: 'white' }}>Maintenance Mode</Typography> <Typography style={{ fontSize: '16px', color: 'white' }}>Maintenance Mode</Typography>
</div> </div>
<div style={{ padding: 20, width: '100%' }}> <div style={{ padding: 20, width: '100%' }}>
<Paper style={{ paddingTop: 10, paddingBottom: 50 }}> <Paper style={{ paddingTop: 10, paddingBottom: 50}}>
<div style={{ display: 'flex', justifyContent: 'space-between', margin: 10, borderBottom: 'solid 2px #00000057', }}> <div style={{ display: 'flex', justifyContent: 'space-between', margin: 10, borderBottom: 'solid 2px #00000057', height: '100%' }}>
<div > <div >
<Typography style={{ fontSize: '17px', color: '#4b4b4b', margin: 10 }}>General Setting - Maintenance Mode</Typography> <Typography style={{ fontSize: '17px', color: '#4b4b4b', margin: 10 }}>General Setting - Maintenance Mode</Typography>
</div> </div>
...@@ -578,7 +578,7 @@ class MaintenanceMode extends Component { ...@@ -578,7 +578,7 @@ class MaintenanceMode extends Component {
</div> </div>
</div> </div>
</div> </div>
<Typography style={{ marginTop: 30, width: '80%', color: '#656565', fontSize: 15, fontWeight: 'bold' }}>Setting Notifikasi Email Saat Maintenance Mode Aktif</Typography> {/* <Typography style={{ marginTop: 30, width: '80%', color: '#656565', fontSize: 15, fontWeight: 'bold' }}>Setting Notifikasi Email Saat Maintenance Mode Aktif</Typography>
<div style={{ display: 'flex', marginTop: 20, width: '100%', justifyContent: 'space-between' }}> <div style={{ display: 'flex', marginTop: 20, width: '100%', justifyContent: 'space-between' }}>
<Typography style={{ marginTop: 13, width: '20%', color: '#656565', fontSize: 14 }}>Kirim Email Notif</Typography> <Typography style={{ marginTop: 13, width: '20%', color: '#656565', fontSize: 14 }}>Kirim Email Notif</Typography>
<div style={{ width: '80%', margin: 0, marginTop: 10 }}> <div style={{ width: '80%', margin: 0, marginTop: 10 }}>
...@@ -655,8 +655,8 @@ class MaintenanceMode extends Component { ...@@ -655,8 +655,8 @@ class MaintenanceMode extends Component {
/> />
</div> </div>
</div> </div>
</div> </div> */}
<Typography style={{ marginTop: 30, width: '80%', color: '#656565', fontSize: 15, fontWeight: 'bold' }}>Setting Notifikasi Email Saat Maintenance Mode Non Aktif</Typography> {/* <Typography style={{ marginTop: 30, width: '80%', color: '#656565', fontSize: 15, fontWeight: 'bold' }}>Setting Notifikasi Email Saat Maintenance Mode Non Aktif</Typography>
<div style={{ display: 'flex', marginTop: 20, width: '100%', justifyContent: 'space-between' }}> <div style={{ display: 'flex', marginTop: 20, width: '100%', justifyContent: 'space-between' }}>
<Typography style={{ marginTop: 13, width: '20%', color: '#656565', fontSize: 14 }}>Kirim Email Notif</Typography> <Typography style={{ marginTop: 13, width: '20%', color: '#656565', fontSize: 14 }}>Kirim Email Notif</Typography>
<div style={{ width: '80%', margin: 0, marginTop: 10 }}> <div style={{ width: '80%', margin: 0, marginTop: 10 }}>
...@@ -733,7 +733,7 @@ class MaintenanceMode extends Component { ...@@ -733,7 +733,7 @@ class MaintenanceMode extends Component {
/> />
</div> </div>
</div> </div>
</div> </div> */}
</div> </div>
</Paper> </Paper>
</div> </div>
......
src/container/Reports/TableSubHolding.js
View file @ 0d3445df
...@@ -20500,7 +20500,7 @@ export default class TableSubHolding extends Component { ...@@ -20500,7 +20500,7 @@ export default class TableSubHolding extends Component {
</div> </div>
} }
</div> </div>
<div className="col-3"> <div className="col-3" style={{ right: 26}}>
{tableMeta.rowData[0] === 4 ? {tableMeta.rowData[0] === 4 ?
null null
: tableMeta.rowData[0] === 1 ? : tableMeta.rowData[0] === 1 ?
...@@ -20523,7 +20523,7 @@ export default class TableSubHolding extends Component { ...@@ -20523,7 +20523,7 @@ export default class TableSubHolding extends Component {
</div> </div>
} }
</div> </div>
<div className="col-4"> <div className="col-4" style={{ right: 40}}>
{tableMeta.rowData[0] === 4 ? {tableMeta.rowData[0] === 4 ?
null null
: tableMeta.rowData[0] === 1 ? : tableMeta.rowData[0] === 1 ?
...@@ -20546,7 +20546,7 @@ export default class TableSubHolding extends Component { ...@@ -20546,7 +20546,7 @@ export default class TableSubHolding extends Component {
</div> </div>
} }
</div> </div>
<div className="col-5"> <div className="col-5" style={{ right: 53}}>
{tableMeta.rowData[0] === 4 ? {tableMeta.rowData[0] === 4 ?
null null
: tableMeta.rowData[0] === 1 ? : tableMeta.rowData[0] === 1 ?
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