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

senin siang

See merge request !250

src/api/index.js

@@ -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

@@ -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

+<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

@@ -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/library/PopUpDelete.js

+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>
+        );
+    }
+}