Skip to content

T
Tia-dev
Commit 5a4aad16 authored by EKSAD's avatar EKSAD
Browse files
Options

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

parents 5c922371 10d4bf81
Show whitespace changes
Inline Side-by-side
Showing with 246 additions and 209 deletions
src/api/index.js
View file @ 5a4aad16
......@@ -191,6 +191,7 @@ const create = (type = "") => {
const getPeriodeTransaction = () => api.get('transaction/get_periode')
const deleteAttachment = (id) => api.post(`transaction/delete_attachment/${id}`)
const getDetailReportMB = (body) => api.post('/transaction/master_budget/get_report_hierarki', body)
const getLastestUpdateMB = (body) => api.post('/transaction/master_budget/get_latest_update', body)
const createSubmitReport = (body) => api.post('transaction/master_budget/create_submission_report', body)
const getSubmission = (body) => api.post('transaction/get_submission_id', body)
const checkUploadMB = (body) => api.post('transaction/master_budget/check_import', body)
......@@ -348,7 +349,8 @@ const create = (type = "") => {
deleteAllItemReport,
validateSubmitReport,
checkUploadOperatingInd,
uploadOperatingInd
uploadOperatingInd,
getLastestUpdateMB
}
}
......
src/container/BudgetTahunan.js
View file @ 5a4aad16
......@@ -349,7 +349,7 @@ export default class BudgetTahunan extends Component {
render() {
const columns = ["#", "Jenis Laporan",
const columns = ["#", "Report Type",
{
name: "Revision",
options: {
......@@ -464,12 +464,12 @@ export default class BudgetTahunan extends Component {
{this.state.visibleBudgetTahunan && (
<div>
<div className={"main-color"} style={{ height: 78, display: 'flex', alignItems: 'center', paddingLeft: 20 }}>
<Typography style={{ fontSize: '16px', color: 'white' }}>Pengajuan Budget Tahunan</Typography>
<Typography style={{ fontSize: '16px', color: 'white' }}>Master Budget Submission</Typography>
</div>
<div style={{ padding: 20, width: '100%' }}>
<Paper style={{ paddingTop: 10 }}>
<div style={{ borderBottom: 'solid 1px #c4c4c4' }} >
<Typography style={{ fontSize: '12px', color: '#4b4b4b', margin: 10 }}>Budget Tahunan</Typography>
<Typography style={{ fontSize: '12px', color: '#4b4b4b', margin: 10 }}>Master Budget</Typography>
</div>
<div style={{ padding: 20 }}>
<div>
......@@ -484,7 +484,7 @@ export default class BudgetTahunan extends Component {
disableClearable
style={{ width: 250 }}
renderInput={(params) =>
<TextField {...params} label="Periode" margin="normal" style={{ marginTop: 7 }}
<TextField {...params} label="Period" margin="normal" style={{ marginTop: 7 }}
/>}
value={this.state.periode}
/>
......
src/container/BudgetTahunan/BalanceSheet.js
View file @ 5a4aad16
......@@ -44,7 +44,8 @@ export default class BalanceSheet extends Component {
disabledSave: true,
editable: false,
buttonError: false,
judulColumn: null
judulColumn: null,
updateBy: '-'
}
this.handleValue = this.handleValue.bind(this)
this.fileHandler = this.fileHandler.bind(this);
......@@ -52,9 +53,29 @@ export default class BalanceSheet extends Component {
componentDidMount() {
this.getItemHierarki()
this.getLatestUpdate()
console.log(this.props);
}
getLatestUpdate() {
let payload = {
"report_id": this.props.report_id,
"revision": Number(this.props.revision),
"periode": this.props.periode,
"company_id": this.props.company.company_id,
"submission_id": this.props.submissionID
}
api.create().getLastestUpdateMB(payload).then(response => {
if (response.data) {
if (response.data.status === "success") {
this.setState({
updateBy: response.data.data.latest_update === null ? '-' : response.data.data.latest_update
})
}
}
})
}
getItemHierarki() {
this.setState({ loading: true, judulColumn: null })
let payload = {
......@@ -177,22 +198,22 @@ export default class BalanceSheet extends Component {
this.state.dataTable.map(i => {
data.push({
item_report_id: i[1],
total_actual_before: String(i[6]),
january: String(i[7]),
february: String(i[8]),
march: String(i[9]),
april: String(i[10]),
may: String(i[11]),
june: String(i[12]),
july: String(i[13]),
august: String(i[14]),
september: String(i[15]),
october: String(i[16]),
november: String(i[17]),
december: String(i[18]),
total_current_year: String(i[19]),
total_next_year: String(i[20]),
total_more_year: String(i[21])
total_actual_before: String(Number(i[6]).toFixed(1)),
january: String(Number(i[7]).toFixed(1)),
february: String(Number(i[8]).toFixed(1)),
march: String(Number(i[9]).toFixed(1)),
april: String(Number(i[10]).toFixed(1)),
may: String(Number(i[11]).toFixed(1)),
june: String(Number(i[12]).toFixed(1)),
july: String(Number(i[13]).toFixed(1)),
august: String(Number(i[14]).toFixed(1)),
september: String(Number(i[15]).toFixed(1)),
october: String(Number(i[16]).toFixed(1)),
november: String(Number(i[17]).toFixed(1)),
december: String(Number(i[18]).toFixed(1)),
total_current_year: String(Number(i[19]).toFixed(1)),
total_next_year: String(Number(i[20]).toFixed(1)),
total_more_year: String(Number(i[21]).toFixed(1))
})
})
let payload = {
......@@ -218,7 +239,7 @@ export default class BalanceSheet extends Component {
let url = window.URL.createObjectURL(res);
let a = document.createElement('a');
a.href = url;
a.download = 'Template Balance Sheet.xlsx';
a.download = 'Template Master Budget Balance Sheet.xlsx';
a.click();
}
}
......@@ -319,27 +340,27 @@ export default class BalanceSheet extends Component {
})
}
uploadBalanceSheet() {
uploadBalanceSheet(type) {
let data = []
this.state.dataTable.map(i => {
data.push({
item_report_id: i[1],
total_actual_before: String(i[6]),
january: String(i[7]),
february: String(i[8]),
march: String(i[9]),
april: String(i[10]),
may: String(i[11]),
june: String(i[12]),
july: String(i[13]),
august: String(i[14]),
september: String(i[15]),
october: String(i[16]),
november: String(i[17]),
december: String(i[18]),
total_current_year: String(i[19]),
total_next_year: String(i[20]),
total_more_year: String(i[21])
total_actual_before: String(Number(i[6]).toFixed(1)),
january: String(Number(i[7]).toFixed(1)),
february: String(Number(i[8]).toFixed(1)),
march: String(Number(i[9]).toFixed(1)),
april: String(Number(i[10]).toFixed(1)),
may: String(Number(i[11]).toFixed(1)),
june: String(Number(i[12]).toFixed(1)),
july: String(Number(i[13]).toFixed(1)),
august: String(Number(i[14]).toFixed(1)),
september: String(Number(i[15]).toFixed(1)),
october: String(Number(i[16]).toFixed(1)),
november: String(Number(i[17]).toFixed(1)),
december: String(Number(i[18]).toFixed(1)),
total_current_year: String(Number(i[19]).toFixed(1)),
total_next_year: String(Number(i[20]).toFixed(1)),
total_more_year: String(Number(i[21]).toFixed(1))
})
})
let body = {
......@@ -347,9 +368,10 @@ export default class BalanceSheet extends Component {
company_id: this.props.company.company_id,
periode: this.props.periode,
report_id: this.props.report_id,
balance_sheet: data
balance_sheet: data,
status: type
}
console.log(data);
// console.log(data);
api.create('UPLOAD').uploadMasterBudget(body).then(response => {
console.log(response);
if (response.data) {
......@@ -360,6 +382,7 @@ export default class BalanceSheet extends Component {
alert(response.data.status)
}
} else {
this.setState({ loading: false })
alert(response.problem)
}
})
......@@ -377,36 +400,36 @@ export default class BalanceSheet extends Component {
let url = window.URL.createObjectURL(res);
let a = document.createElement('a');
a.href = url;
a.download = 'Balance Sheet.xlsx';
a.download = 'Master Budget Balance Sheet.xlsx';
a.click();
}
}
handleValidate() {
let data = []
console.log(this.state.dataTable)
// console.log(this.state.dataTable)
this.state.dataTable.map(i => {
data.push({
item_report_id: i[1],
total_actual_before: String(i[6]),
january: String(i[7]),
february: String(i[8]),
march: String(i[9]),
april: String(i[10]),
may: String(i[11]),
june: String(i[12]),
july: String(i[13]),
august: String(i[14]),
september: String(i[15]),
october: String(i[16]),
november: String(i[17]),
december: String(i[18]),
total_current_year: String(i[19]),
total_next_year: String(i[20]),
total_more_year: String(i[21])
january: i[0] === 3 && i[7] === "" ? "0" : String(i[7]),
february: i[0] === 3 && i[8] === "" ? "0" : String(i[8]),
march: i[0] === 3 && i[9] === "" ? "0" : String(i[9]),
april: i[0] === 3 && i[10] === "" ? "0" : String(i[10]),
may: i[0] === 3 && i[11] === "" ? "0" : String(i[11]),
june: i[0] === 3 && i[12] === "" ? "0" : String(i[12]),
july: i[0] === 3 && i[13] === "" ? "0" : String(i[13]),
august: i[0] === 3 && i[14] === "" ? "0" : String(i[14]),
september: i[0] === 3 && i[15] === "" ? "0" : String(i[15]),
october: i[0] === 3 && i[16] === "" ? "0" : String(i[16]),
november: i[0] === 3 && i[17] === "" ? "0" : String(i[17]),
december: i[0] === 3 && i[18] === "" ? "0" : String(i[18]),
total_current_year: i[0] === 3 && i[19] === "" ? "0" : String(i[19]),
total_next_year: i[0] === 3 && i[20] === "" ? "0" : String(i[20]),
total_more_year: i[0] === 3 && i[21] === "" ? "0" : String(i[21]),
})
})
console.log(JSON.stringify(data))
// console.log(JSON.stringify(data))
let payload = {
"submission_id": this.props.submissionID,
"company_id": this.props.company.company_id,
......@@ -448,14 +471,7 @@ export default class BalanceSheet extends Component {
}
}
const handleTotal = (tableMeta) => {
let total = 0
dataTable2[tableMeta.rowIndex].map((item, index) => {
if (index >= 7 && index <= 18) {
let valItem = item == undefined || item == "" ? 0 : item
total += Number(valItem)
}
})
dataTable2[tableMeta.rowIndex][19] = total
let total = dataTable2[tableMeta.rowIndex][19] = dataTable2[tableMeta.rowIndex][18]
return total
// console.log(total);
}
......@@ -605,7 +621,7 @@ export default class BalanceSheet extends Component {
type="text"
placeholder=""
disabled={true}
value={value}
value={Number(value).toFixed(1)}
/>
}
/>
......@@ -635,11 +651,10 @@ export default class BalanceSheet extends Component {
control={
<NumberFormat
thousandSeparator={true}
decimalSeparator={"."}
style={{ color: "#5198ea", fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text"
placeholder=""
value={value}
value={Number(value).toFixed(1)}
onBlur={(event) => {
handleChange(event.target.value, tableMeta)
console.log(dataTable2)
......@@ -656,7 +671,7 @@ export default class BalanceSheet extends Component {
type="text"
placeholder=""
disabled={true}
value={handleValue(tableMeta)}
value={Number(handleValue(tableMeta)).toFixed(1)}
/>
</span>
:
......@@ -670,7 +685,7 @@ export default class BalanceSheet extends Component {
type="text"
placeholder=""
disabled={true}
value={handleFormula(value, tableMeta)}
value={Number(handleFormula(value, tableMeta)).toFixed(1)}
/>
:
tableMeta.rowData[0] === 5 ?
......@@ -680,7 +695,7 @@ export default class BalanceSheet extends Component {
type="text"
placeholder=""
disabled={true}
value={handleFormula(value, tableMeta)}
value={Number(handleFormula(value, tableMeta)).toFixed(1)}
/>
:
tableMeta.rowData[0] === 1 ?
......@@ -725,7 +740,7 @@ export default class BalanceSheet extends Component {
style={{ color: "#5198ea", fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text"
placeholder=""
value={value}
value={Number(value).toFixed(1)}
onBlur={(event) => {
// updateValue(event.target.value)
handleChange(event.target.value, tableMeta)
......@@ -743,7 +758,7 @@ export default class BalanceSheet extends Component {
type="text"
placeholder=""
disabled={true}
value={handleValue(tableMeta)}
value={Number(handleValue(tableMeta)).toFixed(1)}
/>
</span>
:
......@@ -757,7 +772,7 @@ export default class BalanceSheet extends Component {
type="text"
placeholder=""
disabled={true}
value={handleFormula(value, tableMeta)}
value={Number(handleFormula(value, tableMeta)).toFixed(1)}
/>
:
tableMeta.rowData[0] === 5 ?
......@@ -767,7 +782,7 @@ export default class BalanceSheet extends Component {
type="text"
placeholder=""
disabled={true}
value={handleFormula(value, tableMeta)}
value={Number(handleFormula(value, tableMeta)).toFixed(1)}
/>
:
tableMeta.rowData[0] === 1 ?
......@@ -812,7 +827,7 @@ export default class BalanceSheet extends Component {
style={{ color: "#5198ea", fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text"
placeholder=""
value={value}
value={Number(value).toFixed(1)}
onBlur={(event) => {
// updateValue(event.target.value)
handleChange(event.target.value, tableMeta)
......@@ -830,7 +845,7 @@ export default class BalanceSheet extends Component {
type="text"
placeholder=""
disabled={true}
value={handleValue(tableMeta)}
value={Number(handleValue(tableMeta)).toFixed(1)}
/>
</span>
:
......@@ -844,7 +859,7 @@ export default class BalanceSheet extends Component {
type="text"
placeholder=""
disabled={true}
value={handleFormula(value, tableMeta)}
value={Number(handleFormula(value, tableMeta)).toFixed(1)}
/>
:
tableMeta.rowData[0] === 5 ?
......@@ -854,7 +869,7 @@ export default class BalanceSheet extends Component {
type="text"
placeholder=""
disabled={true}
value={handleFormula(value, tableMeta)}
value={Number(handleFormula(value, tableMeta)).toFixed(1)}
/>
:
tableMeta.rowData[0] === 1 ?
......@@ -899,7 +914,7 @@ export default class BalanceSheet extends Component {
style={{ color: "#5198ea", fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text"
placeholder=""
value={value}
value={Number(value).toFixed(1)}
onBlur={(event) => {
// updateValue(event.target.value)
handleChange(event.target.value, tableMeta)
......@@ -917,7 +932,7 @@ export default class BalanceSheet extends Component {
type="text"
placeholder=""
disabled={true}
value={handleValue(tableMeta)}
value={Number(handleValue(tableMeta)).toFixed(1)}
/>
</span>
:
......@@ -931,7 +946,7 @@ export default class BalanceSheet extends Component {
type="text"
placeholder=""
disabled={true}
value={handleFormula(value, tableMeta)}
value={Number(handleFormula(value, tableMeta)).toFixed(1)}
/>
:
tableMeta.rowData[0] === 5 ?
......@@ -941,7 +956,7 @@ export default class BalanceSheet extends Component {
type="text"
placeholder=""
disabled={true}
value={handleFormula(value, tableMeta)}
value={Number(handleFormula(value, tableMeta)).toFixed(1)}
/>
:
tableMeta.rowData[0] === 1 ?
......@@ -986,7 +1001,7 @@ export default class BalanceSheet extends Component {
style={{ color: "#5198ea", fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text"
placeholder=""
value={value}
value={Number(value).toFixed(1)}
onBlur={(event) => {
// updateValue(event.target.value)
handleChange(event.target.value, tableMeta)
......@@ -1004,7 +1019,7 @@ export default class BalanceSheet extends Component {
type="text"
placeholder=""
disabled={true}
value={handleValue(tableMeta)}
value={Number(handleValue(tableMeta)).toFixed(1)}
/>
</span>
:
......@@ -1018,7 +1033,7 @@ export default class BalanceSheet extends Component {
type="text"
placeholder=""
disabled={true}
value={handleFormula(value, tableMeta)}
value={Number(handleFormula(value, tableMeta)).toFixed(1)}
/>
:
tableMeta.rowData[0] === 5 ?
......@@ -1028,7 +1043,7 @@ export default class BalanceSheet extends Component {
type="text"
placeholder=""
disabled={true}
value={handleFormula(value, tableMeta)}
value={Number(handleFormula(value, tableMeta)).toFixed(1)}
/>
:
tableMeta.rowData[0] === 1 ?
......@@ -1073,7 +1088,7 @@ export default class BalanceSheet extends Component {
style={{ color: "#5198ea", fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text"
placeholder=""
value={value}
value={Number(value).toFixed(1)}
onBlur={(event) => {
// updateValue(event.target.value)
handleChange(event.target.value, tableMeta)
......@@ -1091,7 +1106,7 @@ export default class BalanceSheet extends Component {
type="text"
placeholder=""
disabled={true}
value={handleValue(tableMeta)}
value={Number(handleValue(tableMeta)).toFixed(1)}
/>
</span>
:
......@@ -1105,7 +1120,7 @@ export default class BalanceSheet extends Component {
type="text"
placeholder=""
disabled={true}
value={handleFormula(value, tableMeta)}
value={Number(handleFormula(value, tableMeta)).toFixed(1)}
/>
:
tableMeta.rowData[0] === 5 ?
......@@ -1115,7 +1130,7 @@ export default class BalanceSheet extends Component {
type="text"
placeholder=""
disabled={true}
value={handleFormula(value, tableMeta)}
value={Number(handleFormula(value, tableMeta)).toFixed(1)}
/>
:
tableMeta.rowData[0] === 1 ?
......@@ -1160,7 +1175,7 @@ export default class BalanceSheet extends Component {
style={{ color: "#5198ea", fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text"
placeholder=""
value={value}
value={Number(value).toFixed(1)}
onBlur={(event) => {
// updateValue(event.target.value)
handleChange(event.target.value, tableMeta)
......@@ -1178,7 +1193,7 @@ export default class BalanceSheet extends Component {
type="text"
placeholder=""
disabled={true}
value={handleValue(tableMeta)}
value={Number(handleValue(tableMeta)).toFixed(1)}
/>
</span>
:
......@@ -1192,7 +1207,7 @@ export default class BalanceSheet extends Component {
type="text"
placeholder=""
disabled={true}
value={handleFormula(value, tableMeta)}
value={Number(handleFormula(value, tableMeta)).toFixed(1)}
/>
:
tableMeta.rowData[0] === 5 ?
......@@ -1202,7 +1217,7 @@ export default class BalanceSheet extends Component {
type="text"
placeholder=""
disabled={true}
value={handleFormula(value, tableMeta)}
value={Number(handleFormula(value, tableMeta)).toFixed(1)}
/>
:
tableMeta.rowData[0] === 1 ?
......@@ -1247,7 +1262,7 @@ export default class BalanceSheet extends Component {
style={{ color: "#5198ea", fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text"
placeholder=""
value={value}
value={Number(value).toFixed(1)}
onBlur={(event) => {
// updateValue(event.target.value)
handleChange(event.target.value, tableMeta)
......@@ -1265,7 +1280,7 @@ export default class BalanceSheet extends Component {
type="text"
placeholder=""
disabled={true}
value={handleValue(tableMeta)}
value={Number(handleValue(tableMeta)).toFixed(1)}
/>
</span>
:
......@@ -1279,7 +1294,7 @@ export default class BalanceSheet extends Component {
type="text"
placeholder=""
disabled={true}
value={handleFormula(value, tableMeta)}
value={Number(handleFormula(value, tableMeta)).toFixed(1)}
/>
:
tableMeta.rowData[0] === 5 ?
......@@ -1289,7 +1304,7 @@ export default class BalanceSheet extends Component {
type="text"
placeholder=""
disabled={true}
value={handleFormula(value, tableMeta)}
value={Number(handleFormula(value, tableMeta)).toFixed(1)}
/>
:
tableMeta.rowData[0] === 1 ?
......@@ -1334,7 +1349,7 @@ export default class BalanceSheet extends Component {
style={{ color: "#5198ea", fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text"
placeholder=""
value={value}
value={Number(value).toFixed(1)}
onBlur={(event) => {
// updateValue(event.target.value)
handleChange(event.target.value, tableMeta)
......@@ -1352,7 +1367,7 @@ export default class BalanceSheet extends Component {
type="text"
placeholder=""
disabled={true}
value={handleValue(tableMeta)}
value={Number(handleValue(tableMeta)).toFixed(1)}
/>
</span>
:
......@@ -1366,7 +1381,7 @@ export default class BalanceSheet extends Component {
type="text"
placeholder=""
disabled={true}
value={handleFormula(value, tableMeta)}
value={Number(handleFormula(value, tableMeta)).toFixed(1)}
/>
:
tableMeta.rowData[0] === 5 ?
......@@ -1376,7 +1391,7 @@ export default class BalanceSheet extends Component {
type="text"
placeholder=""
disabled={true}
value={handleFormula(value, tableMeta)}
value={Number(handleFormula(value, tableMeta)).toFixed(1)}
/>
:
tableMeta.rowData[0] === 1 ?
......@@ -1421,7 +1436,7 @@ export default class BalanceSheet extends Component {
style={{ color: "#5198ea", fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text"
placeholder=""
value={value}
value={Number(value).toFixed(1)}
onBlur={(event) => {
// updateValue(event.target.value)
handleChange(event.target.value, tableMeta)
......@@ -1439,7 +1454,7 @@ export default class BalanceSheet extends Component {
type="text"
placeholder=""
disabled={true}
value={handleValue(tableMeta)}
value={Number(handleValue(tableMeta)).toFixed(1)}
/>
</span>
:
......@@ -1453,7 +1468,7 @@ export default class BalanceSheet extends Component {
type="text"
placeholder=""
disabled={true}
value={handleFormula(value, tableMeta)}
value={Number(handleFormula(value, tableMeta)).toFixed(1)}
/>
:
tableMeta.rowData[0] === 5 ?
......@@ -1463,7 +1478,7 @@ export default class BalanceSheet extends Component {
type="text"
placeholder=""
disabled={true}
value={handleFormula(value, tableMeta)}
value={Number(handleFormula(value, tableMeta)).toFixed(1)}
/>
:
tableMeta.rowData[0] === 1 ?
......@@ -1508,7 +1523,7 @@ export default class BalanceSheet extends Component {
style={{ color: "#5198ea", fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text"
placeholder=""
value={value}
value={Number(value).toFixed(1)}
onBlur={(event) => {
// updateValue(event.target.value)
handleChange(event.target.value, tableMeta)
......@@ -1526,7 +1541,7 @@ export default class BalanceSheet extends Component {
type="text"
placeholder=""
disabled={true}
value={handleValue(tableMeta)}
value={Number(handleValue(tableMeta)).toFixed(1)}
/>
</span>
:
......@@ -1540,7 +1555,7 @@ export default class BalanceSheet extends Component {
type="text"
placeholder=""
disabled={true}
value={handleFormula(value, tableMeta)}
value={Number(handleFormula(value, tableMeta)).toFixed(1)}
/>
:
tableMeta.rowData[0] === 5 ?
......@@ -1550,7 +1565,7 @@ export default class BalanceSheet extends Component {
type="text"
placeholder=""
disabled={true}
value={handleFormula(value, tableMeta)}
value={Number(handleFormula(value, tableMeta)).toFixed(1)}
/>
:
tableMeta.rowData[0] === 1 ?
......@@ -1595,7 +1610,7 @@ export default class BalanceSheet extends Component {
style={{ color: "#5198ea", fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text"
placeholder=""
value={value}
value={Number(value).toFixed(1)}
onBlur={(event) => {
// updateValue(event.target.value)
handleChange(event.target.value, tableMeta)
......@@ -1613,7 +1628,7 @@ export default class BalanceSheet extends Component {
type="text"
placeholder=""
disabled={true}
value={handleValue(tableMeta)}
value={Number(handleValue(tableMeta)).toFixed(1)}
/>
</span>
:
......@@ -1627,7 +1642,7 @@ export default class BalanceSheet extends Component {
type="text"
placeholder=""
disabled={true}
value={handleFormula(value, tableMeta)}
value={Number(handleFormula(value, tableMeta)).toFixed(1)}
/>
:
tableMeta.rowData[0] === 5 ?
......@@ -1637,7 +1652,7 @@ export default class BalanceSheet extends Component {
type="text"
placeholder=""
disabled={true}
value={handleFormula(value, tableMeta)}
value={Number(handleFormula(value, tableMeta)).toFixed(1)}
/>
:
tableMeta.rowData[0] === 1 ?
......@@ -1680,7 +1695,7 @@ export default class BalanceSheet extends Component {
type="text"
placeholder=""
disabled={true}
value={handleValue(tableMeta)}
value={Number(handleValue(tableMeta)).toFixed(1)}
/>
</span> :
<span style={{ fontSize: 12, textAlign: 'right' }}>
......@@ -1690,7 +1705,7 @@ export default class BalanceSheet extends Component {
type="text"
placeholder=""
disabled={true}
value={handleTotal(tableMeta)}
value={Number(handleTotal(tableMeta)).toFixed(1)}
/>
</span>}
</div>
......@@ -1720,7 +1735,7 @@ export default class BalanceSheet extends Component {
style={{ color: "#5198ea", fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text"
placeholder=""
value={value}
value={Number(value).toFixed(1)}
onBlur={(event) => {
// updateValue(event.target.value)
handleChange(event.target.value, tableMeta)
......@@ -1738,7 +1753,7 @@ export default class BalanceSheet extends Component {
type="text"
placeholder=""
disabled={true}
value={handleValue(tableMeta)}
value={Number(handleValue(tableMeta)).toFixed(1)}
/>
</span>
:
......@@ -1752,7 +1767,7 @@ export default class BalanceSheet extends Component {
type="text"
placeholder=""
disabled={true}
value={handleFormula(value, tableMeta)}
value={Number(handleFormula(value, tableMeta)).toFixed(1)}
/>
:
tableMeta.rowData[0] === 5 ?
......@@ -1762,7 +1777,7 @@ export default class BalanceSheet extends Component {
type="text"
placeholder=""
disabled={true}
value={handleFormula(value, tableMeta)}
value={Number(handleFormula(value, tableMeta)).toFixed(1)}
/>
:
tableMeta.rowData[0] === 1 ?
......@@ -1807,7 +1822,7 @@ export default class BalanceSheet extends Component {
style={{ color: "#5198ea", fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text"
placeholder=""
value={value}
value={Number(value).toFixed(1)}
onBlur={(event) => {
// updateValue(event.target.value)
handleChange(event.target.value, tableMeta)
......@@ -1825,7 +1840,7 @@ export default class BalanceSheet extends Component {
type="text"
placeholder=""
disabled={true}
value={handleValue(tableMeta)}
value={Number(handleValue(tableMeta)).toFixed(1)}
/>
</span>
:
......@@ -1839,7 +1854,7 @@ export default class BalanceSheet extends Component {
type="text"
placeholder=""
disabled={true}
value={handleFormula(value, tableMeta)}
value={Number(handleFormula(value, tableMeta)).toFixed(1)}
/>
:
tableMeta.rowData[0] === 5 ?
......@@ -1849,7 +1864,7 @@ export default class BalanceSheet extends Component {
type="text"
placeholder=""
disabled={true}
value={handleFormula(value, tableMeta)}
value={Number(handleFormula(value, tableMeta)).toFixed(1)}
/>
:
tableMeta.rowData[0] === 1 ?
......@@ -1893,7 +1908,7 @@ export default class BalanceSheet extends Component {
return (
<div style={{ height: this.props.height, backgroundColor: '#f8f8f8', marginBottom: 100, minHeight: 1000 }}>
<div className={"main-color"} style={{ height: 78, flex: 1, display: 'flex', alignItems: 'center', paddingLeft: 20 }}>
<Typography style={{ fontSize: '16px', color: 'white' }}>Pengajuan Budget Tahunan</Typography>
<Typography style={{ fontSize: '16px', color: 'white' }}>Master Budget Submission</Typography>
</div>
<Snackbar open={this.state.alert} autoHideDuration={6000} onClose={() => this.closeAlert()}>
<Alert onClose={() => this.closeAlert()} severity={this.state.tipeAlert}>
......@@ -1905,7 +1920,7 @@ export default class BalanceSheet extends Component {
{this.state.visibleBalanceSheet === true ?
<Paper style={{ paddingTop: 10, paddingBottom: 20 }}>
<div style={{ borderBottom: 'solid 1px #c4c4c4' }} >
<Typography style={{ fontSize: '12px', color: '#4b4b4b', margin: 10 }}>Budget Tahunan - Balance Sheet</Typography>
<Typography style={{ fontSize: '12px', color: '#4b4b4b', margin: 10 }}>Master Budget - Balance Sheet</Typography>
</div>
<div style={{ padding: 20 }}>
<div style={{ display: 'flex', justifyContent: 'space-between' }}>
......@@ -1977,18 +1992,13 @@ export default class BalanceSheet extends Component {
/>
</MuiThemeProvider>
</div>
<Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 20 }}>Last Updated by : {this.state.updateBy}</Typography>
</div>
<div className="grid grid-2x" style={{ marginTop: 20 }}>
<div className="col-1">
<button
type="button"
onClick={() => this.state.editable === true ?
this.setState({ loading: true }, () => {
setTimeout(() => {
this.backToMasterBudget('draft')
}, 100);
}) :
this.setState({ loading: true }, () => {
onClick={() => this.setState({ loading: true }, () => {
setTimeout(() => {
this.props.onClickClose()
}, 100);
......@@ -2001,7 +2011,7 @@ export default class BalanceSheet extends Component {
}}
>
<div style={{ backgroundColor: '#019ce5', width: 105, height: 25, borderRadius: 3, justifyContent: 'center', display: 'flex', alignItems: 'center' }}>
<Typography style={{ fontSize: '11px', color: '#fff', textAlign: 'center' }}>Back</Typography>
<Typography style={{ fontSize: '11px', color: '#fff', textAlign: 'center' }}>Cancel</Typography>
</div>
</button>
</div>
......@@ -2016,14 +2026,16 @@ export default class BalanceSheet extends Component {
outline: 'none',
marginRight: 20
}}
onClick={() => this.setState({ loading: true }, () => {
onClick={() => {
this.setState({ loading: true }, () => {
setTimeout(() => {
this.props.onClickClose()
this.handleValidate()
}, 100);
})}
})
}}
>
<div style={{ backgroundColor: '#fff', width: 105, height: 25, borderRadius: 3, justifyContent: 'center', display: 'flex', alignItems: 'center', border: 'solid 1px #354960' }}>
<Typography style={{ fontSize: '11px', color: '#354960', textAlign: 'center' }}>Cancel</Typography>
<Typography style={{ fontSize: '11px', color: '#354960', textAlign: 'center' }}>Calculate</Typography>
</div>
</button>
<button
......@@ -2036,21 +2048,25 @@ export default class BalanceSheet extends Component {
outline: 'none',
marginRight: 20
}}
onClick={() => {
onClick={() => this.state.editable === true ?
this.setState({ loading: true }, () => {
setTimeout(() => {
this.handleValidate()
this.backToMasterBudget('draft')
}, 100);
})
}}
}) :
this.setState({ loading: true }, () => {
setTimeout(() => {
this.props.onClickClose()
}, 100);
})}
>
<div style={{ backgroundColor: '#354960', width: 105, height: 25, borderRadius: 3, justifyContent: 'center', display: 'flex', alignItems: 'center' }}>
<Typography style={{ fontSize: '11px', color: '#fff', textAlign: 'center' }}>Calculate</Typography>
<Typography style={{ fontSize: '11px', color: '#fff', textAlign: 'center' }}>Save as Draft</Typography>
</div>
</button>
<button
type="button"
// disabled={this.state.buttonError}
disabled={this.state.buttonError}
onClick={() => {
this.state.buttonError ?
this.setState({ loading: true }, () => {
......@@ -2068,7 +2084,7 @@ export default class BalanceSheet extends Component {
}}
>
<div style={{ backgroundColor: '#354960', width: 105, height: 25, borderRadius: 3, justifyContent: 'center', display: 'flex', alignItems: 'center' }}>
<Typography style={{ fontSize: '11px', color: '#fff', textAlign: 'center' }}>Save</Typography>
<Typography style={{ fontSize: '11px', color: '#fff', textAlign: 'center' }}>Save & Complete</Typography>
</div>
</button>
</div>
......@@ -2096,7 +2112,9 @@ export default class BalanceSheet extends Component {
</div>
)}
</div>
<div style={{ display: 'flex', width: '100%', placeContent: 'flex-end', padding: 20 }}>
<div className="grid grid-2x" style={{ marginTop: 20 }}>
<div className="col-1">
<button
type="button"
onClick={() => this.setState({ loading: true, visibleBalanceSheet: true }, () => {
......@@ -2106,10 +2124,12 @@ export default class BalanceSheet extends Component {
})}
style={{ marginRight: 20 }}
>
<div style={{ backgroundColor: '#fff', width: 105, height: 25, borderRadius: 3, justifyContent: 'center', display: 'flex', alignItems: 'center', border: 'solid 1px #354960' }}>
<Typography style={{ fontSize: '11px', color: '#354960', textAlign: 'center' }}>Cancel</Typography>
<div style={{ backgroundColor: '#019ce5', width: 105, height: 25, borderRadius: 3, justifyContent: 'center', display: 'flex', alignItems: 'center' }}>
<Typography style={{ fontSize: '11px', color: '#fff', textAlign: 'center' }}>Cancel</Typography>
</div>
</button>
</div>
<div className="col-2" style={{ display: 'flex', justifyContent: 'flex-end', maxWidth: '100%' }}>
<button
className="button"
type="button"
......@@ -2128,9 +2148,23 @@ export default class BalanceSheet extends Component {
}, 100);
})
}}
>
<div style={{ backgroundColor: '#fff', width: 105, height: 25, borderRadius: 3, justifyContent: 'center', display: 'flex', alignItems: 'center', border: 'solid 1px #354960' }}>
<Typography style={{ fontSize: '11px', color: '#354960', textAlign: 'center' }}>Calculate</Typography>
</div>
</button>
<button
type="button"
disabled={this.state.buttonError}
onClick={() => this.setState({ loading: true }, () => {
setTimeout(() => {
this.uploadBalanceSheet('draft')
}, 100);
})}
style={{ marginRight: 20}}
>
<div style={{ backgroundColor: '#354960', width: 105, height: 25, borderRadius: 3, justifyContent: 'center', display: 'flex', alignItems: 'center' }}>
<Typography style={{ fontSize: '11px', color: '#fff', textAlign: 'center' }}>Calculate</Typography>
<Typography style={{ fontSize: '11px', color: '#fff', textAlign: 'center' }}>Save as Draft</Typography>
</div>
</button>
<button
......@@ -2138,16 +2172,17 @@ export default class BalanceSheet extends Component {
disabled={this.state.buttonError}
onClick={() => this.setState({ loading: true }, () => {
setTimeout(() => {
this.uploadBalanceSheet()
this.uploadBalanceSheet('submitted')
}, 100);
})}
>
<div style={{ backgroundColor: '#354960', width: 105, height: 25, borderRadius: 3, justifyContent: 'center', display: 'flex', alignItems: 'center' }}>
<Typography style={{ fontSize: '11px', color: '#fff', textAlign: 'center' }}>Save</Typography>
<Typography style={{ fontSize: '11px', color: '#fff', textAlign: 'center' }}>Save & Complete</Typography>
</div>
</button>
</div>
</div>
</div>
</Paper>}
</div>
......
src/container/BudgetTahunan/TaxPlanning.js
View file @ 5a4aad16
......@@ -661,7 +661,7 @@ export default class TaxPlanning extends Component {
"company_id": this.props.company.company_id,
"periode": this.props.periode,
"report_id": this.props.report_id,
"balance_sheet": data,
"tax_planning": data,
"status": "submitted"
}
api.create().validateSubmitReport(payload).then((response) => {
......@@ -725,7 +725,7 @@ export default class TaxPlanning extends Component {
let total = 0
dataTable2[tableMeta.rowIndex].map((item, index) => {
if (index >= 9 && index <= 20) {
console.log(item);
// console.log(item);
let valItem = item.fcp == undefined || item.fcp == "" ? 0 : item.fcp
total += Number(valItem)
}
......@@ -4075,7 +4075,7 @@ export default class TaxPlanning extends Component {
<div className="grid grid-3x content-center">
{/* <div className="col-1"> */}
<div style={{ textAlign: 'right' }}>
{tableMeta.rowData[1] === 3 ?
{tableMeta.rowData[2] === 3 ?
<div style={{ flex: 1 }}>
<FormControlLabel
style={{ margin: 0 }}
......@@ -4851,8 +4851,8 @@ export default class TaxPlanning extends Component {
// this.forceUpdate()
this.setState({ loading: true }, () => {
setTimeout(() => {
this.setState({ loading: false, buttonError: false, editable: true })
// this.handleValidate()
// this.setState({ loading: false, buttonError: false, editable: true })
this.handleValidate()
}, 100);
})
}}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment