Skip to content

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

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

Update UI Monthly Report

See merge request !1690
parents 4576d810 db454b8c
Hide whitespace changes
Inline Side-by-side
Showing with 270 additions and 14 deletions
src/container/GeneralSetting/MaintenanceMode.js
View file @ 3041236f
......@@ -172,17 +172,31 @@ class MaintenanceMode extends Component {
"maintenance_mail": [
{
"mail_type": "MAINTENANCE_MODE_ACTIVE",
"mail_subject": this.state.subjectMailActive,
"mail_body": this.state.mailcontentModeActive,
"mail_status": this.state.mailStatusActive
"mail_subject": "TIA 4.0 Is Under Maintenance",
"mail_body": "",
"mail_status": 0
},
{
"mail_type": "MAINTENANCE_MODE_INACTIVE",
"mail_subject": this.state.subjectMailNonActive,
"mail_body": this.state.mailcontentModeNonActive,
"mail_status": this.state.mailStatusNonActive
"mail_subject": "TIA 4.0 is Back",
"mail_body": "",
"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);
api.create().createMaintenanceMode(payload).then((response) => {
......@@ -223,17 +237,31 @@ class MaintenanceMode extends Component {
"maintenance_mail": [
{
"mail_type": "MAINTENANCE_MODE_ACTIVE",
"mail_subject": this.state.subjectMailActive,
"mail_body": this.state.mailcontentModeActive,
"mail_status": this.state.mailStatusActive
"mail_subject": "TIA 4.0 Is Under Maintenance",
"mail_body": "",
"mail_status": 0
},
{
"mail_type": "MAINTENANCE_MODE_INACTIVE",
"mail_subject": this.state.subjectMailNonActive,
"mail_body": this.state.mailcontentModeNonActive,
"mail_status": this.state.mailStatusNonActive
"mail_subject": "TIA 4.0 is Back",
"mail_body": "",
"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);
api.create().updateMaintenanceMode(payload).then((response) => {
......
src/container/MonthlyReport/MonthlyReport.js
View file @ 3041236f
......@@ -26,7 +26,7 @@ import { PhotoSizeSelectLargeTwoTone, ThreeSixty } from '@material-ui/icons';
import { startTransition } from 'react';
var ct = require("../../library/CustomTable");
const getMuiTheme = () => createMuiTheme(ct.customTable());
const getMuiTheme = () => createMuiTheme(ct.customTable6());
const Alert = withStyles({
})((props) => <MuiAlert elevation={6} variant="filled" {...props} />);
......
src/library/CustomTable.js
View file @ 3041236f
......@@ -501,7 +501,7 @@ export function customTable4() {
overflow: "hidden",
},
responsiveScrollMaxHeight: {
maxHeight:'700px !important'
maxHeight: '700px !important'
},
},
MuiToolbar: {
......@@ -622,6 +622,234 @@ export function customTable4() {
}
}
export function customTable6() {
return {
typography: {
useNextVariants: true,
},
overrides: {
MUIDataTable: {
paper: {
position: 'relative',
// width: '100% !important',
boxShadow: "0 0 0 0 rgba(154,161,171,.15)",
border: "1px rgba(0,0,0,0.1) solid",
borderRadius: "10px",
overflow: "hidden",
},
responsiveScroll: {
position: 'relative',
width: '100% !important',
},
responsiveScrollMaxHeight: {
height: 'calc(200vh - 250px)',
maxHeight: 'calc(200vh - 250px)'
},
},
MuiToolbar: {
root: {
position: 'relative',
}
},
MUIDataTableToolbar: {
root: {
position: 'relative',
padding: "0px 15px",
backgroundColor: '#f2f6fa', //'rgba(0,76,151,0.05)',
},
titleText: {
color: "#555"
},
icon: {
color: "#555 !important"
},
iconActive: {
color: "#555 !important"
},
left: {
flex: "0 0 auto !important"
},
actions: {
flex: "1 0 auto !important"
}
},
MUIDataTableSearch: {
main: {
position: 'absolute',
top: "2px",
right: "2px",
width: "350px !important",
backgroundColor: "#f2f6fa",
zIndex: "10",
textAlign: "right",
display: "block",
},
searchIcon: {
width: "50px !important",
color: "#555 !important",
display: "inline-block",
textAlign: "center",
verticalAlign: "top",
},
searchText: {
width: "calc(100% - 120px) !important",
marginRight: "10px",
color: "#555 !important",
display: "inline-block",
verticalAlign: "top",
},
clearIcon: {
width: "50px !important",
color: "#555 !important",
display: "inline-block",
verticalAlign: "top",
},
},
MuiTableCell: {
root: {
display: 'table-cell',
padding: 10,
paddingLeft: 25,
paddingRight: 25,
fontSize: '0.875rem',
textAlign: 'left',
fontFamily: "Roboto, Helvetica, Arial, sans-serif",
fontWeight: 400,
lineHeight: 1.43,
borderBottom: '1px solid rgba(224, 224, 224, 1)',
letterSpacing: '0.01071em',
verticalAlign: 'inherit',
}
},
MuiPopover: {
paper: {
outline: 0,
position: 'absolute',
maxWidth: 'calc(100% -32px)',
minWidth: 199,
maxHeight: 'calc(100% -32px)',
minHeight: 16,
overflowX: 'hidden',
overflowY: 'auto',
width: 400
}
},
MUIDataTableFilterList: {
root: {
backgroundColor: "#f2f6fa",
margin: "0px 0px 0px 0px",
padding: "0px 16px 0px 16px"
},
chip: {
margin: "8px 8px 8px 0px",
color: "#555",
}
},
MUIDataTableHead: {
main: {
position: 'relative',
backgroundColor: mainColor,
color: "#555",
// display: "flex",
// alignItems: "stretch"
},
fixedHeader: {
// position: "relative",
borderBottom: "1px rgba(0,0,0,0.1) solid",
backgroundColor: '#f2f6fa', //'rgba(0,76,151,0.05)',
color: "#555",
padding: "10px 20px",
height: "auto"
,
marginTop: "10px"
},
},
MUIDataTableHeadRow: {
root: {
position: 'relative',
backgroundColor: mainColor,
}
},
MUIDataTableHeadCell: {
root: {
fontSize: "10pt",
fontWeight: "500",
color: "#555",
backgroundColor: secondColor,
},
fixedHeader: {
// position: "relative",
borderBottom: "1px rgba(0,0,0,0.1) solid",
backgroundColor: '#f2f6fa', //'rgba(0,76,151,0.05)',
color: "#555",
padding: "10px 25px",
height: "auto"
},
toolButton: {
display: "flex",
height: "auto",
whiteSpace: 'nowrap'
},
data: {
display: "inline-block",
verticalAlign: "top",
},
sortActive: {
color: "#555"
},
sortAction: {
color: "#555",
display: "inline-block",
verticalAlign: "top",
MuiButtonBase: {
color: "#555",
root: {
color: "#555",
}
}
}
},
MUIDataTableBodyCell: {
root: {
position: 'relative',
fontSize: "13px",
}
},
MUIDataTableSelectCell: {
headerCell: {
backgroundColor: secondColor,
checkboxRoot: {
color: "#555",
}
},
checkboxRoot: {
color: "#555"
}
},
MuiInput: {
root: {
top: "5px",
color: "#555 !important",
},
underline: {
borderBottom: "1px #555 solid !important",
}
},
MuiSelect: {
root: {
top: "0",
color: "#555 !important",
},
}
// MuiIconButton: {
// root: {
// color: "#fff !important",
// }
// }
}
}
}
export function customOptions() {
return {
// selectableRows: false,
......
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