Merge branch 'master' of http://103.44.149.204/d.arizona/tia-dev into deni-dev(pc)

src/container/ApprovalMatrix/ApprovalMatrix.js

@@ -39,6 +39,9 @@ export default class ApprovalMatrix extends Component {
             rows: null,
             dataLoaded: false,
             popupError: false,
+            alert: false,
+            tipeAlert: '',
+            messageAlert: '',
             btncreate: false,
             btnedit: false,
             load: false,
@@ -75,10 +78,11 @@ export default class ApprovalMatrix extends Component {
                 this.setState({ payload: body, buttonError: false })
                 api.create().checkUploadAM(body).then(response => {
                     // console.log(response.data)
+                    let dataRow = []
                     if(response.data){
                         if (response.ok) {
                             if (response.data.status === "success") {
-                                let dataRow = response.data.data.map((item, index) => {
+                                dataRow = response.data.data.map((item, index) => {
                                     return [
                                         index + 1,
                                         item.approval_type_name,
@@ -91,7 +95,7 @@ export default class ApprovalMatrix extends Component {
                                     ]
                                 })
                                 let columns = [
-                                    "ID",
+                                    "Data",
                                     {
                                         name: "Approval Type",
                                         options: {
@@ -257,7 +261,7 @@ export default class ApprovalMatrix extends Component {
                                     rows: dataRow
                                 });
                             } else {
-                                this.setState({ dataLoaded: false, alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
+                                this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
                                     if (response.data.message.includes("Token")) {
                                         setTimeout(() => {
                                             localStorage.removeItem(Constant.TOKEN)
@@ -267,7 +271,7 @@ export default class ApprovalMatrix extends Component {
                                 })
                             }
                         } else {
-                            this.setState({ dataLoaded: false, alert: true, messageAlert: response.data.message, tipeAlert: 'error' })
+                            this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'error' })
                         }
                     } else {
                         this.setState({
@@ -303,6 +307,8 @@ export default class ApprovalMatrix extends Component {
                         load: true
                     })
                 }
+            } else {
+                this.setState({ load: true })
             }
         })
     }
@@ -820,7 +826,7 @@ export default class ApprovalMatrix extends Component {
                 {this.state.visibleUpload && (
                     <div className="test app-popup-show">
                         <div className="popup-content background-white border-radius" style={{ borderRadius: 8 }}>
-                            <div className="popup-panel grid grid-2x" style={{ backgroundColor: '#51c6ea', height: 64, borderTopRightRadius: 8, borderTopLeftRadius: 8 }}>
+                            <div className="popup-panel grid grid-2x main-color" style={{ height: 64, borderTopRightRadius: 8, borderTopLeftRadius: 8 }}>
                                 <div className="col-1" style={{ maxWidth: "inherit", display: 'flex', alignItems: 'center' }}>
                                     <div className="popup-title">
                                         <span style={{ color: '#fff', fontSize: 16, fontWeight: 'bold' }}>Upload File</span>

src/container/ApprovalMatrix/CreateApprovalMatrix.js

@@ -215,7 +215,6 @@ export default class CreateApprovalMatrix extends Component {
             this.setState({ errorOrder: true, msgErrOrder: 'Order Cannot be Empty.'})
         }
         else if (R.isNil(this.state.userId)) {
-            // return alert("Pemberi Persetujuan tidak boleh kosong");
             this.setState({ errorApproved: true, msgErrApproved: 'Approver Name Cannot be Empty.' })
         } 
         else if (R.isNil(this.state.operatorId)) {

src/container/BudgetTahunan/FixedAssetsMovement.js

@@ -653,7 +653,7 @@ export default class FixedAssetsMovement extends Component {
                 <div style={{ flex: 1, padding: 20, width: '100%' }}>
                     <Paper style={{ paddingTop: 10, paddingBottom: 20 }}>
                         <div style={{ borderBottom: 'solid 1px #c4c4c4' }} >
-                            <Typography style={{ fontSize: '12px', color: '#4b4b4b', margin: 10 }}>Master Budget - Fixed Assets Movement</Typography>
+                            <Typography style={{ fontSize: '12px', color: '#4b4b4b', margin: 10 }}>Budget Tahunan - Fixed Assets Movement</Typography>
                         </div>
                         <div style={{ padding: 20 }}>
                             <div>
@@ -685,7 +685,7 @@ export default class FixedAssetsMovement extends Component {
                                     onClick={() => this.props.onClickClose()}
                                 >
                                     <div style={{ backgroundColor: '#019ce5', width: 105, height: 25, borderRadius: 3, justifyContent: 'center', display: 'flex', alignItems: 'center' }}>
-                                        <Typography style={{ fontSize: '11px', color: '#fff', textAlign: 'center' }}>Kembali</Typography>
+                                        <Typography style={{ fontSize: '11px', color: '#fff', textAlign: 'center' }}>Back</Typography>
                                     </div>
                                 </button>
                             </div>

src/container/ForgotPassword.js

@@ -41,7 +41,7 @@ class ForgotPassword extends Component {
       if (this.state.email.trim() == "") {
           this.setState({ errorEmail: true, msgEmail: 'Email Cannot be Empty.' })
       } else if (!isEmail) {
-          this.setState({ errorEmail: true, msgEmail: 'Email Format is Not Correct.' })
+          this.setState({ errorEmail: true, msgEmail: 'Please enter a valid email address.' })
       } else {
           this.verification()
       }

src/container/Login.js

@@ -77,7 +77,7 @@ class Login extends Component {
     if (this.state.email.trim() == "") {
       this.setState({ errorEmail: true, msgEmail: 'Email Cannot be Empty.' })
     } else if (!isEmail) {
-      this.setState({ errorEmail: true, msgEmail: 'Email Format is Not Correct.' })
+      this.setState({ errorEmail: true, msgEmail: 'Please enter a valid email address.' })
     } else if (this.state.password.trim() == "") {
       this.setState({ errorPassword: true, msgPassword: 'Password Cannot be Empty.' })
     } else {

src/container/MasterData/Perusahaan/CreatePerusahaan.js

@@ -249,6 +249,8 @@ export default class CreatePerusahaan extends Component {
     validasiEdit() {
         if (R.isEmpty(this.state.company)) {
             this.setState({ errorNP: true, msgErrorNP: 'Company Name Cannot be Empty.' })
+        } else if (R.isNil(this.state.getPerusahaan)) {
+            this.setState({ errorPC: true, msgErrorPC: 'Parent Company Cannot be Empty.' })
         } else if (R.isNil(this.state.getTypes)) {
             this.setState({ errorUB: true, msgErrorUB: 'Business Unit Cannot be Empty.' })        
         } else if (R.isNil(this.state.startDate)) {
@@ -260,7 +262,8 @@ export default class CreatePerusahaan extends Component {
                 "company_id": this.state.companyID,
                 "company_name": this.state.company,
                 "business_unit_id": this.state.getTypes.business_unit_id,
-                "parent": this.state.getPerusahaan == null ? null : this.state.getPerusahaan.company_id,
+                // "parent": this.state.getPerusahaan == null ? null : this.state.getPerusahaan.company_id,
+                "parent": this.state.getPerusahaan.company_id,
                 "start_date": this.state.startDate,
                 "end_date": this.state.endDate
             }
@@ -271,6 +274,8 @@ export default class CreatePerusahaan extends Component {
     validasi() {
         if (R.isEmpty(this.state.company)) {
             this.setState({ errorNP: true, msgErrorNP: 'Company Name Cannot be Empty.' })
+        } else if (R.isNil(this.state.getPerusahaan)) {
+            this.setState({ errorPC: true, msgErrorPC: 'Parent Company Cannot be Empty.' })
         } else if (R.isNil(this.state.getTypes)) {
             this.setState({ errorUB: true, msgErrorUB: 'Business Unit Cannot be Empty.' })        
         } else if (R.isNil(this.state.startDate)) {
@@ -281,7 +286,8 @@ export default class CreatePerusahaan extends Component {
         else {
             let payload = {
                 "company_name": this.state.company,
-                "parent": this.state.getPerusahaan == null ? null : this.state.getPerusahaan.company_id,
+                // "parent": this.state.getPerusahaan == null ? null : this.state.getPerusahaan.company_id,
+                "parent": this.state.getPerusahaan.company_id,
                 "business_unit_id": this.state.getTypes.business_unit_id,
                 "start_date": this.state.startDate,
                 "end_date": this.state.endDate
@@ -452,8 +458,17 @@ export default class CreatePerusahaan extends Component {
                                     {...this.state.perusahaan}
                                     debug
                                     id="tipe"
-                                    onChange={(event, newInputValue) => this.setState({ getPerusahaan: newInputValue })}
-                                    renderInput={(params) => <TextField {...params} InputProps={{ ...params.InputProps, style: { fontSize: 11 } }} InputLabelProps={{ style: { fontSize: 11, color: '#7e8085' } }} label="Parent Company" />}
+                                    onChange={(event, newInputValue) => this.setState({ getPerusahaan: newInputValue }, ()=> this.clearError())}
+                                    renderInput={(params) => 
+                                    <TextField 
+                                        {...params} 
+                                        label="Parent Company"
+                                        error={this.state.errorPC}
+                                        helperText={this.state.msgErrorPC}
+                                        InputProps={{ ...params.InputProps, style: { fontSize: 11 } }} 
+                                        InputLabelProps={{ style: { fontSize: 11, color: '#7e8085' } }} 
+                                    />
+                                    }
                                     value={this.state.getPerusahaan}
                                 />
                             </div>
@@ -662,9 +677,18 @@ export default class CreatePerusahaan extends Component {
                                     {...this.state.perusahaan}
                                     debug
                                     id="tipe"
-                                    onChange={(event, newInputValue) => this.setState({ getPerusahaan: newInputValue })}
-                                    renderInput={(params) => <TextField {...params} InputProps={{ ...params.InputProps, style: { fontSize: 11 } }} InputLabelProps={{ style: { fontSize: 11, color: '#7e8085' } }} label="Parent Company" />}
-                                    value={this.state.getPerusahaan}
+                                    onChange={(event, newInputValue) => this.setState({ getPerusahaan: newInputValue }, ()=> this.clearError())}
+                                    renderInput={(params) => 
+                                    <TextField 
+                                        {...params} 
+                                        label="Parent Company"
+                                        error={this.state.errorPC}
+                                        helperText={this.state.msgErrorPC}
+                                        InputProps={{ ...params.InputProps, style: { fontSize: 11 } }} 
+                                        InputLabelProps={{ style: { fontSize: 11, color: '#7e8085' } }} 
+                                    />
+                                    }
+                                    value={this.state.perusahaan}
                                 />
                             </div>
                             <div style={{ padding: 10, borderRadius: 5 }}>

src/container/MasterData/Perusahaan/Perusahaan.js

@@ -46,7 +46,8 @@ export default class Perusahaan extends Component {
             messageAlert: '',
             create: false,
             edit: false,
-            load: false
+            load: false,
+            judul: ''
         }
         this.fileHandler = this.fileHandler.bind(this);
     }
@@ -58,7 +59,6 @@ export default class Perusahaan extends Component {
                 console.log(err);
             }
             else {
-                let judul = resp.rows[2]
                 let isi = resp.rows.slice(3)
                 let payload = []
                 isi.map((item, index) => {
@@ -76,8 +76,14 @@ export default class Perusahaan extends Component {
                 let body = {
                     company: payload
                 }
-                this.setState({ payload: body, buttonError: false })
-                api.create().checkUploadPerusahaan(body).then(response => {
+                console.log(resp.rows[1])
+                this.setState({ payload: body, buttonError: false, judul: resp.rows[1][0] })
+            }
+        });
+    }
+
+    checkUpload() {
+        api.create().checkUploadPerusahaan(this.state.payload).then(response => {
             console.log(response);
             if (response.data) {
                 if (response.ok) {
@@ -146,7 +152,7 @@ export default class Perusahaan extends Component {
                                 }
                             },
                             {
-                                        name: "Unit Bisnis",
+                                name: "Business Unit",
                                 options: {
                                     customBodyRender: (val, tableMeta) => {
                                         let check = null
@@ -171,7 +177,7 @@ export default class Perusahaan extends Component {
                                 }
                             },
                             {
-                                        name: "Start Date",
+                                name: "Valid From",
                                 options: {
                                     customBodyRender: (val, tableMeta) => {
                                         let check = null
@@ -196,7 +202,7 @@ export default class Perusahaan extends Component {
                                 }
                             },
                             {
-                                        name: "End Date",
+                                name: "Valid To",
                                 options: {
                                     customBodyRender: (val, tableMeta) => {
                                         let check = null
@@ -228,11 +234,12 @@ export default class Perusahaan extends Component {
                             }
                         ]
 
-                                console.log(dataRow);
+                        // console.log(dataRow);
                         this.setState({
                             dataLoaded: true,
                             cols: columns,
-                                    rows: dataRow
+                            rows: dataRow, visibleUpload: false, 
+                            visiblePerusahaan: false
                         });
                     } else {
                         this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
@@ -250,11 +257,7 @@ export default class Perusahaan extends Component {
             } else {
                 this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error' })
             }
-                    console.log(response);
         })
-
-            }
-        });
     }
 
     componentDidMount() {
@@ -286,7 +289,7 @@ export default class Perusahaan extends Component {
 
     getData() {
         api.create().getPerusahaan().then((response) => {
-            console.log(response)
+            // console.log(response)
             if (response.data) {
                 if (response.ok) {
                     if (response.data.status == 'success') {
@@ -306,10 +309,10 @@ export default class Perusahaan extends Component {
                         })
                     }
                 } else {
-                    this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'error', dataTable: [] })
+                    this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'error' })
                 }
             } else {
-                this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error', dataTable: [] })
+                this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error' })
             }
         })
     }
@@ -715,7 +718,9 @@ export default class Perusahaan extends Component {
                                 </button>
                                 <button
                                     type="button"
-                                    onClick={() => this.state.buttonError ? this.setState({ popupError: true }) : this.uploadPerusahaan()}
+                                    disabled={this.state.buttonError == true ? true : false}
+                                    onClick={() => this.uploadPerusahaan()}
+                                    // onClick={() => this.state.buttonError ? this.setState({ popupError: true }) : this.uploadPerusahaan()}
                                     style={{}}
                                 >
                                     <div style={{ width: 102, height: 30, backgroundColor: '#354960', borderRadius: 5, alignItems: 'center', display: 'flex', justifyContent: 'center' }}>
@@ -784,7 +789,11 @@ export default class Perusahaan extends Component {
                                     this.fileHandler(dt)
                                     this.setState({ uploadStatus: 'idle', percentage: '0' })
                                 }}
-                                onUpload={() => this.setState({ visibleUpload: false, visiblePerusahaan: false })}
+                                onUpload={() => {
+                                    this.state.judul === "MASTER DATA - COMPANY" ?
+                                    this.checkUpload() :
+                                    this.setState({ alert: true, messageAlert: "Invalid Template", tipeAlert: 'warning'})
+                                }}
                             />
                         </div>
                     </div>

src/container/Otorisasi/UserRole/AddRole.js

@@ -111,7 +111,7 @@ export default class AddRole extends Component {
 
     validasi() {
         if (R.isEmpty(this.state.roleName)) {
-            this.setState({ errorRoleName: true, msgErrorRN: 'Role Name Cannot be Empty.' })
+            this.setState({ errorRoleName: true, msgErrorRN: 'User Role Cannot be Empty.' })
         } else if (R.isNil(this.state.startDate)) {
             this.setState({ errorStartDate: true, msgErrorSD: 'Valid From Cannot be Empty.' })
         } else if (R.isNil(this.state.endDate)) {

src/container/Otorisasi/UserRole/EditRole.js

@@ -124,7 +124,7 @@ export default class EditRole extends Component {
 
     validasi() {
         if (R.isEmpty(this.state.tempData.role_name)) {
-            this.setState({ errorRoleName: true, msgErrorRN: 'Role Name Cannot be Empty.' })
+            this.setState({ errorRoleName: true, msgErrorRN: 'User Role Cannot be Empty.' })
         } else if (R.isNil(this.state.tempData.start_date)) {
             this.setState({ errorStartDate: true, msgErrorSD: 'Valid From Cannot be Empty.' })
         } else if (R.isNil(this.state.tempData.end_date)) {

src/container/ResetPassword.js

@@ -70,15 +70,15 @@ class ResetPassword extends Component {
     if (this.state.password.trim() == "") {
       this.setState({ errorPassword: true, msgPassword: 'New Password Cannot be Empty.' })
     } else if (this.state.password.length < 8) {
-      this.setState({ errorPassword: true, msgPassword: 'New Password Minimum 8 Characters.' })
+      this.setState({ errorPassword: true, msgPassword: 'Invalid password. Minimum length : 8.' })
     } else if (this.isEmail(this.state.password)) {
-      this.setState({ errorPassword: true, msgPassword: 'New Password Format Should Not Use Email.' })
+      this.setState({ errorPassword: true, msgPassword: 'Invalid password. Should not be same as Email Address.' })
     } else if (!this.isRegex(this.state.password)) {
-      this.setState({ errorPassword: true, msgPassword: 'New Password Must be a Combination of Characters, Letters and Numbers.' })
+      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.' })
     } else if (this.state.password !== this.state.confirmPassword) {
-      this.setState({ errorConfirmPassword: true, msgConfirmPassword: 'Password Does Not Match.' })
+      this.setState({ errorConfirmPassword: true, msgConfirmPassword: 'The password and password confirmation do not match.' })
     } else {
       this.confirmPassword()
     }

src/container/SetPassword.js

@@ -70,15 +70,15 @@ class SetPassword extends Component {
     if (this.state.password.trim() == "") {
       this.setState({ errorPassword: true, msgPassword: 'New Password Cannot be Empty.' })
     } else if (this.state.password.length < 8) {
-      this.setState({ errorPassword: true, msgPassword: 'New Password Minimum 8 Characters.' })
+      this.setState({ errorPassword: true, msgPassword: 'Invalid password. Minimum length : 8.' })
     } else if (this.isEmail(this.state.password)) {
-      this.setState({ errorPassword: true, msgPassword: 'New Password Format Should Not Use Email.' })
+      this.setState({ errorPassword: true, msgPassword: 'Invalid password. Should not be same as Email Address.' })
     } else if (!this.isRegex(this.state.password)) {
-      this.setState({ errorPassword: true, msgPassword: 'New Password Must be a Combination of Characters, Letters and Numbers.' })
+      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.' })
     } else if (this.state.password !== this.state.confirmPassword) {
-      this.setState({ errorConfirmPassword: true, msgConfirmPassword: 'Password Does Not Match.' })
+      this.setState({ errorConfirmPassword: true, msgConfirmPassword: 'The password and password confirmation do not match.' })
     } else {
       this.confirmPassword()
     }