Merge branch 'riri' into 'master'

apdate

See merge request !154

src/container/EmailVerification.js

@@ -22,11 +22,11 @@ class EmailVerification extends Component {
               <div style={{paddingTop: 20, paddingRight: 24, paddingLeft: 24, display: 'flex', flexDirection: 'column', width: 378, height: 300, borderRadius: 12, boxShadow: '0 2 4 0 rgba(0, 0, 0, 0.2)', backgroundColor: '#ffffff', justifyContent: 'center', alignItems: 'center' }}>
                 <img src={Images.berhasil} />
 
-                <Typography style={{textAlign: 'center', fontSize: 14, marginTop: 24, color: '#4b4b4b', fontFamily: 'Nunito Sans, sans-serif'}} >Link verifikasi berhasil terkirim. Silahkan cek email Anda.</Typography>
+                <Typography style={{textAlign: 'center', fontSize: 14, marginTop: 24, color: '#4b4b4b', fontFamily: 'Nunito Sans, sans-serif'}} >We sent a recovery link to you. Please check your email.</Typography>
 
                 <Link to={{pathname: '/login'}} style={{textDecoration: 'none'}}>
                   <Button variant="contained" style={{ marginTop: 24, marginBottom: 20,  width: 250, height: 30, borderRadius: 4 , backgroundColor: '#51c6ea', color: '#ffffff'}}>
-                    <Typography style={{fontSize: 12, fontFamily: 'Nunito Sans, sans-serif'}}>Tutup</Typography>
+                    <Typography style={{fontSize: 12, fontFamily: 'Nunito Sans, sans-serif'}}>Back To Login</Typography>
                   </Button>
                 </Link>
                 

src/container/ForgotPassword.js

@@ -39,9 +39,9 @@ class ForgotPassword extends Component {
         var isEmail = this.isEmail(this.state.email)
     
       if (this.state.email.trim() == "") {
-          this.setState({ errorEmail: true, msgEmail: 'Email harus diisi!' })
+          this.setState({ errorEmail: true, msgEmail: 'Email cannot be empty!' })
       } else if (!isEmail) {
-          this.setState({ errorEmail: true, msgEmail: 'Format email tidak sesuai!' })
+          this.setState({ errorEmail: true, msgEmail: 'Email format is not correct!' })
       } else {
           this.verification()
       }
@@ -103,12 +103,12 @@ class ForgotPassword extends Component {
                 />
 
                 <Button name="submit" variant="contained" disabled={this.state.email.trim() === '' ? true : false} onClick={() => this.validateEmail()} style={{ marginTop: this.state.errorEmail ? (this.state.msgEmail.length > 45 ? 60 : 35) : 23,  width: '100%', height: 30, borderRadius: 4, color: this.state.email.trim() === '' ? '#4b4b4b' : '#fff', backgroundColor: this.state.email.trim() === '' ? '#d8d8d8' : '#51c6ea' }}>
-                  <Typography style={{fontSize: 12, fontFamily: 'Nunito Sans, sans-serif'}}>Lanjut</Typography>
+                  <Typography style={{fontSize: 12, fontFamily: 'Nunito Sans, sans-serif'}}>Reset Password</Typography>
                 </Button>
 
                 <div style={{ marginTop: 24}}>
                   <span onClick={() => this.props.history.goBack()} style={{ color: '#51c6ea', cursor: 'pointer' }}>
-                    <Typography style={{fontSize: 14}}>Kembali Ke Login</Typography>
+                    <Typography style={{fontSize: 14}}>Back To Login</Typography>
                   </span>
                 </div>
               </div>

src/container/Login.js

@@ -65,11 +65,11 @@ class Login extends Component {
   validateLogin() {
     var isEmail = this.isEmail(this.state.email)
     if (this.state.email.trim() == "") {
-      this.setState({ errorEmail: true, msgEmail: 'Email harus diisi!' })
+      this.setState({ errorEmail: true, msgEmail: 'Email cannot be empty!' })
     } else if (!isEmail) {
-      this.setState({ errorEmail: true, msgEmail: 'Format email tidak sesuai!' })
+      this.setState({ errorEmail: true, msgEmail: 'Email format is not correct!' })
     } else if (this.state.password.trim() == "") {
-      this.setState({ errorPassword: true, msgPassword: 'Password harus diisi!' })
+      this.setState({ errorPassword: true, msgPassword: 'Password cannot be empty!' })
     } else {
       this.login()
     }
@@ -102,7 +102,7 @@ class Login extends Component {
                 }
                 this.props.history.push('/home/beranda')
               } else {
-                if (response.data.message == 'Kata sandi tidak sesuai.') {
+                if (response.data.message == 'Incorrect Password.') {
                   this.setState({ errorPassword: true, msgPassword: response.data.message })
                 } else {
                   this.setState({ errorEmail: true, msgEmail: response.data.message })
@@ -169,7 +169,7 @@ class Login extends Component {
               />
 
               <TextField
-                label={<Typography style={{ fontSize: 12, fontFamily: 'Nunito Sans, sans-serif' }}>Kata Sandi *</Typography>}
+                label={<Typography style={{ fontSize: 12, fontFamily: 'Nunito Sans, sans-serif' }}>Password *</Typography>}
                 id="password"
                 type={this.state.showPass ? 'text' : 'password'}
                 name={"password"}
@@ -199,7 +199,7 @@ class Login extends Component {
               <div style={{ flexDirection: 'row', width: '100%', marginTop: this.state.errorPassword ? 26 : 16 }}>
                 <CustomCheckbox name="checked-remember" checked={this.state.rememberMe} onChange={() => this.setState({ rememberMe: !this.state.rememberMe })} />
                 <span style={{ color: 'rgba(0, 0, 0, 0.5)', fontSize: 12, fontFamily: 'Nunito Sans, sans-serif' }}>Remember Me</span>
-                <Link to={{ pathname: '/forgot-password' }} style={{ textDecoration: 'none' }}><span style={{ marginLeft: 30, color: '#51c6ea', cursor: 'pointer', fontSize: 12, fontFamily: 'Nunito Sans, sans-serif' }}>Lupa Kata Sandi?</span></Link>
+                <Link to={{ pathname: '/forgot-password' }} style={{ textDecoration: 'none' }}><span style={{ marginLeft: 30, color: '#51c6ea', cursor: 'pointer', fontSize: 12, fontFamily: 'Nunito Sans, sans-serif' }}>Forgot Password?</span></Link>
               </div>
               <button
                 type="submit"

src/container/MasterData/ReportItems.js

@@ -103,7 +103,7 @@ export default class ReportItems extends Component {
                             ]
                         })
                         let columns = [
-                            "Data Ke-",
+                            "Data",
                             {
                                 name: "Report Type",
                                 options: {
@@ -621,7 +621,7 @@ export default class ReportItems extends Component {
                 customBodyRender: (val, tableMeta) => {
                     return (
                         <div style={{ display: 'flex' }}>
-                            <span style={{ color: tableMeta.rowData[10] === "active" ? "#656565" : 'rgba(0, 0, 0, 0.25)' }}>{val}</span>
+                            <span style={{ color: tableMeta.rowData[10] === "Active" ? "#656565" : 'rgba(0, 0, 0, 0.25)' }}>{val}</span>
                         </div >
                     );
                 }
@@ -633,7 +633,7 @@ export default class ReportItems extends Component {
                 customBodyRender: (val, tableMeta) => {
                     return (
                         <div style={{ display: 'flex' }}>
-                            <span style={{ color: tableMeta.rowData[10] === "active" ? "#656565" : 'rgba(0, 0, 0, 0.25)' }}>{val}</span>
+                            <span style={{ color: tableMeta.rowData[10] === "Active" ? "#656565" : 'rgba(0, 0, 0, 0.25)' }}>{val}</span>
                         </div >
                     );
                 }
@@ -645,7 +645,7 @@ export default class ReportItems extends Component {
                 customBodyRender: (val, tableMeta) => {
                     return (
                         <div style={{ display: 'flex' }}>
-                            <span style={{ color: tableMeta.rowData[10] === "active" ? "#656565" : 'rgba(0, 0, 0, 0.25)' }}>{val}</span>
+                            <span style={{ color: tableMeta.rowData[10] === "Active" ? "#656565" : 'rgba(0, 0, 0, 0.25)' }}>{val}</span>
                         </div >
                     );
                 }
@@ -657,7 +657,7 @@ export default class ReportItems extends Component {
                 customBodyRender: (val, tableMeta) => {
                     return (
                         <div style={{ display: 'flex' }}>
-                            <span style={{ color: tableMeta.rowData[10] === "active" ? "#656565" : 'rgba(0, 0, 0, 0.25)' }}>{val}</span>
+                            <span style={{ color: tableMeta.rowData[10] === "Active" ? "#656565" : 'rgba(0, 0, 0, 0.25)' }}>{val}</span>
                         </div >
                     );
                 }
@@ -669,7 +669,7 @@ export default class ReportItems extends Component {
                 customBodyRender: (val, tableMeta) => {
                     return (
                         <div style={{ display: 'flex' }}>
-                            <span style={{ color: tableMeta.rowData[10] === "active" ? "#656565" : 'rgba(0, 0, 0, 0.25)' }}>{val}</span>
+                            <span style={{ color: tableMeta.rowData[10] === "Active" ? "#656565" : 'rgba(0, 0, 0, 0.25)' }}>{val}</span>
                         </div >
                     );
                 }
@@ -681,7 +681,7 @@ export default class ReportItems extends Component {
                 customBodyRender: (val, tableMeta) => {
                     return (
                         <div style={{ display: 'flex' }}>
-                            <span style={{ color: tableMeta.rowData[10] === "active" ? "#656565" : 'rgba(0, 0, 0, 0.25)' }}>{val}</span>
+                            <span style={{ color: tableMeta.rowData[10] === "Active" ? "#656565" : 'rgba(0, 0, 0, 0.25)' }}>{val}</span>
                         </div >
                     );
                 }
@@ -693,7 +693,7 @@ export default class ReportItems extends Component {
                 customBodyRender: (val, tableMeta) => {
                     return (
                         <div style={{ display: 'flex' }}>
-                            <span style={{ color: tableMeta.rowData[10] === "active" ? "#656565" : 'rgba(0, 0, 0, 0.25)' }}>{val}</span>
+                            <span style={{ color: tableMeta.rowData[10] === "Active" ? "#656565" : 'rgba(0, 0, 0, 0.25)' }}>{val}</span>
                         </div >
                     );
                 }
@@ -705,7 +705,7 @@ export default class ReportItems extends Component {
                 customBodyRender: (val, tableMeta) => {
                     return (
                         <div style={{ display: 'flex' }}>
-                            <span style={{ color: tableMeta.rowData[10] === "active" ? "#656565" : 'rgba(0, 0, 0, 0.25)' }}>{val}</span>
+                            <span style={{ color: tableMeta.rowData[10] === "Active" ? "#656565" : 'rgba(0, 0, 0, 0.25)' }}>{val}</span>
                         </div >
                     );
                 }
@@ -717,7 +717,7 @@ export default class ReportItems extends Component {
                 customBodyRender: (val, tableMeta) => {
                     return (
                         <div style={{ display: 'flex' }}>
-                            <span style={{ color: tableMeta.rowData[10] === "active" ? "#656565" : 'rgba(0, 0, 0, 0.25)' }}>{val}</span>
+                            <span style={{ color: tableMeta.rowData[10] === "Active" ? "#656565" : 'rgba(0, 0, 0, 0.25)' }}>{val}</span>
                         </div >
                     );
                 }
@@ -729,7 +729,7 @@ export default class ReportItems extends Component {
                 customBodyRender: (val, tableMeta) => {
                     return (
                         <div style={{ display: 'flex' }}>
-                            <span style={{ color: tableMeta.rowData[10] === "active" ? "#656565" : 'rgba(0, 0, 0, 0.25)' }}>{val}</span>
+                            <span style={{ color: tableMeta.rowData[10] === "Active" ? "#656565" : 'rgba(0, 0, 0, 0.25)' }}>{val}</span>
                         </div >
                     );
                 }
@@ -747,7 +747,7 @@ export default class ReportItems extends Component {
         return (
             <div style={{ height: this.props.height }}>
                 {/* <Row> */}
-                <div className={"main-color"} style={{ height: 199, width: '100%' }} />
+                <div className={"main-color"} style={{ height: 195, width: '100%' }} />
                 <Snackbar open={this.state.alert} autoHideDuration={6000} onClose={() => this.closeAlert()}>
                     <Alert onClose={() => this.closeAlert()} severity={this.state.tipeAlert}>
                         {this.state.messageAlert}
@@ -755,7 +755,7 @@ export default class ReportItems extends Component {
                 </Snackbar>
                 {this.state.itemReport === true ?
                     <div>
-                        <div style={{ display: 'flex', flexDirection: 'row', justifyContent: 'space-between', paddingRight: 25, paddingLeft: 25, marginTop: -150 }}>
+                        <div style={{ display: 'flex', flexDirection: 'row', justifyContent: 'space-between', paddingRight: 25, paddingLeft: 25, marginTop: -118 }}>
                             <label style={{ color: 'white', fontSize: 16, alignSelf: 'center', width: '20%', }}>Master Data - Report Items</label>
                             <div style={{ color: 'white', width: '50%', height: 37, display: 'flex', backgroundColor: 'white', borderWidth: 2, alignItems: 'center', borderRadius: 6, paddingLeft: 5, paddingRight: 5, alignSelf: 'center' }}>
                                 <img src={Images.searchBlack} style={{ marginRight: 10 }} />

src/container/MasterData/formReportItems/CreateReportItems.js

@@ -160,19 +160,19 @@ export default class CreateReportItems extends Component {
             this.setState({ errorTipeData: true, msgErrorTipeData: 'Data type cannot be empty' })
         }
         else if (this.state.disabledFormula === false && R.isEmpty(this.state.formula)) {
-            this.setState({ errorFormula: true, msgErrorFormula: 'Formula Harus Diisi' })
+            this.setState({ errorFormula: true, msgErrorFormula: 'Formula cannot be empty' })
         }
         else if (this.state.disabledValue === false && R.isEmpty(this.state.realVal)) {
-            this.setState({ errorRV: true, msgErrorRV: 'Nilai Seharusnya Harus Diisi' })
+            this.setState({ errorRV: true, msgErrorRV: 'True Value cannot be empty' })
         }
         else if (this.state.disabledCondt === false && R.isEmpty(this.state.condition)) {
-            this.setState({ errorCondition: true, msgErrorCondition: 'Kondisi Jika Salah Harus Diisi' })
+            this.setState({ errorCondition: true, msgErrorCondition: 'False Condition cannot be empty' })
         }
         else if (R.isNil(this.state.startDate)) {
-            this.setState({ errorStartDate: true, msgErrorSD: 'Start Date tidak boleh kosong' })
+            this.setState({ errorStartDate: true, msgErrorSD: 'Start Date cannot be empty' })
         }
         else if (R.isNil(this.state.endDate)) {
-            this.setState({ errorEndDate: true, msgErrorED: 'End Date tidak boleh kosong' })
+            this.setState({ errorEndDate: true, msgErrorED: 'End Date cannot be empty' })
         }
         else {
             this.addReportItems()

src/container/MasterData/formReportItems/EditReportItems.js

@@ -138,15 +138,15 @@ export default class EditReportItems extends Component {
         } else if (R.isNil(this.state.InputType)) {
             this.setState({ errorTipeData: true, msgErrorTipeData: 'Data type cannot be empty' })
         } 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))) {
-            this.setState({ errorFormula: true, msgErrorFormula: 'Formula Harus Diisi' })
+            this.setState({ errorFormula: true, msgErrorFormula: 'Formula cannot be empty' })
         } else if (this.state.InputType.type_report_name === 'Validation' && R.isEmpty(this.state.tempData.condition_it_should_be)) {
-            this.setState({ errorRV: true, msgErrorRV: 'Nilai Seharusnya Harus Diisi' })
+            this.setState({ errorRV: true, msgErrorRV: 'True Value cannot be empty' })
         } else if (this.state.InputType.type_report_name === 'Validation' && R.isNil(this.state.tempData.condition_if_wrong)) {
-            this.setState({ errorCondition: true, msgErrorCondition: 'Kondisi Jika Salah Harus Diisi' })
+            this.setState({ errorCondition: true, msgErrorCondition: 'False Condition cannot be empty' })
         } else if (R.isNil(this.state.tempData.start_date)) {
-            this.setState({ errorStartDate: true, msgErrorSD: 'Start Date Harus Diisi' })
+            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 Harus Diisi' })
+            this.setState({ errorEndDate: true, msgErrorED: 'End Date cannot be empty' })
         } else {
             this.updateReportItems()
         }

src/container/MasterData/formReportItems/VisualReportItems.js

@@ -210,11 +210,11 @@ export default class VisualReportItems extends Component {
                     <div style={{ width: '100%' }}  className={"main-color"}  />
                     <div>
                         <div style={{ display: 'flex', flexDirection: 'row', justifyContent: 'space-between', paddingRight: 25, paddingLeft: 25, marginTop: -150 }}>
-                            <label style={{ color: 'white', width: '20%', fontSize: 16, paddingTop: 8 }}>Visualisasi Data</label>
+                            <label style={{ color: 'white', width: '20%', fontSize: 16, paddingTop: 8 }}>Data Visualization</label>
                         </div>
                         <div style={{ padding: 25, width: '100%' }}>
                             <div style={{ width: '100%', padding: 25, backgroundColor: 'white', borderRadius: 6, border: 'solid 1px #c4c4c4' }}>
-                                <label style={{ color: '#4b4b4b', fontSize: '16px', fontWeight: 'bold' }}>Hirarki Item Laporan</label>
+                                <label style={{ color: '#4b4b4b', fontSize: '16px', fontWeight: 'bold' }}>Report Item Hierarchy</label>
                                 <div className="margin-top-10px" style={{ padding: 10, borderRadius: 5 }}>
                                     <Autocomplete
                                         {...this.state.listReport}
@@ -222,7 +222,7 @@ export default class VisualReportItems extends Component {
                                         onChange={(event, newInputValue) => this.setState({ report: newInputValue }, () => this.getItemHierarki())}
                                         debug
                                         disableClearable
-                                        renderInput={(params) => <TextField {...params} label="Jenis Laporan" margin="normal" style={{ marginTop: 7 }} />}
+                                        renderInput={(params) => <TextField {...params} label="Report Type" margin="normal" style={{ marginTop: 7 }} />}
                                         value={this.state.report}
                                     />
                                 </div>

src/container/ResetPassword.js

@@ -20,7 +20,7 @@ class ResetPassword extends Component {
             showPass2: false,
             errorPassword: false,
             errorConfirmPassword: false,
-            msgPassword: 'Terdiri 8 karakter dengan kombinasi angka.',
+            msgPassword: 'Password minimum 8 characters!.',
             msgConfirmPassword: 'Terdiri 8 karakter dengan kombinasi angka.',
             userId: 0,
             alert: false,
@@ -65,23 +65,23 @@ class ResetPassword extends Component {
 
     validateReset() {
         if (this.state.password.trim() == "") {
-            this.setState({ errorPassword: true, msgPassword: 'Kata sandi harus diisi!' })
+            this.setState({ errorPassword: true, msgPassword: 'Password cannot be empty!' })
         } else if (this.state.password.length < 8) {
-            this.setState({ errorPassword: true, msgPassword: 'Kata sandi minimal 8 karakter!' })
+            this.setState({ errorPassword: true, msgPassword: 'Password minimum 8 characters!' })
         } else if (this.isEmail(this.state.password)) {
-            this.setState({ errorPassword: true, msgPassword: 'Format kata sandi tidak boleh menggunakan email!' })
+            this.setState({ errorPassword: true, msgPassword: 'Password format should not use email!' })
         } else if (!this.isRegex(this.state.password)) {
-            this.setState({ errorPassword: true, msgPassword: 'Kata sandi harus berupa kombinasi karakter, huruf dan angka!' })
+            this.setState({ errorPassword: true, msgPassword: 'The password must be a combination of characters, letters and numbers!' })
         } else if (this.state.confirmPassword.trim() == "") {
-            this.setState({ errorConfirmPassword: true, msgConfirmPassword: 'Konfirmasi kata sandi harus diisi!' })
+            this.setState({ errorConfirmPassword: true, msgConfirmPassword: 'Confirm password cannot be empty!' })
         } else if (this.state.confirmPassword.length < 8) {
-            this.setState({ errorConfirmPassword: true, msgConfirmPassword: 'Konfirmasi kata sandi minimal 8 karakter!' })
+            this.setState({ errorConfirmPassword: true, msgConfirmPassword: 'Confirm password of at least 8 characters!' })
         } else if (this.isEmail(this.state.confirmPassword)) {
-            this.setState({ errorConfirmPassword: true, msgConfirmPassword: 'Format konfirmasi kata sandi tidak boleh menggunakan email!' })
+            this.setState({ errorConfirmPassword: true, msgConfirmPassword: 'Password confirmation format may not use email!' })
         } else if (!this.isRegex(this.state.confirmPassword)) {
-            this.setState({ errorConfirmPassword: true, msgConfirmPassword: 'Konfirmasi kata sandi harus berupa kombinasi karakter, huruf dan angka!' })
+            this.setState({ errorConfirmPassword: true, msgConfirmPassword: 'Password confirmation must be a combination of characters, letters and numbers!' })
         } else if (this.state.password !== this.state.confirmPassword) {
-            this.setState({ errorConfirmPassword: true, msgConfirmPassword: 'Konfirmasi kata sandi harus sama dengan kata sandi!' })
+            this.setState({ errorConfirmPassword: true, msgConfirmPassword: 'The confirmation password must match the password!' })
         } else {
             this.confirmPassword()
         }
@@ -119,9 +119,9 @@ class ResetPassword extends Component {
       let data = this.state
       this.setState({...data, [e.target.name] : e.target.value})
       if (e.target.name == "password") {
-        this.setState({ errorPassword: false, msgPassword: 'Terdiri 8 karakter dengan kombinasi angka.' })
+        this.setState({ errorPassword: false, msgPassword: 'Password consists of 8 characters with a combination of numbers.' })
       } else if (e.target.name == "confirmPassword") {
-          this.setState({ errorConfirmPassword: false, msgConfirmPassword: 'Terdiri 8 karakter dengan kombinasi angka.' })
+          this.setState({ errorConfirmPassword: false, msgConfirmPassword: 'Confirm Password consists of 8 characters with a combination of numbers.' })
       }
     }
 
@@ -137,7 +137,7 @@ class ResetPassword extends Component {
                 <img src={Images.tia}/>
 
                 <TextField
-                  label={<Typography style={{fontSize: 12, fontFamily: 'Nunito Sans, sans-serif'}}>Kata Sandi Baru *</Typography>}
+                  label={<Typography style={{fontSize: 12, fontFamily: 'Nunito Sans, sans-serif'}}>New password *</Typography>}
                   id="password"
                   type={this.state.showPass ? 'text' : 'password'}
                   name={"password"}
@@ -164,7 +164,7 @@ class ResetPassword extends Component {
                 />
 
                 <TextField
-                  label={<Typography style={{fontSize: 12, fontFamily: 'Nunito Sans, sans-serif'}}>Ulangi Kata Sandi Baru *</Typography>}
+                  label={<Typography style={{fontSize: 12, fontFamily: 'Nunito Sans, sans-serif'}}>Repeat New Password *</Typography>}
                   id="confirmPassword"
                   type={this.state.showPass2 ? 'text' : 'password'}
                   name={"confirmPassword"}
@@ -191,7 +191,7 @@ class ResetPassword extends Component {
                 />
 
                 <Button name="submit" variant="contained" disabled={this.state.password.trim() == '' && this.state.confirmPassword.trim() == '' ? true : false} onClick={() => this.validateReset()} style={{ marginTop: 50,  width: '100%', height: 35, borderRadius: 4, color: this.state.password.trim() == '' && this.state.confirmPassword.trim() == '' ? '#4b4b4b' : '#fff', backgroundColor: this.state.password.trim() == '' && this.state.confirmPassword.trim() == '' ? '#d8d8d8' : '#51c6ea' }}>
-                  <Typography style={{fontSize: 12, fontFamily: 'Nunito Sans, sans-serif'}}>Lanjut</Typography>
+                  <Typography style={{fontSize: 12, fontFamily: 'Nunito Sans, sans-serif'}}>Reset Password</Typography>
                 </Button>
               </div>
           </div>