balance sheet ++

src/api/index.js

@@ -132,6 +132,7 @@ 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 getReportTypeBody = (body) => api.post('report/get_all_report', body)
   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)
@@ -248,7 +249,8 @@ const create = (baseURL = 'https://tia.eksad.com/tia-reporting-dev/public/') =>
     getUnitBisnisActive,
     getMenuByUser,
     getDetailUnitBisnis,
-    uploadFoto
+    uploadFoto,
+    getReportTypeBody
   }
 }
 

src/assets/Images.js

@@ -45,7 +45,8 @@ const Images = {
     setting: require('./logout.png'),
     failedCopy: require('./failed-copy.svg'),
     triputraLogo: require('./triputra-logo.png'),
-    photo: require('./photo.svg')
+    photo: require('./photo.svg'),
+    camera: require('./camera.svg')
 
 }
 

src/assets/camera.svg

+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="13" viewBox="0 0 14 13">
+    <g fill="none" fill-rule="evenodd">
+        <path d="M0 0H24V24H0z" transform="translate(-5 -6)"/>
+        <g transform="translate(-5 -6) translate(5 6)">
+            <path fill="#FFF" d="M7.664 0c1.086 0 2 .743 2.259 1.749L11 1.75c1.657 0 3 1.343 3 3v4.5c0 1.657-1.343 3-3 3H3c-1.657 0-3-1.343-3-3v-4.5c0-1.657 1.343-3 3-3l1.074-.001C4.334.743 5.247 0 6.334 0h1.33z"/>
+            <circle cx="7" cy="7" r="3" fill="#019CE5"/>
+        </g>
+    </g>
+</svg>

src/container/BudgetTahunan.js

@@ -29,11 +29,15 @@ export default class BudgetTahunan extends Component {
 
     componentDidMount() {
         this.getCompanyActive()
-        this.getReport()
     }
 
     getReport() {
-        api.create().getReportType().then(response => {
+        let payload = {
+            "company_id": this.state.company.company_id,
+            "periode": this.state.periode,
+            "revisi": this.state.periode
+        }
+        api.create().getReportTypeBody(payload).then(response => {
             if (response.data) {
                 if (response.data.status === "success") {
 
@@ -65,7 +69,7 @@ export default class BudgetTahunan extends Component {
                     options: companyData,
                     getOptionLabel: (option) => titleCase(option.company_name),
                 };
-                this.setState({ listCompany: defaultProps, company: companyData[0] })
+                this.setState({ listCompany: defaultProps, company: companyData[0] }, ()=> this.getReport())
             } else {
                 alert(response.data.message)
             }
@@ -297,7 +301,7 @@ export default class BudgetTahunan extends Component {
                 {this.state.visibleBS && (
                     <BalanceSheet
                         report_id={this.state.report_id}
-                        company_id={this.state.company.company_id}
+                        company={this.state.company}
                         onClickClose={()=> this.setState({ visibleBS: false, visibleBudgetTahunan: true})}
                     />
                 )}

src/container/BudgetTahunan/BalanceSheet.js

@@ -26,16 +26,16 @@ export default class BalanceSheet extends Component {
         super(props)
         this.state = {
             dataTable: [
-                ["TOTAL ASSETS", "11,247,249", "10,702,196"],
-                ["TOTAL CURRENT ASSETS", "2,647,647", "2,058,898"],
-                ["Cash & Cash Equivalent", "1,464,571", "729,743"],
-                ["Cash & Bank Balance", "938,707", "265,584"],
-                ["Time & Call Deposit", "525,864", "464,159"],
-                ["BI Deposit", "", ""],
-                ["Marketable Securities", "150,250", "154,500"],
-                ["Notes Receivable", "", ""],
-                ["Accounts Receivable", "172,031", "97,112"],
-                ["Trade Receivables - Third Party", "142,668", "77,480"],
+                // ["TOTAL ASSETS", "11,247,249", "10,702,196"],
+                // ["TOTAL CURRENT ASSETS", "2,647,647", "2,058,898"],
+                // ["Cash & Cash Equivalent", "1,464,571", "729,743"],
+                // ["Cash & Bank Balance", "938,707", "265,584"],
+                // ["Time & Call Deposit", "525,864", "464,159"],
+                // ["BI Deposit", "", ""],
+                // ["Marketable Securities", "150,250", "154,500"],
+                // ["Notes Receivable", "", ""],
+                // ["Accounts Receivable", "172,031", "97,112"],
+                // ["Trade Receivables - Third Party", "142,668", "77,480"],
             ]
         }
     }
@@ -48,10 +48,56 @@ export default class BalanceSheet extends Component {
     getItemHierarki() {
         let payload = {
             "report_id": this.props.report_id,
-            "company_id": this.props.company_id
+            "company_id": this.props.company.company_id
         }
         api.create().getItemReportHierarki(payload).then(response => {
             console.log(response);
+            if (response.data) {
+                if (response.data.status === "success") {
+                    let dataTable = []
+                    response.data.data.map((item, index) => {
+                        if (item.children.length > 0) {
+                            dataTable.push([
+                                item.level,
+                                item.description
+                            ])
+                            item.children.map(i => {
+                                if (i.children) {
+                                    if (i.children.length > 0) {
+                                        dataTable.push([
+                                            i.level,
+                                            i.description
+                                        ])
+                                        i.children.map(val => {
+                                            dataTable.push([
+                                                val.level,
+                                                val.description
+                                            ])
+                                        })
+                                    } else {
+                                        dataTable.push([
+                                            i.level,
+                                            i.description
+                                        ])
+                                    }
+                                } else {
+                                    dataTable.push([
+                                        i.level,
+                                        i.description
+                                    ])
+                                }
+                            })
+                        } else {
+                            dataTable.push([
+                                item.level,
+                                item.description
+                            ])
+                        }
+                    })
+                    console.log(dataTable);
+                    this.setState({ dataTable })
+                }
+            }
         })
     }
 
@@ -67,6 +113,11 @@ export default class BalanceSheet extends Component {
 
     render() {
         const columns = [{
+            name: "",
+            options: {
+                display: false
+            }
+        }, {
             name: "Account",
             options: {
                 customHeadRender: (columnMeta) => (
@@ -78,12 +129,12 @@ export default class BalanceSheet extends Component {
                 customBodyRender: (val, tableMeta) => {
                     return (
                         <div style={{ width: 388 }}>
-                            {tableMeta.rowIndex == 0 || tableMeta.rowIndex == 1 ?
-                                <span style={{ fontSize: 12, fontWeight: 'bold' }}>{val}</span>
+                            {tableMeta.rowData[0] == 0 ?
+                                <span style={{ fontSize: 12, fontWeight: 'bold' }}>{String(val).toUpperCase()}</span>
                                 :
-                                tableMeta.rowIndex == 2 || tableMeta.rowIndex == 6 || tableMeta.rowIndex == 7 || tableMeta.rowIndex == 8 ?
-                                    <span style={{ fontSize: 12, marginLeft: 10 }}>{val}</span> :
-                                    <span style={{ fontSize: 12, marginLeft: 20 }}>{val}</span>
+                                tableMeta.rowData[0] === 1?
+                                    <span style={{ fontSize: 12, marginLeft: 20 }}>{val}</span> :
+                                    <span style={{ fontSize: 12, marginLeft: 40 }}>{val}</span>
                             }
                         </div>
                     )
@@ -299,7 +350,7 @@ export default class BalanceSheet extends Component {
                         </div>
                         <div style={{ padding: 20 }}>
                             <div>
-                                <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>PT. XYZ</Typography>
+                                <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>{this.props.company.company_name}</Typography>
                                 <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>Periode : 2021</Typography>
                                 <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>in IDR mn</Typography>
                             </div>
@@ -316,8 +367,8 @@ export default class BalanceSheet extends Component {
                         </div>
                         <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' }}>
                                 <button
+                                    className="button"
                                     type="button"
                                     style={{
                                         backgroundColor: 'transparent',
@@ -326,9 +377,10 @@ export default class BalanceSheet extends Component {
                                     }}
                                     onClick={() => this.props.onClickClose()}
                                 >
+                                    <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>
                                     </div>
+                                </button>
                             </div>
                             <div className="col-2" style={{ display: 'flex', justifyContent: 'flex-end', maxWidth: '100%' }}>
                                 <div style={{ backgroundColor: '#fff', width: 105, height: 25, borderRadius: 3, justifyContent: 'center', display: 'flex', alignItems: 'center', border: 'solid 1px #354960', marginRight: 20 }}>

src/container/Home.js

@@ -347,7 +347,7 @@ export default function MiniDrawer() {
           })
           setApplication(app)
           setSetting(set)
-          console.log(app);
+          console.log(set);
         } else {
           localStorage.removeItem(Constant.TOKEN)
           window.location.reload();
@@ -491,7 +491,7 @@ export default function MiniDrawer() {
             </div>
           </div>
         }
-        {open &&
+        {open && application.length > 0 &&
           <div style={{ marginLeft: 20, marginTop: 10 }}>
             <Typography style={{ color: '#525355', fontSize: 14, fontFamily: 'Nunito Sans, sans-serif' }}>Application</Typography>
           </div>
@@ -539,7 +539,7 @@ export default function MiniDrawer() {
             </div>
           ))}
         </List>
-        {open &&
+        {open && setting.length > 0 &&
           <div style={{ marginLeft: 20 }}>
             <Typography style={{ color: '#525355', fontSize: 14, fontFamily: 'Nunito Sans, sans-serif' }}>Setting</Typography>
           </div>

src/container/MasterData/Parameter/CreateParameter.js

@@ -334,25 +334,25 @@ export default class CreateParameter extends Component {
 
     validasi() {
         if (R.isNil(this.state.getTypes)) {
-            this.setState({ errorGroup: true, msgErrorGroup: 'Group is required' })
+            this.setState({ errorGroup: true, msgErrorGroup: 'Group is required.' })
         } else if (R.isNil(this.state.getParameter)) {
-            this.setState({ errorParameter: true, msgErrorParameter: 'Parameter is required' })
+            this.setState({ errorParameter: true, msgErrorParameter: 'Parameter is required.' })
         } else if (R.isNil(this.state.getPerusahaan)) {
-            this.setState({ errorPerusahaan: true, msgErrorPerusahaan: 'Company is required' })
+            this.setState({ errorPerusahaan: true, msgErrorPerusahaan: 'Company is required.' })
             // } else if (R.isEmpty(this.state.tempData.description)) {
             //     this.setState({ errorDeskripsi: true, msgErrorDeskripsi: 'Deskripsi tidak boleh kosong' })
             // } else if (R.isEmpty(this.state.tempData.value)) {
             //     this.setState({ errorValue: true, msgErrorValue: 'Value tidak boleh kosong' })
         } else if ((!R.isNil(this.state.tempData.max_value) && R.isNil(this.state.tempData.min_value)) || (!R.isNil(this.state.tempData.max_value) && R.isEmpty(this.state.tempData.min_value))) {
-            this.setState({ errorMinValue: true, msgErrorMinValue: 'Min Value is required' })
+            this.setState({ errorMinValue: true, msgErrorMinValue: 'Min value is required.' })
         } else if (R.isNil(this.state.tempData.start_date)) {
-            this.setState({ errorStartDate: true, msgErrorStartDate: 'Start Date is required' })
+            this.setState({ errorStartDate: true, msgErrorStartDate: 'Start date is required.' })
             // } else if (R.isNil(this.state.tempData.order)) {
             //     this.setState({ errorOrder: true, msgErrorOrder: 'Order tidak boleh kosong' })
         } else if (!R.isNil(this.state.tempData.min_value) && R.isNil(this.state.tempData.max_value)) {
-            this.setState({ errorMaxValue: true, msgErrorMaxValue: 'Max Value is required' })
+            this.setState({ errorMaxValue: true, msgErrorMaxValue: 'Max value is required.' })
         } else if (R.isNil(this.state.tempData.end_date)) {
-            this.setState({ errorEndDate: true, msgErrorEndDate: 'End Date is required' })
+            this.setState({ errorEndDate: true, msgErrorEndDate: 'End date is required.' })
         } else {
             this.updateParameter()
         }
@@ -360,25 +360,25 @@ export default class CreateParameter extends Component {
 
     validasiCreate() {
         if (R.isNil(this.state.getTypes)) {
-            this.setState({ errorGroup: true, msgErrorGroup: 'Group is required' })
+            this.setState({ errorGroup: true, msgErrorGroup: 'Group is required.' })
         } else if (R.isNil(this.state.getParameter)) {
-            this.setState({ errorParameter: true, msgErrorParameter: 'Parameter is required' })
+            this.setState({ errorParameter: true, msgErrorParameter: 'Parameter is required.' })
         } else if (R.isNil(this.state.getPerusahaan)) {
-            this.setState({ errorPerusahaan: true, msgErrorPerusahaan: 'Perusahaan is required' })
+            this.setState({ errorPerusahaan: true, msgErrorPerusahaan: 'Perusahaan is required.' })
             // } else if (R.isEmpty(this.state.description)) {
             //     this.setState({ errorDeskripsi: true, msgErrorDeskripsi: 'Deskripsi tidak boleh kosong' })
             // } else if (R.isNil(this.state.value)) {
             //     this.setState({ errorValue: true, msgErrorValue: 'Value tidak boleh kosong' })
         } else if (!R.isNil(this.state.maxValue) && R.isNil(this.state.minValue)) {
-            this.setState({ errorMinValue: true, msgErrorMinValue: 'Min Value is required' })
+            this.setState({ errorMinValue: true, msgErrorMinValue: 'Min value is required.' })
         } else if (R.isNil(this.state.startDate)) {
-            this.setState({ errorStartDate: true, msgErrorStartDate: 'Start Date is required' })
+            this.setState({ errorStartDate: true, msgErrorStartDate: 'Start date is required.' })
             // } else if (R.isNil(this.state.order)) {
             //     this.setState({ errorOrder: true, msgErrorOrder: 'Order tidak boleh kosong' })
         } else if (!R.isNil(this.state.minValue) && R.isNil(this.state.maxValue)) {
-            this.setState({ errorMaxValue: true, msgErrorMaxValue: 'Max Value is required' })
+            this.setState({ errorMaxValue: true, msgErrorMaxValue: 'Max value is required.' })
         } else if (R.isNil(this.state.endDate)) {
-            this.setState({ errorEndDate: true, msgErrorEndDate: 'End Date tidak boleh kosong' })
+            this.setState({ errorEndDate: true, msgErrorEndDate: 'End date is required' })
         } else {
             this.createParameter()
         }
@@ -614,11 +614,11 @@ export default class CreateParameter extends Component {
 
                             <div className="margin-top-10px" style={{ padding: 10, borderRadius: 5 }}>
                                 <div style={{ display: 'flex' }}>
-                                    <Typography style={{ fontSize: 11, width: '20%' }}>Created</Typography>
+                                    <Typography style={{ fontSize: 11, width: '25%' }}>Created By</Typography>
                                     <Typography style={{ fontSize: 11 }}>: {this.state.tempData === null ? "" : this.state.tempData.created}</Typography>
                                 </div>
                                 <div style={{ display: 'flex' }}>
-                                    <Typography style={{ fontSize: 11, width: '20%' }}>Updated</Typography>
+                                    <Typography style={{ fontSize: 11, width: '25%' }}>Updated By</Typography>
                                     <Typography style={{ fontSize: 11 }}>: {this.state.tempData === null ? "" : this.state.tempData.updated === null ? "" : this.state.tempData.updated}</Typography>
                                 </div>
                             </div>
@@ -958,8 +958,8 @@ export default class CreateParameter extends Component {
                             </div>
 
                             <div className="margin-top-10px" style={{ padding: 10, borderRadius: 5 }}>
-                                <Typography style={{ fontSize: 11 }}>Created	: </Typography>
-                                <Typography style={{ fontSize: 11 }}>Updated	: </Typography>
+                                <Typography style={{ fontSize: 11, width: '25%' }}>Created by	: </Typography>
+                                <Typography style={{ fontSize: 11, width: '25%' }}>Updated by	: </Typography>
                             </div>
                         </div>
 
@@ -1101,7 +1101,7 @@ export default class CreateParameter extends Component {
                                 onClick={() => this.validasiCreate()}
                             >
                                 <div style={{ width: 102, height: 30, backgroundColor: '#354960', borderRadius: 5, alignItems: 'center', display: 'flex', justifyContent: 'center' }}>
-                                    <span style={{ color: '#fff', fontSize: 11 }}>Simpan</span>
+                                    <span style={{ color: '#fff', fontSize: 11 }}>Save</span>
                                 </div>
                             </button>
                         </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: 'Business Unit is required' })
+            this.setState({ errorName: true, msgErrorName: 'Business unit is required.' })
         } else if (R.isEmpty(this.state.startDate)) {
-            this.setState({ errorStartDate: true, msgErrorStartDate: 'Start Date is required' })
+            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: 'End Date is required' })
+            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: 'Business Unit is required' })
+            this.setState({ errorName: true, msgErrorName: 'Business unit is required.' })
         } else if (R.isNil(this.state.startDate)) {
-            this.setState({ errorStartDate: true, msgErrorStartDate: 'Start Date is required' })
+            this.setState({ errorStartDate: true, msgErrorStartDate: 'Start date is required.' })
         } else if (R.isNil(this.state.endDate)) {
-            this.setState({ errorEndDate: true, msgErrorEndDate: 'End Date is required'})
+            this.setState({ errorEndDate: true, msgErrorEndDate: 'End date is required.'})
         } else {
             let payload = {
                 "business_unit_name": this.state.name,
@@ -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%' }}>Created</Typography>
+                                    <Typography style={{ fontSize: 11, width: '25%' }}>Created By</Typography>
                                     <Typography style={{ fontSize: 11 }}>: {this.state.created}</Typography>
                                 </div>
                                 <div style={{ display: 'flex' }}>
-                                    <Typography style={{ fontSize: 11, width: '20%' }}>Updated</Typography>
+                                    <Typography style={{ fontSize: 11, width: '25%' }}>Updated By</Typography>
                                     <Typography style={{ fontSize: 11 }}>: {this.state.updated}</Typography>
                                 </div>
                             </div>
@@ -311,7 +311,7 @@ export default class CreateUnitBisnis extends Component {
                                 onClick={() => this.validasi()}
                             >
                                 <div style={{ width: 102, height: 30, backgroundColor: '#354960', borderRadius: 5, alignItems: 'center', display: 'flex', justifyContent: 'center' }}>
-                                    <span style={{ color: '#fff', fontSize: 11 }}>Simpan</span>
+                                    <span style={{ color: '#fff', fontSize: 11 }}>Save</span>
                                 </div>
                             </button>
                         </div>
@@ -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 }}>Created    : </Typography>
-                                <Typography style={{ fontSize: 11 }}>Updated    : </Typography>
+                                <Typography style={{ fontSize: 11, width: '25%' }}>Created By : </Typography>
+                                <Typography style={{ fontSize: 11, width: '25%' }}>Updated By : </Typography>
                             </div>
                         </div>
 
@@ -494,7 +494,7 @@ export default class CreateUnitBisnis extends Component {
                                 onClick={() => this.validasiCreate()}
                             >
                                 <div style={{ width: 102, height: 30, backgroundColor: '#354960', borderRadius: 5, alignItems: 'center', display: 'flex', justifyContent: 'center' }}>
-                                    <span style={{ color: '#fff', fontSize: 11 }}>Simpan</span>
+                                    <span style={{ color: '#fff', fontSize: 11 }}>Save</span>
                                 </div>
                             </button>
                         </div>