Skip to content

T
Tia-dev
Commit 132323b6 authored by Riri Novita's avatar Riri Novita
Browse files
Options

Merge branch 'riri' into 'master' 

push latest update MB

See merge request !1377
parents a30e7043 be4d7ee7
Show whitespace changes
Inline Side-by-side
Showing with 109 additions and 24 deletions
src/container/BudgetTahunan/BalanceSheet.js
View file @ 132323b6
...@@ -50,7 +50,7 @@ export default class BalanceSheet extends Component { ...@@ -50,7 +50,7 @@ export default class BalanceSheet extends Component {
editable: false, editable: false,
buttonError: false, buttonError: false,
judulColumn: null, judulColumn: null,
updateBy: '-', updateBy: [],
handleTekTekTek: 0, handleTekTekTek: 0,
saveDraft: true, saveDraft: true,
minValue: "0", minValue: "0",
...@@ -112,7 +112,7 @@ export default class BalanceSheet extends Component { ...@@ -112,7 +112,7 @@ export default class BalanceSheet extends Component {
if (response.data) { if (response.data) {
if (response.data.status === "success") { if (response.data.status === "success") {
this.setState({ this.setState({
updateBy: response.data.data.latest_update === null ? '-' : response.data.data.latest_update updateBy: response.data.data.detail === null ? [] : response.data.data.detail
}) })
} else { } else {
this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning', loading: false }, () => { this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning', loading: false }, () => {
...@@ -3494,7 +3494,19 @@ export default class BalanceSheet extends Component { ...@@ -3494,7 +3494,19 @@ export default class BalanceSheet extends Component {
/> />
</MuiThemeProvider> </MuiThemeProvider>
</div> </div>
<Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 20 }}>Last Updated by : {this.state.updateBy}</Typography> <div style={{ display: 'flex' }}>
<Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 20 }}>Last Updated by : </Typography>
<div style={{ marginLeft: 10, overflowY: 'scroll', height: this.state.updateBy.length < 2 ? 25 : 75, marginTop: 10 }}>
{
this.state.updateBy.length > 0 ? this.state.updateBy.reverse().map((item, index) => {
return (
<Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 10, marginRight: 5 }}>{item.latest_update}</Typography>
)
}) :
<Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 10, marginRight: 5 }}>-</Typography>
}
</div>
</div>
</div> </div>
<div className="grid grid-2x" style={{ marginTop: 20 }}> <div className="grid grid-2x" style={{ marginTop: 20 }}>
<div className="col-1"> <div className="col-1">
......
src/container/BudgetTahunan/CorporateAnnualTarget.js
View file @ 132323b6
...@@ -77,7 +77,7 @@ export default class CorporateAnnualTarget extends Component { ...@@ -77,7 +77,7 @@ export default class CorporateAnnualTarget extends Component {
dataDelete: [], dataDelete: [],
dataReal: [], dataReal: [],
buttonDraft: true, buttonDraft: true,
updateBy: '', updateBy: [],
handleTekTekTek: 0, handleTekTekTek: 0,
editable: false, editable: false,
dataCustomerPrs: [], dataCustomerPrs: [],
...@@ -1013,7 +1013,7 @@ export default class CorporateAnnualTarget extends Component { ...@@ -1013,7 +1013,7 @@ export default class CorporateAnnualTarget extends Component {
if (response.data) { if (response.data) {
if (response.data.status === "success") { if (response.data.status === "success") {
this.setState({ this.setState({
updateBy: response.data.data.latest_update === null ? '-' : response.data.data.latest_update updateBy: response.data.data.detail === null ? '-' : response.data.data.detail
}) })
} }
} }
...@@ -3783,7 +3783,19 @@ export default class CorporateAnnualTarget extends Component { ...@@ -3783,7 +3783,19 @@ export default class CorporateAnnualTarget extends Component {
/> />
</MuiThemeProvider> </MuiThemeProvider>
</div> </div>
<Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 20 }}>Last Updated by : {this.state.updateBy}</Typography> <div style={{ display: 'flex' }}>
<Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 20 }}>Last Updated by : </Typography>
<div style={{ marginLeft: 10, overflowY: 'scroll', height: this.state.updateBy.length < 2 ? 25 : 75, marginTop: 10 }}>
{
this.state.updateBy.length > 0 ? this.state.updateBy.reverse().map((item, index) => {
return (
<Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 10, marginRight: 5 }}>{item.latest_update}</Typography>
)
}) :
<Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 10, marginRight: 5 }}>-</Typography>
}
</div>
</div>
</div> </div>
<div className="grid grid-2x"> <div className="grid grid-2x">
<div className="col-1"> <div className="col-1">
......
src/container/BudgetTahunan/FixedAssetsMovement.js
View file @ 132323b6
...@@ -47,7 +47,7 @@ export default class FixedAssetsMovement extends Component { ...@@ -47,7 +47,7 @@ export default class FixedAssetsMovement extends Component {
editable: false, editable: false,
buttonError: false, buttonError: false,
judulColumn: null, judulColumn: null,
updateBy: '-', updateBy: [],
handleTekTekTek: 0 handleTekTekTek: 0
} }
this.handleValue = this.handleValue.bind(this) this.handleValue = this.handleValue.bind(this)
...@@ -71,7 +71,7 @@ export default class FixedAssetsMovement extends Component { ...@@ -71,7 +71,7 @@ export default class FixedAssetsMovement extends Component {
if (response.data) { if (response.data) {
if (response.data.status === "success") { if (response.data.status === "success") {
this.setState({ this.setState({
updateBy: response.data.data.latest_update === null ? '-' : response.data.data.latest_update updateBy: response.data.data.detail === null ? [] : response.data.data.detail
}) })
} else { } else {
this.setState({ alert: true, messageAlert: response.data.message, typeAlert: 'warning', loading: false }, () => { this.setState({ alert: true, messageAlert: response.data.message, typeAlert: 'warning', loading: false }, () => {
...@@ -2718,7 +2718,19 @@ export default class FixedAssetsMovement extends Component { ...@@ -2718,7 +2718,19 @@ export default class FixedAssetsMovement extends Component {
/> />
</MuiThemeProvider> </MuiThemeProvider>
</div> </div>
<Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 20 }}>Last Updated by : {this.state.updateBy}</Typography> <div style={{ display: 'flex' }}>
<Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 20 }}>Last Updated by : </Typography>
<div style={{ marginLeft: 10, overflowY: 'scroll', height: this.state.updateBy.length < 2 ? 25 : 75, marginTop: 10 }}>
{
this.state.updateBy.length > 0 ? this.state.updateBy.reverse().map((item, index) => {
return (
<Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 10, marginRight: 5 }}>{item.latest_update}</Typography>
)
}) :
<Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 10, marginRight: 5 }}>-</Typography>
}
</div>
</div>
</div> </div>
<div className="grid grid-2x" style={{ marginTop: 20 }}> <div className="grid grid-2x" style={{ marginTop: 20 }}>
<div className="col-1"> <div className="col-1">
......
src/container/BudgetTahunan/ProfitLoss.js
View file @ 132323b6
...@@ -60,7 +60,7 @@ export default class ProfitLoss extends Component { ...@@ -60,7 +60,7 @@ export default class ProfitLoss extends Component {
editable: false, editable: false,
buttonError: false, buttonError: false,
judulColumn: null, judulColumn: null,
updateBy: '-', updateBy: [],
buttonDraft: true, buttonDraft: true,
handleTekTekTek: 0, handleTekTekTek: 0,
fromUpload: false fromUpload: false
...@@ -87,7 +87,7 @@ export default class ProfitLoss extends Component { ...@@ -87,7 +87,7 @@ export default class ProfitLoss extends Component {
if (response.data) { if (response.data) {
if (response.data.status === "success") { if (response.data.status === "success") {
this.setState({ this.setState({
updateBy: response.data.data.latest_update === null ? '-' : response.data.data.latest_update updateBy: response.data.data.detail === null ? [] : response.data.data.detail
}) })
} }
} }
...@@ -2916,7 +2916,19 @@ export default class ProfitLoss extends Component { ...@@ -2916,7 +2916,19 @@ export default class ProfitLoss extends Component {
)} )}
</div> </div>
<Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 20 }}>Last Updated by : {this.state.updateBy}</Typography> <div style={{ display: 'flex' }}>
<Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 20 }}>Last Updated by : </Typography>
<div style={{ marginLeft: 10, overflowY: 'scroll', height: this.state.updateBy.length < 2 ? 25 : 75, marginTop: 10 }}>
{
this.state.updateBy.length > 0 ? this.state.updateBy.reverse().map((item, index) => {
return (
<Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 10, marginRight: 5 }}>{item.latest_update}</Typography>
)
}) :
<Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 10, marginRight: 5 }}>-</Typography>
}
</div>
</div>
</div> </div>
<div className="grid grid-2x" style={{ marginTop: 20 }}> <div className="grid grid-2x" style={{ marginTop: 20 }}>
<div className="col-1"> <div className="col-1">
......
src/container/BudgetTahunan/TaxPlanning.js
View file @ 132323b6
...@@ -50,7 +50,7 @@ export default class TaxPlanning extends Component { ...@@ -50,7 +50,7 @@ export default class TaxPlanning extends Component {
editable: false, editable: false,
buttonError: false, buttonError: false,
judulColumn: null, judulColumn: null,
updateBy: '-', updateBy: [],
buttonDraft: true, buttonDraft: true,
handleTekTekTek: 0, handleTekTekTek: 0,
saveDraft: true, saveDraft: true,
...@@ -98,7 +98,7 @@ export default class TaxPlanning extends Component { ...@@ -98,7 +98,7 @@ export default class TaxPlanning extends Component {
if (response.data) { if (response.data) {
if (response.data.status === "success") { if (response.data.status === "success") {
this.setState({ this.setState({
updateBy: response.data.data.latest_update === null ? '-' : response.data.data.latest_update updateBy: response.data.data.detail === null ? [] : response.data.data.detail
}) })
} else { } else {
this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning', loading: false }, () => { this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning', loading: false }, () => {
...@@ -9026,7 +9026,19 @@ export default class TaxPlanning extends Component { ...@@ -9026,7 +9026,19 @@ export default class TaxPlanning extends Component {
/> />
</MuiThemeProvider> </MuiThemeProvider>
</div> </div>
<Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 20 }}>Last Updated by : {this.state.updateBy}</Typography> <div style={{ display: 'flex' }}>
<Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 20 }}>Last Updated by : </Typography>
<div style={{ marginLeft: 10, overflowY: 'scroll', height: this.state.updateBy.length < 2 ? 25 : 75, marginTop: 10 }}>
{
this.state.updateBy.length > 0 ? this.state.updateBy.reverse().map((item, index) => {
return (
<Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 10, marginRight: 5 }}>{item.latest_update}</Typography>
)
}) :
<Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 10, marginRight: 5 }}>-</Typography>
}
</div>
</div>
</div> </div>
<div className="grid grid-2x" style={{ marginTop: 20 }}> <div className="grid grid-2x" style={{ marginTop: 20 }}>
<div className="col-1"> <div className="col-1">
......
src/container/MonthlyReport/OperatingIndicatorMR.js
View file @ 132323b6
...@@ -57,7 +57,7 @@ export default class OperatingIndicatorMR extends Component { ...@@ -57,7 +57,7 @@ export default class OperatingIndicatorMR extends Component {
visibleOI: true, visibleOI: true,
minValue: 0, minValue: 0,
maxValue: 0, maxValue: 0,
updateBy: '-', updateBy: [],
notesUpdate: '-', notesUpdate: '-',
disabledSave: true, disabledSave: true,
editable: true, editable: true,
...@@ -111,7 +111,7 @@ export default class OperatingIndicatorMR extends Component { ...@@ -111,7 +111,7 @@ export default class OperatingIndicatorMR extends Component {
if (response.data) { if (response.data) {
if (response.data.status === "success") { if (response.data.status === "success") {
this.setState({ this.setState({
updateBy: response.data.data.latest_update === null ? '-' : response.data.data.latest_update, updateBy: response.data.data.detail === null ? [] : response.data.data.detail,
notesUpdate: response.data.data.notes_update === null ? '-' : response.data.data.notes_update notesUpdate: response.data.data.notes_update === null ? '-' : response.data.data.notes_update
}) })
} else { } else {
...@@ -1712,7 +1712,19 @@ export default class OperatingIndicatorMR extends Component { ...@@ -1712,7 +1712,19 @@ export default class OperatingIndicatorMR extends Component {
</MuiThemeProvider> </MuiThemeProvider>
} }
</div> </div>
<Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 20 }}>Last Updated by : {this.state.updateBy}</Typography> <div style={{ display: 'flex' }}>
<Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 20 }}>Last Updated by : </Typography>
<div style={{ marginLeft: 10, overflowY: 'scroll', height: this.state.updateBy.length < 2 ? 25 : 75, marginTop: 10 }}>
{
this.state.updateBy.length > 0 ? this.state.updateBy.reverse().map((item, index) => {
return (
<Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 10, marginRight: 5 }}>{item.latest_update}</Typography>
)
}) :
<Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 10, marginRight: 5 }}>-</Typography>
}
</div>
</div>
<Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 10 }}>Notes : {this.state.notesUpdate}</Typography> <Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 10 }}>Notes : {this.state.notesUpdate}</Typography>
</div> </div>
<div className="grid grid-2x"> <div className="grid grid-2x">
......
src/container/OprIndicator/OperatingIndicator.js
View file @ 132323b6
...@@ -508,10 +508,10 @@ export default class OperatingIndicator extends Component { ...@@ -508,10 +508,10 @@ export default class OperatingIndicator extends Component {
borderColor: 'transparent' borderColor: 'transparent'
}} }}
onClick={() => onClick={() =>
// tableMeta.rowData[4] ? tableMeta.rowData[4] ?
this.clickDetail(tableMeta.rowData, tableMeta.rowData[1], tableMeta.rowData[3], tableMeta.rowData[2]) this.clickDetail(tableMeta.rowData, tableMeta.rowData[1], tableMeta.rowData[3], tableMeta.rowData[2])
// : :
// null null
} }
> >
<Typography style={{ color: tableMeta.rowData[4] ? '#5198ea' : 'GrayText', fontSize: 12, }}>Detail</Typography> <Typography style={{ color: tableMeta.rowData[4] ? '#5198ea' : 'GrayText', fontSize: 12, }}>Detail</Typography>
......
src/container/OprIndicator/OperatingIndicatorDetail.js
View file @ 132323b6
...@@ -57,6 +57,7 @@ export default class BalanceSheet extends Component { ...@@ -57,6 +57,7 @@ export default class BalanceSheet extends Component {
disabledSave: true, disabledSave: true,
editable: true, editable: true,
emptyData: false, emptyData: false,
updateBy: [],
templateNull: true templateNull: true
} }
this.handleValue = this.handleValue.bind(this) this.handleValue = this.handleValue.bind(this)
...@@ -75,7 +76,7 @@ export default class BalanceSheet extends Component { ...@@ -75,7 +76,7 @@ export default class BalanceSheet extends Component {
if (response.data) { if (response.data) {
if (response.data.status === "success") { if (response.data.status === "success") {
this.setState({ this.setState({
updateBy: response.data.data.latest_update === null ? '-' : response.data.data.latest_update updateBy: response.data.data.detail === null ? [] : response.data.data.detail
}) })
} }
} }
...@@ -1952,7 +1953,19 @@ export default class BalanceSheet extends Component { ...@@ -1952,7 +1953,19 @@ export default class BalanceSheet extends Component {
/> />
</MuiThemeProvider> </MuiThemeProvider>
</div> </div>
<Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 20 }}>Last Updated by : {this.state.updateBy}</Typography> <div style={{ display: 'flex' }}>
<Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 20 }}>Last Updated by : </Typography>
<div style={{ marginLeft: 10, overflowY: 'scroll', height: this.state.updateBy.length < 2 ? 25 : 75, marginTop: 10 }}>
{
this.state.updateBy.length > 0 ? this.state.updateBy.reverse().map((item, index) => {
return (
<Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 10, marginRight: 5 }}>{item.latest_update}</Typography>
)
}) :
<Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 10, marginRight: 5 }}>-</Typography>
}
</div>
</div>
</div> </div>
<div className="grid grid-2x"> <div className="grid grid-2x">
<div className="col-1"> <div className="col-1">
......
src/container/RollingOutlook/OperatingIndicatorRO.js
View file @ 132323b6
...@@ -2150,7 +2150,7 @@ export default class OperatingIndicatorRO extends Component { ...@@ -2150,7 +2150,7 @@ export default class OperatingIndicatorRO extends Component {
</button> </button>
</div> </div>
{!this.state.emptyData && (this.props.permission.create || this.props.permission.edit) && <div className="col-2" style={{ display: 'flex', justifyContent: 'flex-end', maxWidth: '100%', paddingRight: 2 }}> {!this.state.emptyData && (this.props.permission.create || this.props.permission.edit) && <div className="col-2" style={{ display: 'flex', justifyContent: 'flex-end', maxWidth: '100%', paddingRight: 2 }}>
{this.state.get_for == 'view' && {this.state.get_for == 'view' && this.state.viewOnly &&
<button <button
type="button" type="button"
onClick={() => { onClick={() => {
......
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