Skip to content

T
Tia-dev
Commit ffa7a76b authored by Deni Rinaldi's avatar Deni Rinaldi
Browse files
Options

Merge branch 'deni-dev(pc)' into 'master' 

senin siang

See merge request !250
parents 6ea8906c e14b3aca
Show whitespace changes
Inline Side-by-side
Showing with 337 additions and 128 deletions
src/api/index.js
View file @ ffa7a76b
......@@ -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 getUnitBisnisActive = () => api.get('business_unit/get_all_business_unit_active')
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
const getPerusahaan = () => api.get('company/get_all_company')
......@@ -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 uploadParameter = (body) => api.post('/setting/import_setting', body)
const searchParameter = (body) => api.post('setting/search_setting', body)
const deleteParameter = (id) => api.post(`setting/delete_setting/${id}`)
//Transaction
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/') =>
getPeriodeTransaction,
getRevision,
deleteAttachment,
getDetailReportMB
getDetailReportMB,
deleteUnitBisnis,
deleteParameter
}
}
......
src/assets/Images.js
View file @ ffa7a76b
......@@ -44,6 +44,7 @@ const Images = {
logout: require('./setting.png'),
setting: require('./logout.png'),
failedCopy: require('./failed-copy.svg'),
failed: require('./failed.svg'),
triputraLogo: require('./triputra-logo.png'),
photo: require('./photo.svg'),
camera: require('./camera.svg'),
......
src/assets/failed.svg 0 → 100644
View file @ ffa7a76b
<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/MasterData/Parameter/CreateParameter.js
View file @ ffa7a76b
......@@ -621,11 +621,10 @@ export default class CreateParameter extends Component {
}}
name="value"
onChange={(e) => {
let coba = String(e.target.value).replace(/[^\d]/g, '');
this.setState({
tempData: {
...this.state.tempData,
value: coba
value: e.target.value
}
})
this.clearMessage()
......@@ -1006,9 +1005,8 @@ export default class CreateParameter extends Component {
}}
name="value"
onChange={(e) => {
let coba = String(e.target.value).replace(/[^\d]/g, '');
this.setState({
value: coba
value: e.target.value
})
this.clearMessage()
}
......
src/container/MasterData/Parameter/Parameter.js
View file @ ffa7a76b
......@@ -11,6 +11,7 @@ import ReactTooltip from 'react-tooltip';
import UploadFile from "../../../library/Upload";
import { ExcelRenderer } from 'react-excel-renderer';
import Constant from '../../../library/Constant';
import PopUpDelete from '../../../library/PopUpDelete';
var ct = require("../../../library/CustomTable");
const getMuiTheme = () => createMuiTheme(ct.customTable());
......@@ -114,6 +115,11 @@ export default class Parameter extends Component {
rowData: rowData,
visibleEdit: true
})
} else if (type === 'delete') {
this.setState({
rowData: rowData,
visibleDelete: true
})
} else {
this.setState({
rowData: rowData,
......@@ -268,14 +274,14 @@ export default class Parameter extends Component {
if (item.length > 0) {
payload.push({
id: index + 1,
group: item[0] === undefined ? "" : item[0] ,
group: item[0] === undefined ? "" : item[0],
parameter: item[1] === undefined ? "" : item[1],
company: item[2] === undefined ? "" : item[2],
description: item[3],
orders: item[4],
value: item[5],
min_value: item[6],
max_value: item[7],
description: item[3] === undefined ? "" : item[3],
orders: item[4] === undefined ? "" : item[4],
value: item[5] === undefined ? "" : item[5],
min_value: item[6] === undefined ? "" : item[6],
max_value: item[7] === undefined ? "" : item[7],
start_date: item[8] === undefined ? "" : item[8],
end_date: item[9] === undefined ? "" : item[9],
})
......@@ -290,7 +296,7 @@ export default class Parameter extends Component {
});
}
checkUpload(){
checkUpload() {
api.create().checkUploadParameter(this.state.payload).then(response => {
console.log(response);
if (response.data) {
......@@ -329,9 +335,9 @@ export default class Parameter extends Component {
<div style={{ display: 'flex' }}>
{tableMeta.rowData[11] != null && check > -1 ?
<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> :
<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" />
</div >
......@@ -354,9 +360,9 @@ export default class Parameter extends Component {
<div style={{ display: 'flex' }}>
{tableMeta.rowData[11] != null && check > -1 ?
<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> :
<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" />
</div >
......@@ -379,9 +385,9 @@ export default class Parameter extends Component {
<div style={{ display: 'flex' }}>
{tableMeta.rowData[11] != null && check > -1 ?
<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> :
<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" />
</div >
......@@ -529,9 +535,9 @@ export default class Parameter extends Component {
<div style={{ display: 'flex' }}>
{tableMeta.rowData[11] != null && check > -1 ?
<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> :
<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" />
</div >
......@@ -554,9 +560,9 @@ export default class Parameter extends Component {
<div style={{ display: 'flex' }}>
{tableMeta.rowData[11] != null && check > -1 ?
<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> :
<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" />
</div >
......@@ -641,6 +647,33 @@ export default class Parameter extends Component {
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() {
const columns = [{
name: "Action",
......@@ -649,21 +682,39 @@ export default class Parameter extends Component {
filter: false,
customBodyRender: (val, tableMeta) => {
return (
this.state.edit && (
<div style={{ display: 'flex' }}>
{this.state.edit && (
<a data-tip={'Edit'} data-for="edit">
<button
style={{
backgroundColor: 'transparent',
cursor: 'pointer',
borderColor: 'transparent'
borderColor: 'transparent',
marginRight: 15
}}
// onClick={() => console.log(tableMeta)}
onClick={() => this.openPopUp(tableMeta.rowData, 'edit')}
// onClick={()=> console.log(tableMeta)}
>
<img src={Images.editCopy} />
</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 {
</div>
</div>
)}
{this.state.visibleDelete && (
<PopUpDelete
rowData={this.state.rowData}
intent={'parameter'}
onClickClose={() => this.setState({ visibleDelete: false })}
onClickDelete={this.deleteParameter.bind(this)}
/>
)}
</div>
);
}
......
src/container/MasterData/ReportItems.js
View file @ ffa7a76b
......@@ -89,7 +89,7 @@ export default class ReportItems extends Component {
});
}
checkUpload(){
checkUpload() {
api.create().checkUploadReportItems(this.state.payload).then(response => {
console.log(response)
let dataRow = []
......@@ -513,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) => {
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 {
this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
if (response.data.message.includes("Token")) {
......@@ -951,6 +953,17 @@ export default class ReportItems extends Component {
<ReactTooltip border={true} id="tambah" place="bottom" type="light" effect="solid" />
</div>
</div>
<div style={{ padding: 25 }}>
<MuiThemeProvider theme={getMuiTheme()}>
<MUIDataTable
theme={getMuiTheme()}
data={this.state.dataTable}
columns={columns}
options={options}
/>
</MuiThemeProvider>
</div>
</div>
)
:
......@@ -1049,7 +1062,7 @@ export default class ReportItems extends Component {
onUpload={() => {
this.state.judul === "MASTER DATA - REPORT ITEMS" ?
this.checkUpload() :
this.setState({ alert: true, messageAlert: "Invalid Template", tipeAlert: 'warning'})
this.setState({ alert: true, messageAlert: "Invalid Template", tipeAlert: 'warning' })
}}
/>
......
src/container/MasterData/UnitBisnis.js
View file @ ffa7a76b
......@@ -13,6 +13,7 @@ import { ExcelRenderer } from 'react-excel-renderer';
import api from "../../api";
import { isThisSecond } from "date-fns";
import PopUpFailedSave from "../../library/PopUpFailedSave";
import PopUpDelete from "../../library/PopUpDelete";
import Constant from "../../library/Constant";
var ct = require("../../library/CustomTable");
......@@ -29,6 +30,7 @@ export default class UnitBisnis extends Component {
this.state = {
visibleCreate: false,
visibleEdit: false,
visibleDelete: false,
dataTable: [],
listData: [],
data: [],
......@@ -45,6 +47,8 @@ export default class UnitBisnis extends Component {
edit: false,
load: false,
judul: '',
rowData: [],
unitBisnisName: ''
// visibleLoad: true
}
this.fileHandler = this.fileHandler.bind(this);
......@@ -80,7 +84,7 @@ export default class UnitBisnis extends Component {
});
}
checkUpload(){
checkUpload() {
api.create().checkUploadUnitBisnis(this.state.payload).then(response => {
console.log(response)
let dataRow = []
......@@ -111,9 +115,9 @@ export default class UnitBisnis extends Component {
<div style={{ display: 'flex' }}>
{tableMeta.rowData[3] != null && check > -1 ?
<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> :
<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" />
</div >
......@@ -136,9 +140,9 @@ export default class UnitBisnis extends Component {
<div style={{ display: 'flex' }}>
{tableMeta.rowData[3] != null && check > -1 ?
<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> :
<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" />
</div >
......@@ -161,9 +165,9 @@ export default class UnitBisnis extends Component {
<div style={{ display: 'flex' }}>
{tableMeta.rowData[3] != null && check > -1 ?
<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> :
<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" />
</div >
......@@ -273,6 +277,12 @@ export default class UnitBisnis extends Component {
rowData: rowData,
visibleEdit: true
})
} else if (type === 'delete') {
this.setState({
rowData: rowData,
unitBisnisName: String(rowData[2]),
visibleDelete: true
})
} else {
this.setState({
rowData: rowData,
......@@ -431,6 +441,34 @@ export default class UnitBisnis extends Component {
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() {
const columns = [{
name: "Action",
......@@ -439,21 +477,39 @@ export default class UnitBisnis extends Component {
sort: false,
customBodyRender: (val, tableMeta) => {
return (
this.state.edit && (
<div style={{ display: 'flex' }}>
{this.state.edit && (
<a data-tip={'Edit'} data-for="edit">
<button
style={{
backgroundColor: 'transparent',
cursor: 'pointer',
borderColor: 'transparent',
marginRight: 15
}}
// onClick={() => console.log(tableMeta)}
onClick={() => this.openPopUp(tableMeta.rowData, 'edit')}
>
<img src={Images.editCopy} />
</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 {
</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 && (
<div className="test app-popup-show">
<div className="popup-content" style={{ textAlign: 'center'}}>
......
src/library/PopUpDelete.js 0 → 100644
View file @ ffa7a76b
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