Merge branch 'riri' into 'master'

apdate banyak

See merge request !199

src/container/EmailVerification.js

@@ -18,7 +18,7 @@ class EmailVerification extends Component {
     }
     render() {
         return (
-          <div style={{ flex: 1, display: 'flex', backgroundColor: '#152d40', height: '100vh', justifyContent: 'center', alignItems: 'center' }}>
+          <div style={{ flex: 1, display: 'flex', backgroundColor: '#263b80', height: '100vh', justifyContent: 'center', alignItems: 'center' }}>
               <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} />
 

src/container/ForgotPassword.js

@@ -75,14 +75,14 @@ class ForgotPassword extends Component {
 
     render() {
         return (
-          <div style={{ flex: 1, display: 'flex', backgroundColor: '#152d40', height: '100vh', justifyContent: 'center', alignItems: 'center' }}>
+          <div style={{ flex: 1, display: 'flex', backgroundColor: '#263b80', height: '100vh', justifyContent: 'center', alignItems: 'center' }}>
             <Snackbar open={this.state.alert} autoHideDuration={6000} onClose={() => this.closeAlert()}>
                 <Alert onClose={() => this.closeAlert()} severity={this.state.tipeAlert}>
                     {this.state.messageAlert}
                 </Alert>
             </Snackbar>
               <div style={{padding: 60, display: 'flex', flexDirection: 'column', width: (this.state.msgEmail.length > 45 ? 403 : 378), height: 351, borderRadius: 12, boxShadow: '0 2 4 0 rgba(0, 0, 0, 0.2)', backgroundColor: '#ffffff', justifyContent: 'center', alignItems: 'center' }}>
-                <img src={Images.tia} />
+              <img src={Images.triputraBlack} style={{ height: 59, width: 175, alignSelf: 'center'}} />
 
                 <TextField
                     label={<Typography style={{fontSize: 12, fontFamily: 'Nunito Sans, sans-serif'}}>Email *</Typography>}

src/container/MasterData/formReportItems/EditReportItems.js

@@ -286,6 +286,7 @@ export default class EditReportItems extends Component {
 
     getParent() {
         if (this.state.reportType !== null && this.state.company !== null) {
+            console.log(this.state.tempData.item_report_id)
             let payload = {
                 "report_id": this.state.reportType.report_id,
                 "company_id": this.state.company.company_id
@@ -295,12 +296,21 @@ export default class EditReportItems extends Component {
                 if (response.data) {
                     if (response.data.status === 'success') {
                         let data = response.data.data
-                        let parentData = data.map((item) => {
-                            return {
-                                item_report_id: item.item_report_id,
-                                description: item.description
+                        let currentIndex = null
+                        let parentData = data.map((item, index) => {
+                            if (this.state.tempData.item_report_id !== item.item_report_id) {
+                                return {
+                                    item_report_id: item.item_report_id,
+                                    description: item.description
+                                }
+                            } else {
+                                currentIndex = index
                             }
                         })
+                        if (currentIndex !== null) {
+                            parentData.splice(currentIndex, 1)
+                        }
+                        console.log(parentData)
                         let defaultProps = {
                             options: parentData,
                             getOptionLabel: (option) => titleCase(option.description),

src/container/ResetPassword.js

@@ -133,14 +133,14 @@ class ResetPassword extends Component {
 
   render() {
     return (
-      <div style={{ flex: 1, display: 'flex', backgroundColor: '#152d40', height: '100vh', justifyContent: 'center', alignItems: 'center' }}>
+      <div style={{ flex: 1, display: 'flex', backgroundColor: '#263b80', height: '100vh', justifyContent: 'center', alignItems: 'center' }}>
         <Snackbar open={this.state.alert} autoHideDuration={6000} onClose={() => this.closeAlert()}>
           <Alert onClose={() => this.closeAlert()} severity={this.state.tipeAlert}>
             {this.state.messageAlert}
           </Alert>
         </Snackbar>
         <div style={{ padding: 56, display: 'flex', flexDirection: 'column', width: 378, height: 415, borderRadius: 12, boxShadow: '0 2 4 0 rgba(0, 0, 0, 0.2)', backgroundColor: '#ffffff', justifyContent: 'center', alignItems: 'center' }}>
-          <img src={Images.tia} />
+        <img src={Images.triputraBlack} style={{ height: 59, width: 175, alignSelf: 'center'}} />
 
           <TextField
             label={<Typography style={{ fontSize: 12, fontFamily: 'Nunito Sans, sans-serif' }}>New password *</Typography>}

src/container/SetPassword.js

@@ -133,14 +133,14 @@ class SetPassword extends Component {
 
   render() {
     return (
-      <div style={{ flex: 1, display: 'flex', backgroundColor: '#152d40', height: '100vh', justifyContent: 'center', alignItems: 'center' }}>
+      <div style={{ flex: 1, display: 'flex', backgroundColor: '#263b80', height: '100vh', justifyContent: 'center', alignItems: 'center' }}>
         <Snackbar open={this.state.alert} autoHideDuration={6000} onClose={() => this.closeAlert()}>
           <Alert onClose={() => this.closeAlert()} severity={this.state.tipeAlert}>
             {this.state.messageAlert}
           </Alert>
         </Snackbar>
         <div style={{ padding: 56, display: 'flex', flexDirection: 'column', width: 378, height: 415, borderRadius: 12, boxShadow: '0 2 4 0 rgba(0, 0, 0, 0.2)', backgroundColor: '#ffffff', justifyContent: 'center', alignItems: 'center' }}>
-          <img src={Images.tia} />
+        <img src={Images.triputraBlack} style={{ height: 59, width: 175, alignSelf: 'center'}} />
 
           <TextField
             label={<Typography style={{ fontSize: 12, fontFamily: 'Nunito Sans, sans-serif' }}>New password *</Typography>}