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

src/container/BudgetTahunan.js

@@ -9,6 +9,7 @@ import { titleCase } from '../library/Utils';
 import ProfitLoss from './BudgetTahunan/ProfitLoss';
 import TaxPlanning from './BudgetTahunan/TaxPlanning';
 import FixedAssetsMovement from './BudgetTahunan/FixedAssetsMovement';
+import CorporateAnnualTarget from './BudgetTahunan/CorporateAnnualTarget';
 
 export default class BudgetTahunan extends Component {
     constructor(props) {
@@ -23,7 +24,8 @@ export default class BudgetTahunan extends Component {
             company: null,
             report_id: null,
             visiblePL: false,
-            visibleFAM: false
+            visibleFAM: false,
+            visibleCAT: false
         }
     }
 
@@ -114,6 +116,15 @@ export default class BudgetTahunan extends Component {
                 visibleFAM: true,
                 visibleTP: false
             })
+        } else if (item === 'CAT') {
+            this.setState({ 
+                visibleBudgetTahunan: false, 
+                visibleBS: false,
+                visiblePL: false,
+                visibleCAT: true,
+                visibleFAM: false,
+                visibleTP: false
+            })
         }
     }
 
@@ -306,7 +317,12 @@ export default class BudgetTahunan extends Component {
                     />
                 )}
                 {this.state.visiblePL && (
-                    <ProfitLoss />
+                    <ProfitLoss 
+                        report_id={this.state.report_id}
+                        company={this.state.company}
+                        onClickClose={()=> this.setState({ visiblePL: false, visibleBudgetTahunan: true})}
+                    />
+                    
                 )}
                 {this.state.visibleTP && (
                     <TaxPlanning 
@@ -316,7 +332,14 @@ export default class BudgetTahunan extends Component {
                     />
                 )}
                 {this.state.visibleFAM && (
-                    <FixedAssetsMovement />
+                    <FixedAssetsMovement 
+                    onClickClose={() => this.setState({ visibleFAM: false, visibleBudgetTahunan: true })}
+                    />
+                )}
+                {this.state.visibleCAT && (
+                    <CorporateAnnualTarget 
+                    onClickClose={() => this.setState({ visibleCAT: false, visibleBudgetTahunan: true })}
+                    />
                 )}
             </div >
         );

src/container/MasterData/formReportItems/CreateReportItems.js

@@ -350,7 +350,7 @@ export default class CreateReportItems extends Component {
                     <div className="popup-panel grid grid-2x main-color" style={{ height: 64, borderTopRightRadius: 8, borderTopLeftRadius: 8 }}>
                         <div className="col-1" style={{ maxWidth: "inherit", display: 'flex', alignItems: 'center' }}>
                             <div className="popup-title">
-                                <span style={{ color: '#fff', fontSize: 16, fontWeight: 'bold' }}>Add Data</span>
+                                <span style={{ color: '#fff', fontSize: 16, fontWeight: 'bold' }}>Create Data</span>
                             </div>
                         </div>
                         <div className="col-2 content-right" style={{ maxWidth: "inherit", alignSelf: 'center' }}>
@@ -431,7 +431,7 @@ export default class CreateReportItems extends Component {
                                     debug
                                     renderInput={(params) =>
                                         <TextField {...params}
-                                            label="Company"
+                                            label="Company Name"
                                             InputLabelProps={{
                                                 style: {
                                                     fontSize: 11,
@@ -830,16 +830,14 @@ export default class CreateReportItems extends Component {
                         </div>
                     </div>
 
-                    <div className="grid grid-2x grid-mobile-none gap-15px" style={{ paddingBottom: 20, paddingLeft: 20, paddingRight: 20 }}>
-                        <div className="column-1">
-                            <div className="margin-top-10px" style={{ padding: 10, borderRadius: 5 }}>
-                                <div style={{ display: 'flex' }}>
-                                    <Typography style={{ fontSize: 11 }}>Created By :</Typography>
-                                </div>
-                                <div style={{ display: 'flex' }}>
-                                    <Typography style={{ fontSize: 11 }}>Updated By :</Typography>
-                                </div>
-                            </div>
+                    <div className="margin-top-10px" style={{ padding: 20}}>
+                        <div style={{ display: 'flex' }}>
+                            <Typography style={{ fontSize: 11, width: '13%' }}>Created By</Typography>
+                            <Typography style={{ fontSize: 11 }}>: </Typography>
+                        </div>
+                        <div style={{ display: 'flex' }}>
+                            <Typography style={{ fontSize: 11, width: '13%' }}>Updated By</Typography>
+                            <Typography style={{ fontSize: 11 }}>: </Typography>
                         </div>
                     </div>
 

src/container/MasterData/formReportItems/EditReportItems.js

@@ -421,7 +421,7 @@ export default class EditReportItems extends Component {
                                     debug
                                     renderInput={(params) =>
                                         <TextField {...params}
-                                            label="Company"
+                                            label="Company Name"
                                             InputLabelProps={{
                                                 style: {
                                                     fontSize: 11,
@@ -789,11 +789,11 @@ export default class EditReportItems extends Component {
                     <div className="margin-top-10px" style={{ padding: 20}}>
                         <div style={{ display: 'flex' }}>
                             <Typography style={{ fontSize: 11, width: '13%' }}>Created By</Typography>
-                            <Typography style={{ fontSize: 11 }}>: {this.state.tempData === null ? "" : this.state.tempData.created}</Typography>
+                            <Typography style={{ fontSize: 11 }}>:  {this.state.tempData === null ? "" : this.state.tempData.created}</Typography>
                         </div>
                         <div style={{ display: 'flex' }}>
                             <Typography style={{ fontSize: 11, width: '13%' }}>Updated By</Typography>
-                            <Typography style={{ fontSize: 11 }}>: {this.state.tempData === null ? "" : this.state.tempData.updated}</Typography>
+                            <Typography style={{ fontSize: 11 }}>:  {this.state.tempData === null ? "" : this.state.tempData.updated}</Typography>
                         </div>
                     </div>
 

src/container/MasterData/formUnitBisnis/CreateUnitBisnis.js

@@ -112,11 +112,11 @@ export default class CreateUnitBisnis extends Component {
 
     validasi() {
         if (R.isEmpty(this.state.name)) {
-            this.setState({ errorName: true, msgErrorName: 'Business unit is required.' })
+            this.setState({ errorName: true, msgErrorName: 'Business unit Cannot be Empty.' })
         } else if (R.isEmpty(this.state.startDate)) {
-            this.setState({ errorStartDate: true, msgErrorStartDate: 'Start date is required.' })
+            this.setState({ errorStartDate: true, msgErrorStartDate: 'Start date Cannot be Empty.' })
         } else if (R.isEmpty(this.state.endDate) || this.state.endDate === null) {
-            this.setState({ errorEndDate: true, msgErrorEndDate: 'End date is required.' })
+            this.setState({ errorEndDate: true, msgErrorEndDate: 'End date Cannot be Empty.' })
         } else {
             let payload = {
                 "business_unit_id": this.state.id,
@@ -130,11 +130,11 @@ export default class CreateUnitBisnis extends Component {
 
     validasiCreate() {
         if (R.isEmpty(this.state.name)) {
-            this.setState({ errorName: true, msgErrorName: 'Business unit is required.' })
+            this.setState({ errorName: true, msgErrorName: 'Business unit Cannot be Empty.' })
         } else if (R.isNil(this.state.startDate)) {
-            this.setState({ errorStartDate: true, msgErrorStartDate: 'Start date is required.' })
+            this.setState({ errorStartDate: true, msgErrorStartDate: 'Start date Cannot be Empty.' })
         } else if (R.isNil(this.state.endDate)) {
-            this.setState({ errorEndDate: true, msgErrorEndDate: 'End date is required.' })
+            this.setState({ errorEndDate: true, msgErrorEndDate: 'End date Cannot be Empty.' })
         } else {
             let payload = {
                 "business_unit_name": this.state.name,

src/container/Profile.js

@@ -78,7 +78,7 @@ export default class Profile extends Component {
 
     validasi() {
         if (this.state.oldPassword == "") {
-            this.setState({ errorOldPassword: true, msgOldPassword: 'Old password is required.' })
+            this.setState({ errorOldPassword: true, msgOldPassword: 'Old password Cannot be Empty.' })
         } else if (this.state.oldPassword.length < 8) {
             this.setState({ errorOldPassword: true, msgOldPassword: 'Old password minimum 8 characters.' })
         } else if (this.isEmail(this.state.oldPassword)) {
@@ -86,7 +86,7 @@ export default class Profile extends Component {
         } else if (!this.isRegex(this.state.oldPassword)) {
             this.setState({ errorOldPassword: true, msgOldPassword: 'Old password must be a combination of characters, letters and numbers.' })
         } else if (this.state.password.trim() == "") {
-            this.setState({ errorPassword: true, msgPassword: 'Password is required.' })
+            this.setState({ errorPassword: true, msgPassword: 'Password Cannot be Empty.' })
         } else if (this.state.password.length < 8) {
             this.setState({ errorPassword: true, msgPassword: 'Password minimum 8 characters.' })
         } else if (this.isEmail(this.state.password)) {
@@ -94,7 +94,7 @@ export default class Profile extends Component {
         } else if (!this.isRegex(this.state.password)) {
             this.setState({ errorPassword: true, msgPassword: 'Password must be a combination of characters, letters and numbers.' })
         } else if (this.state.confirmPassword.trim() == "") {
-            this.setState({ errorConfirmPassword: true, msgConfirmPassword: 'Password confirmation is required.' })
+            this.setState({ errorConfirmPassword: true, msgConfirmPassword: 'Password confirmation Cannot be Empty.' })
         } else if (this.state.confirmPassword.length < 8) {
             this.setState({ errorConfirmPassword: true, msgConfirmPassword: 'Password confirmation of at least 8 characters.' })
         } else if (this.isEmail(this.state.confirmPassword)) {