Skip to content

T
Tia-dev
Commit 6921ae0d authored by a.bairuha's avatar a.bairuha
Browse files
Options

Merge branch 'master' of http://103.44.149.204/d.arizona/tia-dev into syadziy

parents ef8e7b62 ffa7a76b
Hide whitespace changes
Inline Side-by-side
Showing with 453 additions and 242 deletions
src/api/index.js
View file @ 6921ae0d
...@@ -91,7 +91,7 @@ const create = (baseURL = 'https://tia.eksad.com/tia-reporting-dev/public/') => ...@@ -91,7 +91,7 @@ const create = (baseURL = 'https://tia.eksad.com/tia-reporting-dev/public/') =>
const uploadUnitBisnis = (body) => api.post('/business_unit/import_business_unit', body) const uploadUnitBisnis = (body) => api.post('/business_unit/import_business_unit', body)
const getUnitBisnisActive = () => api.get('business_unit/get_all_business_unit_active') const getUnitBisnisActive = () => api.get('business_unit/get_all_business_unit_active')
const getDetailUnitBisnis = (id) => api.get(`business_unit/get_business_unit_by_id/${id}`) const getDetailUnitBisnis = (id) => api.get(`business_unit/get_business_unit_by_id/${id}`)
const deleteUnitBisnis = (id) => api.post(`business_unit/delete_business_unit/${id}`)
// Perusahaan // Perusahaan
const getPerusahaan = () => api.get('company/get_all_company') const getPerusahaan = () => api.get('company/get_all_company')
...@@ -154,6 +154,7 @@ const create = (baseURL = 'https://tia.eksad.com/tia-reporting-dev/public/') => ...@@ -154,6 +154,7 @@ const create = (baseURL = 'https://tia.eksad.com/tia-reporting-dev/public/') =>
const checkUploadParameter = (body) => api.post('setting/check_import', body) const checkUploadParameter = (body) => api.post('setting/check_import', body)
const uploadParameter = (body) => api.post('/setting/import_setting', body) const uploadParameter = (body) => api.post('/setting/import_setting', body)
const searchParameter = (body) => api.post('setting/search_setting', body) const searchParameter = (body) => api.post('setting/search_setting', body)
const deleteParameter = (id) => api.post(`setting/delete_setting/${id}`)
//Transaction //Transaction
const getReportTypeBody = (body) => api.post('transaction/get_all_report', body) const getReportTypeBody = (body) => api.post('transaction/get_all_report', body)
...@@ -268,7 +269,9 @@ const create = (baseURL = 'https://tia.eksad.com/tia-reporting-dev/public/') => ...@@ -268,7 +269,9 @@ const create = (baseURL = 'https://tia.eksad.com/tia-reporting-dev/public/') =>
getPeriodeTransaction, getPeriodeTransaction,
getRevision, getRevision,
deleteAttachment, deleteAttachment,
getDetailReportMB getDetailReportMB,
deleteUnitBisnis,
deleteParameter
} }
} }
......
src/assets/Images.js
View file @ 6921ae0d
...@@ -44,11 +44,13 @@ const Images = { ...@@ -44,11 +44,13 @@ const Images = {
logout: require('./setting.png'), logout: require('./setting.png'),
setting: require('./logout.png'), setting: require('./logout.png'),
failedCopy: require('./failed-copy.svg'), failedCopy: require('./failed-copy.svg'),
failed: require('./failed.svg'),
triputraLogo: require('./triputra-logo.png'), triputraLogo: require('./triputra-logo.png'),
photo: require('./photo.svg'), photo: require('./photo.svg'),
camera: require('./camera.svg'), camera: require('./camera.svg'),
meeting: require('./meeting.jpg'), meeting: require('./meeting.jpg'),
triputraBlack: require('./triputra-black.jpg'), triputraBlack: require('./triputra-black.jpg'),
delete: require('./delete.svg')
} }
......
src/assets/delete.svg 0 → 100644
View file @ 6921ae0d
<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
<g fill="none" fill-rule="evenodd">
<g>
<g>
<g>
<g transform="translate(-404 -219) translate(332 151) translate(0 56) translate(72 12)">
<circle cx="16" cy="16" r="16" fill="#ED5050"/>
<g fill="#FFF" fill-rule="nonzero">
<path d="M11.75 2H9v-.5C9 .673 8.327 0 7.5 0h-2C4.673 0 4 .673 4 1.5V2H1.25C.56 2 0 2.56 0 3.25V5c0 .276.224.5.5.5h.273l.432 9.071c.038.801.696 1.429 1.498 1.429h7.594c.802 0 1.46-.628 1.498-1.429l.432-9.071h.273c.276 0 .5-.224.5-.5V3.25C13 2.56 12.44 2 11.75 2zM5 1.5c0-.276.224-.5.5-.5h2c.276 0 .5.224.5.5V2H5v-.5zM1 3.25c0-.138.112-.25.25-.25h10.5c.138 0 .25.112.25.25V4.5H1V3.25zm9.796 11.274c-.013.267-.232.476-.5.476H2.705c-.268 0-.487-.21-.5-.476L1.774 5.5h9.452l-.43 9.024z" transform="translate(9 8)"/>
<path d="M6.5 14c.276 0 .5-.224.5-.5V7c0-.276-.224-.5-.5-.5S6 6.724 6 7v6.5c0 .276.224.5.5.5zM9 14c.276 0 .5-.224.5-.5V7c0-.276-.224-.5-.5-.5s-.5.224-.5.5v6.5c0 .276.224.5.5.5zM4 14c.276 0 .5-.224.5-.5V7c0-.276-.224-.5-.5-.5s-.5.224-.5.5v6.5c0 .276.224.5.5.5z" transform="translate(9 8)"/>
</g>
</g>
</g>
</g>
</g>
</g>
</svg>
src/assets/failed.svg 0 → 100644
View file @ 6921ae0d
<svg xmlns="http://www.w3.org/2000/svg" width="72" height="72" viewBox="0 0 72 72">
<g fill="none" fill-rule="evenodd">
<g>
<g>
<g>
<g transform="translate(-685 -449) translate(420 393) translate(265 56)">
<circle cx="36" cy="36" r="36" fill="#ED8080"/>
<path fill="#FF3939" d="M36 72c19.882 0 36-16.118 36-36S55.882 0 36 0"/>
<circle cx="35.95" cy="35.95" r="31.95" fill="#FFF" fill-rule="nonzero"/>
<g fill="#FF3939" transform="translate(31 17)">
<rect width="11" height="24" rx="3"/>
<circle cx="5.5" cy="32.5" r="5.5"/>
</g>
</g>
</g>
</g>
</g>
</g>
</svg>
src/container/ApprovalMatrix/ApprovalMatrix.js
View file @ 6921ae0d
...@@ -66,12 +66,12 @@ export default class ApprovalMatrix extends Component { ...@@ -66,12 +66,12 @@ export default class ApprovalMatrix extends Component {
if (item.length > 0) { if (item.length > 0) {
payload.push({ payload.push({
id: index + 1, id: index + 1,
approval_type_name: item[0], approval_type_name: item[0] === undefined ? "" : item[0],
orders: item[1], orders: item[1] === undefined ? "" : item[1],
fullname: item[2], fullname: item[2] === undefined ? "" : item[2],
operator_type_name: item[3], operator_type_name: item[3] === undefined ? "" : item[3],
start_date: item[4], start_date: item[4] === undefined ? "" : item[4],
end_date: item[5], end_date: item[5] === undefined ? "" : item[5],
}) })
} }
}) })
...@@ -93,7 +93,6 @@ export default class ApprovalMatrix extends Component { ...@@ -93,7 +93,6 @@ export default class ApprovalMatrix extends Component {
if (response.data.status === "success") { if (response.data.status === "success") {
dataRow = response.data.data.map((item, index) => { dataRow = response.data.data.map((item, index) => {
return [ return [
index + 1,
item.approval_type_name, item.approval_type_name,
item.orders, item.orders,
item.fullname, item.fullname,
...@@ -104,25 +103,24 @@ export default class ApprovalMatrix extends Component { ...@@ -104,25 +103,24 @@ export default class ApprovalMatrix extends Component {
] ]
}) })
let columns = [ let columns = [
"Data",
{ {
name: "Approval Type", name: "Approval Type",
options: { options: {
customBodyRender: (val, tableMeta) => { customBodyRender: (val, tableMeta) => {
let check = null let check = null
if (tableMeta.rowData[7] != null) { if (tableMeta.rowData[6] != null) {
check = tableMeta.rowData[7].findIndex((val) => val.field.includes('approval_type_name')) check = tableMeta.rowData[6].findIndex((val) => val.field.includes('approval_type_name'))
if (check > -1) { if (check > -1) {
this.setState({ buttonError: true }) this.setState({ buttonError: true })
} }
} }
return ( return (
<div style={{ display: 'flex' }}> <div style={{ display: 'flex' }}>
{tableMeta.rowData[7] != null && check > -1 ? {tableMeta.rowData[6] != null && check > -1 ?
<a data-tip={tableMeta.rowData[7][check].message} data-for="approvaltype"> <a data-tip={tableMeta.rowData[6][check].message} data-for="approvaltype">
<span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val}</span> <span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "Empty" : val}</span>
</a> : </a> :
<span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val}</span> <span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "Empty" : val}</span>
} }
<ReactTooltip border={true} id="approvaltype" place="bottom" type="light" effect="solid" /> <ReactTooltip border={true} id="approvaltype" place="bottom" type="light" effect="solid" />
</div > </div >
...@@ -135,19 +133,19 @@ export default class ApprovalMatrix extends Component { ...@@ -135,19 +133,19 @@ export default class ApprovalMatrix extends Component {
options: { options: {
customBodyRender: (val, tableMeta) => { customBodyRender: (val, tableMeta) => {
let check = null let check = null
if (tableMeta.rowData[7] != null) { if (tableMeta.rowData[6] != null) {
check = tableMeta.rowData[7].findIndex((val) => val.field.includes('orders')) check = tableMeta.rowData[6].findIndex((val) => val.field.includes('orders'))
if (check > -1) { if (check > -1) {
this.setState({ buttonError: true }) this.setState({ buttonError: true })
} }
} }
return ( return (
<div style={{ display: 'flex' }}> <div style={{ display: 'flex' }}>
{tableMeta.rowData[7] != null && check > -1 ? {tableMeta.rowData[6] != null && check > -1 ?
<a data-tip={tableMeta.rowData[7][check].message} data-for="order"> <a data-tip={tableMeta.rowData[6][check].message} data-for="order">
<span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val}</span> <span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "Empty" : val}</span>
</a> : </a> :
<span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val}</span> <span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "Empty" : val}</span>
} }
<ReactTooltip border={true} id="order" place="bottom" type="light" effect="solid" /> <ReactTooltip border={true} id="order" place="bottom" type="light" effect="solid" />
</div > </div >
...@@ -160,19 +158,19 @@ export default class ApprovalMatrix extends Component { ...@@ -160,19 +158,19 @@ export default class ApprovalMatrix extends Component {
options: { options: {
customBodyRender: (val, tableMeta) => { customBodyRender: (val, tableMeta) => {
let check = null let check = null
if (tableMeta.rowData[7] != null) { if (tableMeta.rowData[6] != null) {
check = tableMeta.rowData[7].findIndex((val) => val.field.includes('fullname')) check = tableMeta.rowData[6].findIndex((val) => val.field.includes('fullname'))
if (check > -1) { if (check > -1) {
this.setState({ buttonError: true }) this.setState({ buttonError: true })
} }
} }
return ( return (
<div style={{ display: 'flex' }}> <div style={{ display: 'flex' }}>
{tableMeta.rowData[7] != null && check > -1 ? {tableMeta.rowData[6] != null && check > -1 ?
<a data-tip={tableMeta.rowData[7][check].message} data-for="fullname"> <a data-tip={tableMeta.rowData[6][check].message} data-for="fullname">
<span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val}</span> <span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "Empty" : val}</span>
</a> : </a> :
<span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val}</span> <span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "Empty" : val}</span>
} }
<ReactTooltip border={true} id="fullname" place="bottom" type="light" effect="solid" /> <ReactTooltip border={true} id="fullname" place="bottom" type="light" effect="solid" />
</div > </div >
...@@ -185,19 +183,19 @@ export default class ApprovalMatrix extends Component { ...@@ -185,19 +183,19 @@ export default class ApprovalMatrix extends Component {
options: { options: {
customBodyRender: (val, tableMeta) => { customBodyRender: (val, tableMeta) => {
let check = null let check = null
if (tableMeta.rowData[7] != null) { if (tableMeta.rowData[6] != null) {
check = tableMeta.rowData[7].findIndex((val) => val.field.includes('operator_type_name')) check = tableMeta.rowData[6].findIndex((val) => val.field.includes('operator_type_name'))
if (check > -1) { if (check > -1) {
this.setState({ buttonError: true }) this.setState({ buttonError: true })
} }
} }
return ( return (
<div style={{ display: 'flex' }}> <div style={{ display: 'flex' }}>
{tableMeta.rowData[7] != null && check > -1 ? {tableMeta.rowData[6] != null && check > -1 ?
<a data-tip={tableMeta.rowData[7][check].message} data-for="operatorname"> <a data-tip={tableMeta.rowData[6][check].message} data-for="operatorname">
<span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val}</span> <span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "Empty" : val}</span>
</a> : </a> :
<span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val}</span> <span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "Empty" : val}</span>
} }
<ReactTooltip border={true} id="operatorname" place="bottom" type="light" effect="solid" /> <ReactTooltip border={true} id="operatorname" place="bottom" type="light" effect="solid" />
</div > </div >
...@@ -210,19 +208,19 @@ export default class ApprovalMatrix extends Component { ...@@ -210,19 +208,19 @@ export default class ApprovalMatrix extends Component {
options: { options: {
customBodyRender: (val, tableMeta) => { customBodyRender: (val, tableMeta) => {
let check = null let check = null
if (tableMeta.rowData[7] != null) { if (tableMeta.rowData[6] != null) {
check = tableMeta.rowData[7].findIndex((val) => val.field.includes('start_date')) check = tableMeta.rowData[6].findIndex((val) => val.field.includes('start_date'))
if (check > -1) { if (check > -1) {
this.setState({ buttonError: true }) this.setState({ buttonError: true })
} }
} }
return ( return (
<div style={{ display: 'flex' }}> <div style={{ display: 'flex' }}>
{tableMeta.rowData[7] != null && check > -1 ? {tableMeta.rowData[6] != null && check > -1 ?
<a data-tip={tableMeta.rowData[7][check].message} data-for="startdate"> <a data-tip={tableMeta.rowData[6][check].message} data-for="startdate">
<span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val}</span> <span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "Empty" : val}</span>
</a> : </a> :
<span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val}</span> <span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "Empty" : val}</span>
} }
<ReactTooltip border={true} id="startdate" place="bottom" type="light" effect="solid" /> <ReactTooltip border={true} id="startdate" place="bottom" type="light" effect="solid" />
</div > </div >
...@@ -235,19 +233,19 @@ export default class ApprovalMatrix extends Component { ...@@ -235,19 +233,19 @@ export default class ApprovalMatrix extends Component {
options: { options: {
customBodyRender: (val, tableMeta) => { customBodyRender: (val, tableMeta) => {
let check = null let check = null
if (tableMeta.rowData[7] != null) { if (tableMeta.rowData[6] != null) {
check = tableMeta.rowData[7].findIndex((val) => val.field.includes('end_date')) check = tableMeta.rowData[6].findIndex((val) => val.field.includes('end_date'))
if (check > -1) { if (check > -1) {
this.setState({ buttonError: true }) this.setState({ buttonError: true })
} }
} }
return ( return (
<div style={{ display: 'flex' }}> <div style={{ display: 'flex' }}>
{tableMeta.rowData[7] != null && check > -1 ? {tableMeta.rowData[6] != null && check > -1 ?
<a data-tip={tableMeta.rowData[7][check].message} data-for="enddate"> <a data-tip={tableMeta.rowData[6][check].message} data-for="enddate">
<span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val}</span> <span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "Empty" : val}</span>
</a> : </a> :
<span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val}</span> <span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "Empty" : val}</span>
} }
<ReactTooltip border={true} id="enddate" place="bottom" type="light" effect="solid" /> <ReactTooltip border={true} id="enddate" place="bottom" type="light" effect="solid" />
</div > </div >
...@@ -358,7 +356,6 @@ export default class ApprovalMatrix extends Component { ...@@ -358,7 +356,6 @@ export default class ApprovalMatrix extends Component {
visibleEdit: true visibleEdit: true
}) })
} else if (type === 'delete') { } else if (type === 'delete') {
console.log("berhasil klik btn del")
this.setState({ this.setState({
rowData: index, rowData: index,
popupDel: true popupDel: true
...@@ -608,7 +605,7 @@ export default class ApprovalMatrix extends Component { ...@@ -608,7 +605,7 @@ export default class ApprovalMatrix extends Component {
}} }}
onClick={() => this.openPopUp(tableMeta.rowData, 'delete')} onClick={() => this.openPopUp(tableMeta.rowData, 'delete')}
> >
<img src={Images.visualisasi} /> <img src={Images.delete} />
</button> </button>
)} )}
</div > </div >
......
src/container/MasterData/Parameter/CreateParameter.js
View file @ 6921ae0d
...@@ -621,11 +621,10 @@ export default class CreateParameter extends Component { ...@@ -621,11 +621,10 @@ export default class CreateParameter extends Component {
}} }}
name="value" name="value"
onChange={(e) => { onChange={(e) => {
let coba = String(e.target.value).replace(/[^\d]/g, '');
this.setState({ this.setState({
tempData: { tempData: {
...this.state.tempData, ...this.state.tempData,
value: coba value: e.target.value
} }
}) })
this.clearMessage() this.clearMessage()
...@@ -1006,9 +1005,8 @@ export default class CreateParameter extends Component { ...@@ -1006,9 +1005,8 @@ export default class CreateParameter extends Component {
}} }}
name="value" name="value"
onChange={(e) => { onChange={(e) => {
let coba = String(e.target.value).replace(/[^\d]/g, '');
this.setState({ this.setState({
value: coba value: e.target.value
}) })
this.clearMessage() this.clearMessage()
} }
......
src/container/MasterData/Parameter/Parameter.js
View file @ 6921ae0d
...@@ -11,6 +11,7 @@ import ReactTooltip from 'react-tooltip'; ...@@ -11,6 +11,7 @@ import ReactTooltip from 'react-tooltip';
import UploadFile from "../../../library/Upload"; import UploadFile from "../../../library/Upload";
import { ExcelRenderer } from 'react-excel-renderer'; import { ExcelRenderer } from 'react-excel-renderer';
import Constant from '../../../library/Constant'; import Constant from '../../../library/Constant';
import PopUpDelete from '../../../library/PopUpDelete';
var ct = require("../../../library/CustomTable"); var ct = require("../../../library/CustomTable");
const getMuiTheme = () => createMuiTheme(ct.customTable()); const getMuiTheme = () => createMuiTheme(ct.customTable());
...@@ -114,6 +115,11 @@ export default class Parameter extends Component { ...@@ -114,6 +115,11 @@ export default class Parameter extends Component {
rowData: rowData, rowData: rowData,
visibleEdit: true visibleEdit: true
}) })
} else if (type === 'delete') {
this.setState({
rowData: rowData,
visibleDelete: true
})
} else { } else {
this.setState({ this.setState({
rowData: rowData, rowData: rowData,
...@@ -268,14 +274,14 @@ export default class Parameter extends Component { ...@@ -268,14 +274,14 @@ export default class Parameter extends Component {
if (item.length > 0) { if (item.length > 0) {
payload.push({ payload.push({
id: index + 1, id: index + 1,
group: item[0] === undefined ? "" : item[0] , group: item[0] === undefined ? "" : item[0],
parameter: item[1] === undefined ? "" : item[1], parameter: item[1] === undefined ? "" : item[1],
company: item[2] === undefined ? "" : item[2], company: item[2] === undefined ? "" : item[2],
description: item[3], description: item[3] === undefined ? "" : item[3],
orders: item[4], orders: item[4] === undefined ? "" : item[4],
value: item[5], value: item[5] === undefined ? "" : item[5],
min_value: item[6], min_value: item[6] === undefined ? "" : item[6],
max_value: item[7], max_value: item[7] === undefined ? "" : item[7],
start_date: item[8] === undefined ? "" : item[8], start_date: item[8] === undefined ? "" : item[8],
end_date: item[9] === undefined ? "" : item[9], end_date: item[9] === undefined ? "" : item[9],
}) })
...@@ -290,7 +296,7 @@ export default class Parameter extends Component { ...@@ -290,7 +296,7 @@ export default class Parameter extends Component {
}); });
} }
checkUpload(){ checkUpload() {
api.create().checkUploadParameter(this.state.payload).then(response => { api.create().checkUploadParameter(this.state.payload).then(response => {
console.log(response); console.log(response);
if (response.data) { if (response.data) {
...@@ -329,9 +335,9 @@ export default class Parameter extends Component { ...@@ -329,9 +335,9 @@ export default class Parameter extends Component {
<div style={{ display: 'flex' }}> <div style={{ display: 'flex' }}>
{tableMeta.rowData[11] != null && check > -1 ? {tableMeta.rowData[11] != null && check > -1 ?
<a data-tip={tableMeta.rowData[11][check].message} data-for="group"> <a data-tip={tableMeta.rowData[11][check].message} data-for="group">
<span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "-" : val}</span> <span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "Empty" : val}</span>
</a> : </a> :
<span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "-" : val}</span> <span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "Empty" : val}</span>
} }
<ReactTooltip border={true} id="group" place="bottom" type="light" effect="solid" /> <ReactTooltip border={true} id="group" place="bottom" type="light" effect="solid" />
</div > </div >
...@@ -354,9 +360,9 @@ export default class Parameter extends Component { ...@@ -354,9 +360,9 @@ export default class Parameter extends Component {
<div style={{ display: 'flex' }}> <div style={{ display: 'flex' }}>
{tableMeta.rowData[11] != null && check > -1 ? {tableMeta.rowData[11] != null && check > -1 ?
<a data-tip={tableMeta.rowData[11][check].message} data-for="parameter"> <a data-tip={tableMeta.rowData[11][check].message} data-for="parameter">
<span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "-" : val}</span> <span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "Empty" : val}</span>
</a> : </a> :
<span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "-" : val}</span> <span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "Empty" : val}</span>
} }
<ReactTooltip border={true} id="parameter" place="bottom" type="light" effect="solid" /> <ReactTooltip border={true} id="parameter" place="bottom" type="light" effect="solid" />
</div > </div >
...@@ -379,9 +385,9 @@ export default class Parameter extends Component { ...@@ -379,9 +385,9 @@ export default class Parameter extends Component {
<div style={{ display: 'flex' }}> <div style={{ display: 'flex' }}>
{tableMeta.rowData[11] != null && check > -1 ? {tableMeta.rowData[11] != null && check > -1 ?
<a data-tip={tableMeta.rowData[11][check].message} data-for="company"> <a data-tip={tableMeta.rowData[11][check].message} data-for="company">
<span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "-" : val}</span> <span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "Empty" : val}</span>
</a> : </a> :
<span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "-" : val}</span> <span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "Empty" : val}</span>
} }
<ReactTooltip border={true} id="company" place="bottom" type="light" effect="solid" /> <ReactTooltip border={true} id="company" place="bottom" type="light" effect="solid" />
</div > </div >
...@@ -529,9 +535,9 @@ export default class Parameter extends Component { ...@@ -529,9 +535,9 @@ export default class Parameter extends Component {
<div style={{ display: 'flex' }}> <div style={{ display: 'flex' }}>
{tableMeta.rowData[11] != null && check > -1 ? {tableMeta.rowData[11] != null && check > -1 ?
<a data-tip={tableMeta.rowData[11][check].message} data-for="start_date"> <a data-tip={tableMeta.rowData[11][check].message} data-for="start_date">
<span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "-" : val}</span> <span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "Empty" : val}</span>
</a> : </a> :
<span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "-" : val}</span> <span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "Empty" : val}</span>
} }
<ReactTooltip border={true} id="start_date" place="bottom" type="light" effect="solid" /> <ReactTooltip border={true} id="start_date" place="bottom" type="light" effect="solid" />
</div > </div >
...@@ -554,9 +560,9 @@ export default class Parameter extends Component { ...@@ -554,9 +560,9 @@ export default class Parameter extends Component {
<div style={{ display: 'flex' }}> <div style={{ display: 'flex' }}>
{tableMeta.rowData[11] != null && check > -1 ? {tableMeta.rowData[11] != null && check > -1 ?
<a data-tip={tableMeta.rowData[11][check].message} data-for="enddate"> <a data-tip={tableMeta.rowData[11][check].message} data-for="enddate">
<span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "-" : val}</span> <span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "Empty" : val}</span>
</a> : </a> :
<span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "-" : val}</span> <span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "Empty" : val}</span>
} }
<ReactTooltip border={true} id="enddate" place="bottom" type="light" effect="solid" /> <ReactTooltip border={true} id="enddate" place="bottom" type="light" effect="solid" />
</div > </div >
...@@ -577,7 +583,7 @@ export default class Parameter extends Component { ...@@ -577,7 +583,7 @@ export default class Parameter extends Component {
dataLoaded: true, dataLoaded: true,
cols: columns, cols: columns,
rows: dataRow, rows: dataRow,
visibleUpload: false, visibleUpload: false,
visibleParameter: false visibleParameter: false
}); });
} else { } else {
...@@ -641,6 +647,33 @@ export default class Parameter extends Component { ...@@ -641,6 +647,33 @@ export default class Parameter extends Component {
this.setState({ alert: false }) this.setState({ alert: false })
} }
deleteParameter(payload) {
let id = String(payload[1])
api.create().deleteParameter(id).then(response => {
if (response.data) {
if (response.ok) {
if (response.data.status === "success") {
this.getAllParameter()
this.setState({ visibleDelete: false, alert: true, messageAlert: response.data.message, tipeAlert: 'success' })
} else {
this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
if (response.data.message.includes("Token")) {
setTimeout(() => {
localStorage.removeItem(Constant.TOKEN)
window.location.reload();
}, 1000);
}
})
}
} else {
this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'error' })
}
} else {
this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error' })
}
})
}
render() { render() {
const columns = [{ const columns = [{
name: "Action", name: "Action",
...@@ -649,21 +682,39 @@ export default class Parameter extends Component { ...@@ -649,21 +682,39 @@ export default class Parameter extends Component {
filter: false, filter: false,
customBodyRender: (val, tableMeta) => { customBodyRender: (val, tableMeta) => {
return ( return (
<div style={{ display: 'flex' }}> this.state.edit && (
{this.state.edit && ( <div style={{ display: 'flex' }}>
<button <a data-tip={'Edit'} data-for="edit">
style={{ <button
backgroundColor: 'transparent', style={{
cursor: 'pointer', backgroundColor: 'transparent',
borderColor: 'transparent' cursor: 'pointer',
}} borderColor: 'transparent',
onClick={() => this.openPopUp(tableMeta.rowData, 'edit')} marginRight: 15
// onClick={()=> console.log(tableMeta)} }}
> // onClick={() => console.log(tableMeta)}
<img src={Images.editCopy} /> onClick={() => this.openPopUp(tableMeta.rowData, 'edit')}
</button> >
)} <img src={Images.editCopy} />
</div > </button>
</a>
<ReactTooltip border={true} id="edit" place="bottom" type="light" effect="solid" />
<a data-tip={'Delete'} data-for="delete">
<button
style={{
backgroundColor: 'transparent',
cursor: 'pointer',
borderColor: 'transparent',
}}
// onClick={() => console.log(tableMeta)}
onClick={() => this.openPopUp(tableMeta.rowData, 'delete')}
>
<img src={Images.delete} />
</button>
</a>
<ReactTooltip border={true} id="delete" place="bottom" type="light" effect="solid" />
</div >
)
); );
} }
} }
...@@ -983,6 +1034,16 @@ export default class Parameter extends Component { ...@@ -983,6 +1034,16 @@ export default class Parameter extends Component {
</div> </div>
</div> </div>
)} )}
{this.state.visibleDelete && (
<PopUpDelete
rowData={this.state.rowData}
intent={'parameter'}
onClickClose={() => this.setState({ visibleDelete: false })}
onClickDelete={this.deleteParameter.bind(this)}
/>
)}
</div> </div>
); );
} }
......
src/container/MasterData/Perusahaan/CreatePerusahaan.js
View file @ 6921ae0d
...@@ -388,7 +388,7 @@ export default class CreatePerusahaan extends Component { ...@@ -388,7 +388,7 @@ export default class CreatePerusahaan extends Component {
margin="normal" margin="normal"
id="startDate" id="startDate"
label="Valid From" label="Valid From"
format="dd MMMM yyyy" format="dd-MM-yyyy"
value={this.state.startDate} value={this.state.startDate}
onChange={(e) => this.handleChange(e, 'start_date')} onChange={(e) => this.handleChange(e, 'start_date')}
KeyboardButtonProps={{ KeyboardButtonProps={{
...@@ -491,7 +491,7 @@ export default class CreatePerusahaan extends Component { ...@@ -491,7 +491,7 @@ export default class CreatePerusahaan extends Component {
margin="normal" margin="normal"
id="endDate" id="endDate"
label="Valid To" label="Valid To"
format="dd MMMM yyyy" format="dd-MM-yyyy"
value={this.state.endDate} value={this.state.endDate}
minDate={this.state.startDate} minDate={this.state.startDate}
onChange={(e) => this.handleChange(e, 'end_date')} onChange={(e) => this.handleChange(e, 'end_date')}
...@@ -614,7 +614,7 @@ export default class CreatePerusahaan extends Component { ...@@ -614,7 +614,7 @@ export default class CreatePerusahaan extends Component {
margin="normal" margin="normal"
id="startDate" id="startDate"
label="Valid From" label="Valid From"
format="dd MMMM yyyy" format="dd-MM-yyyy"
value={this.state.startDate == "" ? null : this.state.startDate} value={this.state.startDate == "" ? null : this.state.startDate}
onChange={(e) => this.handleChange(e, 'start_date')} onChange={(e) => this.handleChange(e, 'start_date')}
KeyboardButtonProps={{ KeyboardButtonProps={{
...@@ -710,7 +710,7 @@ export default class CreatePerusahaan extends Component { ...@@ -710,7 +710,7 @@ export default class CreatePerusahaan extends Component {
margin="normal" margin="normal"
id="endDate" id="endDate"
label="Valid To" label="Valid To"
format="dd MMMM yyyy" format="dd-MM-yyyy"
error={this.state.errorED} error={this.state.errorED}
helperText={this.state.msgErrorED} helperText={this.state.msgErrorED}
minDate={this.state.startDate} minDate={this.state.startDate}
......
src/container/MasterData/ReportItems.js
View file @ 6921ae0d
...@@ -64,9 +64,9 @@ export default class ReportItems extends Component { ...@@ -64,9 +64,9 @@ export default class ReportItems extends Component {
if (item.length > 0) { if (item.length > 0) {
payload.push({ payload.push({
id: index + 1, id: index + 1,
report: item[0], report: item[0] === undefined ? "" : item[0],
company: item[1], company: item[1] == undefined ? "" : item[1],
orders: item[2], orders: item[2] === undefined ? "" : item[2],
description: item[3] === undefined ? "-" : item[3], description: item[3] === undefined ? "-" : item[3],
parent: item[4] === undefined ? 0 : item[4], parent: item[4] === undefined ? 0 : item[4],
uom: item[5] === undefined ? null : item[5], uom: item[5] === undefined ? null : item[5],
...@@ -89,7 +89,7 @@ export default class ReportItems extends Component { ...@@ -89,7 +89,7 @@ export default class ReportItems extends Component {
}); });
} }
checkUpload(){ checkUpload() {
api.create().checkUploadReportItems(this.state.payload).then(response => { api.create().checkUploadReportItems(this.state.payload).then(response => {
console.log(response) console.log(response)
let dataRow = [] let dataRow = []
...@@ -98,7 +98,7 @@ export default class ReportItems extends Component { ...@@ -98,7 +98,7 @@ export default class ReportItems extends Component {
if (response.data.status === "success") { if (response.data.status === "success") {
dataRow = response.data.data.map((item, index) => { dataRow = response.data.data.map((item, index) => {
return [ return [
index + 1, // index + 1,
item.report, item.report,
item.company, item.company,
item.orders, item.orders,
...@@ -116,25 +116,24 @@ export default class ReportItems extends Component { ...@@ -116,25 +116,24 @@ export default class ReportItems extends Component {
] ]
}) })
let columns = [ let columns = [
"Data",
{ {
name: "Report Type", name: "Report Type",
options: { options: {
customBodyRender: (val, tableMeta) => { customBodyRender: (val, tableMeta) => {
let check = null let check = null
if (tableMeta.rowData[14] != null) { if (tableMeta.rowData[13] != null) {
check = tableMeta.rowData[14].findIndex((val) => val.field.includes('report')) check = tableMeta.rowData[13].findIndex((val) => val.field.includes('report'))
if (check > -1) { if (check > -1) {
this.setState({ buttonError: true }) this.setState({ buttonError: true })
} }
} }
return ( return (
<div style={{ display: 'flex' }}> <div style={{ display: 'flex' }}>
{tableMeta.rowData[14] != null && check > -1 ? {tableMeta.rowData[13] != null && check > -1 ?
<a data-tip={tableMeta.rowData[14][check].message} data-for="reportname"> <a data-tip={tableMeta.rowData[13][check].message} data-for="reportname">
<span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val}</span> <span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "-" : val}</span>
</a> : </a> :
<span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val}</span> <span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "-" : val}</span>
} }
<ReactTooltip border={true} id="reportname" place="bottom" type="light" effect="solid" /> <ReactTooltip border={true} id="reportname" place="bottom" type="light" effect="solid" />
</div > </div >
...@@ -147,19 +146,19 @@ export default class ReportItems extends Component { ...@@ -147,19 +146,19 @@ export default class ReportItems extends Component {
options: { options: {
customBodyRender: (val, tableMeta) => { customBodyRender: (val, tableMeta) => {
let check = null let check = null
if (tableMeta.rowData[14] != null) { if (tableMeta.rowData[13] != null) {
check = tableMeta.rowData[14].findIndex((val) => val.field.includes('company')) check = tableMeta.rowData[13].findIndex((val) => val.field.includes('company'))
if (check > -1) { if (check > -1) {
this.setState({ buttonError: true }) this.setState({ buttonError: true })
} }
} }
return ( return (
<div style={{ display: 'flex' }}> <div style={{ display: 'flex' }}>
{tableMeta.rowData[14] != null && check > -1 ? {tableMeta.rowData[13] != null && check > -1 ?
<a data-tip={tableMeta.rowData[14][check].message} data-for="companyname"> <a data-tip={tableMeta.rowData[13][check].message} data-for="companyname">
<span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val}</span> <span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "-" : val}</span>
</a> : </a> :
<span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val}</span> <span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "-" : val}</span>
} }
<ReactTooltip border={true} id="companyname" place="bottom" type="light" effect="solid" /> <ReactTooltip border={true} id="companyname" place="bottom" type="light" effect="solid" />
</div > </div >
...@@ -172,19 +171,19 @@ export default class ReportItems extends Component { ...@@ -172,19 +171,19 @@ export default class ReportItems extends Component {
options: { options: {
customBodyRender: (val, tableMeta) => { customBodyRender: (val, tableMeta) => {
let check = null let check = null
if (tableMeta.rowData[14] != null) { if (tableMeta.rowData[13] != null) {
check = tableMeta.rowData[14].findIndex((val) => val.field.includes('orders')) check = tableMeta.rowData[13].findIndex((val) => val.field.includes('orders'))
if (check > -1) { if (check > -1) {
this.setState({ buttonError: true }) this.setState({ buttonError: true })
} }
} }
return ( return (
<div style={{ display: 'flex' }}> <div style={{ display: 'flex' }}>
{tableMeta.rowData[14] != null && check > -1 ? {tableMeta.rowData[13] != null && check > -1 ?
<a data-tip={tableMeta.rowData[14][check].message} data-for="order"> <a data-tip={tableMeta.rowData[13][check].message} data-for="order">
<span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val}</span> <span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "-" : val}</span>
</a> : </a> :
<span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val}</span> <span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "-" : val}</span>
} }
<ReactTooltip border={true} id="order" place="bottom" type="light" effect="solid" /> <ReactTooltip border={true} id="order" place="bottom" type="light" effect="solid" />
</div > </div >
...@@ -197,19 +196,19 @@ export default class ReportItems extends Component { ...@@ -197,19 +196,19 @@ export default class ReportItems extends Component {
options: { options: {
customBodyRender: (val, tableMeta) => { customBodyRender: (val, tableMeta) => {
let check = null let check = null
if (tableMeta.rowData[14] != null) { if (tableMeta.rowData[13] != null) {
check = tableMeta.rowData[14].findIndex((val) => val.field.includes('description')) check = tableMeta.rowData[13].findIndex((val) => val.field.includes('description'))
if (check > -1) { if (check > -1) {
this.setState({ buttonError: true }) this.setState({ buttonError: true })
} }
} }
return ( return (
<div style={{ display: 'flex' }}> <div style={{ display: 'flex' }}>
{tableMeta.rowData[14] != null && check > -1 ? {tableMeta.rowData[13] != null && check > -1 ?
<a data-tip={tableMeta.rowData[14][check].message} data-for="desc"> <a data-tip={tableMeta.rowData[13][check].message} data-for="desc">
<span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val}</span> <span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "-" : val}</span>
</a> : </a> :
<span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val}</span> <span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "-" : val}</span>
} }
<ReactTooltip border={true} id="desc" place="bottom" type="light" effect="solid" /> <ReactTooltip border={true} id="desc" place="bottom" type="light" effect="solid" />
</div > </div >
...@@ -222,19 +221,19 @@ export default class ReportItems extends Component { ...@@ -222,19 +221,19 @@ export default class ReportItems extends Component {
options: { options: {
customBodyRender: (val, tableMeta) => { customBodyRender: (val, tableMeta) => {
let check = null let check = null
if (tableMeta.rowData[14] != null) { if (tableMeta.rowData[13] != null) {
check = tableMeta.rowData[14].findIndex((val) => val.field.includes('parent')) check = tableMeta.rowData[13].findIndex((val) => val.field.includes('parent'))
if (check > -1) { if (check > -1) {
this.setState({ buttonError: true }) this.setState({ buttonError: true })
} }
} }
return ( return (
<div style={{ display: 'flex' }}> <div style={{ display: 'flex' }}>
{tableMeta.rowData[14] != null && check > -1 ? {tableMeta.rowData[13] != null && check > -1 ?
<a data-tip={tableMeta.rowData[14][check].message} data-for="parents"> <a data-tip={tableMeta.rowData[13][check].message} data-for="parents">
<span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val}</span> <span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "-" : val}</span>
</a> : </a> :
<span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val}</span> <span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "-" : val}</span>
} }
<ReactTooltip border={true} id="parents" place="bottom" type="light" effect="solid" /> <ReactTooltip border={true} id="parents" place="bottom" type="light" effect="solid" />
</div > </div >
...@@ -247,19 +246,19 @@ export default class ReportItems extends Component { ...@@ -247,19 +246,19 @@ export default class ReportItems extends Component {
options: { options: {
customBodyRender: (val, tableMeta) => { customBodyRender: (val, tableMeta) => {
let check = null let check = null
if (tableMeta.rowData[14] != null) { if (tableMeta.rowData[13] != null) {
check = tableMeta.rowData[14].findIndex((val) => val.field.includes('uom')) check = tableMeta.rowData[13].findIndex((val) => val.field.includes('uom'))
if (check > -1) { if (check > -1) {
this.setState({ buttonError: true }) this.setState({ buttonError: true })
} }
} }
return ( return (
<div style={{ display: 'flex' }}> <div style={{ display: 'flex' }}>
{tableMeta.rowData[14] != null && check > -1 ? {tableMeta.rowData[13] != null && check > -1 ?
<a data-tip={tableMeta.rowData[14][check].message} data-for="uoms"> <a data-tip={tableMeta.rowData[13][check].message} data-for="uoms">
<span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val}</span> <span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "-" : val}</span>
</a> : </a> :
<span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val}</span> <span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "-" : val}</span>
} }
<ReactTooltip border={true} id="uoms" place="bottom" type="light" effect="solid" /> <ReactTooltip border={true} id="uoms" place="bottom" type="light" effect="solid" />
</div > </div >
...@@ -272,19 +271,19 @@ export default class ReportItems extends Component { ...@@ -272,19 +271,19 @@ export default class ReportItems extends Component {
options: { options: {
customBodyRender: (val, tableMeta) => { customBodyRender: (val, tableMeta) => {
let check = null let check = null
if (tableMeta.rowData[14] != null) { if (tableMeta.rowData[13] != null) {
check = tableMeta.rowData[14].findIndex((val) => val.field.includes('weight')) check = tableMeta.rowData[13].findIndex((val) => val.field.includes('weight'))
if (check > -1) { if (check > -1) {
this.setState({ buttonError: true }) this.setState({ buttonError: true })
} }
} }
return ( return (
<div style={{ display: 'flex' }}> <div style={{ display: 'flex' }}>
{tableMeta.rowData[14] != null && check > -1 ? {tableMeta.rowData[13] != null && check > -1 ?
<a data-tip={tableMeta.rowData[14][check].message} data-for="weights"> <a data-tip={tableMeta.rowData[13][check].message} data-for="weights">
<span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val}</span> <span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "-" : val}</span>
</a> : </a> :
<span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val}</span> <span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "-" : val}</span>
} }
<ReactTooltip border={true} id="weights" place="bottom" type="light" effect="solid" /> <ReactTooltip border={true} id="weights" place="bottom" type="light" effect="solid" />
</div > </div >
...@@ -297,19 +296,19 @@ export default class ReportItems extends Component { ...@@ -297,19 +296,19 @@ export default class ReportItems extends Component {
options: { options: {
customBodyRender: (val, tableMeta) => { customBodyRender: (val, tableMeta) => {
let check = null let check = null
if (tableMeta.rowData[14] != null) { if (tableMeta.rowData[13] != null) {
check = tableMeta.rowData[14].findIndex((val) => val.field.includes('type_report')) check = tableMeta.rowData[13].findIndex((val) => val.field.includes('type_report'))
if (check > -1) { if (check > -1) {
this.setState({ buttonError: true }) this.setState({ buttonError: true })
} }
} }
return ( return (
<div style={{ display: 'flex' }}> <div style={{ display: 'flex' }}>
{tableMeta.rowData[14] != null && check > -1 ? {tableMeta.rowData[13] != null && check > -1 ?
<a data-tip={tableMeta.rowData[14][check].message} data-for="datatype"> <a data-tip={tableMeta.rowData[13][check].message} data-for="datatype">
<span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val}</span> <span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "-" : val}</span>
</a> : </a> :
<span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val}</span> <span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "-" : val}</span>
} }
<ReactTooltip border={true} id="datatype" place="bottom" type="light" effect="solid" /> <ReactTooltip border={true} id="datatype" place="bottom" type="light" effect="solid" />
</div > </div >
...@@ -322,19 +321,19 @@ export default class ReportItems extends Component { ...@@ -322,19 +321,19 @@ export default class ReportItems extends Component {
options: { options: {
customBodyRender: (val, tableMeta) => { customBodyRender: (val, tableMeta) => {
let check = null let check = null
if (tableMeta.rowData[14] != null) { if (tableMeta.rowData[13] != null) {
check = tableMeta.rowData[14].findIndex((val) => val.field.includes('formula')) check = tableMeta.rowData[13].findIndex((val) => val.field.includes('formula'))
if (check > -1) { if (check > -1) {
this.setState({ buttonError: true }) this.setState({ buttonError: true })
} }
} }
return ( return (
<div style={{ display: 'flex' }}> <div style={{ display: 'flex' }}>
{tableMeta.rowData[14] != null && check > -1 ? {tableMeta.rowData[13] != null && check > -1 ?
<a data-tip={tableMeta.rowData[14][check].message} data-for="formulas"> <a data-tip={tableMeta.rowData[13][check].message} data-for="formulas">
<span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val}</span> <span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "-" : val}</span>
</a> : </a> :
<span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val}</span> <span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "-" : val}</span>
} }
<ReactTooltip border={true} id="formulas" place="bottom" type="light" effect="solid" /> <ReactTooltip border={true} id="formulas" place="bottom" type="light" effect="solid" />
</div > </div >
...@@ -347,19 +346,19 @@ export default class ReportItems extends Component { ...@@ -347,19 +346,19 @@ export default class ReportItems extends Component {
options: { options: {
customBodyRender: (val, tableMeta) => { customBodyRender: (val, tableMeta) => {
let check = null let check = null
if (tableMeta.rowData[14] != null) { if (tableMeta.rowData[13] != null) {
check = tableMeta.rowData[14].findIndex((val) => val.field.includes('condition_it_should_be')) check = tableMeta.rowData[13].findIndex((val) => val.field.includes('condition_it_should_be'))
if (check > -1) { if (check > -1) {
this.setState({ buttonError: true }) this.setState({ buttonError: true })
} }
} }
return ( return (
<div style={{ display: 'flex' }}> <div style={{ display: 'flex' }}>
{tableMeta.rowData[14] != null && check > -1 ? {tableMeta.rowData[13] != null && check > -1 ?
<a data-tip={tableMeta.rowData[14][check].message} data-for="values"> <a data-tip={tableMeta.rowData[13][check].message} data-for="values">
<span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val}</span> <span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "-" : val}</span>
</a> : </a> :
<span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val}</span> <span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "-" : val}</span>
} }
<ReactTooltip border={true} id="values" place="bottom" type="light" effect="solid" /> <ReactTooltip border={true} id="values" place="bottom" type="light" effect="solid" />
</div > </div >
...@@ -372,19 +371,19 @@ export default class ReportItems extends Component { ...@@ -372,19 +371,19 @@ export default class ReportItems extends Component {
options: { options: {
customBodyRender: (val, tableMeta) => { customBodyRender: (val, tableMeta) => {
let check = null let check = null
if (tableMeta.rowData[14] != null) { if (tableMeta.rowData[13] != null) {
check = tableMeta.rowData[14].findIndex((val) => val.field.includes('condition_if_wrong')) check = tableMeta.rowData[13].findIndex((val) => val.field.includes('condition_if_wrong'))
if (check > -1) { if (check > -1) {
this.setState({ buttonError: true }) this.setState({ buttonError: true })
} }
} }
return ( return (
<div style={{ display: 'flex' }}> <div style={{ display: 'flex' }}>
{tableMeta.rowData[14] != null && check > -1 ? {tableMeta.rowData[13] != null && check > -1 ?
<a data-tip={tableMeta.rowData[14][check].message} data-for="conditions"> <a data-tip={tableMeta.rowData[13][check].message} data-for="conditions">
<span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val}</span> <span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "-" : val}</span>
</a> : </a> :
<span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val}</span> <span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "-" : val}</span>
} }
<ReactTooltip border={true} id="conditions" place="bottom" type="light" effect="solid" /> <ReactTooltip border={true} id="conditions" place="bottom" type="light" effect="solid" />
</div > </div >
...@@ -397,19 +396,19 @@ export default class ReportItems extends Component { ...@@ -397,19 +396,19 @@ export default class ReportItems extends Component {
options: { options: {
customBodyRender: (val, tableMeta) => { customBodyRender: (val, tableMeta) => {
let check = null let check = null
if (tableMeta.rowData[14] != null) { if (tableMeta.rowData[13] != null) {
check = tableMeta.rowData[14].findIndex((val) => val.field.includes('start_date')) check = tableMeta.rowData[13].findIndex((val) => val.field.includes('start_date'))
if (check > -1) { if (check > -1) {
this.setState({ buttonError: true }) this.setState({ buttonError: true })
} }
} }
return ( return (
<div style={{ display: 'flex' }}> <div style={{ display: 'flex' }}>
{tableMeta.rowData[14] != null && check > -1 ? {tableMeta.rowData[13] != null && check > -1 ?
<a data-tip={tableMeta.rowData[14][check].message} data-for="startdate"> <a data-tip={tableMeta.rowData[13][check].message} data-for="startdate">
<span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val}</span> <span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "-" : val}</span>
</a> : </a> :
<span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val}</span> <span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "-" : val}</span>
} }
<ReactTooltip border={true} id="startdate" place="bottom" type="light" effect="solid" /> <ReactTooltip border={true} id="startdate" place="bottom" type="light" effect="solid" />
</div > </div >
...@@ -422,19 +421,19 @@ export default class ReportItems extends Component { ...@@ -422,19 +421,19 @@ export default class ReportItems extends Component {
options: { options: {
customBodyRender: (val, tableMeta) => { customBodyRender: (val, tableMeta) => {
let check = null let check = null
if (tableMeta.rowData[14] != null) { if (tableMeta.rowData[13] != null) {
check = tableMeta.rowData[14].findIndex((val) => val.field.includes('end_date')) check = tableMeta.rowData[13].findIndex((val) => val.field.includes('end_date'))
if (check > -1) { if (check > -1) {
this.setState({ buttonError: true }) this.setState({ buttonError: true })
} }
} }
return ( return (
<div style={{ display: 'flex' }}> <div style={{ display: 'flex' }}>
{tableMeta.rowData[14] != null && check > -1 ? {tableMeta.rowData[13] != null && check > -1 ?
<a data-tip={tableMeta.rowData[14][check].message} data-for="enddate"> <a data-tip={tableMeta.rowData[13][check].message} data-for="enddate">
<span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val}</span> <span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "-" : val}</span>
</a> : </a> :
<span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val}</span> <span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "-" : val}</span>
} }
<ReactTooltip border={true} id="enddate" place="bottom" type="light" effect="solid" /> <ReactTooltip border={true} id="enddate" place="bottom" type="light" effect="solid" />
</div > </div >
...@@ -454,7 +453,7 @@ export default class ReportItems extends Component { ...@@ -454,7 +453,7 @@ export default class ReportItems extends Component {
this.setState({ this.setState({
dataLoaded: true, dataLoaded: true,
cols: columns, cols: columns,
rows: dataRow, visibleUpload: false, rows: dataRow, visibleUpload: false,
itemReport: false itemReport: false
}); });
} else { } else {
...@@ -514,7 +513,9 @@ export default class ReportItems extends Component { ...@@ -514,7 +513,9 @@ export default class ReportItems extends Component {
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 [index, item.item_report_id, item.report_name, item.company_name, item.order, item.description, item.parent, item.uom, item.weight, item.type_item_report_name, item.status] return [index, item.item_report_id, item.report_name, item.company_name, item.order, item.description, item.parent, item.uom, item.weight, item.type_item_report_name, item.status]
}) })
this.setState({ dataTable: listData, listData: response.data.data }) this.setState({ dataTable: listData, listData: response.data.data }, () => {
console.log(this.state.dataTable);
})
} else { } else {
this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => { this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
if (response.data.message.includes("Token")) { if (response.data.message.includes("Token")) {
...@@ -684,7 +685,7 @@ export default class ReportItems extends Component { ...@@ -684,7 +685,7 @@ export default class ReportItems extends Component {
}) })
} }
} else { } else {
this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'error' }) this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'error' })
} }
} else { } else {
this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error' }) this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error' })
...@@ -861,21 +862,21 @@ export default class ReportItems extends Component { ...@@ -861,21 +862,21 @@ export default class ReportItems extends Component {
</Alert> </Alert>
</Snackbar> </Snackbar>
{this.state.itemReport === true ? {this.state.itemReport === true ?
<div> this.state.load && (
{this.state.load && ( <div>
<div style={{ display: 'flex', flexDirection: 'row', justifyContent: 'space-between', paddingRight: 25, paddingLeft: 25, marginTop: -180 }}> <div style={{ display: 'flex', flexDirection: 'row', justifyContent: 'space-between', paddingRight: 25, paddingLeft: 25, marginTop: -182 }}>
<label style={{ color: 'white', fontSize: 16, alignSelf: 'center', width: '20%', }}>Master Data - Report Items</label> <label style={{ color: 'white', fontSize: 16, alignSelf: 'center', width: '50%', }}>Master Data - Report Items</label>
{/* <div style={{ color: 'white', width: '50%', height: 37, display: 'flex', backgroundColor: 'white', borderWidth: 2, alignItems: 'center', borderRadius: 6, paddingLeft: 5, paddingRight: 5, alignSelf: 'center' }}> {/* <div style={{ color: 'white', width: '50%', height: 37, display: 'flex', backgroundColor: 'white', borderWidth: 2, alignItems: 'center', borderRadius: 6, paddingLeft: 5, paddingRight: 5, alignSelf: 'center' }}>
<img src={Images.searchBlack} style={{ marginRight: 10 }} /> <img src={Images.searchBlack} style={{ marginRight: 10 }} />
<InputBase <InputBase
style={{ width: '100%' }} style={{ width: '100%' }}
placeholder="Search" placeholder="Search"
value={this.state.search} value={this.state.search}
onChange={(e) => this.handleInputChange(e.target.value)} onChange={(e) => this.handleInputChange(e.target.value)}
inputProps={{ 'aria-label': 'naked' }} inputProps={{ 'aria-label': 'naked' }}
/> />
</div> */} </div> */}
<div style={{ width: '30%', justifyContent: 'flex-end', display: 'flex', flexFlow: 'wrap' }}> <div style={{ width: '50%', justifyContent: 'flex-end', display: 'flex', flexFlow: 'wrap' }}>
<a data-tip={'Download Template'} data-for="template"> <a data-tip={'Download Template'} data-for="template">
<button <button
style={{ style={{
...@@ -952,18 +953,19 @@ export default class ReportItems extends Component { ...@@ -952,18 +953,19 @@ export default class ReportItems extends Component {
<ReactTooltip border={true} id="tambah" place="bottom" type="light" effect="solid" /> <ReactTooltip border={true} id="tambah" place="bottom" type="light" effect="solid" />
</div> </div>
</div> </div>
)} <div style={{ padding: 25 }}>
<div style={{ padding: 25 }}> <MuiThemeProvider theme={getMuiTheme()}>
<MuiThemeProvider theme={getMuiTheme()}> <MUIDataTable
<MUIDataTable theme={getMuiTheme()}
theme={getMuiTheme()} data={this.state.dataTable}
data={this.state.dataTable} columns={columns}
columns={columns} options={options}
options={options} />
/> </MuiThemeProvider>
</MuiThemeProvider>
</div>
</div> </div>
</div> )
: :
this.state.visualisasi == true ? this.state.visualisasi == true ?
<VisualReportItems <VisualReportItems
...@@ -978,16 +980,14 @@ export default class ReportItems extends Component { ...@@ -978,16 +980,14 @@ export default class ReportItems extends Component {
<label style={{ color: 'white', fontSize: 16, alignSelf: 'center' }}>Preview Data</label> <label style={{ color: 'white', fontSize: 16, alignSelf: 'center' }}>Preview Data</label>
</div> </div>
<div style={{ padding: 25 }}> <div style={{ padding: 25 }}>
{this.state.dataLoaded && ( <MuiThemeProvider theme={getMuiTheme()}>
<MuiThemeProvider theme={getMuiTheme()}> <MUIDataTable
<MUIDataTable theme={getMuiTheme()}
theme={getMuiTheme()} data={this.state.rows}
data={this.state.rows} columns={this.state.cols}
columns={this.state.cols} options={options}
options={options} />
/> </MuiThemeProvider>
</MuiThemeProvider>
)}
</div> </div>
<div style={{ display: 'flex', width: '100%', placeContent: 'flex-end', padding: 20 }}> <div style={{ display: 'flex', width: '100%', placeContent: 'flex-end', padding: 20 }}>
<button <button
...@@ -1061,10 +1061,10 @@ export default class ReportItems extends Component { ...@@ -1061,10 +1061,10 @@ export default class ReportItems extends Component {
}} }}
onUpload={() => { onUpload={() => {
this.state.judul === "MASTER DATA - REPORT ITEMS" ? this.state.judul === "MASTER DATA - REPORT ITEMS" ?
this.checkUpload() : this.checkUpload() :
this.setState({ alert: true, messageAlert: "Invalid Template", tipeAlert: 'warning'}) this.setState({ alert: true, messageAlert: "Invalid Template", tipeAlert: 'warning' })
}} }}
/> />
</div> </div>
</div> </div>
......
src/container/MasterData/UnitBisnis.js
View file @ 6921ae0d
...@@ -13,6 +13,7 @@ import { ExcelRenderer } from 'react-excel-renderer'; ...@@ -13,6 +13,7 @@ import { ExcelRenderer } from 'react-excel-renderer';
import api from "../../api"; import api from "../../api";
import { isThisSecond } from "date-fns"; import { isThisSecond } from "date-fns";
import PopUpFailedSave from "../../library/PopUpFailedSave"; import PopUpFailedSave from "../../library/PopUpFailedSave";
import PopUpDelete from "../../library/PopUpDelete";
import Constant from "../../library/Constant"; import Constant from "../../library/Constant";
var ct = require("../../library/CustomTable"); var ct = require("../../library/CustomTable");
...@@ -29,6 +30,7 @@ export default class UnitBisnis extends Component { ...@@ -29,6 +30,7 @@ export default class UnitBisnis extends Component {
this.state = { this.state = {
visibleCreate: false, visibleCreate: false,
visibleEdit: false, visibleEdit: false,
visibleDelete: false,
dataTable: [], dataTable: [],
listData: [], listData: [],
data: [], data: [],
...@@ -45,6 +47,8 @@ export default class UnitBisnis extends Component { ...@@ -45,6 +47,8 @@ export default class UnitBisnis extends Component {
edit: false, edit: false,
load: false, load: false,
judul: '', judul: '',
rowData: [],
unitBisnisName: ''
// visibleLoad: true // visibleLoad: true
} }
this.fileHandler = this.fileHandler.bind(this); this.fileHandler = this.fileHandler.bind(this);
...@@ -80,7 +84,7 @@ export default class UnitBisnis extends Component { ...@@ -80,7 +84,7 @@ export default class UnitBisnis extends Component {
}); });
} }
checkUpload(){ checkUpload() {
api.create().checkUploadUnitBisnis(this.state.payload).then(response => { api.create().checkUploadUnitBisnis(this.state.payload).then(response => {
console.log(response) console.log(response)
let dataRow = [] let dataRow = []
...@@ -111,9 +115,9 @@ export default class UnitBisnis extends Component { ...@@ -111,9 +115,9 @@ export default class UnitBisnis extends Component {
<div style={{ display: 'flex' }}> <div style={{ display: 'flex' }}>
{tableMeta.rowData[3] != null && check > -1 ? {tableMeta.rowData[3] != null && check > -1 ?
<a data-tip={tableMeta.rowData[3][check].message} data-for="unitbisnis"> <a data-tip={tableMeta.rowData[3][check].message} data-for="unitbisnis">
<span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "-" : val}</span> <span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "Empty" : val}</span>
</a> : </a> :
<span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "-" : val}</span> <span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "Empty" : val}</span>
} }
<ReactTooltip border={true} id="unitbisnis" place="bottom" type="light" effect="solid" /> <ReactTooltip border={true} id="unitbisnis" place="bottom" type="light" effect="solid" />
</div > </div >
...@@ -136,9 +140,9 @@ export default class UnitBisnis extends Component { ...@@ -136,9 +140,9 @@ export default class UnitBisnis extends Component {
<div style={{ display: 'flex' }}> <div style={{ display: 'flex' }}>
{tableMeta.rowData[3] != null && check > -1 ? {tableMeta.rowData[3] != null && check > -1 ?
<a data-tip={tableMeta.rowData[3][check].message} data-for="startdate"> <a data-tip={tableMeta.rowData[3][check].message} data-for="startdate">
<span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "-" : val}</span> <span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "Empty" : val}</span>
</a> : </a> :
<span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "-" : val}</span> <span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "Empty" : val}</span>
} }
<ReactTooltip border={true} id="startdate" place="bottom" type="light" effect="solid" /> <ReactTooltip border={true} id="startdate" place="bottom" type="light" effect="solid" />
</div > </div >
...@@ -161,9 +165,9 @@ export default class UnitBisnis extends Component { ...@@ -161,9 +165,9 @@ export default class UnitBisnis extends Component {
<div style={{ display: 'flex' }}> <div style={{ display: 'flex' }}>
{tableMeta.rowData[3] != null && check > -1 ? {tableMeta.rowData[3] != null && check > -1 ?
<a data-tip={tableMeta.rowData[3][check].message} data-for="enddate"> <a data-tip={tableMeta.rowData[3][check].message} data-for="enddate">
<span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "-" : val}</span> <span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "Empty" : val}</span>
</a> : </a> :
<span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "-" : val}</span> <span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "Empty" : val}</span>
} }
<ReactTooltip border={true} id="enddate" place="bottom" type="light" effect="solid" /> <ReactTooltip border={true} id="enddate" place="bottom" type="light" effect="solid" />
</div > </div >
...@@ -183,7 +187,7 @@ export default class UnitBisnis extends Component { ...@@ -183,7 +187,7 @@ export default class UnitBisnis extends Component {
this.setState({ this.setState({
dataLoaded: true, dataLoaded: true,
cols: columns, cols: columns,
rows: dataRow, visibleUpload: false, rows: dataRow, visibleUpload: false,
visibleUnitBisnis: false visibleUnitBisnis: false
}); });
} else { } else {
...@@ -273,6 +277,12 @@ export default class UnitBisnis extends Component { ...@@ -273,6 +277,12 @@ export default class UnitBisnis extends Component {
rowData: rowData, rowData: rowData,
visibleEdit: true visibleEdit: true
}) })
} else if (type === 'delete') {
this.setState({
rowData: rowData,
unitBisnisName: String(rowData[2]),
visibleDelete: true
})
} else { } else {
this.setState({ this.setState({
rowData: rowData, rowData: rowData,
...@@ -431,6 +441,34 @@ export default class UnitBisnis extends Component { ...@@ -431,6 +441,34 @@ export default class UnitBisnis extends Component {
this.setState({ alert: false }) this.setState({ alert: false })
} }
deleteUnitBisnis(payload) {
console.log(payload);
let id = String(payload[1])
api.create().deleteUnitBisnis(id).then(response => {
if (response.data) {
if (response.ok) {
if (response.data.status === "success") {
this.getData()
this.setState({ visibleDelete: false, alert: true, messageAlert: response.data.message, tipeAlert: 'success' })
} else {
this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
if (response.data.message.includes("Token")) {
setTimeout(() => {
localStorage.removeItem(Constant.TOKEN)
window.location.reload();
}, 1000);
}
})
}
} else {
this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'error' })
}
} else {
this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error' })
}
})
}
render() { render() {
const columns = [{ const columns = [{
name: "Action", name: "Action",
...@@ -439,21 +477,39 @@ export default class UnitBisnis extends Component { ...@@ -439,21 +477,39 @@ export default class UnitBisnis extends Component {
sort: false, sort: false,
customBodyRender: (val, tableMeta) => { customBodyRender: (val, tableMeta) => {
return ( return (
<div style={{ display: 'flex' }}> this.state.edit && (
{this.state.edit && ( <div style={{ display: 'flex' }}>
<button <a data-tip={'Edit'} data-for="edit">
style={{ <button
backgroundColor: 'transparent', style={{
cursor: 'pointer', backgroundColor: 'transparent',
borderColor: 'transparent', cursor: 'pointer',
}} borderColor: 'transparent',
// onClick={() => console.log(tableMeta)} marginRight: 15
onClick={() => this.openPopUp(tableMeta.rowData, 'edit')} }}
> // onClick={() => console.log(tableMeta)}
<img src={Images.editCopy} /> onClick={() => this.openPopUp(tableMeta.rowData, 'edit')}
</button> >
)} <img src={Images.editCopy} />
</div > </button>
</a>
<ReactTooltip border={true} id="edit" place="bottom" type="light" effect="solid" />
<a data-tip={'Delete'} data-for="delete">
<button
style={{
backgroundColor: 'transparent',
cursor: 'pointer',
borderColor: 'transparent',
}}
// onClick={() => console.log(tableMeta)}
onClick={() => this.openPopUp(tableMeta.rowData, 'delete')}
>
<img src={Images.delete} />
</button>
</a>
<ReactTooltip border={true} id="delete" place="bottom" type="light" effect="solid" />
</div >
)
); );
} }
} }
...@@ -697,6 +753,16 @@ export default class UnitBisnis extends Component { ...@@ -697,6 +753,16 @@ export default class UnitBisnis extends Component {
</div> </div>
)} )}
{this.state.visibleDelete && (
<PopUpDelete
rowData={this.state.rowData}
name={this.state.unitBisnisName}
onClickClose={() => this.setState({ visibleDelete: false })}
onClickDelete={this.deleteUnitBisnis.bind(this)}
/>
)}
{/* {this.state.visibleLoad && ( {/* {this.state.visibleLoad && (
<div className="test app-popup-show"> <div className="test app-popup-show">
<div className="popup-content" style={{ textAlign: 'center'}}> <div className="popup-content" style={{ textAlign: 'center'}}>
......
src/container/MasterData/formReportItems/CreateReportItems.js
View file @ 6921ae0d
...@@ -785,7 +785,7 @@ export default class CreateReportItems extends Component { ...@@ -785,7 +785,7 @@ export default class CreateReportItems extends Component {
margin="normal" margin="normal"
id="startDate" id="startDate"
label="Valid From" label="Valid From"
format="dd MMMM yyyy" format="dd-MM-yyyy"
value={this.state.startDate == "" ? null : this.state.startDate} value={this.state.startDate == "" ? null : this.state.startDate}
error={this.state.errorStartDate} error={this.state.errorStartDate}
helperText={this.state.msgErrorSD} helperText={this.state.msgErrorSD}
...@@ -817,7 +817,7 @@ export default class CreateReportItems extends Component { ...@@ -817,7 +817,7 @@ export default class CreateReportItems extends Component {
margin="normal" margin="normal"
id="endDate" id="endDate"
label="Valid To" label="Valid To"
format="dd MMMM yyyy" format="dd-MM-yyyy"
value={this.state.endDate == "" ? null : this.state.endDate} value={this.state.endDate == "" ? null : this.state.endDate}
error={this.state.errorEndDate} error={this.state.errorEndDate}
helperText={this.state.msgErrorED} helperText={this.state.msgErrorED}
......
src/container/MasterData/formReportItems/EditReportItems.js
View file @ 6921ae0d
...@@ -767,7 +767,7 @@ export default class EditReportItems extends Component { ...@@ -767,7 +767,7 @@ export default class EditReportItems extends Component {
margin="normal" margin="normal"
id="startDate" id="startDate"
label="Valid From" label="Valid From"
format="dd MMMM yyyy" format="dd-MM-yyyy"
value={this.state.tempData === null ? null : this.state.tempData.start_date} value={this.state.tempData === null ? null : this.state.tempData.start_date}
error={this.state.errorStartDate} error={this.state.errorStartDate}
helperText={this.state.msgErrorSD} helperText={this.state.msgErrorSD}
...@@ -798,7 +798,7 @@ export default class EditReportItems extends Component { ...@@ -798,7 +798,7 @@ export default class EditReportItems extends Component {
margin="normal" margin="normal"
id="endDate" id="endDate"
label="Valid To" label="Valid To"
format="dd MMMM yyyy" format="dd-MM-yyyy"
value={this.state.tempData === null ? null : this.state.tempData.end_date} value={this.state.tempData === null ? null : this.state.tempData.end_date}
error={this.state.errorEndDate} error={this.state.errorEndDate}
helperText={this.state.msgErrorED} helperText={this.state.msgErrorED}
......
src/container/ResetPassword.js
View file @ 6921ae0d
...@@ -76,7 +76,7 @@ class ResetPassword extends Component { ...@@ -76,7 +76,7 @@ class ResetPassword extends Component {
} else if (!this.isRegex(this.state.password)) { } else if (!this.isRegex(this.state.password)) {
this.setState({ errorPassword: true, msgPassword: 'Invalid password. Must using combination of characters, letters and numbers.' }) this.setState({ errorPassword: true, msgPassword: 'Invalid password. Must using combination of characters, letters and numbers.' })
} else if (this.state.confirmPassword.trim() == "") { } else if (this.state.confirmPassword.trim() == "") {
this.setState({ errorConfirmPassword: true, msgConfirmPassword: 'Password Confirmation Cannot be Empty.' }) this.setState({ errorConfirmPassword: true, msgConfirmPassword: 'Repeat Password Cannot be Empty.' })
} else if (this.state.password !== this.state.confirmPassword) { } else if (this.state.password !== this.state.confirmPassword) {
this.setState({ errorConfirmPassword: true, msgConfirmPassword: 'The password and password confirmation do not match.' }) this.setState({ errorConfirmPassword: true, msgConfirmPassword: 'The password and password confirmation do not match.' })
} else { } else {
......
src/library/PopUpDelete.js 0 → 100644
View file @ 6921ae0d
import React, { Component } from 'react';
import Images from '../assets/Images';
import { Typography } from '@material-ui/core';
export default class PopUpDelete extends Component {
render() {
return (
<div className="test app-popup-show">
<div className="popup-content background-white border-radius" style={{ borderRadius: 8 }}>
<div style={{ display: 'flex', justifyContent: 'center', paddingTop: 20 }}>
<img src={Images.failed} />
</div>
<div style={{ display: 'grid', justifyContent: 'center', marginTop: 20, paddingBottom: 20 }}>
<span style={{ textAlign: 'center', fontSize: 14, fontWeight: 'bold', fontFamily: 'Nunito Sans, sans-serif' }}>
{this.props.intent === 'parameter' ?
`Delete [${this.props.rowData[2]}, ${this.props.rowData[3]}, ${this.props.rowData[4]}, ${this.props.rowData[7] === "" ? this.props.rowData[8] + ' + ' + this.props.rowData[9] : this.props.rowData[7]}]?`
:
`Delete ${this.props.name}?`
}
</span>
</div>
<div className="border-top grid grid-2x" style={{ height: 56, backgroundColor: '#f5f5f5', paddingLeft: 20, paddingRight: 20 }}>
<div className="column-1" style={{ alignSelf: 'center' }}>
<button
type="button"
onClick={() => this.props.onClickClose()}
>
<div style={{ width: 102, height: 30, border: 'solid 1px #354960', borderRadius: 5, alignItems: 'center', display: 'flex', justifyContent: 'center' }}>
<span style={{ color: '#354960', fontSize: 11 }}>Cancel</span>
</div>
</button>
</div>
<div className="column-2" style={{ display: 'flex', justifyContent: 'flex-end', alignItems: 'center' }}>
<button
type="button"
onClick={() => this.props.onClickDelete(this.props.rowData)}
>
<div style={{ width: 102, height: 30, backgroundColor: '#354960', borderRadius: 5, alignItems: 'center', display: 'flex', justifyContent: 'center' }}>
<span style={{ color: '#fff', fontSize: 11 }}>Delete</span>
</div>
</button>
</div>
</div>
</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