Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
T
Tia-dev
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Dida Adams Arizona
Tia-dev
Commits
ec5d2f93
Commit
ec5d2f93
authored
Apr 10, 2023
by
Riri Novita
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'ENV-DEV' into 'ENV-DEPLOYMENT'
Fixing CF dan Reminder See merge request
!1771
parents
10db258f
404c3a3e
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
71 additions
and
47 deletions
+71
-47
ProgressReport.js
src/container/ProgressReport/ProgressReport.js
+4
-0
TableProgressReport.js
src/container/ProgressReport/TableProgressReport.js
+65
-46
TableSubHolding.js
src/container/Reports/TableSubHolding.js
+2
-1
No files found.
src/container/ProgressReport/ProgressReport.js
View file @
ec5d2f93
...
@@ -187,6 +187,7 @@ class ReportProgress extends Component {
...
@@ -187,6 +187,7 @@ class ReportProgress extends Component {
item
.
automatic_reminder_report_date
,
item
.
automatic_reminder_report_date
,
item
.
manual_reminder_report_status
,
item
.
manual_reminder_report_status
,
item
.
manual_reminder_report_date
,
item
.
manual_reminder_report_date
,
item
.
submission_status
,
item
.
company_id
,
item
.
company_id
,
])
])
})
})
...
@@ -241,6 +242,7 @@ class ReportProgress extends Component {
...
@@ -241,6 +242,7 @@ class ReportProgress extends Component {
item
.
automatic_reminder_report_date
,
item
.
automatic_reminder_report_date
,
item
.
manual_reminder_report_status
,
item
.
manual_reminder_report_status
,
item
.
manual_reminder_report_date
,
item
.
manual_reminder_report_date
,
item
.
monthly_status
,
item
.
company_id
,
item
.
company_id
,
])
])
})
})
...
@@ -277,6 +279,7 @@ class ReportProgress extends Component {
...
@@ -277,6 +279,7 @@ class ReportProgress extends Component {
item
.
automatic_reminder_report_date
,
item
.
automatic_reminder_report_date
,
item
.
manual_reminder_report_status
,
item
.
manual_reminder_report_status
,
item
.
manual_reminder_report_date
,
item
.
manual_reminder_report_date
,
item
.
rolling_status
,
item
.
company_id
,
item
.
company_id
,
])
])
})
})
...
@@ -321,6 +324,7 @@ class ReportProgress extends Component {
...
@@ -321,6 +324,7 @@ class ReportProgress extends Component {
item
.
automatic_reminder_report_date
,
item
.
automatic_reminder_report_date
,
item
.
manual_reminder_report_status
,
item
.
manual_reminder_report_status
,
item
.
manual_reminder_report_date
,
item
.
manual_reminder_report_date
,
item
.
outlook_status
,
item
.
company_id
,
item
.
company_id
,
])
])
})
})
...
...
src/container/ProgressReport/TableProgressReport.js
View file @
ec5d2f93
This diff is collapsed.
Click to expand it.
src/container/Reports/TableSubHolding.js
View file @
ec5d2f93
...
@@ -19053,7 +19053,8 @@ export default class TableSubHolding extends Component {
...
@@ -19053,7 +19053,8 @@ export default class TableSubHolding extends Component {
else {
else {
persenOl = ol / fy
persenOl = ol / fy
}
}
value = String(type).includes('MTD') ? persenMtd : String(type).includes('YTD') ? persenYtd : String(type).includes('Quarter') ? persenQuarter : persenFy
// console.log(type);
value = String(type).includes('MTD') ? persenMtd : String(type).includes('YTD') ? persenYtd : String(type).includes('Quarter') ? persenQuarter : String(type).includes('OL') ? persenOl : persenFy
value = (value == null || value == Infinity || value == -Infinity || isNaN(value) ? 0 : Number(value * 100).toFixed(1))
value = (value == null || value == Infinity || value == -Infinity || isNaN(value) ? 0 : Number(value * 100).toFixed(1))
// value = isNaN(value) || value == 'Infinity' || value == '-Infinity' ? (value == '' || value == 0 ? -0 : 0) : (value== '' || value == 0 ? persenFy * -100 : persenFy * 100)
// value = isNaN(value) || value == 'Infinity' || value == '-Infinity' ? (value == '' || value == 0 ? -0 : 0) : (value== '' || value == 0 ? persenFy * -100 : persenFy * 100)
} else {
} else {
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment