Skip to content

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

Merge branch 'ENV-STAGING' into 'ENV-PROD' 

Env staging

See merge request !2300
parents 83b9fb6f 50f50f80
Hide whitespace changes
Inline Side-by-side
Showing with 100 additions and 99 deletions
src/container/MasterData/MasterDataCAT/CreateMasterDataCAT.js
View file @ 4cd9f815
...@@ -3,7 +3,7 @@ import { TextField, Typography, Snackbar, withStyles } from '@material-ui/core'; ...@@ -3,7 +3,7 @@ import { TextField, Typography, Snackbar, withStyles } from '@material-ui/core';
import * as R from 'ramda'; import * as R from 'ramda';
import api from '../../../api'; import api from '../../../api';
import Autocomplete from '@material-ui/lab/Autocomplete'; import Autocomplete from '@material-ui/lab/Autocomplete';
import { titleCase } from '../../../library/Utils'; import { fixNumber, titleCase } from '../../../library/Utils';
import format from "date-fns/format"; import format from "date-fns/format";
import { DatePicker } from '@material-ui/pickers'; import { DatePicker } from '@material-ui/pickers';
import Images from '../../../assets/Images'; import Images from '../../../assets/Images';
...@@ -184,10 +184,10 @@ export default class CreateMasterDataCAT extends Component { ...@@ -184,10 +184,10 @@ export default class CreateMasterDataCAT extends Component {
getData.map((item) => { getData.map((item) => {
jumlah += Number(item.weight) jumlah += Number(item.weight)
}) })
console.log(jumlah) console.log(fixNumber(jumlah,3))
if ( jumlah > 100/100 ) { if ( fixNumber(jumlah,3) > 100/100 ) {
this.setState({ errorWeight: true, msgErrorWeight: 'Weight more than 100%' }) this.setState({ errorWeight: true, msgErrorWeight: 'Weight more than 100%' })
} else if (jumlah < 100/100) { } else if (fixNumber(jumlah,3) < 100/100) {
this.setState({ errorWeight: true, msgErrorWeight: 'Weight less than 100%' }) this.setState({ errorWeight: true, msgErrorWeight: 'Weight less than 100%' })
} }
else { else {
......
src/container/MasterData/MasterDataCAT/EditMasterDataCAT.js
View file @ 4cd9f815
...@@ -6,7 +6,7 @@ import Autocomplete from '@material-ui/lab/Autocomplete'; ...@@ -6,7 +6,7 @@ import Autocomplete from '@material-ui/lab/Autocomplete';
import MuiAlert from '@material-ui/lab/Alert'; import MuiAlert from '@material-ui/lab/Alert';
import api from '../../../api'; import api from '../../../api';
import * as R from 'ramda' import * as R from 'ramda'
import { titleCase } from '../../../library/Utils'; import { fixNumber, titleCase } from '../../../library/Utils';
import Images from '../../../assets/Images'; import Images from '../../../assets/Images';
import Constant from '../../../library/Constant'; import Constant from '../../../library/Constant';
const Alert = withStyles({ const Alert = withStyles({
...@@ -194,10 +194,10 @@ export default class EditMasterDataCAT extends Component { ...@@ -194,10 +194,10 @@ export default class EditMasterDataCAT extends Component {
getData.map((item) => { getData.map((item) => {
jumlah += Number(item.weight) jumlah += Number(item.weight)
}) })
console.log(jumlah) console.log(fixNumber(jumlah,3))
if ( jumlah > 100/100 ) { if ( fixNumber(jumlah,3) > 100/100 ) {
this.setState({ errorWeight: true, msgErrorWeight: 'Weight more than 100%' }) this.setState({ errorWeight: true, msgErrorWeight: 'Weight more than 100%' })
} else if (jumlah < 100/100) { } else if (fixNumber(jumlah,3) < 100/100) {
this.setState({ errorWeight: true, msgErrorWeight: 'Weight less than 100%' }) this.setState({ errorWeight: true, msgErrorWeight: 'Weight less than 100%' })
} }
else { else {
...@@ -226,7 +226,7 @@ export default class EditMasterDataCAT extends Component { ...@@ -226,7 +226,7 @@ export default class EditMasterDataCAT extends Component {
this.props.updateReportItems(payload) this.props.updateReportItems(payload)
} }
getInputType() { getInputType() {
api.create().getInputType().then((response) => { api.create().getInputType().then((response) => {
// console.log(response.data) // console.log(response.data)
...@@ -378,7 +378,7 @@ export default class EditMasterDataCAT extends Component { ...@@ -378,7 +378,7 @@ export default class EditMasterDataCAT extends Component {
<div className="grid grid-2x grid-mobile-none gap-15px" style={{ paddingLeft: 20, paddingRight: 20 }}> <div className="grid grid-2x grid-mobile-none gap-15px" style={{ paddingLeft: 20, paddingRight: 20 }}>
<div className="column-1"> <div className="column-1">
<div className="margin-top-10px" style={{ padding: 10, borderRadius: 5 }} > <div className="margin-top-10px" style={{ padding: 10, borderRadius: 5 }} >
<Autocomplete <Autocomplete
{...this.state.listCompany} {...this.state.listCompany}
id="company" id="company"
......
src/container/MasterData/MasterDataCAT/MasterDataCAT.js
View file @ 4cd9f815
...@@ -602,13 +602,13 @@ export default class MasterDataCAT extends Component { ...@@ -602,13 +602,13 @@ export default class MasterDataCAT extends Component {
let data = response.data.data let data = response.data.data
let listData = data.sort((a, b) => a.item_report_id - b.item_report_id).map((item, index) => { let listData = data.sort((a, b) => a.item_report_id - b.item_report_id).map((item, index) => {
return [ return [
index, index,
item.item_report_id, item.item_report_id,
item.item_report_name,
item.company_name,
item.report_name, item.report_name,
item.weight, item.item_report_name,
item.years, item.years,
item.company_name,
item.weight,
item.status, item.status,
item.company_id item.company_id
] ]
...@@ -848,11 +848,12 @@ export default class MasterDataCAT extends Component { ...@@ -848,11 +848,12 @@ 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' }}>
{this.state.buttonEdit && {this.state.buttonEdit &&
<span> <span>
<a data-tip={'Edit'} data-for="edit"> <a data-tip={'Edit'} data-for="edit">
<button <button
style={{ style={{
...@@ -870,7 +871,7 @@ export default class MasterDataCAT extends Component { ...@@ -870,7 +871,7 @@ export default class MasterDataCAT extends Component {
</span> </span>
} }
{this.state.buttonDelete && {this.state.buttonDelete &&
<span> <span>
<a data-tip={'Delete'} data-for="delete"> <a data-tip={'Delete'} data-for="delete">
<button <button
style={{ style={{
...@@ -893,96 +894,96 @@ export default class MasterDataCAT extends Component { ...@@ -893,96 +894,96 @@ export default class MasterDataCAT extends Component {
} }
} }
}, },
{ {
name: "ID", name: "ID",
options: { options: {
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 >
); );
}
} }
} },
}, {
{ name: "Report Name",
name: "Report Name", options: {
options: { 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[4]}</span> </div >
</div > );
); }
} }
} },
}, {
{ name: "Item Report Name",
name: "Item Report Name", options: {
options: { 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[2]}</span> </div >
</div > );
); }
} }
} },
}, {
{ name: "Year",
name: "Year", options: {
options: { 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[6]}</span> </div >
</div > );
); }
} }
} },
}, {
{ name: "Company Name",
name: "Company Name", options: {
options: { 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[3]}</span> </div >
</div > );
); }
} }
} },
}, {
{ name: "Weight",
name: "Weight", options: {
options: { 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[5]}</span> </div >
</div > );
); }
} }
} },
}, {
{ name: "Status",
name: "Status", options: {
options: { 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[7]}</span>
<span style={{ color: tableMeta.rowData[7] === "Active" ? "#656565" : 'rgba(0, 0, 0, 0.25)' }}>{tableMeta.rowData[7]}</span> </div >
</div > );
); }
}
},
{
name: "company id",
options: {
display: false
} }
} }
},
{
name: "company id",
options: {
display: false
}
}
] ]
const loadingComponent = ( const loadingComponent = (
<div style={{ position: 'absolute', zIndex: 110, top: 0, left: 0, width: '100%', height: '100%', display: 'flex', justifyContent: 'center', alignItems: 'center', background: 'rgba(255,255,255,0.8)' }}> <div style={{ position: 'absolute', zIndex: 110, top: 0, left: 0, width: '100%', height: '100%', display: 'flex', justifyContent: 'center', alignItems: 'center', background: 'rgba(255,255,255,0.8)' }}>
......
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