Skip to content

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

Merge branch 'riri' into 'master' 

Riri

See merge request !1369
parents 3359e66d f2089a95
Show whitespace changes
Inline Side-by-side
Showing with 106 additions and 22 deletions
src/container/OutlookPA/BalanceSheetOLPA.js
View file @ ee5d1655
...@@ -48,7 +48,7 @@ export default class BalanceSheetOLPA extends Component { ...@@ -48,7 +48,7 @@ export default class BalanceSheetOLPA extends Component {
editable: false, editable: false,
buttonError: false, buttonError: false,
judulColumn: null, judulColumn: null,
updateBy: '-', updateBy: [],
handleTekTekTek: 0, handleTekTekTek: 0,
viewOnly: true, viewOnly: true,
get_for: 'view', get_for: 'view',
...@@ -152,7 +152,7 @@ export default class BalanceSheetOLPA extends Component { ...@@ -152,7 +152,7 @@ export default class BalanceSheetOLPA 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 }, () => {
...@@ -1854,7 +1854,19 @@ export default class BalanceSheetOLPA extends Component { ...@@ -1854,7 +1854,19 @@ export default class BalanceSheetOLPA 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/OutlookPA/ProfitLossOLPA.js
View file @ ee5d1655
...@@ -60,7 +60,7 @@ export default class ProfitLossOLPA extends Component { ...@@ -60,7 +60,7 @@ export default class ProfitLossOLPA extends Component {
editable: false, editable: false,
buttonError: false, buttonError: false,
judulColumn: null, judulColumn: null,
updateBy: '-', updateBy: [],
buttonDraft: true, buttonDraft: true,
handleTekTekTek: 0, handleTekTekTek: 0,
viewOnly: true, viewOnly: true,
...@@ -131,7 +131,7 @@ export default class ProfitLossOLPA extends Component { ...@@ -131,7 +131,7 @@ export default class ProfitLossOLPA 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 }, () => {
...@@ -1826,7 +1826,19 @@ export default class ProfitLossOLPA extends Component { ...@@ -1826,7 +1826,19 @@ export default class ProfitLossOLPA 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/OutlookPA/TaxPlanningOLPA.js
View file @ ee5d1655
...@@ -50,7 +50,7 @@ export default class TaxPlanningOLPA extends Component { ...@@ -50,7 +50,7 @@ export default class TaxPlanningOLPA extends Component {
editable: false, editable: false,
buttonError: false, buttonError: false,
judulColumn: null, judulColumn: null,
updateBy: '-', updateBy: [],
buttonDraft: true, buttonDraft: true,
handleTekTekTek: 0, handleTekTekTek: 0,
get_for: "view", get_for: "view",
...@@ -155,7 +155,7 @@ export default class TaxPlanningOLPA extends Component { ...@@ -155,7 +155,7 @@ export default class TaxPlanningOLPA 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
}) })
} }
} }
...@@ -3002,7 +3002,19 @@ export default class TaxPlanningOLPA extends Component { ...@@ -3002,7 +3002,19 @@ export default class TaxPlanningOLPA 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: 5 }}>Notes : {this.state.notesUpdate}</Typography> <Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 5 }}>Notes : {this.state.notesUpdate}</Typography>
</div> </div>
<div className="grid grid-2x" style={{ marginTop: 20 }}> <div className="grid grid-2x" style={{ marginTop: 20 }}>
......
src/container/RollingOutlook/BalanceSheetRO.js
View file @ ee5d1655
...@@ -47,7 +47,7 @@ export default class BalanceSheetRO extends Component { ...@@ -47,7 +47,7 @@ export default class BalanceSheetRO extends Component {
loading: true, loading: true,
get_for: "view", get_for: "view",
viewOnly : true, viewOnly : true,
updateBy: '-', updateBy: [],
editable: false, editable: false,
handleTekTekTek: 0, handleTekTekTek: 0,
saveDraft: true, saveDraft: true,
...@@ -157,7 +157,7 @@ export default class BalanceSheetRO extends Component { ...@@ -157,7 +157,7 @@ export default class BalanceSheetRO 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,
notes: response.data.data.notes_update === null ? "" : response.data.data.notes_update notes: response.data.data.notes_update === null ? "" : response.data.data.notes_update
}) })
} else { } else {
...@@ -2967,7 +2967,19 @@ export default class BalanceSheetRO extends Component { ...@@ -2967,7 +2967,19 @@ export default class BalanceSheetRO 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>
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>Notes : {this.state.notes}</Typography> <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>Notes : {this.state.notes}</Typography>
</div> </div>
......
src/container/RollingOutlook/CatRevision.js
View file @ ee5d1655
...@@ -67,7 +67,7 @@ export default class CatRevision extends Component { ...@@ -67,7 +67,7 @@ export default class CatRevision extends Component {
dataDelete: [], dataDelete: [],
dataReal: [], dataReal: [],
buttonDraft: true, buttonDraft: true,
updateBy: '', updateBy: [],
handleTekTekTek: 0, handleTekTekTek: 0,
editable: false, editable: false,
get_for: 'view', get_for: 'view',
...@@ -699,7 +699,7 @@ export default class CatRevision extends Component { ...@@ -699,7 +699,7 @@ export default class CatRevision 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,
notes: response.data.data.notes_update === null ? "" : response.data.data.notes_update notes: response.data.data.notes_update === null ? "" : response.data.data.notes_update
}) })
} else { } else {
...@@ -3056,7 +3056,19 @@ export default class CatRevision extends Component { ...@@ -3056,7 +3056,19 @@ export default class CatRevision 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' }}>Notes : {this.state.notes}</Typography> <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>Notes : {this.state.notes}</Typography>
</div> </div>
<div className="grid grid-2x" style={{ padding: 20 }}> <div className="grid grid-2x" style={{ padding: 20 }}>
...@@ -3204,7 +3216,19 @@ export default class CatRevision extends Component { ...@@ -3204,7 +3216,19 @@ export default class CatRevision 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' }}>Notes : {this.state.notes}</Typography> <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>Notes : {this.state.notes}</Typography>
</div> </div>
<div className="grid grid-2x" style={{ padding: 20 }}> <div className="grid grid-2x" style={{ padding: 20 }}>
......
src/container/RollingOutlook/ProfitLossRO.js
View file @ ee5d1655
...@@ -85,7 +85,7 @@ export default class ProfitLossROO extends Component { ...@@ -85,7 +85,7 @@ export default class ProfitLossROO extends Component {
visiblePLRO: true, visiblePLRO: true,
minValue: 0, minValue: 0,
maxValue: 0, maxValue: 0,
updateBy: '-', updateBy: [],
notesUpdate: '-', notesUpdate: '-',
bebas: false, bebas: false,
judulColumn: null, judulColumn: null,
...@@ -196,7 +196,7 @@ export default class ProfitLossROO extends Component { ...@@ -196,7 +196,7 @@ export default class ProfitLossROO 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,
notes: response.data.data.notes_update === null ? "" : response.data.data.notes_update notes: response.data.data.notes_update === null ? "" : response.data.data.notes_update
}) })
} else { } else {
...@@ -1008,7 +1008,7 @@ export default class ProfitLossROO extends Component { ...@@ -1008,7 +1008,7 @@ export default class ProfitLossROO extends Component {
} }
} }
}, { }, {
name: `Jan ${this.props.periode}`, name: `Jan ${this.props.periode} Actual`,
options: { options: {
customHeadRender: (columnMeta) => ( customHeadRender: (columnMeta) => (
<TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96, borderRight: '1px #fff solid' }}> <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96, borderRight: '1px #fff solid' }}>
...@@ -1106,7 +1106,7 @@ export default class ProfitLossROO extends Component { ...@@ -1106,7 +1106,7 @@ export default class ProfitLossROO extends Component {
} }
} }
}, { }, {
name: `Feb ${this.props.periode}`, name: `Feb ${this.props.periode} Actual`,
options: { options: {
customHeadRender: (columnMeta) => ( customHeadRender: (columnMeta) => (
<TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96, borderRight: '1px #fff solid' }}> <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96, borderRight: '1px #fff solid' }}>
...@@ -1204,7 +1204,7 @@ export default class ProfitLossROO extends Component { ...@@ -1204,7 +1204,7 @@ export default class ProfitLossROO extends Component {
} }
} }
}, { }, {
name: `Mar ${this.props.periode}`, name: `Mar ${this.props.periode} Actual`,
options: { options: {
customHeadRender: (columnMeta) => ( customHeadRender: (columnMeta) => (
<TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96, borderRight: '1px #fff solid' }}> <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96, borderRight: '1px #fff solid' }}>
...@@ -2407,7 +2407,19 @@ export default class ProfitLossROO extends Component { ...@@ -2407,7 +2407,19 @@ export default class ProfitLossROO 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>
<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 :
......
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