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

Deni dev(pc)

See merge request !194

src/api/index.js

@@ -133,7 +133,6 @@ const create = (baseURL = 'https://tia.eksad.com/tia-reporting-dev/public/') =>
   const getReportItems = () => api.get('item_report/get_all_item_report')
   const getInputType = () => api.get('type_item_report/get_all_type_item_report')
   const getReportType = () => api.get('report/get_all_report')
-  const getReportTypeBody = (body) => api.post('report/get_all_report', body)
   const getDetailReportItems = (userId) => api.get(`item_report/get_item_report_by_id/${userId}`)
   const searchReportItems = (body) => api.post('/item_report/search_item_report', body)
   const createReportItems = (body) => api.post('/item_report/create_item_report', body)
@@ -155,6 +154,13 @@ const create = (baseURL = 'https://tia.eksad.com/tia-reporting-dev/public/') =>
   const uploadParameter = (body) => api.post('/setting/import_setting', body)
   const searchParameter = (body) => api.post('setting/search_setting', body)
 
+  //Transaction
+  const getReportTypeBody = (body) => api.post('transaction/get_all_report', body)
+  const getMasterBudgetAtt = (body) => api.post('transaction/get_report_attachment', body)
+  const uploadAttachment = (body) => api.post('transaction/upload_attachment', body)
+  const getRevision = (body) => api.post('transaction/get_revision', body)
+  const getPeriodeTransaction = () => api.get('transaction/get_periode')
+
   //Template
   const downloadTemplate = (fileName, fileType) => api.get(`attachment/download_file?fileName=${fileName}&&fileType=${fileType}`)
 
@@ -252,7 +258,11 @@ const create = (baseURL = 'https://tia.eksad.com/tia-reporting-dev/public/') =>
     getDetailUnitBisnis,
     uploadFoto,
     getReportTypeBody,
-    getPermission
+    getPermission,
+    getMasterBudgetAtt,
+    uploadAttachment,
+    getPeriodeTransaction,
+    getRevision
   }
 }
 

src/container/Otorisasi/User/AddUser.js

@@ -158,17 +158,17 @@ export default class AddUser extends Component {
         var isEmail = this.isEmail(this.state.email)
 
         if (R.isEmpty(this.state.fullname)) {
-            this.setState({ errorFullname: true, msgErrorFN: 'Fullname is required' })
+            this.setState({ errorFullname: true, msgErrorFN: 'Fullname Cannot be Empty' })
         } else if (R.isEmpty(this.state.email)) {
-            this.setState({ errorEmail: true, msgErrorEM: 'Email is required' })
+            this.setState({ errorEmail: true, msgErrorEM: 'Email Cannot be Empty' })
         } else if (!isEmail) {
             this.setState({ errorEmail: true, msgErrorEM: 'Email format not recognized!' })
         } else if (R.isNil(this.state.role)) {
-            this.setState({ errorRoleName: true, msgErrorRN: 'Role name is required' })
+            this.setState({ errorRoleName: true, msgErrorRN: 'Role name Cannot be Empty' })
         } else if (R.isNil(this.state.startDate)) {
-            this.setState({ errorStartDate: true, msgErrorSD: 'Start date is required' })
+            this.setState({ errorStartDate: true, msgErrorSD: 'Start date Cannot be Empty' })
         } else if (R.isNil(this.state.endDate)) {
-            this.setState({ errorEndDate: true, msgErrorED: 'End date is required' })
+            this.setState({ errorEndDate: true, msgErrorED: 'End date Cannot be Empty' })
         }
         // else if (this.state.privileges.length < 1) {
         //     alert('Hak Akses belum di pilih !!')

src/container/Otorisasi/User/EditUser.js

@@ -166,17 +166,17 @@ export default class EditUser extends Component {
         // console.log(this.state.tempData)
 
         if (R.isEmpty(this.state.tempData.fullname)) {
-            this.setState({ errorFullname: true, msgErrorFN: 'Full Name is Required' })
+            this.setState({ errorFullname: true, msgErrorFN: 'Full Name Cannot be Empty' })
         } else if (R.isEmpty(this.state.tempData.email)) {
-            this.setState({ errorEmail: true, msgErrorEM: 'Email is Required' })
+            this.setState({ errorEmail: true, msgErrorEM: 'Email Cannot be Empty' })
         } else if (!isEmail) {
             this.setState({ errorEmail: true, msgErrorEM: 'Email format not recognized!' })
         } else if (R.isNil(this.state.role)) {
-            this.setState({ errorRoleName: true, msgErrorRN: 'Role Name is Required' })
+            this.setState({ errorRoleName: true, msgErrorRN: 'Role Name Cannot be Empty' })
         } else if (R.isNil(this.state.tempData.start_date)) {
-            this.setState({ errorStartDate: true, msgErrorSD: 'Start Date is Required' })
+            this.setState({ errorStartDate: true, msgErrorSD: 'Start Date Cannot be Empty' })
         } else if (R.isNil(this.state.tempData.end_date)) {
-            this.setState({ errorEndDate: true, msgErrorED: 'End Date is Required' })
+            this.setState({ errorEndDate: true, msgErrorED: 'End Date Cannot be Empty' })
         }
         // else if (this.state.privileges.length < 1) {
         //     alert('Hak Akses belum di pilih !!')

src/container/Otorisasi/UserRole/AddRole.js

@@ -110,11 +110,11 @@ export default class AddRole extends Component {
 
     validasi() {
         if (R.isEmpty(this.state.roleName)) {
-            this.setState({ errorRoleName: true, msgErrorRN: 'Role name is required' })
+            this.setState({ errorRoleName: true, msgErrorRN: 'Role name Cannot be Empty' })
         } else if (R.isNil(this.state.startDate)) {
-            this.setState({ errorStartDate: true, msgErrorSD: 'Start date is required' })
+            this.setState({ errorStartDate: true, msgErrorSD: 'Start date Cannot be Empty' })
         } else if (R.isNil(this.state.endDate)) {
-            this.setState({ errorEndDate: true, msgErrorED: 'End date is required' })
+            this.setState({ errorEndDate: true, msgErrorED: 'End date Cannot be Empty' })
         } else if (this.state.privileges.length < 1) {
             this.setState({ alert: true, messageAlert: 'You must choose the Access Rights!!', tipeAlert: 'warning' })
         } else {

src/container/Otorisasi/UserRole/EditRole.js

@@ -116,11 +116,11 @@ export default class EditRole extends Component {
 
     validasi() {
         if (R.isEmpty(this.state.tempData.role_name)) {
-            this.setState({ errorRoleName: true, msgErrorRN: 'Role name is required' })
+            this.setState({ errorRoleName: true, msgErrorRN: 'Role name Cannot be Empty' })
         } else if (R.isNil(this.state.tempData.start_date)) {
-            this.setState({ errorStartDate: true, msgErrorSD: 'Start date is required' })
+            this.setState({ errorStartDate: true, msgErrorSD: 'Start date Cannot be Empty' })
         } else if (R.isNil(this.state.tempData.end_date)) {
-            this.setState({ errorEndDate: true, msgErrorED: 'End date is required' })
+            this.setState({ errorEndDate: true, msgErrorED: 'End date Cannot be Empty' })
         } else if (this.state.privileges.length < 1) {
             this.setState({ alert: true, messageAlert: 'You must choose the Access Rights', tipeAlert: 'warning' })
         } else {