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

src/container/BudgetTahunan.js

@@ -287,6 +287,7 @@ export default class BudgetTahunan extends Component {
                     <BalanceSheet
                         report_id={this.state.report_id}
                         company_id={this.state.company.company_id}
+                        onClickClose={()=> this.setState({ visibleBS: false, visibleBudgetTahunan: true})}
                     />
                 )}
                 {this.state.visiblePL && (

src/container/BudgetTahunan/BalanceSheet.js

@@ -40,12 +40,12 @@ export default class BalanceSheet extends Component {
         }
     }
 
-    componentDidMount(){
+    componentDidMount() {
         this.getItemHierarki()
         console.log(this.props);
     }
 
-    getItemHierarki(){
+    getItemHierarki() {
         let payload = {
             "report_id": this.props.report_id,
             "company_id": this.props.company_id
@@ -60,7 +60,7 @@ export default class BalanceSheet extends Component {
         let a = data[tableMeta.rowIndex][tableMeta.columnIndex] = value
         this.setState({
             data: a
-        }, ()=> console.log(this.state.dataTable))
+        }, () => console.log(this.state.dataTable))
         // let a = data[0].tableMeta.tableData[tableMeta.rowIndex] === value
         // console.log(data)
     }
@@ -317,7 +317,17 @@ export default class BalanceSheet extends Component {
                         <div className="grid grid-2x">
                             <div className="col-1">
                                 <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>
+                                    <button
+                                        type="button"
+                                        style={{
+                                            backgroundColor: 'transparent',
+                                            cursor: 'pointer',
+                                            borderColor: 'transparent',
+                                        }}
+                                        onClick={() => this.props.onClickClose()}
+                                    >
+                                        <Typography style={{ fontSize: '11px', color: '#fff', textAlign: 'center' }}>Kembali</Typography>
+                                    </button>
                                 </div>
                             </div>
                             <div className="col-2" style={{ display: 'flex', justifyContent: 'flex-end', maxWidth: '100%' }}>

src/container/MasterData/Parameter/Parameter.js

@@ -566,7 +566,7 @@ export default class Parameter extends Component {
                 customBodyRender: (val, tableMeta) => {
                     return (
                         <div style={{ display: 'flex' }}>
-                            <span style={{ color: tableMeta.rowData[10] === "Aktif" ? "#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 >
                     );
                 }
@@ -577,7 +577,7 @@ export default class Parameter extends Component {
                 customBodyRender: (val, tableMeta) => {
                     return (
                         <div style={{ display: 'flex' }}>
-                            <span style={{ color: tableMeta.rowData[10] === "Aktif" ? "#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 >
                     );
                 }
@@ -588,7 +588,7 @@ export default class Parameter extends Component {
                 customBodyRender: (val, tableMeta) => {
                     return (
                         <div style={{ display: 'flex' }}>
-                            <span style={{ color: tableMeta.rowData[10] === "Aktif" ? "#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 >
                     );
                 }
@@ -599,7 +599,7 @@ export default class Parameter extends Component {
                 customBodyRender: (val, tableMeta) => {
                     return (
                         <div style={{ display: 'flex' }}>
-                            <span style={{ color: tableMeta.rowData[10] === "Aktif" ? "#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 >
                     );
                 }
@@ -610,7 +610,7 @@ export default class Parameter extends Component {
                 customBodyRender: (val, tableMeta) => {
                     return (
                         <div style={{ display: 'flex' }}>
-                            <span style={{ color: tableMeta.rowData[10] === "Aktif" ? "#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 >
                     );
                 }
@@ -621,7 +621,7 @@ export default class Parameter extends Component {
                 customBodyRender: (val, tableMeta) => {
                     return (
                         <div style={{ display: 'flex' }}>
-                            <span style={{ color: tableMeta.rowData[10] === "Aktif" ? "#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 >
                     );
                 }
@@ -632,7 +632,7 @@ export default class Parameter extends Component {
                 customBodyRender: (val, tableMeta) => {
                     return (
                         <div style={{ display: 'flex' }}>
-                            <span style={{ color: tableMeta.rowData[10] === "Aktif" ? "#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 >
                     );
                 }
@@ -643,7 +643,7 @@ export default class Parameter extends Component {
                 customBodyRender: (val, tableMeta) => {
                     return (
                         <div style={{ display: 'flex' }}>
-                            <span style={{ color: tableMeta.rowData[10] === "Aktif" ? "#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 >
                     );
                 }
@@ -654,7 +654,7 @@ export default class Parameter extends Component {
                 customBodyRender: (val, tableMeta) => {
                     return (
                         <div style={{ display: 'flex' }}>
-                            <span style={{ color: tableMeta.rowData[10] === "Aktif" ? "#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 >
                     );
                 }
@@ -665,7 +665,7 @@ export default class Parameter extends Component {
                 customBodyRender: (val, tableMeta) => {
                     return (
                         <div style={{ display: 'flex' }}>
-                            <span style={{ color: tableMeta.rowData[10] === "Aktif" ? "#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 >
                     );
                 }

src/container/MasterData/UnitBisnis.js

@@ -357,7 +357,7 @@ export default class UnitBisnis extends Component {
                 customBodyRender: (val, tableMeta) => {
                     return (
                         <div style={{ display: 'flex' }}>
-                            <span style={{ color: tableMeta.rowData[3] === "Aktif" ? "#656565" : 'rgba(0, 0, 0, 0.25)' }}>{val}</span>
+                            <span style={{ color: tableMeta.rowData[3] === "Active" ? "#656565" : 'rgba(0, 0, 0, 0.25)' }}>{val}</span>
                         </div >
                     );
                 }
@@ -368,7 +368,7 @@ export default class UnitBisnis extends Component {
                 customBodyRender: (val, tableMeta) => {
                     return (
                         <div style={{ display: 'flex' }}>
-                            <span style={{ color: tableMeta.rowData[3] === "Aktif" ? "#656565" : 'rgba(0, 0, 0, 0.25)' }}>{val}</span>
+                            <span style={{ color: tableMeta.rowData[3] === "Active" ? "#656565" : 'rgba(0, 0, 0, 0.25)' }}>{val}</span>
                         </div >
                     );
                 }
@@ -379,7 +379,7 @@ export default class UnitBisnis extends Component {
                 customBodyRender: (val, tableMeta) => {
                     return (
                         <div style={{ display: 'flex' }}>
-                            <span style={{ color: tableMeta.rowData[3] === "Aktif" ? "#656565" : 'rgba(0, 0, 0, 0.25)' }}>{val}</span>
+                            <span style={{ color: tableMeta.rowData[3] === "Active" ? "#656565" : 'rgba(0, 0, 0, 0.25)' }}>{val}</span>
                         </div >
                     );
                 }

src/container/MasterData/formUnitBisnis/CreateUnitBisnis.js

@@ -100,11 +100,11 @@ export default class CreateUnitBisnis extends Component {
 
     validasi() {
         if (R.isEmpty(this.state.name)) {
-            this.setState({ errorName: true, msgErrorName: 'Unit Bisnis tidak boleh kosong' })
+            this.setState({ errorName: true, msgErrorName: 'Business Unit is required' })
         } else if (R.isEmpty(this.state.startDate)) {
-            this.setState({ errorStartDate: true, msgErrorStartDate: 'Tanggal Mulai tidak boleh kosong' })
+            this.setState({ errorStartDate: true, msgErrorStartDate: 'Start Date is required' })
         } else if (R.isEmpty(this.state.endDate) || this.state.endDate === null) {
-            this.setState({ errorEndDate: true, msgErrorEndDate: 'Tanggal Berakhir tidak boleh kosong' })
+            this.setState({ errorEndDate: true, msgErrorEndDate: 'End Date is required' })
         } else {
             let payload = {
                 "business_unit_id": this.state.id,
@@ -118,11 +118,11 @@ export default class CreateUnitBisnis extends Component {
 
     validasiCreate() {
         if (R.isEmpty(this.state.name)) {
-            this.setState({ errorName: true, msgErrorName: 'Unit Bisnis tidak boleh kosong' })
+            this.setState({ errorName: true, msgErrorName: 'Business Unit is required' })
         } else if (R.isNil(this.state.startDate)) {
-            this.setState({ errorStartDate: true, msgErrorStartDate: 'Berlaku Mulai tidak boleh kosong' })
+            this.setState({ errorStartDate: true, msgErrorStartDate: 'Start Date is required' })
         } else if (R.isNil(this.state.endDate)) {
-            this.setState({ errorEndDate: true, msgErrorEndDate: 'Berkahir Hingga tidak boleh kosong' })
+            this.setState({ errorEndDate: true, msgErrorEndDate: 'End Date is required'})
         } else {
             let payload = {
                 "business_unit_name": this.state.name,
@@ -181,7 +181,7 @@ export default class CreateUnitBisnis extends Component {
                                 <DatePicker
                                     margin="normal"
                                     id="startDate"
-                                    label="Berlaku Mulai"
+                                    label="Start Date"
                                     format="dd MMMM yyyy"
                                     value={this.state.startDate}
                                     onChange={(e) => this.handleChange(e, 'start_date')}
@@ -228,11 +228,11 @@ export default class CreateUnitBisnis extends Component {
 
                             <div className="margin-top-10px" style={{ padding: 10, borderRadius: 5 }}>
                                 <div style={{ display: 'flex' }}>
-                                    <Typography style={{ fontSize: 11, width: '20%' }}>Dibuat</Typography>
+                                    <Typography style={{ fontSize: 11, width: '20%' }}>Created</Typography>
                                     <Typography style={{ fontSize: 11 }}>: {this.state.created}</Typography>
                                 </div>
                                 <div style={{ display: 'flex' }}>
-                                    <Typography style={{ fontSize: 11, width: '20%' }}>Diubah</Typography>
+                                    <Typography style={{ fontSize: 11, width: '20%' }}>Updated</Typography>
                                     <Typography style={{ fontSize: 11 }}>: {this.state.updated}</Typography>
                                 </div>
                             </div>
@@ -266,7 +266,7 @@ export default class CreateUnitBisnis extends Component {
                                 <DatePicker
                                     margin="normal"
                                     id="startDate"
-                                    label="Berakhir Hingga"
+                                    label="End Date"
                                     format="dd MMMM yyyy"
                                     error={this.state.errorEndDate}
                                     helperText={this.state.msgErrorEndDate}
@@ -369,7 +369,7 @@ export default class CreateUnitBisnis extends Component {
                                 <DatePicker
                                     margin="normal"
                                     id="startDate"
-                                    label="Berlaku Mulai"
+                                    label="Start Date"
                                     format="dd MMMM yyyy"
                                     value={this.state.startDate == "" ? null : this.state.startDate}
                                     onChange={(e) => this.handleChange(e, 'start_date')}
@@ -415,8 +415,8 @@ export default class CreateUnitBisnis extends Component {
                             </div>
 
                             <div className="margin-top-10px" style={{ padding: 10, borderRadius: 5 }}>
-                                <Typography style={{ fontSize: 11 }}>Dibuat	: </Typography>
-                                <Typography style={{ fontSize: 11 }}>Diubah	: </Typography>
+                                <Typography style={{ fontSize: 11 }}>Created    : </Typography>
+                                <Typography style={{ fontSize: 11 }}>Updated    : </Typography>
                             </div>
                         </div>
 
@@ -448,7 +448,7 @@ export default class CreateUnitBisnis extends Component {
                                 <DatePicker
                                     margin="normal"
                                     id="endDate"
-                                    label="Berakhir Hingga"
+                                    label="End Date"
                                     format="dd MMMM yyyy"
                                     error={this.state.errorEndDate}
                                     helperText={this.state.msgErrorEndDate}