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

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 {