Skip to content

T
Tia-dev
Commit 175037a7 authored by Riri Novita's avatar Riri Novita
Browse files
Options

Update

parent 2377b8ac
Hide whitespace changes
Inline Side-by-side
Showing with 113 additions and 113 deletions
src/container/MasterData/Company/CreateCompany.js
View file @ 175037a7
...@@ -378,7 +378,7 @@ export default class CreatePerusahaan extends Component { ...@@ -378,7 +378,7 @@ export default class CreatePerusahaan extends Component {
"default_currency": this.state.defaultCurrency.id "default_currency": this.state.defaultCurrency.id
} }
console.log(payload); console.log(payload);
// this.props.updatePerusahaan(payload) this.props.updatePerusahaan(payload)
} }
} }
......
src/container/RollingOutlook/ProfitLossRO.js
View file @ 175037a7
...@@ -2423,128 +2423,128 @@ export default class ProfitLossROO extends Component { ...@@ -2423,128 +2423,128 @@ export default class ProfitLossROO extends Component {
</div> </div>
<Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 5 }}>Notes : {this.state.notesUpdate}</Typography> <Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 5 }}>Notes : {this.state.notesUpdate}</Typography>
</div> </div>
{/* {this.props.isApprover === true || this.state.dataTable.length == 0 ? null : {this.props.isApprover === true || this.state.dataTable.length == 0 ? null :
(this.props.lastStatus === 'SUBMIT' || this.props.lastStatus === 'REVISION') && this.props.prevRevision === false && (this.props.status === 'revision' || this.props.status === 'not-yet' || this.props.status === 'draft' || this.props.status === 'submitted') ? */} (this.props.lastStatus === 'SUBMIT' || this.props.lastStatus === 'REVISION') && this.props.prevRevision === false && (this.props.status === 'revision' || this.props.status === 'not-yet' || this.props.status === 'draft' || this.props.status === 'submitted') ?
<div className="grid grid-2x" style={{ padding: 20 }}> <div className="grid grid-2x" style={{ padding: 20 }}>
<div className="col-1" style={{ paddingLeft: 0 }}> <div className="col-1" style={{ paddingLeft: 0 }}>
<button
type="button"
onClick={() => this.setState({ loading: true }, () => {
setTimeout(() => {
this.props.onClickClose()
}, 100);
})}
style={{
backgroundColor: 'transparent',
cursor: 'pointer',
borderColor: 'transparent',
outline: 'none'
}}
>
<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>
</div>
</button>
</div>
{this.props.isApprover === true ?
<div className="col-2">
</div> :
<div className="col-2" style={{ display: 'flex', justifyContent: 'flex-end', maxWidth: '100%', paddingRight: 5 }}>
{this.state.get_for == 'view' && this.state.viewOnly &&
<button <button
className="button"
type="button" type="button"
onClick={() => this.setState({ loading: true }, () => {
setTimeout(() => {
this.props.onClickClose()
}, 100);
})}
style={{ style={{
backgroundColor: 'transparent', backgroundColor: 'transparent',
cursor: 'pointer', cursor: 'pointer',
borderColor: 'transparent', borderColor: 'transparent',
outline: 'none', outline: 'none'
marginRight: 20
}}
onClick={() => {
this.setState({ loading: true, refresh: true }, () => {
this.handleGetFor('edit')
})
}} }}
> >
<div style={{ backgroundColor: '#fff', width: 105, height: 25, borderRadius: 3, justifyContent: 'center', display: 'flex', alignItems: 'center', border: 'solid 1px #354960' }}> <div style={{ backgroundColor: '#019ce5', width: 105, height: 25, borderRadius: 3, justifyContent: 'center', display: 'flex', alignItems: 'center' }}>
<Typography style={{ fontSize: '11px', color: '#354960', textAlign: 'center' }}>Edit</Typography> <Typography style={{ fontSize: '11px', color: '#fff', textAlign: 'center' }}>Back</Typography>
</div> </div>
</button>} </button>
{this.state.get_for == 'edit' && <button </div>
className="button" {this.props.isApprover === true ?
type="button" <div className="col-2">
style={{ </div> :
backgroundColor: 'transparent', <div className="col-2" style={{ display: 'flex', justifyContent: 'flex-end', maxWidth: '100%', paddingRight: 5 }}>
cursor: 'pointer', {this.state.get_for == 'view' && this.state.viewOnly &&
borderColor: 'transparent', <button
outline: 'none', className="button"
marginRight: 20 type="button"
}} style={{
onClick={() => { backgroundColor: 'transparent',
this.setState({ loading: true }, () => { cursor: 'pointer',
setTimeout(() => { borderColor: 'transparent',
this.handleValidate() outline: 'none',
}, 100); marginRight: 20
}) }}
}} onClick={() => {
> this.setState({ loading: true, refresh: true }, () => {
<div style={{ backgroundColor: '#fff', width: 105, height: 25, borderRadius: 3, justifyContent: 'center', display: 'flex', alignItems: 'center', border: 'solid 1px #354960' }}> this.handleGetFor('edit')
<Typography style={{ fontSize: '11px', color: '#354960', textAlign: 'center' }}>Calculate</Typography> })
</div> }}
</button>} >
{this.state.get_for == 'edit' && <button <div style={{ backgroundColor: '#fff', width: 105, height: 25, borderRadius: 3, justifyContent: 'center', display: 'flex', alignItems: 'center', border: 'solid 1px #354960' }}>
className="button" <Typography style={{ fontSize: '11px', color: '#354960', textAlign: 'center' }}>Edit</Typography>
type="button" </div>
style={{ </button>}
backgroundColor: 'transparent', {this.state.get_for == 'edit' && <button
cursor: 'pointer', className="button"
borderColor: 'transparent', type="button"
outline: 'none', style={{
marginRight: 20 backgroundColor: 'transparent',
}} cursor: 'pointer',
onClick={() => borderColor: 'transparent',
this.state.saveDraft === true ? outline: 'none',
this.setState({ alert: true, messageAlert: 'Data Incomplete !', tipeAlert: 'error' }) marginRight: 20
: }}
this.state.handleDoubleClick == 1 ? null : onClick={() => {
this.setState({ handleDoubleClick: 1, loading: true }, () => { this.setState({ loading: true }, () => {
this.backToRollingOutlook('draft') setTimeout(() => {
this.handleValidate()
}, 100);
}) })
} }}
> >
<div style={{ backgroundColor: '#354960', width: 105, height: 25, borderRadius: 3, justifyContent: 'center', display: 'flex', alignItems: 'center' }}> <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: '#fff', textAlign: 'center' }}>Save as Draft</Typography> <Typography style={{ fontSize: '11px', color: '#354960', textAlign: 'center' }}>Calculate</Typography>
</div> </div>
</button>} </button>}
{this.state.get_for == 'edit' && <button {this.state.get_for == 'edit' && <button
type="button" className="button"
// disabled={this.state.buttonError} type="button"
onClick={() => style={{
this.state.buttonError ? backgroundColor: 'transparent',
this.setState({ alert: true, messageAlert: 'Data Incomplete !', tipeAlert: 'error' }) cursor: 'pointer',
: borderColor: 'transparent',
this.state.handleDoubleClick == 1 ? null : outline: 'none',
this.setState({ handleDoubleClick: 1, loading: true }, () => { marginRight: 20
this.backToRollingOutlook('submitted') }}
})} onClick={() =>
style={{ this.state.saveDraft === true ?
backgroundColor: 'transparent', this.setState({ alert: true, messageAlert: 'Data Incomplete !', tipeAlert: 'error' })
cursor: 'pointer', :
borderColor: 'transparent', this.state.handleDoubleClick == 1 ? null :
outline: 'none', this.setState({ handleDoubleClick: 1, loading: true }, () => {
}} this.backToRollingOutlook('draft')
> })
<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 & Complete3</Typography> >
{/*save & complete ini muncul setelah pencet tombol edit, kemudian setelah upload suatu file*/} <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>
</div>
</button>}
{this.state.get_for == 'edit' && <button
type="button"
// disabled={this.state.buttonError}
onClick={() =>
this.state.buttonError ?
this.setState({ alert: true, messageAlert: 'Data Incomplete !', tipeAlert: 'error' })
:
this.state.handleDoubleClick == 1 ? null :
this.setState({ handleDoubleClick: 1, loading: true }, () => {
this.backToRollingOutlook('submitted')
})}
style={{
backgroundColor: 'transparent',
cursor: 'pointer',
borderColor: 'transparent',
outline: 'none',
}}
>
<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 & Complete3</Typography>
{/*save & complete ini muncul setelah pencet tombol edit, kemudian setelah upload suatu file*/}
</div>
</button>}
</div> </div>
</button>} }
</div> </div>
} : null
</div> }
{/* : null
} */}
</Paper> </Paper>
: :
<Paper style={{ paddingTop: 10 }}> <Paper style={{ paddingTop: 10 }}>
......
src/container/RollingOutlook/RollingOutlook.js
View file @ 175037a7
...@@ -1731,9 +1731,9 @@ export default class RollingOutlook extends Component { ...@@ -1731,9 +1731,9 @@ export default class RollingOutlook extends Component {
borderColor: 'transparent' borderColor: 'transparent'
}} }}
onClick={() => onClick={() =>
// tableMeta.rowData[5] == true ? tableMeta.rowData[5] == true ?
this.clickDetail(tableMeta.rowData[1], tableMeta.rowData[4], tableMeta.rowData[2], tableMeta.rowData[3]) this.clickDetail(tableMeta.rowData[1], tableMeta.rowData[4], tableMeta.rowData[2], tableMeta.rowData[3])
// : null : null
} }
> >
{/* {this.state.isApprover == true ? {/* {this.state.isApprover == true ?
......
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