Merge branch 'riri' into 'master'

update

See merge request !107

src/api/index.js

@@ -119,8 +119,10 @@ const create = (baseURL = 'https://tia.eksad.com/tia-reporting-dev/public/') =>
   const getReportItems = () => api.get('item_report/get_all_item_report')
   const getInputType = () => api.get('type_report/get_all_type_report')
   const getReportType = () => api.get('report/get_all_report')
+  const getDetailReportItems = (userId) => api.get(`item_report/get_item_report_by_id/${userId}`)
   const searchReportItems = (body) => api.post('/item_report/search_item_report', body)
   const createReportItems = (body) => api.post('/item_report/create_item_report', body)
+  const updateReportItems = (body) => api.post('/item_report/update_item_report', body)
   const checkUploadReportItems = (body) => api.post('/item_report/check_import', body)
   const uploadReportItems = (body) => api.post('/item_report/import_item_report', body)
   const getItemReportHierarki = () => api.get('item_report/get_item_report_hierarki')
@@ -193,6 +195,8 @@ const create = (baseURL = 'https://tia.eksad.com/tia-reporting-dev/public/') =>
     getReportItems,
     searchReportItems,
     createReportItems,
+    updateReportItems,
+    getDetailReportItems,
     getInputType,
     getReportType,
     checkUploadReportItems,

src/container/MasterData/ReportItems.js

@@ -708,13 +708,13 @@ export default class ReportItems extends Component {
     ]
        
         return (
-            <div>
-                {this.state.itemReport === true ?
             <div style={{ height: this.props.height }}>
+                {/* <Row> */}
                 <div className={"main-color"} style={{ height: 199, width: '100%' }} />
+                {this.state.itemReport === true ?
                     <div>
                         <div style={{ display: 'flex', flexDirection: 'row', justifyContent: 'space-between', paddingRight: 25, paddingLeft: 25, marginTop: -150 }}>
-                                <label style={{ width: '20%', color: 'white', fontSize: 16, alignSelf: 'center', paddingTop: 8 }}>Master Data - Item Report</label>
+                            <label style={{ color: 'white', fontSize: 16, alignSelf: 'center', width: '20%', }}>Master Data - Item Report</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 }} />
                                 <InputBase
@@ -731,7 +731,6 @@ export default class ReportItems extends Component {
                                         backgroundColor: 'transparent',
                                         cursor: 'pointer',
                                         borderColor: 'transparent',
-                                            padding: 0,
                                         margin: 5
                                     }}
                                     onClick={() => this.downloadFile()}
@@ -794,7 +793,6 @@ export default class ReportItems extends Component {
                             </MuiThemeProvider>
                         </div>
                     </div>
-                    </div>
                 :    
                 this.state.visualisasi == true ?
                     <VisualReportItems

src/container/MasterData/formReportItems/CreateReportItems.js

@@ -24,7 +24,6 @@ export default class CreateReportItems extends Component {
             formula: '',
             realVal: '',
             condition: null,
-            inputValue: '', 
             date: new Date(),
             listInputType: null,
             listCompany: null,
@@ -137,7 +136,6 @@ export default class CreateReportItems extends Component {
         else {
             this.addReportItems()
         }
-
     }
 
     addReportItems() {