Skip to content

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

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

fixing maintenance

See merge request !1695
parents ceb43c76 2f583041
Show whitespace changes
Inline Side-by-side
Showing with 62 additions and 62 deletions
src/container/GeneralSetting/MaintenanceMode.js
View file @ d6f9e520
...@@ -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) => {
......
src/container/Reports/TableSubHolding.js
View file @ d6f9e520
...@@ -19829,7 +19829,7 @@ export default class TableSubHolding extends Component { ...@@ -19829,7 +19829,7 @@ export default class TableSubHolding extends Component {
</div> </div>
} }
</div> </div>
<div className="col-2"> <div className="col-2" style={{ left: 12}}>
{tableMeta.rowData[0] === 4 ? {tableMeta.rowData[0] === 4 ?
null null
: tableMeta.rowData[0] === 1 ? : tableMeta.rowData[0] === 1 ?
...@@ -19841,7 +19841,7 @@ export default class TableSubHolding extends Component { ...@@ -19841,7 +19841,7 @@ export default class TableSubHolding extends Component {
control={ control={
<NumberFormat <NumberFormat
thousandSeparator={true} thousandSeparator={true}
style={{ color: this.props.approvedMB ? '#000000de' : '#5198ea', fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }} style={{ color: this.props.approvedMB ? '#000000de' : '#5198ea', fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent'}}
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
...@@ -19852,7 +19852,7 @@ export default class TableSubHolding extends Component { ...@@ -19852,7 +19852,7 @@ export default class TableSubHolding extends Component {
</div> </div>
} }
</div> </div>
<div className="col-3"> <div className="col-3" style={{ left: 28}}>
{tableMeta.rowData[0] === 4 ? {tableMeta.rowData[0] === 4 ?
null null
: tableMeta.rowData[0] === 1 ? : tableMeta.rowData[0] === 1 ?
...@@ -19875,7 +19875,7 @@ export default class TableSubHolding extends Component { ...@@ -19875,7 +19875,7 @@ export default class TableSubHolding extends Component {
</div> </div>
} }
</div> </div>
<div className="col-4"> <div className="col-4" style={{ left: 42}}>
{tableMeta.rowData[0] === 4 ? {tableMeta.rowData[0] === 4 ?
null null
: tableMeta.rowData[0] === 1 ? : tableMeta.rowData[0] === 1 ?
...@@ -19899,7 +19899,7 @@ export default class TableSubHolding extends Component { ...@@ -19899,7 +19899,7 @@ export default class TableSubHolding extends Component {
} }
</div> </div>
</div> </div>
<div className="grid grid-4x content-center"> <div className="grid grid-4x content-center" style={{ left: 56}}>
<div className="col-1"> <div className="col-1">
{tableMeta.rowData[0] === 4 ? {tableMeta.rowData[0] === 4 ?
null null
...@@ -19923,7 +19923,7 @@ export default class TableSubHolding extends Component { ...@@ -19923,7 +19923,7 @@ export default class TableSubHolding extends Component {
</div> </div>
} }
</div> </div>
<div className="col-2"> <div className="col-2" style={{ left: 14}}>
{tableMeta.rowData[0] === 4 ? {tableMeta.rowData[0] === 4 ?
null null
: tableMeta.rowData[0] === 1 ? : tableMeta.rowData[0] === 1 ?
...@@ -19946,7 +19946,7 @@ export default class TableSubHolding extends Component { ...@@ -19946,7 +19946,7 @@ export default class TableSubHolding extends Component {
</div> </div>
} }
</div> </div>
<div className="col-3"> <div className="col-3" style={{ left: 28}}>
{tableMeta.rowData[0] === 4 ? {tableMeta.rowData[0] === 4 ?
null null
: tableMeta.rowData[0] === 1 ? : tableMeta.rowData[0] === 1 ?
...@@ -19969,7 +19969,7 @@ export default class TableSubHolding extends Component { ...@@ -19969,7 +19969,7 @@ export default class TableSubHolding extends Component {
</div> </div>
} }
</div> </div>
<div className="col-4"> <div className="col-4" style={{ left: 43}}>
{tableMeta.rowData[0] === 4 ? {tableMeta.rowData[0] === 4 ?
null null
: tableMeta.rowData[0] === 1 ? : tableMeta.rowData[0] === 1 ?
...@@ -19993,7 +19993,7 @@ export default class TableSubHolding extends Component { ...@@ -19993,7 +19993,7 @@ export default class TableSubHolding extends Component {
} }
</div> </div>
</div> </div>
<div className="grid grid-5x content-center"> <div className="grid grid-5x content-center" style={{ left: 85}}>
<div className="col-1"> <div className="col-1">
{tableMeta.rowData[0] === 4 ? {tableMeta.rowData[0] === 4 ?
null null
...@@ -20017,7 +20017,7 @@ export default class TableSubHolding extends Component { ...@@ -20017,7 +20017,7 @@ export default class TableSubHolding extends Component {
</div> </div>
} }
</div> </div>
<div className="col-2"> <div className="col-2" style={{ right: 13}}>
{tableMeta.rowData[0] === 4 ? {tableMeta.rowData[0] === 4 ?
null null
: tableMeta.rowData[0] === 1 ? : tableMeta.rowData[0] === 1 ?
...@@ -20040,7 +20040,7 @@ export default class TableSubHolding extends Component { ...@@ -20040,7 +20040,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 ?
...@@ -20063,7 +20063,7 @@ export default class TableSubHolding extends Component { ...@@ -20063,7 +20063,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 ?
...@@ -20086,7 +20086,7 @@ export default class TableSubHolding extends Component { ...@@ -20086,7 +20086,7 @@ export default class TableSubHolding extends Component {
</div> </div>
} }
</div> </div>
<div className="col-5"> <div className="col-5" style={{ right: 50}}>
{tableMeta.rowData[0] === 4 ? {tableMeta.rowData[0] === 4 ?
null null
: tableMeta.rowData[0] === 1 ? : tableMeta.rowData[0] === 1 ?
...@@ -20289,7 +20289,7 @@ export default class TableSubHolding extends Component { ...@@ -20289,7 +20289,7 @@ export default class TableSubHolding extends Component {
</div> </div>
} }
</div> </div>
<div className="col-2"> <div className="col-2" style={{ left: 14}}>
{tableMeta.rowData[0] === 4 ? {tableMeta.rowData[0] === 4 ?
null null
: tableMeta.rowData[0] === 1 ? : tableMeta.rowData[0] === 1 ?
...@@ -20312,7 +20312,7 @@ export default class TableSubHolding extends Component { ...@@ -20312,7 +20312,7 @@ export default class TableSubHolding extends Component {
</div> </div>
} }
</div> </div>
<div className="col-3"> <div className="col-3" style={{ left: 28}}>
{tableMeta.rowData[0] === 4 ? {tableMeta.rowData[0] === 4 ?
null null
: tableMeta.rowData[0] === 1 ? : tableMeta.rowData[0] === 1 ?
...@@ -20335,7 +20335,7 @@ export default class TableSubHolding extends Component { ...@@ -20335,7 +20335,7 @@ export default class TableSubHolding extends Component {
</div> </div>
} }
</div> </div>
<div className="col-4"> <div className="col-4" style={{ left: 44}}>
{tableMeta.rowData[0] === 4 ? {tableMeta.rowData[0] === 4 ?
null null
: tableMeta.rowData[0] === 1 ? : tableMeta.rowData[0] === 1 ?
...@@ -20359,7 +20359,7 @@ export default class TableSubHolding extends Component { ...@@ -20359,7 +20359,7 @@ export default class TableSubHolding extends Component {
} }
</div> </div>
</div> </div>
<div className="grid grid-4x content-center"> <div className="grid grid-4x content-center" style={{ left: 55}}>
<div className="col-1"> <div className="col-1">
{tableMeta.rowData[0] === 4 ? {tableMeta.rowData[0] === 4 ?
null null
...@@ -20383,7 +20383,7 @@ export default class TableSubHolding extends Component { ...@@ -20383,7 +20383,7 @@ export default class TableSubHolding extends Component {
</div> </div>
} }
</div> </div>
<div className="col-2"> <div className="col-2" style={{ left: 15}}>
{tableMeta.rowData[0] === 4 ? {tableMeta.rowData[0] === 4 ?
null null
: tableMeta.rowData[0] === 1 ? : tableMeta.rowData[0] === 1 ?
...@@ -20406,7 +20406,7 @@ export default class TableSubHolding extends Component { ...@@ -20406,7 +20406,7 @@ export default class TableSubHolding extends Component {
</div> </div>
} }
</div> </div>
<div className="col-3"> <div className="col-3" style={{ left: 30}}>
{tableMeta.rowData[0] === 4 ? {tableMeta.rowData[0] === 4 ?
null null
: tableMeta.rowData[0] === 1 ? : tableMeta.rowData[0] === 1 ?
...@@ -20429,7 +20429,7 @@ export default class TableSubHolding extends Component { ...@@ -20429,7 +20429,7 @@ export default class TableSubHolding extends Component {
</div> </div>
} }
</div> </div>
<div className="col-4"> <div className="col-4" style={{ left: 45}}>
{tableMeta.rowData[0] === 4 ? {tableMeta.rowData[0] === 4 ?
null null
: tableMeta.rowData[0] === 1 ? : tableMeta.rowData[0] === 1 ?
...@@ -20453,7 +20453,7 @@ export default class TableSubHolding extends Component { ...@@ -20453,7 +20453,7 @@ export default class TableSubHolding extends Component {
} }
</div> </div>
</div> </div>
<div className="grid grid-5x content-center"> <div className="grid grid-5x content-center" style={{ left: 88}}>
<div className="col-1"> <div className="col-1">
{tableMeta.rowData[0] === 4 ? {tableMeta.rowData[0] === 4 ?
null null
...@@ -20477,7 +20477,7 @@ export default class TableSubHolding extends Component { ...@@ -20477,7 +20477,7 @@ export default class TableSubHolding extends Component {
</div> </div>
} }
</div> </div>
<div className="col-2"> <div className="col-2" style={{ right: 12}}>
{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