Skip to content

T
Tia-dev
Commit d0715be7 authored by fahrur huzain's avatar fahrur huzain
Browse files
Options

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

Env dev

See merge request !2299
parents b2e694cc d150a4c3
Show whitespace changes
Inline Side-by-side
Showing with 89 additions and 88 deletions
src/container/MasterData/MasterDataCAT/MasterDataCAT.js
View file @ d0715be7
...@@ -604,11 +604,11 @@ export default class MasterDataCAT extends Component { ...@@ -604,11 +604,11 @@ export default class MasterDataCAT extends Component {
return [ return [
index, index,
item.item_report_id, item.item_report_id,
item.report_name,
item.item_report_name, item.item_report_name,
item.years,
item.company_name, item.company_name,
item.report_name,
item.weight, item.weight,
item.years,
item.status, item.status,
item.company_id item.company_id
] ]
...@@ -848,6 +848,7 @@ export default class MasterDataCAT extends Component { ...@@ -848,6 +848,7 @@ export default class MasterDataCAT extends Component {
name: "Action", name: "Action",
options: { options: {
sort: false, sort: false,
filter: false,
customBodyRender: (val, tableMeta) => { customBodyRender: (val, tableMeta) => {
return ( return (
<div style={{ display: 'flex' }}> <div style={{ display: 'flex' }}>
...@@ -899,7 +900,7 @@ export default class MasterDataCAT extends Component { ...@@ -899,7 +900,7 @@ export default class MasterDataCAT extends Component {
customBodyRender: (val, tableMeta) => { customBodyRender: (val, tableMeta) => {
return ( return (
<div style={{ display: 'flex' }}> <div style={{ display: 'flex' }}>
<span style={{ color: tableMeta.rowData[7] === "Active" ? "#656565" : 'rgba(0, 0, 0, 0.25)' }}>{val}</span> <span style={{ color: tableMeta.rowData[7] === "Active" ? "#656565" : 'rgba(0, 0, 0, 0.25)' }}>{tableMeta.rowData[1]}</span>
</div > </div >
); );
} }
...@@ -911,7 +912,7 @@ export default class MasterDataCAT extends Component { ...@@ -911,7 +912,7 @@ export default class MasterDataCAT extends Component {
customBodyRender: (val, tableMeta) => { customBodyRender: (val, tableMeta) => {
return ( return (
<div style={{ display: 'flex' }}> <div style={{ display: 'flex' }}>
<span style={{ color: tableMeta.rowData[7] === "Active" ? "#656565" : 'rgba(0, 0, 0, 0.25)' }}>{tableMeta.rowData[4]}</span> <span style={{ color: tableMeta.rowData[7] === "Active" ? "#656565" : 'rgba(0, 0, 0, 0.25)' }}>{tableMeta.rowData[2]}</span>
</div > </div >
); );
} }
...@@ -923,7 +924,7 @@ export default class MasterDataCAT extends Component { ...@@ -923,7 +924,7 @@ export default class MasterDataCAT extends Component {
customBodyRender: (val, tableMeta) => { customBodyRender: (val, tableMeta) => {
return ( return (
<div style={{ display: 'flex' }}> <div style={{ display: 'flex' }}>
<span style={{ color: tableMeta.rowData[7] === "Active" ? "#656565" : 'rgba(0, 0, 0, 0.25)' }}>{tableMeta.rowData[2]}</span> <span style={{ color: tableMeta.rowData[7] === "Active" ? "#656565" : 'rgba(0, 0, 0, 0.25)' }}>{tableMeta.rowData[3]}</span>
</div > </div >
); );
} }
...@@ -935,7 +936,7 @@ export default class MasterDataCAT extends Component { ...@@ -935,7 +936,7 @@ export default class MasterDataCAT extends Component {
customBodyRender: (val, tableMeta) => { customBodyRender: (val, tableMeta) => {
return ( return (
<div style={{ display: 'flex' }}> <div style={{ display: 'flex' }}>
<span style={{ color: tableMeta.rowData[7] === "Active" ? "#656565" : 'rgba(0, 0, 0, 0.25)' }}>{tableMeta.rowData[6]}</span> <span style={{ color: tableMeta.rowData[7] === "Active" ? "#656565" : 'rgba(0, 0, 0, 0.25)' }}>{tableMeta.rowData[4]}</span>
</div > </div >
); );
} }
...@@ -947,7 +948,7 @@ export default class MasterDataCAT extends Component { ...@@ -947,7 +948,7 @@ export default class MasterDataCAT extends Component {
customBodyRender: (val, tableMeta) => { customBodyRender: (val, tableMeta) => {
return ( return (
<div style={{ display: 'flex' }}> <div style={{ display: 'flex' }}>
<span style={{ color: tableMeta.rowData[7] === "Active" ? "#656565" : 'rgba(0, 0, 0, 0.25)' }}>{tableMeta.rowData[3]}</span> <span style={{ color: tableMeta.rowData[7] === "Active" ? "#656565" : 'rgba(0, 0, 0, 0.25)' }}>{tableMeta.rowData[5]}</span>
</div > </div >
); );
} }
...@@ -959,7 +960,7 @@ export default class MasterDataCAT extends Component { ...@@ -959,7 +960,7 @@ export default class MasterDataCAT extends Component {
customBodyRender: (val, tableMeta) => { customBodyRender: (val, tableMeta) => {
return ( return (
<div style={{ display: 'flex' }}> <div style={{ display: 'flex' }}>
<span style={{ color: tableMeta.rowData[7] === "Active" ? "#656565" : 'rgba(0, 0, 0, 0.25)' }}>{tableMeta.rowData[5]}</span> <span style={{ color: tableMeta.rowData[7] === "Active" ? "#656565" : 'rgba(0, 0, 0, 0.25)' }}>{tableMeta.rowData[6]}</span>
</div > </div >
); );
} }
......
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