Skip to content

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

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

rapihin ui

See merge request !1698
parents 0d3445df 7bb705d5
Hide whitespace changes
Inline Side-by-side
Showing with 55 additions and 47 deletions
src/container/ProgressReport/TableProgressReport.js
View file @ b9444e21
...@@ -6,9 +6,9 @@ import Constant from '../../library/Constant'; ...@@ -6,9 +6,9 @@ import Constant from '../../library/Constant';
var ct = require("../../library/CustomTable"); var ct = require("../../library/CustomTable");
const getMuiTheme = () => createMuiTheme(ct.customTable4()); const getMuiTheme = () => createMuiTheme(ct.customTable3());
const options = ct.customOptionsFixedColumnMonitoring(); const options = ct.customOptionsFixedColumn();
const style = { const style = {
position: "sticky", position: "sticky",
left: 0, left: 0,
...@@ -18,7 +18,7 @@ const style = { ...@@ -18,7 +18,7 @@ const style = {
const style2 = { const style2 = {
position: "sticky", position: "sticky",
background: "white", background: "white",
zIndex: 100, zIndex: 100
}; };
export default class TableProgressReport extends Component { export default class TableProgressReport extends Component {
...@@ -83,23 +83,27 @@ export default class TableProgressReport extends Component { ...@@ -83,23 +83,27 @@ export default class TableProgressReport extends Component {
name: "Company", name: "Company",
options: { options: {
customHeadRender: (columnMeta) => ( customHeadRender: (columnMeta) => (
<TableCell key={columnMeta.index} style={{ ...style, top: 0, zIndex: 103, backgroundColor: "#1c71b8", width: 200, borderRight: "1px #fff solid", borderBottom: "1px #fff solid", }}> <TableCell key={columnMeta.index} style={{ ...style, top: 0, zIndex: 103, backgroundColor: '#1c71b8', width: 200 }}>
<Typography style={{ color: "white", fontSize: 12, fontWeight: "bold", textAlign: "center" }}>{columnMeta.name}</Typography> <Typography style={{ color: 'white', fontSize: 12, fontWeight: 'bold', textAlign: 'left' }}>{columnMeta.name}</Typography>
</TableCell> </TableCell>
), ),
setCellProps: () => ({ style }), setCellProps: () => ({ style }),
customBodyRender: (val, tableMeta) => { customBodyRender: (val, tableMeta) => {
return <div style={{ width: 300, textAlign: 'left', paddingLeft: 20 }}>{val}</div>; return (
}, <div style={{ width: 200 }}>
}, {val}
</div>
)
}
}
}, },
{ {
name: `INPUT MASTER BUDGET`, name: `INPUT MASTER BUDGET`,
options: { options: {
customHeadRender: (columnMeta) => ( customHeadRender: (columnMeta) => (
<th style={{ ...style, top: 0, zIndex: 103, color: '#fff', backgroundColor: '#1c71b8', fontSize: 13, fontWeight: 1, borderRight: "1px solid rgb(255, 255, 255)", padding: 0 }} > <th style={{ ...style2, color: '#fff', backgroundColor: '#07a7d0', top: 0, zIndex: 102, fontSize: 13, fontWeight: 1, width: 150, borderRight: "1px solid rgb(255, 255, 255)", padding: 0 }} >
<div style={{ borderBottom: "1px #fff solid", backgroundColor: '#37b5e6', justifyContent: 'center', display: 'flex', alignItems: 'center', height: 40, fontSize: 12, fontWeight: 'bold', padding: 5 }}>{columnMeta.name}</div> <div style={{ borderBottom: "1px #fff solid", backgroundColor: '#1c71b8', textAlign: 'center', fontSize: 12, fontWeight: 'bold', padding: 5, borderRight: "1px solid rgb(255, 255, 255)" }}>{columnMeta.name}</div>
<div className="grid grid-3x"> <div className="grid grid-3x" style={{ ...style2, color: '#fff', fontSize: 12, fontWeight: 'bold', position: "sticky" }}>
<div className="column-1 grid grid-4x" style={{ color: '#fff', fontSize: 12, fontWeight: 'bold', position: "sticky" }}> <div className="column-1 grid grid-4x" style={{ color: '#fff', fontSize: 12, fontWeight: 'bold', position: "sticky" }}>
<div className="column-1" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, borderRight: "1px #fff solid", backgroundColor: '#1c71b8', justifyContent: 'center', display: 'flex', alignItems: 'center', height: 45 }}> <div className="column-1" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, borderRight: "1px #fff solid", backgroundColor: '#1c71b8', justifyContent: 'center', display: 'flex', alignItems: 'center', height: 45 }}>
<span>{"Profit Loss"}</span> <span>{"Profit Loss"}</span>
...@@ -132,7 +136,7 @@ export default class TableProgressReport extends Component { ...@@ -132,7 +136,7 @@ export default class TableProgressReport extends Component {
<div className="column-1" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, borderRight: "1px #fff solid", backgroundColor: '#1c71b8', justifyContent: 'center', display: 'flex', alignItems: 'center', height: 45 }}> <div className="column-1" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, borderRight: "1px #fff solid", backgroundColor: '#1c71b8', justifyContent: 'center', display: 'flex', alignItems: 'center', height: 45 }}>
<span>{"Automatic Reminder"}</span> <span>{"Automatic Reminder"}</span>
</div> </div>
<div className="column-2" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, borderRight: "1px #fff solid", backgroundColor: '#1c71b8', justifyContent: 'center', display: 'flex', alignItems: 'center', height: 45 }}> <div className="column-2" style={{ placeSelf: 'right', textAlign: 'center', padding: 5, borderRight: "1px #fff solid", backgroundColor: '#1c71b8', justifyContent: 'center', display: 'flex', alignItems: 'center', height: 45 }}>
<span>{"Manual Reminder"}</span> <span>{"Manual Reminder"}</span>
</div> </div>
<div className="column-3" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, borderRight: "1px #fff solid", backgroundColor: '#1c71b8', justifyContent: 'center', display: 'flex', alignItems: 'center', height: 45 }}> <div className="column-3" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, borderRight: "1px #fff solid", backgroundColor: '#1c71b8', justifyContent: 'center', display: 'flex', alignItems: 'center', height: 45 }}>
...@@ -232,23 +236,27 @@ export default class TableProgressReport extends Component { ...@@ -232,23 +236,27 @@ export default class TableProgressReport extends Component {
name: "Company", name: "Company",
options: { options: {
customHeadRender: (columnMeta) => ( customHeadRender: (columnMeta) => (
<TableCell key={columnMeta.index} style={{ ...style, top: 0, zIndex: 103, backgroundColor: "#1c71b8", width: 200, borderRight: "1px #fff solid", borderBottom: "1px #fff solid", }}> <TableCell key={columnMeta.index} style={{ ...style, top: 0, zIndex: 103, backgroundColor: '#1c71b8', width: 300 }}>
<Typography style={{ color: "white", fontSize: 12, fontWeight: "bold", textAlign: "center" }}>{columnMeta.name}</Typography> <Typography style={{ color: 'white', fontSize: 12, fontWeight: 'bold', textAlign: 'left' }}>{columnMeta.name}</Typography>
</TableCell> </TableCell>
), ),
setCellProps: () => ({ style }), setCellProps: () => ({ style }),
customBodyRender: (val, tableMeta) => { customBodyRender: (val, tableMeta) => {
return <div style={{ width: 300, textAlign: 'left', paddingLeft: 20 }}>{val}</div>; return (
}, <div style={{ width: 300 }}>
}, {val}
</div>
)
}
}
}, },
{ {
name: `INPUT MONTHLY REPORT`, name: `INPUT MONTHLY REPORT`,
options: { options: {
customHeadRender: (columnMeta) => ( customHeadRender: (columnMeta) => (
<th style={{ ...style, top: 0, zIndex: 103, color: '#fff', backgroundColor: '#1c71b8', fontSize: 13, fontWeight: 1, borderRight: "1px solid rgb(255, 255, 255)", padding: 0 }} > <th style={{ ...style2, color: '#fff', backgroundColor: '#07a7d0', top: 0, zIndex: 102, fontSize: 13, fontWeight: 1, width: 150, borderRight: "1px solid rgb(255, 255, 255)", padding: 0 }} >
<div style={{ borderBottom: "1px #fff solid", backgroundColor: '#37b5e6', justifyContent: 'center', display: 'flex', alignItems: 'center', height: 40, fontSize: 12, fontWeight: 'bold', padding: 5 }}>{columnMeta.name}</div> <div style={{ borderBottom: "1px #fff solid", backgroundColor: '#1c71b8', textAlign: 'center', fontSize: 12, fontWeight: 'bold', padding: 5, borderRight: "1px solid rgb(255, 255, 255)" }}>{columnMeta.name}</div>
<div className="grid grid-4x"> <div className="grid grid-4x" style={{ ...style2, color: '#fff', fontSize: 12, fontWeight: 'bold', position: "sticky" }}>
<div className="column-1 grid grid-3x" style={{ color: '#fff', fontSize: 12, fontWeight: 'bold', position: "sticky" }}> <div className="column-1 grid grid-3x" style={{ color: '#fff', fontSize: 12, fontWeight: 'bold', position: "sticky" }}>
<div className="column-1" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, borderRight: "1px #fff solid", backgroundColor: '#1c71b8', justifyContent: 'center', display: 'flex', alignItems: 'center', height: 45 }}> <div className="column-1" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, borderRight: "1px #fff solid", backgroundColor: '#1c71b8', justifyContent: 'center', display: 'flex', alignItems: 'center', height: 45 }}>
<span>{"Profit Loss"}</span> <span>{"Profit Loss"}</span>
...@@ -344,7 +352,7 @@ export default class TableProgressReport extends Component { ...@@ -344,7 +352,7 @@ export default class TableProgressReport extends Component {
style={{ background: 'white' }} style={{ background: 'white' }}
onClick={() => this.handleSendEmail(tableMeta.rowData[5])} onClick={() => this.handleSendEmail(tableMeta.rowData[5])}
> >
<div style={{ width: 85, height: 30, backgroundColor: '#354960', borderRadius: 5, alignItems: 'center', display: 'flex', justifyContent: 'center' }}> <div style={{ position: 'relative', width: 85, height: 30, backgroundColor: '#354960', borderRadius: 5, alignItems: 'center', display: 'flex', justifyContent: 'center' }}>
<span style={{ color: '#fff', fontSize: 11 }}>{tableMeta.rowData[3] === null || tableMeta.rowData[3] === 0 ? "Send Email" : "Sent"}</span> <span style={{ color: '#fff', fontSize: 11 }}>{tableMeta.rowData[3] === null || tableMeta.rowData[3] === 0 ? "Send Email" : "Sent"}</span>
</div> </div>
</button> </button>
......
src/container/Reports/TableSubHolding.js
View file @ b9444e21
...@@ -19805,7 +19805,7 @@ export default class TableSubHolding extends Component { ...@@ -19805,7 +19805,7 @@ export default class TableSubHolding extends Component {
return ( return (
<div> <div>
<div className="grid grid-3x content-center"> <div className="grid grid-3x content-center">
<div className="grid grid-4x content-center"> <div className="grid grid-4x content-center" style={{ right: 11}}>
<div className="col-1"> <div className="col-1">
{tableMeta.rowData[0] === 4 ? {tableMeta.rowData[0] === 4 ?
null null
...@@ -20665,7 +20665,7 @@ export default class TableSubHolding extends Component { ...@@ -20665,7 +20665,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 ?
...@@ -20688,7 +20688,7 @@ export default class TableSubHolding extends Component { ...@@ -20688,7 +20688,7 @@ export default class TableSubHolding extends Component {
</div> </div>
} }
</div> </div>
<div className="col-3"> <div className="col-3" style={{ left: 29}}>
{tableMeta.rowData[0] === 4 ? {tableMeta.rowData[0] === 4 ?
null null
: tableMeta.rowData[0] === 1 ? : tableMeta.rowData[0] === 1 ?
...@@ -20711,7 +20711,7 @@ export default class TableSubHolding extends Component { ...@@ -20711,7 +20711,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 ?
...@@ -20735,7 +20735,7 @@ export default class TableSubHolding extends Component { ...@@ -20735,7 +20735,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: 57}}>
<div className="col-1"> <div className="col-1">
{tableMeta.rowData[0] === 4 ? {tableMeta.rowData[0] === 4 ?
null null
...@@ -20759,7 +20759,7 @@ export default class TableSubHolding extends Component { ...@@ -20759,7 +20759,7 @@ export default class TableSubHolding extends Component {
</div> </div>
} }
</div> </div>
<div className="col-2"> <div className="col-2" style={{ left: 16}}>
{tableMeta.rowData[0] === 4 ? {tableMeta.rowData[0] === 4 ?
null null
: tableMeta.rowData[0] === 1 ? : tableMeta.rowData[0] === 1 ?
...@@ -20782,7 +20782,7 @@ export default class TableSubHolding extends Component { ...@@ -20782,7 +20782,7 @@ export default class TableSubHolding extends Component {
</div> </div>
} }
</div> </div>
<div className="col-3"> <div className="col-3" style={{ left: 32}}>
{tableMeta.rowData[0] === 4 ? {tableMeta.rowData[0] === 4 ?
null null
: tableMeta.rowData[0] === 1 ? : tableMeta.rowData[0] === 1 ?
...@@ -20805,7 +20805,7 @@ export default class TableSubHolding extends Component { ...@@ -20805,7 +20805,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 ?
...@@ -20829,7 +20829,7 @@ export default class TableSubHolding extends Component { ...@@ -20829,7 +20829,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: 90}}>
<div className="col-1"> <div className="col-1">
{tableMeta.rowData[0] === 4 ? {tableMeta.rowData[0] === 4 ?
null null
...@@ -20853,7 +20853,7 @@ export default class TableSubHolding extends Component { ...@@ -20853,7 +20853,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 ?
...@@ -20876,7 +20876,7 @@ export default class TableSubHolding extends Component { ...@@ -20876,7 +20876,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 ?
...@@ -20899,7 +20899,7 @@ export default class TableSubHolding extends Component { ...@@ -20899,7 +20899,7 @@ export default class TableSubHolding extends Component {
</div> </div>
} }
</div> </div>
<div className="col-4"> <div className="col-4" style={{ right: 41}}>
{tableMeta.rowData[0] === 4 ? {tableMeta.rowData[0] === 4 ?
null null
: tableMeta.rowData[0] === 1 ? : tableMeta.rowData[0] === 1 ?
...@@ -20922,7 +20922,7 @@ export default class TableSubHolding extends Component { ...@@ -20922,7 +20922,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 ?
...@@ -21042,7 +21042,7 @@ export default class TableSubHolding extends Component { ...@@ -21042,7 +21042,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 ?
...@@ -21065,7 +21065,7 @@ export default class TableSubHolding extends Component { ...@@ -21065,7 +21065,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 ?
...@@ -21088,7 +21088,7 @@ export default class TableSubHolding extends Component { ...@@ -21088,7 +21088,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 ?
...@@ -21112,7 +21112,7 @@ export default class TableSubHolding extends Component { ...@@ -21112,7 +21112,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: 59}}>
<div className="col-1"> <div className="col-1">
{tableMeta.rowData[0] === 4 ? {tableMeta.rowData[0] === 4 ?
null null
...@@ -21136,7 +21136,7 @@ export default class TableSubHolding extends Component { ...@@ -21136,7 +21136,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 ?
...@@ -21159,7 +21159,7 @@ export default class TableSubHolding extends Component { ...@@ -21159,7 +21159,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 ?
...@@ -21182,7 +21182,7 @@ export default class TableSubHolding extends Component { ...@@ -21182,7 +21182,7 @@ export default class TableSubHolding extends Component {
</div> </div>
} }
</div> </div>
<div className="col-4"> <div className="col-4" style={{ left: 41}}>
{tableMeta.rowData[0] === 4 ? {tableMeta.rowData[0] === 4 ?
null null
: tableMeta.rowData[0] === 1 ? : tableMeta.rowData[0] === 1 ?
...@@ -21206,7 +21206,7 @@ export default class TableSubHolding extends Component { ...@@ -21206,7 +21206,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: 89}}>
<div className="col-1"> <div className="col-1">
{tableMeta.rowData[0] === 4 ? {tableMeta.rowData[0] === 4 ?
null null
...@@ -21230,7 +21230,7 @@ export default class TableSubHolding extends Component { ...@@ -21230,7 +21230,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 ?
...@@ -21253,7 +21253,7 @@ export default class TableSubHolding extends Component { ...@@ -21253,7 +21253,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 ?
...@@ -21276,7 +21276,7 @@ export default class TableSubHolding extends Component { ...@@ -21276,7 +21276,7 @@ export default class TableSubHolding extends Component {
</div> </div>
} }
</div> </div>
<div className="col-4"> <div className="col-4" style={{ right: 41}}>
{tableMeta.rowData[0] === 4 ? {tableMeta.rowData[0] === 4 ?
null null
: tableMeta.rowData[0] === 1 ? : tableMeta.rowData[0] === 1 ?
...@@ -21299,7 +21299,7 @@ export default class TableSubHolding extends Component { ...@@ -21299,7 +21299,7 @@ export default class TableSubHolding extends Component {
</div> </div>
} }
</div> </div>
<div className="col-5"> <div className="col-5" style={{ right: 52}}>
{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