Merge branch 'syadziy' into 'master'

update

See merge request !180

src/api/index.js

@@ -131,7 +131,7 @@ const create = (baseURL = 'https://tia.eksad.com/tia-reporting-dev/public/') =>
 
   //Report Items
   const getReportItems = () => api.get('item_report/get_all_item_report')
-  const getInputType = () => api.get('type_report/get_all_type_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}`)

src/container/MasterData/ReportItems.js

@@ -68,7 +68,7 @@ export default class ReportItems extends Component {
                             description: item[3],
                             parent: item[4],
                             uom: item[5],
-                            weight: String(item[6]),
+                            weight: item[6] == null ? null : String(item[6]),
                             type_report: item[7],
                             formula: item[8],
                             condition_it_should_be: item[9],
@@ -485,7 +485,7 @@ export default class ReportItems extends Component {
                 if (response.data.status == 'success') {
                     let data = response.data.data
                     let listData = data.sort((a, b) => a.item_report_id - b.item_report_id).map((item, index) => {
-                        return [index, item.item_report_id, item.report_name, item.company_name, item.order, item.description, item.parent, item.uom, item.weight, item.type_report_name, item.status]
+                        return [index, item.item_report_id, item.report_name, item.company_name, item.order, item.description, item.parent, item.uom, item.weight, item.type_item_report_name, item.status]
                     })
                     this.setState({ dataTable: listData, listData: response.data.data })
                 } else {
@@ -521,7 +521,7 @@ export default class ReportItems extends Component {
                 if (response.data.status == 'success') {
                     let data = response.data.data
                     let listData = data.map((item, index) => {
-                        return [index, item.item_report_id, item.report_name, item.company_name, item.order, item.description, item.parent, item.uom, item.weight, item.type_report_name, item.status]
+                        return [index, item.item_report_id, item.report_name, item.company_name, item.order, item.description, item.parent, item.uom, item.weight, item.type_item_report_name, item.status]
                     })
                     this.setState({ dataTable: listData, listData: response.data.data })
                 } else {

src/container/MasterData/formReportItems/CreateReportItems.js

@@ -187,7 +187,7 @@ export default class CreateReportItems extends Component {
             "description": this.state.description,
             "orders": this.state.order,
             "parent": this.state.parent === null ? null : this.state.parent.item_report_id,
-            "type_report_id": this.state.InputType.type_report_id,
+            "type_report_id": this.state.InputType.type_item_report_id,
             "formula": this.state.formula,
             "uom": this.state.uom,
             "weight": this.state.weight,
@@ -209,13 +209,13 @@ export default class CreateReportItems extends Component {
                     let data = response.data.data
                     let inputData = data.map((item) => {
                         return {
-                            type_report_id: item.type_report_id,
-                            type_report_name: item.type_report_name
+                            type_item_report_id: item.type_item_report_id,
+                            type_item_report_name: item.type_item_report_name
                         }
                     })
                     let defaultProps = {
                         options: inputData,
-                        getOptionLabel: (option) => titleCase(option.type_report_name),
+                        getOptionLabel: (option) => titleCase(option.type_item_report_name),
                     };
                     this.setState({ listInputType: defaultProps, inputData: response.data.data })
                 } else {
@@ -598,7 +598,7 @@ export default class CreateReportItems extends Component {
                                     id="inputType"
                                     onChange={(event, newInputValue) => this.setState({ InputType: newInputValue },
                                         () => newInputValue === null ? this.setState({ disabledFormula: true, disabledCondt: true, disabledValue: true, formula: '', condition: '', realVal: '' })
-                                            : newInputValue.type_report_name === 'Formula' ?
+                                            : newInputValue.type_item_report_name === 'Formula' ?
                                                 this.setState({
                                                     disabledFormula: false,
                                                     disabledCondt: true,
@@ -607,7 +607,7 @@ export default class CreateReportItems extends Component {
                                                     condition: '',
                                                     realVal: ''
                                                 }, () => this.clearMessage())
-                                                : newInputValue.type_report_name === 'Validation' ?
+                                                : newInputValue.type_item_report_name === 'Validation' ?
                                                     this.setState({
                                                         disabledFormula: false,
                                                         disabledCondt: false,

src/container/MasterData/formReportItems/EditReportItems.js

@@ -137,11 +137,11 @@ export default class EditReportItems extends Component {
             this.setState({ errorDesc: true, msgErrorDesc: 'Description is required..' })
         } else if (R.isNil(this.state.InputType)) {
             this.setState({ errorTipeData: true, msgErrorTipeData: 'Data type is required.' })
-        } else if ((this.state.InputType.type_report_name === 'Formula' && R.isEmpty(this.state.tempData.formula)) || (this.state.InputType.type_report_name === 'Validation' && R.isEmpty(this.state.tempData.formula))) {
+        } else if ((this.state.InputType.type_item_report_name === 'Formula' && R.isEmpty(this.state.tempData.formula)) || (this.state.InputType.type_item_report_name === 'Validation' && R.isEmpty(this.state.tempData.formula))) {
             this.setState({ errorFormula: true, msgErrorFormula: 'Formula is required.' })
-        } else if (this.state.InputType.type_report_name === 'Validation' && R.isEmpty(this.state.tempData.condition_it_should_be)) {
+        } else if (this.state.InputType.type_item_report_name === 'Validation' && R.isEmpty(this.state.tempData.condition_it_should_be)) {
             this.setState({ errorRV: true, msgErrorRV: 'True value is required.' })
-        } else if (this.state.InputType.type_report_name === 'Validation' && R.isNil(this.state.tempData.condition_if_wrong)) {
+        } else if (this.state.InputType.type_item_report_name === 'Validation' && R.isNil(this.state.tempData.condition_if_wrong)) {
             this.setState({ errorCondition: true, msgErrorCondition: 'False condition is required.' })
         } else if (R.isNil(this.state.tempData.start_date)) {
             this.setState({ errorStartDate: true, msgErrorSD: 'Start date is required.' })
@@ -162,7 +162,7 @@ export default class EditReportItems extends Component {
             "description": this.state.tempData.description,
             "orders": this.state.tempData.order,
             "parent": this.state.parent == null ? this.state.tempData.parent : this.state.parent.item_report_id,
-            "type_report_id": this.state.InputType == null ? this.state.tempData.type_report_id : this.state.InputType.type_report_id,
+            "type_report_id": this.state.InputType == null ? this.state.tempData.type_item_report_id : this.state.InputType.type_item_report_id,
             "formula": this.state.tempData.formula,
             "uom": this.state.tempData.uom,
             "weight": this.state.tempData.weight == null ? "" : this.state.tempData.weight,
@@ -204,16 +204,16 @@ export default class EditReportItems extends Component {
                     let data = response.data.data
                     let inputData = data.map((item) => {
                         return {
-                            type_report_id: item.type_report_id,
-                            type_report_name: item.type_report_name
+                            type_item_report_id: item.type_item_report_id,
+                            type_item_report_name: item.type_item_report_name
                         }
                     })
                     let defaultProps = {
                         options: inputData,
-                        getOptionLabel: (option) => titleCase(option.type_report_name),
+                        getOptionLabel: (option) => titleCase(option.type_item_report_name),
                     };
 
-                    let index = inputData.findIndex((val) => val.type_report_id === this.state.tempData.type_report_id)
+                    let index = inputData.findIndex((val) => val.type_item_report_id === this.state.tempData.type_item_report_id)
                     this.setState({ listInputType: defaultProps, InputType: index === -1 ? null : inputData[index] })
                 } else {
                     this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' })
@@ -613,7 +613,7 @@ export default class EditReportItems extends Component {
                                     style={{ width: '100%' }}
                                     id="formula"
                                     label="Formula"
-                                    disabled={this.state.InputType == null ? true : (this.state.InputType.type_report_name === 'Formula' || this.state.InputType.type_report_name === 'Validation' ? false : true)}
+                                    disabled={this.state.InputType == null ? true : (this.state.InputType.type_item_report_name === 'Formula' || this.state.InputType.type_item_report_name === 'Validation' ? false : true)}
                                     name="formula"
                                     error={this.state.errorFormula}
                                     helperText={this.state.msgErrorFormula}
@@ -646,7 +646,7 @@ export default class EditReportItems extends Component {
                                     label="True Value"
                                     error={this.state.errorRV}
                                     helperText={this.state.msgErrorRV}
-                                    disabled={this.state.InputType == null ? true : (this.state.InputType.type_report_name === 'Validation' ? false : true)}
+                                    disabled={this.state.InputType == null ? true : (this.state.InputType.type_item_report_name === 'Validation' ? false : true)}
                                     name="condition_it_should_be"
                                     onChange={(e) => this.handleChange(e, '')}
                                     value={this.state.tempData === null ? '' : this.state.tempData.condition_it_should_be}
@@ -671,7 +671,7 @@ export default class EditReportItems extends Component {
                                 <Autocomplete
                                     value={this.state.tempData === null ? "" : this.state.tempData.condition_if_wrong}
                                     id="isWrongCondition"
-                                    disabled={this.state.InputType == null ? true : (this.state.InputType.type_report_name === 'Validation' ? false : true)}
+                                    disabled={this.state.InputType == null ? true : (this.state.InputType.type_item_report_name === 'Validation' ? false : true)}
                                     onChange={(event, newValue) => {
                                         this.setState({ tempData: { ...this.state.tempData, condition_if_wrong: newValue } }, () => this.clearMessage());
                                     }}

src/container/Otorisasi/User.js

@@ -572,7 +572,7 @@ export default class UserRole extends Component {
                 style={{ marginRight: 20 }}
               >
                 <div style={{ width: 102, height: 30, border: 'solid 1px #354960', borderRadius: 5, alignItems: 'center', display: 'flex', justifyContent: 'center' }}>
-                  <span style={{ color: '#354960', fontSize: 11 }}>Batal</span>
+                  <span style={{ color: '#354960', fontSize: 11 }}>Cancel</span>
                 </div>
               </button>
               <button
@@ -581,7 +581,7 @@ export default class UserRole extends Component {
                 style={{}}
               >
                 <div style={{ width: 102, height: 30, backgroundColor: '#354960', borderRadius: 5, alignItems: 'center', display: 'flex', justifyContent: 'center' }}>
-                  <span style={{ color: '#fff', fontSize: 11 }}>Simpan</span>
+                  <span style={{ color: '#fff', fontSize: 11 }}>Save</span>
                 </div>
               </button>
             </div>

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: 'Full Name is Required' })
+            this.setState({ errorFullname: true, msgErrorFN: 'Fullname is required' })
         } else if (R.isEmpty(this.state.email)) {
-            this.setState({ errorEmail: true, msgErrorEM: 'Email is Required' })
+            this.setState({ errorEmail: true, msgErrorEM: 'Email is required' })
         } 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 is required' })
         } else if (R.isNil(this.state.startDate)) {
-            this.setState({ errorStartDate: true, msgErrorSD: 'Start Date is Required' })
+            this.setState({ errorStartDate: true, msgErrorSD: 'Start date is required' })
         } else if (R.isNil(this.state.endDate)) {
-            this.setState({ errorEndDate: true, msgErrorED: 'End Date is Required' })
+            this.setState({ errorEndDate: true, msgErrorED: 'End date is required' })
         }
         // else if (this.state.privileges.length < 1) {
         //     alert('Hak Akses belum di pilih !!')

src/container/Otorisasi/User/EditUser.js

@@ -705,8 +705,8 @@ export default class EditUser extends Component {
                         </div>
                     </div>
                     <div style={{ flexDirection: 'column', display: 'flex', paddingLeft: 20, paddingRight: 20 }}>
-                        <Typography style={{ fontSize: 12 }}>{`Created by  : ${this.state.tempData === null ? '' : this.state.tempData.created}`}</Typography>
-                        <Typography style={{ fontSize: 12 }}>{`Updated by: ${this.state.tempData === null ? '' : this.state.tempData.updated}`}</Typography>
+                        <Typography style={{ fontSize: 11 }}>{`Created By  : ${this.state.tempData === null ? '' : this.state.tempData.created}`}</Typography>
+                        <Typography style={{ fontSize: 11 }}>{`Updated By  : ${this.state.tempData === null ? '' : this.state.tempData.updated}`}</Typography>
                     </div>
                     <Divider style={{ margin: 20 }} />
                     <div style={{ paddingLeft: 20, paddingRight: 20 }}>

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 is required' })
         } else if (R.isNil(this.state.startDate)) {
-            this.setState({ errorStartDate: true, msgErrorSD: 'Start Date is Required' })
+            this.setState({ errorStartDate: true, msgErrorSD: 'Start date is required' })
         } else if (R.isNil(this.state.endDate)) {
-            this.setState({ errorEndDate: true, msgErrorED: 'End Date is Required' })
+            this.setState({ errorEndDate: true, msgErrorED: 'End date is required' })
         } 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 is required' })
         } 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 is required' })
         } 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 is required' })
         } else if (this.state.privileges.length < 1) {
             this.setState({ alert: true, messageAlert: 'You must choose the Access Rights', tipeAlert: 'warning' })
         } else {
@@ -506,8 +506,8 @@ export default class EditRole extends Component {
                         </div>
                     </div>
                     <div style={{ flexDirection: 'column', display: 'flex', paddingLeft: 20, paddingRight: 20 }}>
-                        <Typography style={{ fontSize: 12 }}>{`Created by  : ${this.state.tempData === null ? '' : (this.state.tempData.created === null ? '-' : this.state.tempData.created)}`}</Typography>
-                        <Typography style={{ fontSize: 12 }}>{`Updated by: ${this.state.tempData === null ? '' : (this.state.tempData.updated === null ? '-' : this.state.tempData.updated)}`}</Typography>
+                        <Typography style={{ fontSize: 11 }}>{`Created By  : ${this.state.tempData === null ? '' : (this.state.tempData.created === null ? '-' : this.state.tempData.created)}`}</Typography>
+                        <Typography style={{ fontSize: 11 }}>{`Updated By  : ${this.state.tempData === null ? '' : (this.state.tempData.updated === null ? '-' : this.state.tempData.updated)}`}</Typography>
                     </div>
                     <Divider style={{ margin: 20 }} />
                     <div style={{ paddingLeft: 20, paddingRight: 20 }}>