Merge branch 'rifka' into 'master'

taxplan bersih

See merge request !551

src/container/ApprovalMatrix/ApprovalMatrix.js

@@ -68,9 +68,9 @@ export default class ApprovalMatrix extends Component {
     fileHandler = (event) => {
         let fileObj = event
         ExcelRenderer(fileObj, (err, resp) => {
-            console.log(resp)
+            // console.log(resp)
             if (err) {
-                console.log(err);
+                // console.log(err);
             }
             else {
                 let isi = resp.rows.slice(3)
@@ -93,14 +93,14 @@ export default class ApprovalMatrix extends Component {
                     approval_matrix: payload
                 }
                 this.setState({ payload: body, buttonError: false, judul: resp.rows[1][0] })
-                console.log(this.state.payload)
+                // console.log(this.state.payload)
             }
         });
     }
 
     checkUpload(){
         api.create().checkUploadAM(this.state.payload).then(response => {
-            console.log(response)
+            // console.log(response)
             let dataRow = []
             if (response.data) {
                 if (response.ok) {
@@ -335,7 +335,7 @@ export default class ApprovalMatrix extends Component {
             menu: "approval matrix"
         }
         api.create().getPermission(payload).then(response => {
-            console.log(response)
+            // console.log(response)
             if (response.data) {
                 if (response.data.status === "success") {
                     this.setState({
@@ -540,7 +540,6 @@ export default class ApprovalMatrix extends Component {
     }
 
     downloadDataTable = async () => {
-        // alert('link belum ada')
         let res = await fetch(
             "https://tia.eksad.com/tia-reporting-dev/public/approval_matrix/export_approval_matrix"
         )
@@ -557,7 +556,7 @@ export default class ApprovalMatrix extends Component {
 
     uploadAM() {
         api.create().uploadAM(this.state.payload).then(response => {
-            console.log(response)
+            // console.log(response)
             if (response.data) {
                 if (response.ok) {
                     if (response.data.status === "success") {
@@ -589,7 +588,7 @@ export default class ApprovalMatrix extends Component {
     deleteAM = (payload) => {
         this.setState({ popupDel: false })
         api.create().deleteAM(payload).then(response => {
-            console.log(response.data)
+            // console.log(response.data)
             if (response.data) {
                 if (response.ok) {
                     if (response.data.status == 'success') {

src/container/ApprovalMatrix/CreateApprovalMatrix.js

@@ -45,7 +45,6 @@ export default class CreateApprovalMatrix extends Component {
         this.getTypeData()
         this.getOperatorData()
         let date = format(new Date, 'yyyy-MM-dd')
-        console.log(date);
         this.setState({
             startDate: date,
             endDate: date
@@ -64,14 +63,12 @@ export default class CreateApprovalMatrix extends Component {
                                 fullname: item.fullname == null? "(NO_NAME)" : item.fullname
                             }
                         })
-                        // console.log(userData)
                         let defaultProps = {
                             options: userData,
                             getOptionLabel: (option) => option.fullname,
                         };
                         this.setState({ approvedBy: defaultProps, userData: response.data.data})
                     } else {
-                        // alert('Approver Name: ' +response.data.message)
                         if (response.data.message.includes("Someone Logged In")) {
                             this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
                                 setTimeout(() => {
@@ -110,7 +107,6 @@ export default class CreateApprovalMatrix extends Component {
                           };
                         this.setState({ types: typeProps, typeData: response.data.data })
                     } else {
-                        // alert('Approval Type: ' +response.data.message)
                         if (response.data.message.includes("Someone Logged In")) {
                             this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
                                 setTimeout(() => {
@@ -143,14 +139,12 @@ export default class CreateApprovalMatrix extends Component {
                                 operator_type_name: item.operator_type_name
                             }
                         })
-                        // console.log(userData)
                         let operatorProps = {
                             options: operatorData,
                             getOptionLabel: (option) => option.operator_type_name,
                           };
                         this.setState({ operators: operatorProps, operatorData: response.data.data })
                     } else {
-                        // alert('Operator: ' +response.data.message)
                         if (response.data.message.includes("Someone Logged In")) {
                             this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
                                 setTimeout(() => {
@@ -177,12 +171,12 @@ export default class CreateApprovalMatrix extends Component {
         if (isDate && type == 'start_date') {
             this.setState({ startDate: format(e, 'yyyy-MM-dd'), endDate: null }, () => {
                 this.clearError()
-                console.log(this.state.startDate)
+                // console.log(this.state.startDate)
             })
         } else if (isDate && type == 'end_date') {
             this.setState({ endDate: format(e, 'yyyy-MM-dd')},  () => {
                 this.clearError()
-                console.log(this.state.endDate)
+                // console.log(this.state.endDate)
             })
         } else {
             // this.setState({...data, tempData: {...this.state.tempData, [e.target.name] :  e.target.value}})
@@ -225,7 +219,6 @@ export default class CreateApprovalMatrix extends Component {
         } else if (R.isNil(this.state.endDate)) {
             this.setState({ errorEndDate: true, msgErrorEndDate: 'Valid To Cannot be Empty' })
         } else {
-            console.log('masuk');
             let payload = {
                 "approval_type_id": this.state.typeId.approval_type_id,
                 "orders": this.state.order,
@@ -235,7 +228,6 @@ export default class CreateApprovalMatrix extends Component {
                 "end_date": this.state.endDate
             }
             this.props.createAM(payload)
-            // console.log(payload)
         }
     }
 

src/container/ApprovalMatrix/EditApprovalMatrix.js

@@ -42,7 +42,6 @@ export default class EditApprovalMatrix extends Component {
     componentDidMount() {
         if (this.props.type === 'edit') {
             this.getDetailAM()
-            console.log(this.state.startDate);
             // let getApprovedBy = {
             //     user_id: data.user_id,
             //     fullname: data.fullname
@@ -265,7 +264,6 @@ export default class EditApprovalMatrix extends Component {
         } else if (R.isEmpty(this.state.endDate)) {
             this.setState({ errorEndDate: true, msgErrorEndDate: 'Valid To Cannot be Empty' })
         } else {
-            console.log('masuk');
             if (this.props.type == 'edit') {
             let payload = {
                     "approval_matrix_id": this.state.id,
@@ -277,7 +275,6 @@ export default class EditApprovalMatrix extends Component {
                     "end_date": this.state.endDate
                 }
                 this.props.updateAM(payload)
-                // console.log(payload)
             }
         }
     }

src/container/ApprovalMatrix/PopUpDeleteAM.js

@@ -22,7 +22,7 @@ export default class PopUpDeleteAM extends Component {
 
     getDetailAM() {
         api.create().getDetailAM(this.props.data[1]).then(response => {
-            console.log(response.data)
+            // console.log(response.data)
             if (response.data) {
                 if (response.ok) {
                     if (response.data.status === "success") {

src/container/ApprovalMatrix/VisualisasiAM.js

@@ -100,15 +100,11 @@ export default class VisualisasiAM extends Component {
                                     orderId: item.orders,
                                     data: [item]
                                 })
-                                // console.log(listVisual);
                             } else {
                                 listVisual[indexId].data.push(item)
-                                // console.log('listVisual');
-                                // console.log(listVisual);
                             }
                         })
                         this.setState({ listApproval: listVisual})
-                        // console.log(listVisual);
                     } else {
                         this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
                             if (response.data.message.includes("Someone Logged In")) {
@@ -133,7 +129,7 @@ export default class VisualisasiAM extends Component {
         let orderIdFrom = listApproval[fromIndex].orderId
         listApproval[fromIndex].orderId = listApproval[toIndex].orderId
         listApproval[toIndex].orderId = orderIdFrom
-        that.setState({listEdit: listApproval}, () => console.log(this.state.listEdit))
+        that.setState({listEdit: listApproval})
     }
 
     handleSave() {

src/container/DocumentManagement/AllDocument.js

@@ -41,7 +41,6 @@ export default class getAllDocument extends Component {
         const { refresh, id } = this.props;
         if (props.refresh !== refresh) {
             this.getData()
-            console.log(this.props.data)
         }
       }
 
@@ -51,14 +50,13 @@ export default class getAllDocument extends Component {
         }
         this.setState({ loading: true })
         api.create().getAllDocument(payload).then(response => {
-            console.log(response)
+            // console.log(response)
             if (response.data) {
                 if (response.ok) {
                     if (response.data.status == 'success') {
                         let dataTable = []
                         response.data.data.map((item, index) => {
                             let indexId = this.props.userCompActive.findIndex((val) => val == item.company_id)
-                            console.log(indexId)
                             if (String(this.props.name).includes('Manual')){
                                 dataTable.push( [
                                     index,
@@ -89,7 +87,7 @@ export default class getAllDocument extends Component {
                                 } 
                             }
                         })
-                        console.log(dataTable)
+                        // console.log(dataTable)
                         this.setState({ dataTable, loading: false })
                         let docPath = response.data.data.map((item) => {
                             return [
@@ -124,7 +122,6 @@ export default class getAllDocument extends Component {
 
     openPopUp = async (index, val, type) =>{
         if (type === 'download') {
-            console.log(this.state.docPath[val])
             let res = await fetch(
                 "https://tia.eksad.com/tia-reporting-dev/public/document/download_document?documentName="+this.state.docPath[val]+"&&fileType="+index[5]
             )
@@ -157,7 +154,7 @@ export default class getAllDocument extends Component {
     deleteDoc = (payload) => {
         this.setState({ popupDel: false, loading: true })
         api.create().deleteDocument(payload).then(response => {
-            console.log(response.data)
+            // console.log(response.data)
             if (response.data) {
                 if (response.ok) {
                     if (response.data.status == 'success') {
@@ -185,7 +182,7 @@ export default class getAllDocument extends Component {
     updateDocument(payload) {
         this.setState({ visibleEdit: false, loading: true })
         api.create().updateDocument(payload).then(response => {
-            console.log(response)
+            // console.log(response)
             if (response.data) {
                 if (response.ok) {
                     if (response.data.status === "success") {
@@ -231,7 +228,6 @@ export default class getAllDocument extends Component {
                                         borderColor: 'transparent',
                                         marginRight: 15
                                     }}
-                                    // onClick={() => console.log(tableMeta)}
                                     onClick={() => this.openPopUp(tableMeta.rowData, val, 'download')}
                                     >
                                         <img src={Images.download} />
@@ -247,7 +243,6 @@ export default class getAllDocument extends Component {
                                         borderColor: 'transparent',
                                         marginRight: 15
                                     }}
-                                    // onClick={() => console.log(tableMeta)}
                                     onClick={() => this.openPopUp(tableMeta.rowData, val, 'edit')}
                                     >
                                         <img src={Images.editCopy} />

src/container/DocumentManagement/CreateManagementDoc.js

@@ -66,7 +66,7 @@ export default class CreateManagementDoc extends Component {
             type: 'MAX_FILE_SIZE'
         }
         api.create().getAllSettingByType(body).then(response => {
-            console.log(response);
+            // console.log(response);
             if (response.data) {
                 if (response.data.status === "success") {
                     if (response.data.data.length == 0) {
@@ -115,7 +115,7 @@ export default class CreateManagementDoc extends Component {
                     })
                 }
             } else {
-                alert(response.problem)
+                this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error' })
             }
         })
     }
@@ -148,7 +148,7 @@ export default class CreateManagementDoc extends Component {
                             })
                         }
                     })
-                    console.log(typeData)
+                    // console.log(typeData)
                     let typeProps = {
                         options: typeData.sort((a, b) => a.document_category_id - b.document_category_id),
                         getOptionLabel: (option) => option.document_category_name,
@@ -165,7 +165,7 @@ export default class CreateManagementDoc extends Component {
                     })
                 }
             } else {
-                alert(response.problem)
+                this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error' })
             }
         })
     }
@@ -173,7 +173,6 @@ export default class CreateManagementDoc extends Component {
     getPeriode() {
         api.create().getPeriodeTransaction().then(response => {
             let dateNow = new Date
-            // console.log(dateNow)
             let year = format(dateNow, 'yyyy')
             if (response.data) {
                 if (response.data.status === "success") {
@@ -236,14 +235,13 @@ export default class CreateManagementDoc extends Component {
         let fileObj = event
         let length = event.name.split(".").length
         let fileType = event.name.split(".")[length - 1]
-        // console.log(fileType)
         if (fileType === 'zip' || 'rar') {
             this.setState({ file: event, fileType: String(fileType) })
         } else {
             ExcelRenderer(fileObj, (err, resp) => {
-                console.log(fileType)
+                // console.log(fileType)
                 if (err) {
-                    console.log(err);
+                    // console.log(err);
                 }
                 else {
                     this.setState({ file: event, fileType: String(fileType) })

src/container/DocumentManagement/DocumentManagement.js

@@ -72,7 +72,7 @@ export default class DocumentManagement extends Component {
 
     getDataDocument(id, name) {
         api.create().getDocumentCategory().then(response => {
-            console.log(response);
+            // console.log(response);
             if (response) {
                 if (response.data.status === "success") {
                     this.setState({
@@ -82,7 +82,6 @@ export default class DocumentManagement extends Component {
                         loadTable: true,
                         refresh: id === undefined ? '' : 'create'
                     })
-                    // console.log(this.state.listData)
                 } else {
 
                 }
@@ -95,7 +94,7 @@ export default class DocumentManagement extends Component {
     createDocument(payload, settingID, menuName) {
         this.setState({ loading: true })
         api.create().uploadDocument(payload).then(response => {
-            console.log(response)
+            // console.log(response)
             if (response.data) {
                 if (response.ok) {
                     if (response.data.message === "The Document Already Exists in The System, Do You Want to Overwrite It?") {
@@ -131,7 +130,7 @@ export default class DocumentManagement extends Component {
         formData.append("updated", 1)
         this.setState({ loading: true })
         api.create().updateDocument(formData).then(response => {
-            console.log(response)
+            // console.log(response)
             if (response.data) {
                 if (response.ok) {
                     if (response.data.status === "success") {
@@ -157,7 +156,7 @@ export default class DocumentManagement extends Component {
     }
 
     getID(id) {
-        console.log(id);
+        // console.log(id);
         this.setState({ id })
     }
 
@@ -208,7 +207,7 @@ export default class DocumentManagement extends Component {
                         this.setState({ btnadd: false})
                     }
                     this.setState({ userCompActive, visibleTrue: true })
-                    console.log(userCompActive)
+                    // console.log(userCompActive)
                 } else {
                     this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning', visibleTrue: true }, () => {
                         if (response.data.message.includes("Someone Logged In")) {

src/container/DocumentManagement/EditManagementDoc.js

@@ -68,7 +68,7 @@ export default class EditManagementDoc extends Component {
             type: 'MAX_FILE_SIZE'
         }
         api.create().getAllSettingByType(body).then(response => {
-            console.log(response);
+            // console.log(response);
             if (response.data) {
                 if (response.data.status === "success") {
                     this.setState({
@@ -81,7 +81,7 @@ export default class EditManagementDoc extends Component {
 
     getDetailDoc() {
         api.create().getDetailDocument(this.props.idoc).then(response => {
-            console.log(response)
+            // console.log(response)
             if (response.data) {
                 if (response.ok) {
                     if (response.data.status === "success") {
@@ -159,7 +159,7 @@ export default class EditManagementDoc extends Component {
                     })
                 }
             } else {
-                alert(response.problem)
+                this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error' })
             }
         })
     }
@@ -172,7 +172,7 @@ export default class EditManagementDoc extends Component {
 
         // }
         api.create().getDocumentCategory().then(response => {
-            console.log(response);
+            // console.log(response);
             if (response.data) {
                 if (response.data.status == 'success') {
                     let data = response.data.data
@@ -199,7 +199,7 @@ export default class EditManagementDoc extends Component {
                     })
                 }
             } else {
-                alert(response.problem)
+                this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error' })
             }
         })
     }
@@ -275,7 +275,7 @@ export default class EditManagementDoc extends Component {
             ExcelRenderer(fileObj, (err, resp) => {
                 // console.log(fileType)
                 if (err) {
-                    console.log(err);
+                    // console.log(err);
                 }
                 else {
                     this.setState({ file: event, fileType: String(fileType) })

src/container/DocumentManagement/PopUpDelete.js

@@ -16,8 +16,8 @@ export default class PopUpDelete extends Component {
 
     componentDidMount() {
         if (this.props.type === 'delete') {
-            console.log(this.props.idoc)
-            console.log(this.props.data)
+            // console.log(this.props.idoc)
+            // console.log(this.props.data)
         }
     }