Merge branch 'master' of http://103.44.149.204/d.arizona/tia-dev into faisal

src/assets/Images.js

@@ -49,6 +49,7 @@ const Images = {
     camera: require('./camera.svg'),
     meeting: require('./meeting.jpg'),
     triputraBlack: require('./triputra-black.jpg'),
+    delete: require('./delete.svg')
 
 }
 

src/assets/delete.svg

+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
+    <g fill="none" fill-rule="evenodd">
+        <g>
+            <g>
+                <g>
+                    <g transform="translate(-404 -219) translate(332 151) translate(0 56) translate(72 12)">
+                        <circle cx="16" cy="16" r="16" fill="#ED5050"/>
+                        <g fill="#FFF" fill-rule="nonzero">
+                            <path d="M11.75 2H9v-.5C9 .673 8.327 0 7.5 0h-2C4.673 0 4 .673 4 1.5V2H1.25C.56 2 0 2.56 0 3.25V5c0 .276.224.5.5.5h.273l.432 9.071c.038.801.696 1.429 1.498 1.429h7.594c.802 0 1.46-.628 1.498-1.429l.432-9.071h.273c.276 0 .5-.224.5-.5V3.25C13 2.56 12.44 2 11.75 2zM5 1.5c0-.276.224-.5.5-.5h2c.276 0 .5.224.5.5V2H5v-.5zM1 3.25c0-.138.112-.25.25-.25h10.5c.138 0 .25.112.25.25V4.5H1V3.25zm9.796 11.274c-.013.267-.232.476-.5.476H2.705c-.268 0-.487-.21-.5-.476L1.774 5.5h9.452l-.43 9.024z" transform="translate(9 8)"/>
+                            <path d="M6.5 14c.276 0 .5-.224.5-.5V7c0-.276-.224-.5-.5-.5S6 6.724 6 7v6.5c0 .276.224.5.5.5zM9 14c.276 0 .5-.224.5-.5V7c0-.276-.224-.5-.5-.5s-.5.224-.5.5v6.5c0 .276.224.5.5.5zM4 14c.276 0 .5-.224.5-.5V7c0-.276-.224-.5-.5-.5s-.5.224-.5.5v6.5c0 .276.224.5.5.5z" transform="translate(9 8)"/>
+                        </g>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

src/container/ApprovalMatrix/ApprovalMatrix.js

@@ -66,12 +66,12 @@ export default class ApprovalMatrix extends Component {
                     if (item.length > 0) {
                         payload.push({
                             id: index + 1,
-                            approval_type_name: item[0],
-                            orders: item[1],
-                            fullname: item[2],
-                            operator_type_name: item[3],
-                            start_date: item[4],
-                            end_date: item[5],
+                            approval_type_name: item[0] === undefined ? "" : item[0],
+                            orders: item[1] === undefined ? "" : item[1],
+                            fullname: item[2] === undefined ? "" : item[2],
+                            operator_type_name: item[3] === undefined ? "" : item[3],
+                            start_date: item[4] === undefined ? "" : item[4],
+                            end_date: item[5] === undefined ? "" : item[5],
                         })
                     }
                 })
@@ -608,7 +608,7 @@ export default class ApprovalMatrix extends Component {
                                     }}
                                     onClick={() => this.openPopUp(tableMeta.rowData, 'delete')}
                                 >
-                                    <img src={Images.visualisasi} />
+                                    <img src={Images.delete} />
                                 </button>
                             )}
                         </div >

src/container/MasterData/formReportItems/CreateReportItems.js

@@ -785,7 +785,7 @@ export default class CreateReportItems extends Component {
                                     margin="normal"
                                     id="startDate"
                                     label="Valid From"
-                                    format="dd MMMM yyyy"
+                                    format="dd-MM-yyyy"
                                     value={this.state.startDate == "" ? null : this.state.startDate}
                                     error={this.state.errorStartDate}
                                     helperText={this.state.msgErrorSD}
@@ -817,7 +817,7 @@ export default class CreateReportItems extends Component {
                                     margin="normal"
                                     id="endDate"
                                     label="Valid To"
-                                    format="dd MMMM yyyy"
+                                    format="dd-MM-yyyy"
                                     value={this.state.endDate == "" ? null : this.state.endDate}
                                     error={this.state.errorEndDate}
                                     helperText={this.state.msgErrorED}

src/container/MasterData/formReportItems/EditReportItems.js

@@ -767,7 +767,7 @@ export default class EditReportItems extends Component {
                                     margin="normal"
                                     id="startDate"
                                     label="Valid From"
-                                    format="dd MMMM yyyy"
+                                    format="dd-MM-yyyy"
                                     value={this.state.tempData === null ? null : this.state.tempData.start_date}
                                     error={this.state.errorStartDate}
                                     helperText={this.state.msgErrorSD}
@@ -798,7 +798,7 @@ export default class EditReportItems extends Component {
                                     margin="normal"
                                     id="endDate"
                                     label="Valid To"
-                                    format="dd MMMM yyyy"
+                                    format="dd-MM-yyyy"
                                     value={this.state.tempData === null ? null : this.state.tempData.end_date}
                                     error={this.state.errorEndDate}
                                     helperText={this.state.msgErrorED}

src/container/ResetPassword.js

@@ -76,7 +76,7 @@ class ResetPassword extends Component {
     } else if (!this.isRegex(this.state.password)) {
       this.setState({ errorPassword: true, msgPassword: 'Invalid password. Must using combination of characters, letters and numbers.' })
     } else if (this.state.confirmPassword.trim() == "") {
-      this.setState({ errorConfirmPassword: true, msgConfirmPassword: 'Password Confirmation Cannot be Empty.' })
+      this.setState({ errorConfirmPassword: true, msgConfirmPassword: 'Repeat Password Cannot be Empty.' })
     } else if (this.state.password !== this.state.confirmPassword) {
       this.setState({ errorConfirmPassword: true, msgConfirmPassword: 'The password and password confirmation do not match.' })
     } else {