Skip to content

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

Merge branch 'rifka' into 'master' 

update pop up delete

See merge request !251
parents ffa7a76b 8b585179
Show whitespace changes
Inline Side-by-side
Showing with 64 additions and 84 deletions
src/container/ApprovalMatrix/ApprovalMatrix.js
View file @ 03d79925
...@@ -11,7 +11,7 @@ import UploadFile from "../../library/Upload"; ...@@ -11,7 +11,7 @@ import UploadFile from "../../library/Upload";
import CreateApprovalMatrix from "./CreateApprovalMatrix"; import CreateApprovalMatrix from "./CreateApprovalMatrix";
import EditApprovalMatrix from "./EditApprovalMatrix"; import EditApprovalMatrix from "./EditApprovalMatrix";
import VisualisasiAM from "./VisualisasiAM"; import VisualisasiAM from "./VisualisasiAM";
import PopUpDelete from "./PopUpDelete"; import PopUpDeleteAM from "./PopUpDeleteAM";
import PopUpFailedSave from "../../library/PopUpFailedSave"; import PopUpFailedSave from "../../library/PopUpFailedSave";
import api from "../../api"; import api from "../../api";
import Constant from '../../library/Constant'; import Constant from '../../library/Constant';
...@@ -581,34 +581,39 @@ export default class ApprovalMatrix extends Component { ...@@ -581,34 +581,39 @@ export default class ApprovalMatrix extends Component {
sort: false, sort: false,
customBodyRender: (val, tableMeta) => { customBodyRender: (val, tableMeta) => {
return ( return (
this.state.btnedit && (
<div style={{ display: 'flex' }}> <div style={{ display: 'flex' }}>
{this.state.btnedit && ( <a data-tip={'Edit'} data-for="edit">
<button <button
style={{ style={{
backgroundColor: 'transparent', backgroundColor: 'transparent',
cursor: 'pointer', cursor: 'pointer',
borderColor: 'transparent' borderColor: 'transparent',
marginRight: 15
}} }}
// onClick={() => console.log(tableMeta)}
onClick={() => this.openPopUp(tableMeta.rowData, 'edit')} onClick={() => this.openPopUp(tableMeta.rowData, 'edit')}
// onClick={() => this.setState({ visibleEdit: true })}
> >
<img src={Images.editCopy} /> <img src={Images.editCopy} />
</button> </button>
)} </a>
{this.state.btnedit && ( <ReactTooltip border={true} id="edit" place="bottom" type="light" effect="solid" />
<a data-tip={'Delete'} data-for="delete">
<button <button
style={{ style={{
backgroundColor: 'transparent', backgroundColor: 'transparent',
cursor: 'pointer', cursor: 'pointer',
borderColor: 'transparent', borderColor: 'transparent',
marginLeft: 10
}} }}
// onClick={() => console.log(tableMeta)}
onClick={() => this.openPopUp(tableMeta.rowData, 'delete')} onClick={() => this.openPopUp(tableMeta.rowData, 'delete')}
> >
<img src={Images.delete} /> <img src={Images.delete} />
</button> </button>
)} </a>
<ReactTooltip border={true} id="delete" place="bottom" type="light" effect="solid" />
</div > </div >
)
); );
} }
} }
...@@ -874,7 +879,7 @@ export default class ApprovalMatrix extends Component { ...@@ -874,7 +879,7 @@ export default class ApprovalMatrix extends Component {
/> />
)} )}
{this.state.popupDel && ( {this.state.popupDel && (
<PopUpDelete <PopUpDeleteAM
type={"delete"} type={"delete"}
onClickClose={() => this.setState({ popupDel: false })} onClickClose={() => this.setState({ popupDel: false })}
data={this.state.rowData} data={this.state.rowData}
......
src/container/ApprovalMatrix/PopUpDelete.js → src/container/ApprovalMatrix/PopUpDeleteAM.js
View file @ 03d79925
...@@ -4,7 +4,7 @@ import { Typography } from '@material-ui/core'; ...@@ -4,7 +4,7 @@ import { Typography } from '@material-ui/core';
import api from "../../api"; import api from "../../api";
import Constant from '../../library/Constant'; import Constant from '../../library/Constant';
export default class PopUpDelete extends Component { export default class PopUpDeleteAM extends Component {
constructor(props) { constructor(props) {
super(props) super(props)
this.state = { this.state = {
...@@ -51,36 +51,7 @@ export default class PopUpDelete extends Component { ...@@ -51,36 +51,7 @@ export default class PopUpDelete extends Component {
}) })
} }
// hapus(){ onClickDelete() {
// this.setState({ popupDel: false })
// api.create().deleteAM(this.state.id).then(response => {
// console.log(response.data)
// if (response.data) {
// if (response.ok) {
// if (response.data.status == 'success') {
// // this.getData()
// this.props.getList()
// this.setState({ 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' })
// }
// })
// }
hapus() {
if (this.props.type == 'delete') { if (this.props.type == 'delete') {
let payload = this.state.id let payload = this.state.id
this.props.deleteAM(payload) this.props.deleteAM(payload)
...@@ -90,35 +61,39 @@ export default class PopUpDelete extends Component { ...@@ -90,35 +61,39 @@ export default class PopUpDelete extends Component {
render() { render() {
return ( return (
<div className="test app-popup-show"> <div className="test app-popup-show">
<div className="popup-content background-white border-radius" style={{ borderRadius: 8, padding: 50 }}> <div className="popup-content background-white border-radius" style={{ borderRadius: 8 }}>
<div style={{ display: 'flex', justifyContent: 'center' }}> <div style={{ display: 'flex', justifyContent: 'center', paddingTop: 20 }}>
<img src={Images.failedCopy} /> <img src={Images.failed} />
</div> </div>
<div style={{ display: 'grid', justifyContent: 'center', marginTop: 20 }}> <div style={{ display: 'grid', justifyContent: 'center', marginTop: 20, paddingBottom: 20 }}>
<span style={{ textAlign: 'center', fontSize: 14, fontWeight: 'bold' }}> <span style={{ textAlign: 'center', fontSize: 14, fontWeight: 'bold', fontFamily: 'Nunito Sans, sans-serif' }}>
Delete {this.state.getTypes} - {this.state.getApprovedBy} ? Delete {this.state.getTypes} - {this.state.getApprovedBy}?
</span> </span>
{/* <span style={{ textAlign: 'center', fontSize: 14, fontWeight: 'bold' }}>
{`Please try again later.`}
</span> */}
</div> </div>
<div style={{ display: 'flex', justifyContent: 'center', marginTop: 24 }}> <div className="border-top grid grid-2x" style={{ height: 56, backgroundColor: '#f5f5f5', paddingLeft: 20, paddingRight: 20 }}>
<div className="column-1" style={{ alignSelf: 'center' }}>
<button <button
className={"btn-save"} type="button"
onClick={()=> this.props.onClickClose()} onClick={() => this.props.onClickClose()}
> >
<span style={{ color: 'white' }}>Cancel</span> <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> </button>
</div>
<div className="column-2" style={{ display: 'flex', justifyContent: 'flex-end', alignItems: 'center' }}>
<button <button
className={"btn-save"} type="button"
style={{ marginLeft: 50}} onClick={()=> this.onClickDelete()}
onClick={()=> this.hapus()}
> >
<span style={{ color: 'white' }}>Delete</span> <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> </button>
</div> </div>
</div> </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