Skip to content

T
Tia-dev
Commit 5d6ddff9 authored by faisalhamdi's avatar faisalhamdi
Browse files
Options

issue update!

parent 8d35bd38
Show whitespace changes
Inline Side-by-side
Showing with 124 additions and 20 deletions
src/container/MonthlyReport/BalanceSheetMR.js
View file @ 5d6ddff9
......@@ -50,7 +50,7 @@ export default class BalanceSheetMR extends Component {
valueThreshold: 0,
minValue: 0,
maxValue: 0,
updateBy: '-',
updateBy: [],
notes: "",
judulColumn: null,
get_for: "view",
......@@ -113,7 +113,7 @@ export default class BalanceSheetMR extends Component {
if (response.data) {
if (response.data.status === "success") {
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
})
} else {
......@@ -2626,7 +2626,20 @@ export default class BalanceSheetMR extends Component {
)}
</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>
</div>
......
src/container/MonthlyReport/CorporateAnnualTargetMR.js
View file @ 5d6ddff9
......@@ -65,7 +65,7 @@ export default class CorporateAnnualTargetMR extends Component {
getOptionLabel: (option) => titleCase(option.value),
},
visibleCATMR: true,
updateBy: '-',
updateBy: [],
notes: "",
judulColumn: null,
get_for: "view",
......@@ -169,7 +169,7 @@ export default class CorporateAnnualTargetMR extends Component {
if (response.data) {
if (response.data.status === "success") {
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
})
} else {
......@@ -2007,7 +2007,20 @@ export default class CorporateAnnualTargetMR extends Component {
</div>
<div style={{ display: 'flex', justifyContent: 'space-between', maxWidth: '100%', paddingLeft: 15, paddingRight: 15, marginTop: 5 }}>
<div>
<Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 10 }}>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 style={{ display: 'flex', flexDirection: 'row' }}>
<div style={{ padding: 5 }}>
......@@ -2177,7 +2190,20 @@ export default class CorporateAnnualTargetMR extends Component {
</div>
<div style={{ display: 'flex', justifyContent: 'space-between', maxWidth: '100%', paddingLeft: 15, paddingRight: 15, marginTop: 5 }}>
<div>
<Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 10 }}>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 style={{ display: 'flex', flexDirection: 'row' }}>
<div style={{ padding: 5 }}>
......
src/container/MonthlyReport/FixedAssetsMovementMR.js
View file @ 5d6ddff9
......@@ -46,7 +46,7 @@ export default class FixedAssetsMovementMR extends Component {
dataTable: [],
loading: true,
visibleFAMMR: true,
updateBy: '-',
updateBy: [],
notesUpdate: '-',
get_for: 'view',
saveDraft: true,
......@@ -115,7 +115,7 @@ export default class FixedAssetsMovementMR extends Component {
if (response.data) {
if (response.data.status === "success") {
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
})
} else {
......@@ -1411,7 +1411,20 @@ export default class FixedAssetsMovementMR extends Component {
</MuiThemeProvider>
)}
</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>
</div>
<div className="grid grid-2x" style={{ padding: 20 }}>
......
src/container/MonthlyReport/ListOfCreditFacilities.js
View file @ 5d6ddff9
......@@ -114,7 +114,7 @@ export default class ListOfCreditFacilities extends Component {
saveDraft: true,
saveComp: true,
get_for: 'view',
updateBy: '-',
updateBy: [],
notes: "",
viewOnly: true,
dataDelete: [],
......@@ -407,7 +407,7 @@ export default class ListOfCreditFacilities extends Component {
if (response.data) {
if (response.data.status === "success") {
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
})
} else {
......@@ -3881,7 +3881,20 @@ export default class ListOfCreditFacilities extends Component {
<div style={{ display: 'flex', justifyContent: 'space-between', maxWidth: '100%', paddingLeft: 5, paddingRight: 15, marginTop: 5}}>
<div>
<Typography style={{ fontSize: '12px', color: '#4b4b4b', marginTop: 10 }}>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 style={{display: 'flex', flexDirection: 'row'}}>
<div style={{padding: 5}}>
......@@ -4093,7 +4106,20 @@ export default class ListOfCreditFacilities extends Component {
<div style={{ display: 'flex', justifyContent: 'space-between', maxWidth: '100%', paddingLeft: 5, paddingRight: 15, marginTop: 5}}>
<div>
<Typography style={{ fontSize: '12px', color: '#4b4b4b', marginTop: 10 }}>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 style={{display: 'flex', flexDirection: 'row'}}>
<div style={{padding: 5}}>
......
src/container/MonthlyReport/ProfitLossMR.js
View file @ 5d6ddff9
......@@ -85,7 +85,7 @@ export default class ProfitLossMR extends Component {
visiblePLMR: true,
minValue: 0,
maxValue: 0,
updateBy: '-',
updateBy: [],
notesUpdate: '-',
bebas: false,
judulColumn: null,
......@@ -195,7 +195,7 @@ export default class ProfitLossMR extends Component {
if (response.data) {
if (response.data.status === "success") {
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
})
} else {
......@@ -2056,7 +2056,20 @@ export default class ProfitLossMR extends Component {
)}
</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>
</div>
{/* {this.props.isApprover === true || this.state.dataTable.length == 0 ? null :
......
src/container/MonthlyReport/TaxPlanningMR.js
View file @ 5d6ddff9
......@@ -48,7 +48,7 @@ export default class TaxPlanningMR extends Component {
disabledSave: true,
editable: false,
judulColumn: null,
updateBy: '-',
updateBy: [],
notesUpdate: "",
buttonDraft: true,
handleTekTekTek: 0,
......@@ -155,7 +155,7 @@ export default class TaxPlanningMR extends Component {
if (response.data) {
if (response.data.status === "success") {
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
})
}
......@@ -1571,7 +1571,20 @@ export default class TaxPlanningMR extends Component {
</MuiThemeProvider>
{/* )} */}
</div>
<Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 20, marginLeft: 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, marginLeft: 20 }}>Notes : {this.state.notesUpdate}</Typography>
</div>
<div className="grid grid-2x" style={{ marginTop: 20 }}>
......
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