Skip to content

T
Tia-dev
Commit 5e8f3c6a authored by ardiansyah's avatar ardiansyah
Browse files
Options

Merge branch 'ENV-DEV' into 'ENV-DEPLOYMENT' 

Env dev

See merge request !2438
parents 2abf320c 10935b02
Show whitespace changes
Inline Side-by-side
Showing with 62 additions and 60 deletions
src/container/MonthlyReport/LOVMR.js
View file @ 5e8f3c6a
...@@ -356,7 +356,7 @@ export default class LOV extends Component { ...@@ -356,7 +356,7 @@ export default class LOV extends Component {
isi.map((i, index) => { isi.map((i, index) => {
if (i.length > 0) { if (i.length > 0) {
let tgl = String(i[6]).split('-') let tgl = String(i[6]).split('-')
console.log(tgl); // console.log(tgl);
payload.push({ payload.push({
"item_report_id": i[1], "item_report_id": i[1],
"company_name": this.props.company.company_name, "company_name": this.props.company.company_name,
......
src/container/MonthlyReport/ListOfCreditFacilitiesMR.js
View file @ 5e8f3c6a
...@@ -952,7 +952,8 @@ export default class ListOfCreditFacilities extends Component { ...@@ -952,7 +952,8 @@ export default class ListOfCreditFacilities extends Component {
error = true error = true
this.setState({ emptyData: true}) this.setState({ emptyData: true})
} }
if (i[7] == null || i[7] == ""){
if ((i[7]?.value == 'Government bonds' && i[8] == '') || (i[7]?.value == 'Stocks' && i[8] == '') || (i[7]?.value == 'Mutual funds' && i[8] == '') || (i[7]?.value == 'Investment in associate' && i[8] == '') || (i[7]?.value == 'Investment in joint venture' && i[8] == '') || (i[7]?.value == 'Investment in subsidiary' && i[8] == '') || (i[7]?.value == 'Corporate bonds' && i[8] == '') || (i[7]?.value == 'Others' && i[8] == '')) {
error = true error = true
}else { }else {
if ((i[7].value == 'Government bonds' && i[8] == '') || (i[7].value == 'Stocks' && i[8] == '') || (i[7].value == 'Mutual funds' && i[8] == '') || (i[7].value == 'Investment in associate' && i[8] == '') || (i[7].value == 'Investment in joint venture' && i[8] == '') || (i[7].value == 'Investment in subsidiary' && i[8] == '') || (i[7].value == 'Corporate bonds' && i[8] == '') || (i[7].value == 'Others' && i[8] == '')) { if ((i[7].value == 'Government bonds' && i[8] == '') || (i[7].value == 'Stocks' && i[8] == '') || (i[7].value == 'Mutual funds' && i[8] == '') || (i[7].value == 'Investment in associate' && i[8] == '') || (i[7].value == 'Investment in joint venture' && i[8] == '') || (i[7].value == 'Investment in subsidiary' && i[8] == '') || (i[7].value == 'Corporate bonds' && i[8] == '') || (i[7].value == 'Others' && i[8] == '')) {
......
src/container/Reports/SubHolding.js
View file @ 5e8f3c6a
...@@ -1505,18 +1505,18 @@ export default class SubHolding extends Component { ...@@ -1505,18 +1505,18 @@ export default class SubHolding extends Component {
item.ratio.monthly_last_year_october, item.ratio.monthly_last_year_october,
item.ratio.monthly_last_year_november, item.ratio.monthly_last_year_november,
item.ratio.monthly_last_year_december, item.ratio.monthly_last_year_december,
item.ratio.ro_ol_january, // item.ratio.ro_ol_january,
item.ratio.ro_ol_february, // item.ratio.ro_ol_february,
item.ratio.ro_ol_march, // item.ratio.ro_ol_march,
item.ratio.ro_ol_april, // item.ratio.ro_ol_april,
item.ratio.ro_ol_may, // item.ratio.ro_ol_may,
item.ratio.ro_ol_june, // item.ratio.ro_ol_june,
item.ratio.ro_ol_july, // item.ratio.ro_ol_july,
item.ratio.ro_ol_august, // item.ratio.ro_ol_august,
item.ratio.ro_ol_september, // item.ratio.ro_ol_september,
item.ratio.ro_ol_october, // item.ratio.ro_ol_october,
item.ratio.ro_ol_november, // item.ratio.ro_ol_november,
item.ratio.ro_ol_december, // item.ratio.ro_ol_december,
item.ratio.q1_january, item.ratio.q1_january,
item.ratio.q1_february, item.ratio.q1_february,
item.ratio.q1_march, item.ratio.q1_march,
...@@ -1634,18 +1634,18 @@ export default class SubHolding extends Component { ...@@ -1634,18 +1634,18 @@ export default class SubHolding extends Component {
item.ratio.monthly_last_year_october, item.ratio.monthly_last_year_october,
item.ratio.monthly_last_year_november, item.ratio.monthly_last_year_november,
item.ratio.monthly_last_year_december, item.ratio.monthly_last_year_december,
item.ratio.ro_ol_january, // item.ratio.ro_ol_january,
item.ratio.ro_ol_february, // item.ratio.ro_ol_february,
item.ratio.ro_ol_march, // item.ratio.ro_ol_march,
item.ratio.ro_ol_april, // item.ratio.ro_ol_april,
item.ratio.ro_ol_may, // item.ratio.ro_ol_may,
item.ratio.ro_ol_june, // item.ratio.ro_ol_june,
item.ratio.ro_ol_july, // item.ratio.ro_ol_july,
item.ratio.ro_ol_august, // item.ratio.ro_ol_august,
item.ratio.ro_ol_september, // item.ratio.ro_ol_september,
item.ratio.ro_ol_october, // item.ratio.ro_ol_october,
item.ratio.ro_ol_november, // item.ratio.ro_ol_november,
item.ratio.ro_ol_december, // item.ratio.ro_ol_december,
item.ratio.q1_january, item.ratio.q1_january,
item.ratio.q1_february, item.ratio.q1_february,
item.ratio.q1_march, item.ratio.q1_march,
......
src/container/Reports/TableSubHolding.js
View file @ 5e8f3c6a
...@@ -15557,6 +15557,7 @@ export default class TableSubHolding extends Component { ...@@ -15557,6 +15557,7 @@ export default class TableSubHolding extends Component {
}, { }, {
name: `Rolling Outlook - Full Year ${this.props.periode}`, name: `Rolling Outlook - Full Year ${this.props.periode}`,
options: { options: {
display: false,
customHeadRender: (columnMeta) => ( customHeadRender: (columnMeta) => (
<th style={{ ...style2, color: '#fff', backgroundColor: '#07a7d0', top: 0, zIndex: 102, fontSize: 13, fontWeight: 1, width: 150, borderRight: "1px solid rgb(255, 255, 255)", padding: 0 }} > <th style={{ ...style2, color: '#fff', backgroundColor: '#07a7d0', top: 0, zIndex: 102, fontSize: 13, fontWeight: 1, width: 150, borderRight: "1px solid rgb(255, 255, 255)", padding: 0 }} >
{/* <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96 }}> {/* <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96 }}>
src/container/RollingOutlook/BalanceSheetRO.js
View file @ 5e8f3c6a
...@@ -3318,7 +3318,7 @@ export default class BalanceSheetRO extends Component { ...@@ -3318,7 +3318,7 @@ export default class BalanceSheetRO extends Component {
</div> </div>
{this.state.visibleUpload && ( {this.state.visibleUpload && (
<div className="test app-popup-show"> <div className="test app-popup-show">
<div className="popup-content background-white border-radius" style={{ borderRadius: 8 }}> <div className="popup-content background-white border-radius" style={{ borderRadius: 8, width: 679 }}>
<div className="popup-panel grid grid-2x main-color" style={{ height: 64, borderTopRightRadius: 8, borderTopLeftRadius: 8 }}> <div className="popup-panel grid grid-2x main-color" style={{ height: 64, borderTopRightRadius: 8, borderTopLeftRadius: 8 }}>
<div className="col-1" style={{ maxWidth: "inherit", display: 'flex', alignItems: 'center' }}> <div className="col-1" style={{ maxWidth: "inherit", display: 'flex', alignItems: 'center' }}>
<div className="popup-title"> <div className="popup-title">
......
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