Skip to content

T
Tia-dev
Commit 63a2dfb5 authored by faisalhamdi's avatar faisalhamdi
Browse files
Options

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

parents 5532996d ac9aac2c
Expand all Show whitespace changes
Inline Side-by-side
Showing with 530 additions and 313 deletions
src/api/index.js
View file @ 63a2dfb5
...@@ -24,7 +24,7 @@ const create = (type = "") => { ...@@ -24,7 +24,7 @@ const create = (type = "") => {
'Content-Type': 'application/json', 'Content-Type': 'application/json',
}, },
// 60 second timeout... // 60 second timeout...
timeout: 30000 timeout: 60000
}) })
break; break;
case 'UPLOAD': case 'UPLOAD':
...@@ -38,7 +38,7 @@ const create = (type = "") => { ...@@ -38,7 +38,7 @@ const create = (type = "") => {
'Content-Type': 'application/json', 'Content-Type': 'application/json',
}, },
// 40 second timeout... // 40 second timeout...
timeout: 50000 timeout: 60000
}) })
break; break;
default: default:
......
src/container/BudgetTahunan.js
View file @ 63a2dfb5
This diff is collapsed.
src/container/BudgetTahunan/BalanceSheet.js
View file @ 63a2dfb5
...@@ -45,7 +45,8 @@ export default class BalanceSheet extends Component { ...@@ -45,7 +45,8 @@ export default class BalanceSheet extends Component {
editable: false, editable: false,
buttonError: false, buttonError: false,
judulColumn: null, judulColumn: null,
updateBy: '-' updateBy: '-',
handleTekTekTek: 0
} }
this.handleValue = this.handleValue.bind(this) this.handleValue = this.handleValue.bind(this)
this.fileHandler = this.fileHandler.bind(this); this.fileHandler = this.fileHandler.bind(this);
...@@ -326,7 +327,7 @@ export default class BalanceSheet extends Component { ...@@ -326,7 +327,7 @@ export default class BalanceSheet extends Component {
item.total_current_year, item.total_current_year,
item.total_next_year, item.total_next_year,
item.total_more_year, item.total_more_year,
item.order, item.orders,
item.error item.error
] ]
}) })
...@@ -2126,13 +2127,14 @@ export default class BalanceSheet extends Component { ...@@ -2126,13 +2127,14 @@ export default class BalanceSheet extends Component {
outline: 'none', outline: 'none',
marginRight: 20 marginRight: 20
}} }}
onClick={() => this.state.editable === true ? onClick={() =>
this.state.editable === true ?
null : null :
this.setState({ loading: true }, () => { this.state.handleTekTekTek == 1 ? null :
setTimeout(() => { this.setState({ handleTekTekTek: 1 }, () => {
this.backToMasterBudget('draft') this.backToMasterBudget('draft')
}, 100); })
})} }
> >
<div style={{ backgroundColor: '#354960', width: 105, height: 25, borderRadius: 3, justifyContent: 'center', display: 'flex', alignItems: 'center' }}> <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 as Draft</Typography> <Typography style={{ fontSize: '11px', color: '#fff', textAlign: 'center' }}>Save as Draft</Typography>
...@@ -2141,17 +2143,14 @@ export default class BalanceSheet extends Component { ...@@ -2141,17 +2143,14 @@ export default class BalanceSheet extends Component {
<button <button
type="button" type="button"
disabled={this.state.buttonError} disabled={this.state.buttonError}
onClick={() => { onClick={() =>
this.state.buttonError ? this.state.buttonError ?
this.setState({ loading: true }, () => { this.setState({ alert: true, messageAlert: 'Data is not complete !', tipeAlert: 'warning' })
setTimeout(() => { :
this.setState({ alert: true, messageAlert: 'Data is not complete !', tipeAlert: 'warning', loading: false }) this.state.handleTekTekTek == 1 ? null :
}, 100); this.setState({ handleTekTekTek: 1 }, () => {
})
: this.setState({ loading: true }, () => {
this.backToMasterBudget('submitted') this.backToMasterBudget('submitted')
}) })}
}}
style={{ style={{
backgroundColor: 'transparent', backgroundColor: 'transparent',
cursor: this.state.buttonError === true ? 'default' : 'pointer', cursor: this.state.buttonError === true ? 'default' : 'pointer',
...@@ -2233,11 +2232,14 @@ export default class BalanceSheet extends Component { ...@@ -2233,11 +2232,14 @@ export default class BalanceSheet extends Component {
<button <button
type="button" type="button"
disabled={this.state.buttonError} disabled={this.state.buttonError}
onClick={() => this.setState({ loading: true }, () => { onClick={() => this.setState({ loading: true }, () =>
this.state.handleTekTekTek == 1 ? null :
this.setState({ handleTekTekTek: 1 }, () => {
setTimeout(() => { setTimeout(() => {
this.uploadBalanceSheet('draft') this.uploadBalanceSheet('draft')
}, 100); }, 100);
})} })
)}
style={{ marginRight: 20 }} style={{ marginRight: 20 }}
> >
<div style={{ backgroundColor: '#354960', width: 105, height: 25, borderRadius: 3, justifyContent: 'center', display: 'flex', alignItems: 'center' }}> <div style={{ backgroundColor: '#354960', width: 105, height: 25, borderRadius: 3, justifyContent: 'center', display: 'flex', alignItems: 'center' }}>
...@@ -2247,11 +2249,14 @@ export default class BalanceSheet extends Component { ...@@ -2247,11 +2249,14 @@ export default class BalanceSheet extends Component {
<button <button
type="button" type="button"
disabled={this.state.buttonError} disabled={this.state.buttonError}
onClick={() => this.setState({ loading: true }, () => { onClick={() => this.setState({ loading: true }, () =>
this.state.handleTekTekTek == 1 ? null :
this.setState({ handleTekTekTek: 1 }, () => {
setTimeout(() => { setTimeout(() => {
this.uploadBalanceSheet('submitted') this.uploadBalanceSheet('submitted')
}, 100); }, 100);
})} })
)}
> >
<div style={{ backgroundColor: '#354960', width: 105, height: 25, borderRadius: 3, justifyContent: 'center', display: 'flex', alignItems: 'center' }}> <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 & Complete</Typography> <Typography style={{ fontSize: '11px', color: '#fff', textAlign: 'center' }}>Save & Complete</Typography>
......
src/container/BudgetTahunan/CorporateAnnualTarget.js
View file @ 63a2dfb5
...@@ -434,29 +434,29 @@ export default class CorporateAnnualTarget extends Component { ...@@ -434,29 +434,29 @@ export default class CorporateAnnualTarget extends Component {
// console.log(i[9] == null? "" : i[9].value) // console.log(i[9] == null? "" : i[9].value)
data.push({ data.push({
"item_report_id": i[1], "item_report_id": i[1],
"item_name": i[1] !== ""? null : String(i[6]), "item_name": i[1] == ""? null : String(i[6]),
"parent": i[1] !== ""? null : i[2], "parent": i[1] == ""? null : i[2],
"weight": String(i[7]), "weight": String(i[7]),
"uom": String(i[8]), "uom": String(i[8]),
"kpi_type": i[9] == null? "" : i[9].value, "kpi_type": i[9] == null? "" : i[9].value,
"max_ach": i[10] == null? "" : i[10].value, "max_ach": i[10] == null? "" : i[10].value,
"formula": i[11] == null? "" : i[11].value, "formula": i[11] == null? "" : i[11].value,
"total_actual_before": String(i[12]), "total_actual_before": String(i[12]) == ""? "0,0" : String(i(12)),
"january": String(i[13]), "january": String(i[13]) == ""? "0,0" : String(i[13]),
"february": String(i[14]), "february": String(i[14]) == ""? "0,0" : String(i[14]),
"march": String(i[15]), "march": String(i[15]) == ""? "0,0" : String(i[15]),
"april": String(i[16]), "april": String(i[16]) == ""? "0,0" : String(i[16]),
"may": String(i[17]), "may": String(i[17]) == ""? "0,0" : String(i[17]),
"june": String(i[18]), "june": String(i[18]) == ""? "0,0" : String(i[18]),
"july": String(i[19]), "july": String(i[19]) == ""? "0,0" : String(i[19]),
"august": String(i[20]), "august": String(i[20]) == ""? "0,0" : String(i[20]),
"september": String(i[21]), "september": String(i[21]) == ""? "0,0" : String(i[21]),
"october": String(i[22]), "october": String(i[22]) == ""? "0,0" : String(i[22]),
"november": String(i[23]), "november": String(i[23]) == ""? "0,0" : String(i[23]),
"december": String(i[24]), "december": String(i[24]) == ""? "0,0" : String(i[24]),
"total_current_year": String(i[25]), "total_current_year": String(i[25]) == ""? "0,0" : String(i[25]),
"total_next_year": String(i[26]), "total_next_year": String(i[26]) == ""? "0,0" : String(i[26]),
"total_more_year": String(i[27]), "total_more_year": String(i[27]) == ""? "0,0" : String(i[27]),
"strategic": String(i[28]), "strategic": String(i[28]),
"pic": String(i[29]) "pic": String(i[29])
}) })
...@@ -472,7 +472,7 @@ export default class CorporateAnnualTarget extends Component { ...@@ -472,7 +472,7 @@ export default class CorporateAnnualTarget extends Component {
} }
let totalWeight = 0 let totalWeight = 0
this.state.dataTable.map((items,indexs) => { this.state.dataTable.map((items,indexs) => {
if (items[0] == 3) { if (items[0] !== 1 || items[0] !== 4) {
console.log(items[7]) console.log(items[7])
totalWeight += Number(items[7].replace('%', '')) totalWeight += Number(items[7].replace('%', ''))
} }
...@@ -503,29 +503,29 @@ export default class CorporateAnnualTarget extends Component { ...@@ -503,29 +503,29 @@ export default class CorporateAnnualTarget extends Component {
// console.log(i[9] == null? "" : i[9].value) // console.log(i[9] == null? "" : i[9].value)
data.push({ data.push({
"item_report_id": i[1], "item_report_id": i[1],
"item_name": i[1] !== ""? null : String(i[6]), "item_name": i[1] == ""? null : String(i[6]),
"parent": i[1] !== ""? null : i[2], "parent": i[1] == ""? null : i[2],
"weight": String(i[7]), "weight": String(i[7]),
"uom": String(i[8]), "uom": String(i[8]),
"kpi_type": i[9] == null? "" : i[9].value, "kpi_type": i[9] == null? "" : i[9].value,
"max_ach": i[10] == null? "" : i[10].value, "max_ach": i[10] == null? "" : i[10].value,
"formula": i[11] == null? "" : i[11].value, "formula": i[11] == null? "" : i[11].value,
"total_actual_before": String(i[12]), "total_actual_before": String(i[12]) == ""? "0,0" : String(i(12)),
"january": String(i[13]), "january": String(i[13]) == ""? "0,0" : String(i[13]),
"february": String(i[14]), "february": String(i[14]) == ""? "0,0" : String(i[14]),
"march": String(i[15]), "march": String(i[15]) == ""? "0,0" : String(i[15]),
"april": String(i[16]), "april": String(i[16]) == ""? "0,0" : String(i[16]),
"may": String(i[17]), "may": String(i[17]) == ""? "0,0" : String(i[17]),
"june": String(i[18]), "june": String(i[18]) == ""? "0,0" : String(i[18]),
"july": String(i[19]), "july": String(i[19]) == ""? "0,0" : String(i[19]),
"august": String(i[20]), "august": String(i[20]) == ""? "0,0" : String(i[20]),
"september": String(i[21]), "september": String(i[21]) == ""? "0,0" : String(i[21]),
"october": String(i[22]), "october": String(i[22]) == ""? "0,0" : String(i[22]),
"november": String(i[23]), "november": String(i[23]) == ""? "0,0" : String(i[23]),
"december": String(i[24]), "december": String(i[24]) == ""? "0,0" : String(i[24]),
"total_current_year": String(i[25]), "total_current_year": String(i[25]) == ""? "0,0" : String(i[25]),
"total_next_year": String(i[26]), "total_next_year": String(i[26]) == ""? "0,0" : String(i[26]),
"total_more_year": String(i[27]), "total_more_year": String(i[27]) == ""? "0,0" : String(i[27]),
"strategic": String(i[28]), "strategic": String(i[28]),
"pic": String(i[29]) "pic": String(i[29])
}) })
......
src/container/BudgetTahunan/ProfitLoss.js
View file @ 63a2dfb5
This diff is collapsed.
src/container/BudgetTahunan/TaxPlanning.js
View file @ 63a2dfb5
This diff is collapsed.
src/container/DocumentManagement/CreateManagementDoc.js
View file @ 63a2dfb5
...@@ -55,7 +55,6 @@ export default class CreateManagementDoc extends Component { ...@@ -55,7 +55,6 @@ export default class CreateManagementDoc extends Component {
this.getPeriode() this.getPeriode()
this.getMonth() this.getMonth()
this.getFileSize() this.getFileSize()
console.log(this.props.setting_id)
console.log(this.props.name) console.log(this.props.name)
} }
...@@ -69,9 +68,15 @@ export default class CreateManagementDoc extends Component { ...@@ -69,9 +68,15 @@ export default class CreateManagementDoc extends Component {
console.log(response); console.log(response);
if (response.data) { if (response.data) {
if (response.data.status === "success") { if (response.data.status === "success") {
if(response.data.data.length == 0){
this.setState({ this.setState({
sizeUpload: response.data.data[0] ? response.data.data[0].value === undefined ? "1" : response.data.data[0].value : "1" sizeUpload: "1"
})
} else
this.setState({
sizeUpload: response.data.data[0].value
}) })
console.log(this.state.sizeUpload)
} }
} }
}) })
...@@ -121,7 +126,7 @@ export default class CreateManagementDoc extends Component { ...@@ -121,7 +126,7 @@ export default class CreateManagementDoc extends Component {
// } // }
api.create().getDocumentCategory().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') {
let data = response.data.data let data = response.data.data
...@@ -155,7 +160,7 @@ export default class CreateManagementDoc extends Component { ...@@ -155,7 +160,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) // 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") {
...@@ -179,7 +184,6 @@ export default class CreateManagementDoc extends Component { ...@@ -179,7 +184,6 @@ export default class CreateManagementDoc extends Component {
getMonth(){ getMonth(){
api.create().getMonthTransaction().then(response => { api.create().getMonthTransaction().then(response => {
let dateNow = new Date let dateNow = new Date
console.log(dateNow)
// let bulan = format(dateNow, 'MMMM') // let bulan = format(dateNow, 'MMMM')
if (response.data) { if (response.data) {
if (response.data.status === "success") { if (response.data.status === "success") {
...@@ -220,7 +224,7 @@ export default class CreateManagementDoc extends Component { ...@@ -220,7 +224,7 @@ export default class CreateManagementDoc extends Component {
let length = event.name.split(".").length let length = event.name.split(".").length
let fileType = event.name.split(".")[length - 1] let fileType = event.name.split(".")[length - 1]
ExcelRenderer(fileObj, (err, resp) => { ExcelRenderer(fileObj, (err, resp) => {
console.log(fileType) // console.log(fileType)
if (err) { if (err) {
console.log(err); console.log(err);
} }
...@@ -248,7 +252,7 @@ export default class CreateManagementDoc extends Component { ...@@ -248,7 +252,7 @@ export default class CreateManagementDoc extends Component {
formData.append("documentPeriode", null); formData.append("documentPeriode", null);
formData.append("documentMonth", null); formData.append("documentMonth", null);
this.setState({ formData }, ()=> { this.setState({ formData }, ()=> {
this.props.createDocument(this.state.formData, this.props.setting_id) this.props.createDocument(this.state.formData, this.props.setting_id, this.props.name)
}) })
} }
...@@ -274,7 +278,7 @@ export default class CreateManagementDoc extends Component { ...@@ -274,7 +278,7 @@ export default class CreateManagementDoc extends Component {
formData.append("documentPeriode", this.state.periode.periode); formData.append("documentPeriode", this.state.periode.periode);
formData.append("documentMonth", this.state.monthId.month_id); formData.append("documentMonth", this.state.monthId.month_id);
this.setState({ formData }, ()=> { this.setState({ formData }, ()=> {
this.props.createDocument(this.state.formData, this.props.setting_id) this.props.createDocument(this.state.formData, this.props.setting_id, this.props.name)
}) })
} }
} }
......
src/container/DocumentManagement/DocumentManagement.js
View file @ 63a2dfb5
...@@ -37,7 +37,7 @@ export default class DocumentManagement extends Component { ...@@ -37,7 +37,7 @@ export default class DocumentManagement extends Component {
menu: "document management" menu: "document management"
} }
api.create().getPermission(payload).then(response => { api.create().getPermission(payload).then(response => {
console.log(response) // console.log(response)
if (response.data) { if (response.data) {
if (response.data.status === "success") { if (response.data.status === "success") {
this.setState({ this.setState({
...@@ -95,7 +95,7 @@ export default class DocumentManagement extends Component { ...@@ -95,7 +95,7 @@ export default class DocumentManagement extends Component {
}) })
} }
createDocument(payload, settingID) { createDocument(payload, settingID, menuName) {
api.create().uploadDocument(payload).then(response => { api.create().uploadDocument(payload).then(response => {
console.log(response) console.log(response)
if (response.data) { if (response.data) {
...@@ -106,8 +106,8 @@ export default class DocumentManagement extends Component { ...@@ -106,8 +106,8 @@ export default class DocumentManagement extends Component {
}) })
} }
else if (response.data.message === "Upload Document Success") { else if (response.data.message === "Upload Document Success") {
this.getDataDocument(settingID) this.getDataDocument(settingID, menuName)
this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'success', settingID, visibleCreate: false }) this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'success', settingID, menuName, visibleCreate: false })
} }
else { else {
this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => { this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
...@@ -146,7 +146,7 @@ export default class DocumentManagement extends Component { ...@@ -146,7 +146,7 @@ export default class DocumentManagement extends Component {
if (response.data) { if (response.data) {
if (response.ok) { if (response.ok) {
if (response.data.status === "success") { if (response.data.status === "success") {
this.getDataDocument(this.state.settingID) this.getDataDocument(this.state.settingID, this.state.menuName)
this.setState({ konfirmasi: false, alert: true, messageAlert: response.data.message, tipeAlert: 'success', visibleCreate: false }) this.setState({ konfirmasi: false, alert: true, messageAlert: response.data.message, tipeAlert: 'success', visibleCreate: false })
} else { } else {
this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => { this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
......
src/container/DocumentManagement/EditManagementDoc.js
View file @ 63a2dfb5
...@@ -57,7 +57,6 @@ export default class EditManagementDoc extends Component { ...@@ -57,7 +57,6 @@ export default class EditManagementDoc extends Component {
this.getFileSize() this.getFileSize()
if (this.props.type === 'edit') { if (this.props.type === 'edit') {
this.getDetailDoc() this.getDetailDoc()
console.log(this.props.data)
} }
} }
...@@ -265,12 +264,11 @@ export default class EditManagementDoc extends Component { ...@@ -265,12 +264,11 @@ export default class EditManagementDoc extends Component {
} }
fileHandler = (event) => { fileHandler = (event) => {
console.log(event)
let fileObj = event let fileObj = event
let length = event.name.split(".").length let length = event.name.split(".").length
let fileType = event.name.split(".")[length - 1] let fileType = event.name.split(".")[length - 1]
ExcelRenderer(fileObj, (err, resp) => { ExcelRenderer(fileObj, (err, resp) => {
console.log(fileType) // console.log(fileType)
if (err) { if (err) {
console.log(err); console.log(err);
} }
...@@ -321,12 +319,6 @@ export default class EditManagementDoc extends Component { ...@@ -321,12 +319,6 @@ export default class EditManagementDoc extends Component {
this.setState({ formData }, () => { this.setState({ formData }, () => {
this.props.updateDocument(this.state.formData) this.props.updateDocument(this.state.formData)
}) })
var object = {};
formData.forEach(function(value, key){
object[key] = value;
});
var json = JSON.stringify(object);
console.log(json)
} }
} }
......
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