Skip to content

T
Tia-dev
Commit 8f79221a 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 291a1f4f 9aa6dd57
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1510 additions and 959 deletions
src/api/index.js
View file @ 8f79221a
...@@ -196,6 +196,7 @@ const create = (type = "") => { ...@@ -196,6 +196,7 @@ const create = (type = "") => {
const checkUploadMB = (body) => api.post('transaction/master_budget/check_import', body) const checkUploadMB = (body) => api.post('transaction/master_budget/check_import', body)
const uploadMasterBudget = (body) => api.post('transaction/master_budget/import_master_budget', body) const uploadMasterBudget = (body) => api.post('transaction/master_budget/import_master_budget', body)
const validateSubmitReport = (body) => api.post('transaction/master_budget/validate_save', body) const validateSubmitReport = (body) => api.post('transaction/master_budget/validate_save', body)
const getMonthTransaction = () => api.get('transaction/get_default_month')
const getOpetratingIndID = (body) => api.post('transaction/get_operating_indicator_id', body) const getOpetratingIndID = (body) => api.post('transaction/get_operating_indicator_id', body)
const getAllOperatingInd = (body) => api.post('transaction/get_all_operating_indicator_report', body) const getAllOperatingInd = (body) => api.post('transaction/get_all_operating_indicator_report', body)
...@@ -315,6 +316,7 @@ const create = (type = "") => { ...@@ -315,6 +316,7 @@ const create = (type = "") => {
getMasterBudgetAtt, getMasterBudgetAtt,
uploadAttachment, uploadAttachment,
getPeriodeTransaction, getPeriodeTransaction,
getMonthTransaction,
getRevision, getRevision,
deleteAttachment, deleteAttachment,
getDetailReportMB, getDetailReportMB,
......
src/container/BudgetTahunan/FixedAssetsMovement.js
View file @ 8f79221a
...@@ -81,7 +81,7 @@ export default class FixedAssetsMovement extends Component { ...@@ -81,7 +81,7 @@ export default class FixedAssetsMovement extends Component {
item.formula, item.formula,
item.level, item.level,
item.description, item.description,
item.fixed_asset_movement.total_actual_before, item.fixed_asset_movement.total_actual_before === null ? "0" : item.fixed_asset_movement.total_actual_before === "" ? "0" : item.fixed_asset_movement.total_actual_before,
item.fixed_asset_movement.january, item.fixed_asset_movement.january,
item.fixed_asset_movement.february, item.fixed_asset_movement.february,
item.fixed_asset_movement.march, item.fixed_asset_movement.march,
...@@ -115,7 +115,7 @@ export default class FixedAssetsMovement extends Component { ...@@ -115,7 +115,7 @@ export default class FixedAssetsMovement extends Component {
item.formula, item.formula,
item.level, item.level,
item.description, item.description,
item.fixed_asset_movement.total_actual_before, item.fixed_asset_movement.total_actual_before === null ? "0" : item.fixed_asset_movement.total_actual_before === "" ? "0" : item.fixed_asset_movement.total_actual_before,
item.fixed_asset_movement.january, item.fixed_asset_movement.january,
item.fixed_asset_movement.february, item.fixed_asset_movement.february,
item.fixed_asset_movement.march, item.fixed_asset_movement.march,
...@@ -402,6 +402,18 @@ export default class FixedAssetsMovement extends Component { ...@@ -402,6 +402,18 @@ export default class FixedAssetsMovement 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
return total
// console.log(total);
}
const handleValue = (data) => { const handleValue = (data) => {
let total = 0 let total = 0
dataTable2.map((item, index) => { dataTable2.map((item, index) => {
...@@ -535,6 +547,8 @@ export default class FixedAssetsMovement extends Component { ...@@ -535,6 +547,8 @@ export default class FixedAssetsMovement extends Component {
customBodyRender: (value, tableMeta, updateValue) => { customBodyRender: (value, tableMeta, updateValue) => {
return ( return (
<div style={{ textAlign: 'right' }}> <div style={{ textAlign: 'right' }}>
{console.log(tableMeta)}
{console.log(value)}
{tableMeta.rowData[0] === 4 ? {tableMeta.rowData[0] === 4 ?
null null
: :
...@@ -1637,29 +1651,9 @@ export default class FixedAssetsMovement extends Component { ...@@ -1637,29 +1651,9 @@ export default class FixedAssetsMovement extends Component {
setCellProps: () => ({ style2 }), setCellProps: () => ({ style2 }),
customBodyRender: (value, tableMeta, updateValue) => { customBodyRender: (value, tableMeta, updateValue) => {
return ( return (
<div style={{ textAlign: 'right' }}> <div style={{ width: 96, textAlign: 'right' }}>
{tableMeta.rowData[0] === 3 ? {tableMeta.rowData[0] === 1 || tableMeta.rowData[0] === 4 ?
<div style={{ flex: 1 }}> null : tableMeta.rowData[0] === 2 ?
<FormControlLabel
style={{ margin: 0 }}
value={value}
control={
<NumberFormat
thousandSeparator={true}
style={{ color: "#5198ea", fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text"
placeholder=""
value={value}
onBlur={(event) => {
// updateValue(event.target.value)
handleChange(event.target.value, tableMeta)
console.log(dataTable2)
}}
/>
}
/>
</div> :
tableMeta.rowData[0] === 5 ?
<span style={{ fontSize: 12, textAlign: 'right' }}> <span style={{ fontSize: 12, textAlign: 'right' }}>
<NumberFormat <NumberFormat
thousandSeparator={true} thousandSeparator={true}
...@@ -1669,48 +1663,17 @@ export default class FixedAssetsMovement extends Component { ...@@ -1669,48 +1663,17 @@ export default class FixedAssetsMovement extends Component {
disabled={true} disabled={true}
value={handleValue(tableMeta)} value={handleValue(tableMeta)}
/> />
</span> </span> :
: <span style={{ fontSize: 12, textAlign: 'right' }}>
tableMeta.rowData[0] === 4 ? <NumberFormat
null thousandSeparator={true}
: style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
tableMeta.rowData[0] === 6 ? type="text"
// <NumberFormat placeholder=""
// thousandSeparator={true} disabled={true}
// style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }} value={handleTotal(tableMeta)}
// type="text" />
// placeholder="" </span>}
// disabled={true}
// value={handleFormula(value, tableMeta)}
// />
null
:
tableMeta.rowData[0] === 5 ?
// <NumberFormat
// thousandSeparator={true}
// style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
// type="text"
// placeholder=""
// disabled={true}
// value={handleFormula(value, tableMeta)}
// />
null
:
tableMeta.rowData[0] === 1 ?
// value === "" ?
// null :
// <NumberFormat
// thousandSeparator={true}
// style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
// type="text"
// placeholder=""
// disabled={true}
// value={Number(value)}
// />
null
:
null
}
</div> </div>
) )
} }
......
src/container/BudgetTahunan/TaxPlanning.js
View file @ 8f79221a
This source diff could not be displayed because it is too large. You can view the blob instead.
src/container/DocumentManagement/AllDocument.js
View file @ 8f79221a
...@@ -63,6 +63,7 @@ export default class getAllDocument extends Component { ...@@ -63,6 +63,7 @@ export default class getAllDocument extends Component {
item.document_name, item.document_name,
item.description, item.description,
item.company_name, item.company_name,
item.document_month,
item.document_periode, item.document_periode,
item.document_type, item.document_type,
String(Number(item.document_size) / 1000 + ' KB'), String(Number(item.document_size) / 1000 + ' KB'),
...@@ -200,7 +201,6 @@ export default class getAllDocument extends Component { ...@@ -200,7 +201,6 @@ export default class getAllDocument extends Component {
filter: false, filter: false,
sort: false, sort: false,
customBodyRender: (val, tableMeta) => { customBodyRender: (val, tableMeta) => {
console.log(tableMeta)
return ( return (
<div style={{ display: 'flex' }}> <div style={{ display: 'flex' }}>
{/* {this.state.btnedit && <span> */} {/* {this.state.btnedit && <span> */}
...@@ -258,6 +258,12 @@ export default class getAllDocument extends Component { ...@@ -258,6 +258,12 @@ export default class getAllDocument extends Component {
} }
} }
}, "File Name", "Description", "Company Name", }, "File Name", "Description", "Company Name",
{
name: "Monthly",
options: {
display: String(this.props.data.value).includes('Manual Book TIA') ? false : true
}
},
{ {
name: "Period", name: "Period",
options: { options: {
......
src/container/DocumentManagement/CreateManagementDoc.js
View file @ 8f79221a
...@@ -29,6 +29,8 @@ export default class CreateManagementDoc extends Component { ...@@ -29,6 +29,8 @@ export default class CreateManagementDoc extends Component {
msgErrorDocument: '', msgErrorDocument: '',
listPeriode: null, listPeriode: null,
periode: null, periode: null,
listMonth: null,
monthId: null,
description: '', description: '',
errorDesc: false, errorDesc: false,
msgErrorDesc: '', msgErrorDesc: '',
...@@ -46,6 +48,7 @@ export default class CreateManagementDoc extends Component { ...@@ -46,6 +48,7 @@ export default class CreateManagementDoc extends Component {
this.getDataCompany() this.getDataCompany()
this.getDataDocument() this.getDataDocument()
this.getPeriode() this.getPeriode()
this.getMonth()
} }
getDataCompany() { getDataCompany() {
...@@ -85,13 +88,13 @@ export default class CreateManagementDoc extends Component { ...@@ -85,13 +88,13 @@ export default class CreateManagementDoc extends Component {
} }
getDataDocument() { getDataDocument() {
let payload = { // let payload = {
"setting_group_id": 7, // "setting_group_id": 7,
"setting_type_id": 167, // "setting_type_id": 167,
"company_id": 0 // "company_id": 0
} // }
api.create().getDocumentCategory(payload).then(response => { api.create().getDocumentCategory().then(response => {
console.log(response); console.log(response);
if (response.data) { if (response.data) {
if (response.data.status == 'success') { if (response.data.status == 'success') {
...@@ -126,6 +129,7 @@ export default class CreateManagementDoc extends Component { ...@@ -126,6 +129,7 @@ export default class CreateManagementDoc extends Component {
getPeriode() { getPeriode() {
api.create().getPeriodeTransaction().then(response => { api.create().getPeriodeTransaction().then(response => {
let dateNow = new Date let dateNow = new Date
console.log(dateNow)
let year = format(dateNow, 'yyyy') let year = format(dateNow, 'yyyy')
if (response.data) { if (response.data) {
if (response.data.status === "success") { if (response.data.status === "success") {
...@@ -146,6 +150,32 @@ export default class CreateManagementDoc extends Component { ...@@ -146,6 +150,32 @@ export default class CreateManagementDoc extends Component {
}) })
} }
getMonth(){
api.create().getMonthTransaction().then(response => {
let dateNow = new Date
console.log(dateNow)
// let bulan = format(dateNow, 'MMMM')
if (response.data) {
if (response.data.status === "success") {
let data = response.data.data
let monthData = data.map((item) => {
return {
month_id: item.month_id,
month_name: item.month_name
}
})
let defaultProps = {
options: monthData,
getOptionLabel: (option) => option.month_name,
};
// let index = data.sort((a, b) => a - b).findIndex((val) => val == bulan)
// this.setState({ listMonth: defaultProps, month: index == -1 ? monthData[0] : monthData[index] })
this.setState({ listMonth: defaultProps })
}
}
})
}
clearMessage() { clearMessage() {
this.setState({ this.setState({
errorPerusahaan: false, errorPerusahaan: false,
...@@ -171,11 +201,18 @@ export default class CreateManagementDoc extends Component { ...@@ -171,11 +201,18 @@ export default class CreateManagementDoc extends Component {
} }
validasi() { validasi() {
console.log(this.state.monthId.month_id)
if (R.isNil(this.state.getPerusahaan)) { if (R.isNil(this.state.getPerusahaan)) {
this.setState({ errorPerusahaan: true, msgErrorPerusahaan: 'Company Cannot be Empty' }) this.setState({ errorPerusahaan: true, msgErrorPerusahaan: 'Company Cannot be Empty' })
} else if (R.isNil(this.state.getDocument)) { } else if (R.isNil(this.state.getDocument)) {
this.setState({ errorDocument: true, msgErrorDocument: 'Category Cannot be Empty' }) this.setState({ errorDocument: true, msgErrorDocument: 'Category Cannot be Empty' })
} else if (R.isNil(this.state.file)) { }
// else if (R.isNil(this.state.periode)) {
// this.setState({ errorPeriode: true, msgErrorPeriode: 'Period Cannot be Empty' })
// } else if (R.isNil(this.state.monthId)) {
// this.setState({ errorMonth: true, msgErrorMonth: 'Month Cannot be Empty' })
// }
else if (R.isNil(this.state.file)) {
this.setState({ alert: true, messageAlert: 'File Cannot be Empty', tipeAlert: 'warning' }) this.setState({ alert: true, messageAlert: 'File Cannot be Empty', tipeAlert: 'warning' })
} else { } else {
const formData = new FormData(); const formData = new FormData();
...@@ -183,6 +220,7 @@ export default class CreateManagementDoc extends Component { ...@@ -183,6 +220,7 @@ export default class CreateManagementDoc extends Component {
formData.append("companyId", this.state.getPerusahaan.company_id); formData.append("companyId", this.state.getPerusahaan.company_id);
formData.append("settingId", this.state.getDocument.document_category_id); formData.append("settingId", this.state.getDocument.document_category_id);
formData.append("documentPeriode", this.state.periode.periode); formData.append("documentPeriode", this.state.periode.periode);
formData.append("documentMonth", this.state.monthId.month_id);
formData.append("description", this.state.description); formData.append("description", this.state.description);
formData.append("extension", this.state.fileType); formData.append("extension", this.state.fileType);
this.setState({ formData }, ()=> { this.setState({ formData }, ()=> {
...@@ -243,20 +281,20 @@ export default class CreateManagementDoc extends Component { ...@@ -243,20 +281,20 @@ export default class CreateManagementDoc extends Component {
<div className="margin-top-10px" style={{ padding: 10, borderRadius: 5 }}> <div className="margin-top-10px" style={{ padding: 10, borderRadius: 5 }}>
<Autocomplete <Autocomplete
{...this.state.listPeriode} {...this.state.listMonth}
// debug // debug
clearOnEscape clearOnEscape
id="periode" id="month"
onChange={(event, newInputValue) => this.setState({ periode: newInputValue }, () => { onChange={(event, newInputValue) => this.setState({ monthId: newInputValue }, () => {
this.clearMessage() this.clearMessage()
})} })}
style={{ width: 250 }} style={{ width: 250 }}
renderInput={(params) => renderInput={(params) =>
<TextField {...params} label="Period" margin="normal" style={{ marginTop: 7 }} <TextField {...params} label="Monthly" margin="normal" style={{ marginTop: 7 }}
InputProps={{ ...params.InputProps, style: { fontSize: 11 } }} InputProps={{ ...params.InputProps, style: { fontSize: 11 } }}
InputLabelProps={{ style: { fontSize: 11, color: '#7e8085' } }} InputLabelProps={{ style: { fontSize: 11, color: '#7e8085' } }}
/>} />}
value={this.state.periode} value={this.state.monthId}
/> />
</div> </div>
</div> </div>
...@@ -278,6 +316,25 @@ export default class CreateManagementDoc extends Component { ...@@ -278,6 +316,25 @@ export default class CreateManagementDoc extends Component {
value={this.state.getDocument} value={this.state.getDocument}
/> />
</div> </div>
<div className="margin-top-10px" style={{ padding: 10, borderRadius: 5 }}>
<Autocomplete
{...this.state.listPeriode}
// debug
clearOnEscape
id="periode"
onChange={(event, newInputValue) => this.setState({ periode: newInputValue }, () => {
this.clearMessage()
})}
style={{ width: 250 }}
renderInput={(params) =>
<TextField {...params} label="Period" margin="normal" style={{ marginTop: 7 }}
InputProps={{ ...params.InputProps, style: { fontSize: 11 } }}
InputLabelProps={{ style: { fontSize: 11, color: '#7e8085' } }}
/>}
value={this.state.periode}
/>
</div>
</div> </div>
</div> </div>
<div style={{ paddingLeft: 30, paddingRight: 30 }}> <div style={{ paddingLeft: 30, paddingRight: 30 }}>
......
src/library/Upload.js
View file @ 8f79221a
...@@ -45,6 +45,13 @@ class Upload extends Component { ...@@ -45,6 +45,13 @@ class Upload extends Component {
} }
} }
componentDidMount() {
if (this.props.docName !== undefined && this.props.docName !== "") {
console.log('masuk');
this.setState({ docName: this.props.docName, docSize: this.props.docSize, inputVisible: false, editVisible: true })
}
}
onDrop = (acceptedFiles) => { onDrop = (acceptedFiles) => {
const formData = new FormData() const formData = new FormData()
let length = acceptedFiles[0].name.split(".").length let length = acceptedFiles[0].name.split(".").length
...@@ -116,6 +123,7 @@ class Upload extends Component { ...@@ -116,6 +123,7 @@ class Upload extends Component {
if (this.props.intent === "management") { if (this.props.intent === "management") {
this.setState({ this.setState({
previewVisible: false, previewVisible: false,
editVisible: false,
inputVisible: true, inputVisible: true,
uploadProgress: false, uploadProgress: false,
percentage: '0' percentage: '0'
...@@ -124,6 +132,7 @@ class Upload extends Component { ...@@ -124,6 +132,7 @@ class Upload extends Component {
} else { } else {
this.setState({ this.setState({
previewVisible: false, previewVisible: false,
editVisible: false,
inputVisible: true, inputVisible: true,
uploadProgress: false, uploadProgress: false,
percentage: '0' percentage: '0'
...@@ -187,6 +196,29 @@ class Upload extends Component { ...@@ -187,6 +196,29 @@ class Upload extends Component {
</div> </div>
: null} : null}
{/* edit */}
{this.state.editVisible ?
<div className="u-p-file u-p-preview">
<div className="display-flex-normal">
<div className="width width-35px">
<button
onClick={this.onRemove}
className="btn btn-small-circle btn-black"
type="button">
<img src={Images.close} />
</button>
</div>
<div className="width width-full margin-left-10px">
<div className="txt-site txt-12 txt-white txt-bold">
{this.state.docName}
</div>
<div className="txt-site txt-11 txt-white txt-thin">
{this.state.docSize} KB
</div>
</div>
</div>
</div>
: null}
{/* file */} {/* file */}
{this.state.previewVisible {this.state.previewVisible
? ?
......
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