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

src/container/MasterData/MasterDataCAT/CreateMasterDataCAT.js

@@ -186,9 +186,9 @@ export default class CreateMasterDataCAT extends Component {
         })
         console.log(jumlah)
         if ( jumlah > 100/100 ) {
-            this.setState({ errorWeight: true, msgErrorWeight: 'Weight more than 100 %' })
+            this.setState({ errorWeight: true, msgErrorWeight: 'Weight more than 100%' })
         } else if (jumlah < 100/100) {
-            this.setState({ errorWeight: true, msgErrorWeight: 'Weight less than 100 %' })
+            this.setState({ errorWeight: true, msgErrorWeight: 'Weight less than 100%' })
         }
         else {
             this.addReportItems(getData)

src/container/MasterData/MasterDataCAT/EditMasterDataCAT.js

@@ -196,9 +196,9 @@ export default class EditMasterDataCAT extends Component {
         })
         console.log(jumlah)
         if ( jumlah > 100/100 ) {
-            this.setState({ errorWeight: true, msgErrorWeight: 'Weight more than 100 %' })
+            this.setState({ errorWeight: true, msgErrorWeight: 'Weight more than 100%' })
         } else if (jumlah < 100/100) {
-            this.setState({ errorWeight: true, msgErrorWeight: 'Weight less than 100 %' })
+            this.setState({ errorWeight: true, msgErrorWeight: 'Weight less than 100%' })
         }
         else {
             this.addReportItems(getData)
@@ -314,7 +314,7 @@ export default class EditMasterDataCAT extends Component {
             // console.log(response);
             if (response.data) {
                 if (response.data.status === "success") {
-                    this.setState({ getParent: response.data.data.filter((val) => String(val.type_item_report_name).toLocaleLowerCase() != 'break'), created_by: response.data.data[0].created, updated_by: response.data.data[0].created_at }, () => {
+                    this.setState({ getParent: response.data.data.filter((val) => String(val.type_item_report_name).toLocaleLowerCase() != 'break'), created_by: response.data.data[0].created, updated_by: response.data.data[0].updated }, () => {
                         // console.log(this.state.getParent[0].created);
                         this.setState({ loading: false })
                     })
@@ -587,11 +587,11 @@ export default class EditMasterDataCAT extends Component {
 
                         <div className="margin-top-10px" style={{ paddingTop: 10, paddingBottom: 30, paddingRight: 30, paddingLeft: 30 }}>
                             <div style={{ display: 'flex' }}>
-                                <Typography style={{ fontSize: 11, width: '13%' }}>Created By :</Typography>
+                                <Typography style={{ fontSize: 11, width: '13%' }}>Created By</Typography>
                                 {!this.state.loading && <Typography style={{ fontSize: 11 }}>:  {this.state.created_by}</Typography>}
                             </div>
                             <div style={{ display: 'flex' }}>
-                                <Typography style={{ fontSize: 11, width: '13%' }}>Updated By :</Typography>
+                                <Typography style={{ fontSize: 11, width: '13%' }}>Updated By</Typography>
                                 {!this.state.loading && <Typography style={{ fontSize: 11 }}>:  {this.state.updated_by}</Typography>}
                             </div>
                         </div>