Merge branch 'didam' into 'master'

apdet

See merge request !184

src/container/MasterData/formReportItems/VisualReportItems.js

@@ -55,30 +55,7 @@ export default class VisualReportItems extends Component {
         super(props)
         this.state = {
             open: false,
-            items: [
-                {
-                    id: 0, GG: 'Accumulated Depreciation (negative value)', collapse: false,
-                    children: [
-                        { id: 3, GG: 'Beginning Balance', collapse: false },
-                        { id: 4, GG: 'Depreciation expense MTD (please fill in, if any)', collapse: false },
-                        { id: 5, GG: 'Depreciation expense MTD (please fill in, if any)', collapse: false }
-                    ]
-                }, {
-                    id: 1, GG: 'Control Gain/(Loss) on Fixed Assets', collapse: false
-                }, {
-                    id: 2, GG: 'Gain/(Loss) on Fixed Assets', collapse: false,
-                    children: [
-                        {
-                            id: 6, GG: 'NBV', collapse: false,
-                            children: [
-                                { id: 8, GG: 'Cost', collapse: false },
-                                { id: 9, GG: 'Accm. Depreciation', collapse: false },
-                            ]
-                        },
-                        { id: 7, GG: 'Proceed from sale or disposal of Fixed Assets (please fill in, if any)', collapse: false },
-                    ]
-                },
-            ],
+            items: [],
             arrayCollapse: [],
             defaultCollapsed: false,
             listReport: null,
@@ -87,7 +64,8 @@ export default class VisualReportItems extends Component {
             company: null,
             alert: false,
             tipeAlert: '',
-            messageAlert: ''
+            messageAlert: '',
+            realItems: []
         }
     }
 
@@ -168,7 +146,7 @@ export default class VisualReportItems extends Component {
             if (response.data) {
                 if (response.ok) {
                     if (response.data.status == 'success') {
-                        this.setState({ items: response.data.data })
+                        this.setState({ items: response.data.data, realItems: response.data.data})
                     } else {
                         this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' })
                     }
@@ -215,30 +193,39 @@ export default class VisualReportItems extends Component {
         let payload = {
             "item_report": this.state.items
         }
-        api.create().saveVisualisasiReport(payload).then((response) => {
-            console.log(response);
-            // if (response.data.status == 'ucces') {
-            if (response.data) {
-                if (response.ok) {
-                    if (response.data.status === "success") {
-                        this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'success' }, () => {
-                            setTimeout(() => {
-                                this.props.onClickClose()
-                            }, 1000);
-                        })
+        if (JSON.stringify(this.state.items) === JSON.stringify(this.state.realItems)) {
+            this.setState({ alert: true, messageAlert: 'Save visualization item report success!', tipeAlert: 'success' }, () => {
+                setTimeout(() => {
+                    this.props.onClickClose()
+                }, 1000);
+            })
+        } else {
+            api.create().saveVisualisasiReport(payload).then((response) => {
+                console.log(response);
+                // if (response.data.status == 'ucces') {
+                if (response.data) {
+                    if (response.ok) {
+                        if (response.data.status === "success") {
+                            this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'success' }, () => {
+                                setTimeout(() => {
+                                    this.props.onClickClose()
+                                }, 1000);
+                            })
+                        } else {
+                            this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' })
+                        }
                     } else {
-                        this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' })
+                        this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'error' })
                     }
                 } else {
-                    this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'error' })
+                    this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error' })
                 }
-            } else {
-                this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error' })
-            }
-            // } else {
-            // alert(response.data.message)
-            // }
-        })
+                // } else {
+                // alert(response.data.message)
+                // }
+            })
+        }
+        
     }
 
     renderItem = ({ item, collapseIcon }) => {

src/container/Otorisasi/User/AddUser.js

@@ -195,8 +195,10 @@ export default class AddUser extends Component {
                 if (response.ok) {
                     if (response.data.status === 'success') {
                         this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'success' })
-                        this.props.onClickClose()
-                        this.props.refresh()
+                        setTimeout(() => {
+                            this.props.onClickClose()
+                            this.props.refresh()
+                        }, 750);
                     } else {
                         this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' })
                     }

src/container/Otorisasi/User/EditUser.js

@@ -198,12 +198,16 @@ export default class EditUser extends Component {
         }
 
         api.create().updateUser(payload).then((response) => {
+            console.log(response.data.message)
+            console.log(response.data.status)
             if (response.data) {
                 if (response.ok) {               
                     if (response.data.status === 'success') {
                         this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'success' })
-                        this.props.onClickClose()
-                        this.props.refresh()
+                        setTimeout(() => {
+                            this.props.onClickClose()
+                            this.props.refresh()
+                        }, 750);
                     } else {
                         this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' })
                     }
@@ -295,13 +299,14 @@ export default class EditUser extends Component {
                 let indexIDs = this.state.company.findIndex((val) => val === item.parent)
                 if (indexIDs !== -1) {
                     company.splice(indexIDs, 1)
-                } 
-                if (item.children !== null) {
-                    if (item.children.length > 0) {
-                        item.children.map((items,indexs) => {
-                            this.handleItemClick(items)
-                        })
-                    }
+                }
+            }
+
+            if (item.children !== null) {
+                if (item.children.length > 0) {
+                    item.children.map((items,indexs) => {
+                        this.handleItemClick(items)
+                    })
                 }
             }
         }

src/container/Otorisasi/UserRole/AddRole.js

@@ -138,8 +138,10 @@ export default class AddRole extends Component {
                 if (response.ok) {
                     if (response.data.status === 'success') {
                         this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'success' })
-                        this.props.refresh()
-                        this.props.onClickClose()
+                        setTimeout(() => {
+                            this.props.onClickClose()
+                            this.props.refresh()
+                        }, 750);
                     } else {
                         this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' })
                     }

src/container/Otorisasi/UserRole/EditRole.js

@@ -158,8 +158,10 @@ export default class EditRole extends Component {
                 if (response.ok) {
                     if (response.data.status === 'success') {
                         this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'success' })
-                        this.props.refresh()
-                        this.props.onClickClose()
+                        setTimeout(() => {
+                            this.props.onClickClose()
+                            this.props.refresh()
+                        }, 750);
                     } else {
                         this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' })
                     }