Skip to content

T
Tia-dev
Commit 13242284 authored by Deni Rinaldi's avatar Deni Rinaldi
Browse files
Options

Merge branch 'deni-dev(pc)' into 'master' 

pus pus pus

See merge request !497
parents 152095f6 35fa4c81
Show whitespace changes
Inline Side-by-side
Showing with 104 additions and 109 deletions
src/container/BudgetTahunan/TaxPlanning.js
View file @ 13242284
...@@ -851,7 +851,7 @@ export default class TaxPlanning extends Component { ...@@ -851,7 +851,7 @@ export default class TaxPlanning extends Component {
} }
} }
}) })
// console.log(tableMeta.rowData[5]) // console.log(tableMeta.rowData[8])
// console.log(baru) // console.log(baru)
// console.log(anjay) // console.log(anjay)
// console.log(total) // console.log(total)
...@@ -863,12 +863,6 @@ export default class TaxPlanning extends Component { ...@@ -863,12 +863,6 @@ export default class TaxPlanning extends Component {
// } else { // } else {
// dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbc.value = total // dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbc.value = total
// } // }
// } else if (dex == 2) {
// if (dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].fcp.value == undefined) {
// dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].fcp = total
// } else {
// dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].fcp.value = total
// }
// } else { // } else {
// if (dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf.value == undefined) { // if (dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf.value == undefined) {
// dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf = total // dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf = total
...@@ -7435,7 +7429,7 @@ export default class TaxPlanning extends Component { ...@@ -7435,7 +7429,7 @@ export default class TaxPlanning extends Component {
}} }}
onClick={() => { onClick={() => {
// this.forceUpdate() // this.forceUpdate()
this.setState({ loading: true, buttonDraft: false, dataTable: dataTable2 }, () => { this.setState({ loading: true, buttonDraft: false }, () => {
setTimeout(() => { setTimeout(() => {
// this.setState({ loading: false, buttonError: false, editable: true }) // this.setState({ loading: false, buttonError: false, editable: true })
this.handleValidate() this.handleValidate()
......
src/container/MasterData/Parameter/CreateParameter.js
View file @ 13242284
...@@ -125,8 +125,9 @@ export default class CreateParameter extends Component { ...@@ -125,8 +125,9 @@ export default class CreateParameter extends Component {
options: typeData, options: typeData,
getOptionLabel: (option) => option.setting_group_name, getOptionLabel: (option) => option.setting_group_name,
}; };
this.setState({ types: typeProps, typeData: response.data.data, getTypes: index == -1 ? typeData[0] : typeData[index] }, ()=> { this.setState({ types: typeProps, typeData: response.data.data, getTypes: index == -1 ? typeData[0] : typeData[index] }, () => {
this.getParameterByGroup(this.state.getTypes.setting_group_id)}) this.getParameterByGroup(this.state.getTypes.setting_group_id)
})
} else { } else {
this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => { this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
if (response.data.message.includes("Someone Logged In")) { if (response.data.message.includes("Someone Logged In")) {
...@@ -535,7 +536,7 @@ export default class CreateParameter extends Component { ...@@ -535,7 +536,7 @@ export default class CreateParameter extends Component {
</div> </div>
<div className="border-bottom grid grid-2x grid-mobile-none gap-15px" style={{ padding: 20 }}> <div className="grid grid-2x grid-mobile-none gap-15px" style={{ padding: 20 }}>
<div className="column-1"> <div className="column-1">
<div style={{ backgroundColor: '#e8e8e8', padding: 10, borderRadius: 5 }}> <div style={{ backgroundColor: '#e8e8e8', padding: 10, borderRadius: 5 }}>
<TextField <TextField
...@@ -719,17 +720,6 @@ export default class CreateParameter extends Component { ...@@ -719,17 +720,6 @@ export default class CreateParameter extends Component {
}} }}
/> />
</div> </div>
<div className="margin-top-10px" style={{ padding: 10, borderRadius: 5 }}>
<div style={{ display: 'flex' }}>
<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: '25%' }}>Updated By</Typography>
<Typography style={{ fontSize: 11 }}>: {this.state.tempData === null ? "" : this.state.tempData.updated === null ? "" : this.state.tempData.updated}</Typography>
</div>
</div>
</div> </div>
<div className="column-2"> <div className="column-2">
...@@ -870,6 +860,17 @@ export default class CreateParameter extends Component { ...@@ -870,6 +860,17 @@ export default class CreateParameter extends Component {
</div> </div>
</div> </div>
<div className="border-bottom margin-top-10px" style={{ padding: '0px 20px 20px 20px', borderRadius: 5 }}>
<div style={{ display: 'flex' }}>
<Typography style={{ fontSize: 11, width: '12%' }}>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: '12%' }}>Updated By</Typography>
<Typography style={{ fontSize: 11 }}>: {this.state.tempData === null ? "" : this.state.tempData.updated === null ? "" : this.state.tempData.updated}</Typography>
</div>
</div>
<div className="border-top grid grid-2x" style={{ height: 56, backgroundColor: '#f5f5f5', paddingLeft: 20, paddingRight: 20 }}> <div className="border-top grid grid-2x" style={{ height: 56, backgroundColor: '#f5f5f5', paddingLeft: 20, paddingRight: 20 }}>
<div className="column-1" style={{ alignSelf: 'center' }}> <div className="column-1" style={{ alignSelf: 'center' }}>
<button <button
......
src/container/MasterData/Perusahaan/CreatePerusahaan.js
View file @ 13242284
...@@ -53,7 +53,7 @@ export default class CreatePerusahaan extends Component { ...@@ -53,7 +53,7 @@ export default class CreatePerusahaan extends Component {
} }
componentDidMount() { componentDidMount() {
if(this.props.type === 'edit') { if (this.props.type === 'edit') {
this.getDetailPerusahaan() this.getDetailPerusahaan()
// console.log(this.props.data); // console.log(this.props.data);
} else { } else {
...@@ -344,13 +344,13 @@ export default class CreatePerusahaan extends Component { ...@@ -344,13 +344,13 @@ export default class CreatePerusahaan extends Component {
className="btn btn-circle btn-white" className="btn btn-circle btn-white"
onClick={() => this.props.onClickClose()} onClick={() => this.props.onClickClose()}
> >
<img src={Images.close}/> <img src={Images.close} />
</button> </button>
</div> </div>
</div> </div>
<div className="border-bottom grid grid-2x grid-mobile-none gap-15px" style={{ padding: 20 }}> <div className="grid grid-2x grid-mobile-none gap-15px" style={{ padding: 20 }}>
<div className="column-1"> <div className="column-1">
<div style={{ backgroundColor: '#e8e8e8', padding: 10, borderRadius: 5 }}> <div style={{ backgroundColor: '#e8e8e8', padding: 10, borderRadius: 5 }}>
<TextField <TextField
...@@ -377,7 +377,7 @@ export default class CreatePerusahaan extends Component { ...@@ -377,7 +377,7 @@ export default class CreatePerusahaan extends Component {
{...this.state.types} {...this.state.types}
debug debug
id="tipe" id="tipe"
onChange={(event, newInputValue) => this.setState({ getTypes: newInputValue }, ()=> this.clearError())} onChange={(event, newInputValue) => this.setState({ getTypes: newInputValue }, () => this.clearError())}
renderInput={(params) => renderInput={(params) =>
<TextField <TextField
{...params} {...params}
...@@ -438,17 +438,6 @@ export default class CreatePerusahaan extends Component { ...@@ -438,17 +438,6 @@ export default class CreatePerusahaan extends Component {
}} }}
/> />
</div> </div>
<div className="margin-top-10px" style={{ padding: 10, borderRadius: 5 }}>
<div style={{ display: 'flex' }}>
<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: '25%' }}>Updated By</Typography>
<Typography style={{ fontSize: 11 }}>: {this.state.updated}</Typography>
</div>
</div>
</div> </div>
<div className="column-2"> <div className="column-2">
...@@ -480,7 +469,7 @@ export default class CreatePerusahaan extends Component { ...@@ -480,7 +469,7 @@ export default class CreatePerusahaan extends Component {
{...this.state.perusahaan} {...this.state.perusahaan}
debug debug
id="tipe" id="tipe"
onChange={(event, newInputValue) => this.setState({ getPerusahaan: newInputValue }, ()=> this.clearError())} onChange={(event, newInputValue) => this.setState({ getPerusahaan: newInputValue }, () => this.clearError())}
renderInput={(params) => renderInput={(params) =>
<TextField <TextField
{...params} {...params}
...@@ -525,6 +514,17 @@ export default class CreatePerusahaan extends Component { ...@@ -525,6 +514,17 @@ export default class CreatePerusahaan extends Component {
</div> </div>
</div> </div>
<div className="border-bottom margin-top-10px" style={{ padding: '0px 20px 20px 20px', borderRadius: 5 }}>
<div style={{ display: 'flex' }}>
<Typography style={{ fontSize: 11, width: '12%' }}>Created By</Typography>
<Typography style={{ fontSize: 11 }}>: {this.state.created}</Typography>
</div>
<div style={{ display: 'flex' }}>
<Typography style={{ fontSize: 11, width: '12%' }}>Updated By</Typography>
<Typography style={{ fontSize: 11 }}>: {this.state.updated}</Typography>
</div>
</div>
<div className="border-top grid grid-2x" style={{ height: 56, backgroundColor: '#f5f5f5', paddingLeft: 20, paddingRight: 20 }}> <div className="border-top grid grid-2x" style={{ height: 56, backgroundColor: '#f5f5f5', paddingLeft: 20, paddingRight: 20 }}>
<div className="column-1" style={{ alignSelf: 'center' }}> <div className="column-1" style={{ alignSelf: 'center' }}>
<button <button
...@@ -568,7 +568,7 @@ export default class CreatePerusahaan extends Component { ...@@ -568,7 +568,7 @@ export default class CreatePerusahaan extends Component {
className="btn btn-circle btn-white" className="btn btn-circle btn-white"
onClick={() => this.props.onClickClose()} onClick={() => this.props.onClickClose()}
> >
<img src={Images.close}/> <img src={Images.close} />
</button> </button>
</div> </div>
</div> </div>
...@@ -600,13 +600,13 @@ export default class CreatePerusahaan extends Component { ...@@ -600,13 +600,13 @@ export default class CreatePerusahaan extends Component {
{...this.state.types} {...this.state.types}
debug debug
id="tipe" id="tipe"
onChange={(event, newInputValue) => this.setState({ getTypes: newInputValue }, ()=> this.clearError())} onChange={(event, newInputValue) => this.setState({ getTypes: newInputValue }, () => this.clearError())}
renderInput={(params) => renderInput={(params) =>
<TextField <TextField
{...params} {...params}
label="Business Unit" label="Business Unit"
margin="normal" margin="normal"
style={{marginTop: 7}} style={{ marginTop: 7 }}
error={this.state.errorUB} error={this.state.errorUB}
helperText={this.state.msgErrorUB} helperText={this.state.msgErrorUB}
InputProps={{ ...params.InputProps, style: { fontSize: 11 } }} InputProps={{ ...params.InputProps, style: { fontSize: 11 } }}
...@@ -699,7 +699,7 @@ export default class CreatePerusahaan extends Component { ...@@ -699,7 +699,7 @@ export default class CreatePerusahaan extends Component {
{...this.state.perusahaan} {...this.state.perusahaan}
debug debug
id="tipe" id="tipe"
onChange={(event, newInputValue) => this.setState({ getPerusahaan: newInputValue }, ()=> this.clearError())} onChange={(event, newInputValue) => this.setState({ getPerusahaan: newInputValue }, () => this.clearError())}
renderInput={(params) => renderInput={(params) =>
<TextField <TextField
{...params} {...params}
......
src/container/MasterData/formUnitBisnis/CreateUnitBisnis.js
View file @ 13242284
...@@ -188,7 +188,7 @@ export default class CreateUnitBisnis extends Component { ...@@ -188,7 +188,7 @@ export default class CreateUnitBisnis extends Component {
</div> </div>
<div className="border-bottom grid grid-2x grid-mobile-none gap-15px" style={{ padding: 20 }}> <div className="grid grid-2x grid-mobile-none gap-15px" style={{ padding: 20 }}>
<div className="column-1"> <div className="column-1">
<div style={{ backgroundColor: '#e8e8e8', padding: 10, borderRadius: 5 }}> <div style={{ backgroundColor: '#e8e8e8', padding: 10, borderRadius: 5 }}>
<TextField <TextField
...@@ -258,17 +258,6 @@ export default class CreateUnitBisnis extends Component { ...@@ -258,17 +258,6 @@ export default class CreateUnitBisnis extends Component {
}} }}
/> />
</div> </div>
<div className="margin-top-10px" style={{ padding: 10, borderRadius: 5 }}>
<div style={{ display: 'flex' }}>
<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: '25%' }}>Updated By</Typography>
<Typography style={{ fontSize: 11 }}>: {this.state.updated}</Typography>
</div>
</div>
</div> </div>
<div className="column-2"> <div className="column-2">
...@@ -327,6 +316,17 @@ export default class CreateUnitBisnis extends Component { ...@@ -327,6 +316,17 @@ export default class CreateUnitBisnis extends Component {
</div> </div>
<div className="border-bottom margin-top-10px" style={{ padding: '0px 20px 20px 20px', borderRadius: 5 }}>
<div style={{ display: 'flex' }}>
<Typography style={{ fontSize: 11, width: '12%' }}>Created By</Typography>
<Typography style={{ fontSize: 11 }}>: {this.state.created}</Typography>
</div>
<div style={{ display: 'flex' }}>
<Typography style={{ fontSize: 11, width: '12%' }}>Updated By</Typography>
<Typography style={{ fontSize: 11 }}>: {this.state.updated}</Typography>
</div>
</div>
<div className="border-top grid grid-2x" style={{ height: 56, backgroundColor: '#f5f5f5', paddingLeft: 20, paddingRight: 20 }}> <div className="border-top grid grid-2x" style={{ height: 56, backgroundColor: '#f5f5f5', paddingLeft: 20, paddingRight: 20 }}>
<div className="column-1" style={{ alignSelf: 'center' }}> <div className="column-1" style={{ alignSelf: 'center' }}>
<button <button
......
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