fix: cost of poor quality report time filters not working #28958
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
aaronmenezes
requested review from
ankush,
marination and
rohitwaghchaure
as code owners
ankush
reviewed
Dec 20, 2021
erpnext/manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.py
Outdated
Show resolved
Hide resolved
ankush
added
backport version-13-hotfix
and removed
Develop
backport version-13-pre-release
labels
Codecov Report
@@ Coverage Diff @@
## develop #28958 +/- ##
===========================================
+ Coverage 55.64% 55.73% +0.09%
===========================================
Files 1128 1131 +3
Lines 67335 67589 +254
===========================================
+ Hits 37467 37674 +207
- Misses 29868 29915 +47
|
aaronmenezes
force-pushed
the
fix_cost_of_poor_quality_filters
branch
from
4158435
to
3107e4d
Compare
ankush
added
the
squash
|
report not usable right now on edit: fixed via frappe/frappe#15454 |
ankush
requested changes
Jan 3, 2022
| )) | ||
| ) | ||
| query = append_filters(report_filters,operations,query,job_card) | ||
| data = query.run() |
There was a problem hiding this comment.
the previous function was returning a list of dicts. this is list of tuples. 🤔
erpnext/manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.py
Outdated
Show resolved
Hide resolved
erpnext/manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.py
Outdated
Show resolved
Hide resolved
erpnext/manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.py
Outdated
Show resolved
Hide resolved
| .select(job_card_time_log.parent) | ||
| .where(job_card_time_log.parent == job_card.name) | ||
| .where(job_card_time_log.from_time >= report_filters.get('from_date','')) | ||
| .where(job_card_time_log.to_time <= report_filters.get('to_date','')) |
There was a problem hiding this comment.
if comparing an empty string like x <= '' nothing will show up I think? 🤔
These time filters should be conditionally chained like other filters.
| job_card.serial_no, job_card.batch_no, job_card.workstation, job_card.total_time_in_mins, job_card.hour_rate, | ||
| operatingcost) | ||
| .where(job_card.docstatus==1) | ||
| .where(job_card.is_corrective_job_card==1) |
There was a problem hiding this comment.
- This condition should also be added in the subquery for faster filtering.
- Sub-query should only be required when from/to time is specified.
- optionally apply date filters - join instead of expensive sub-query - return as dictionary
mergify bot
pushed a commit
that referenced
this pull request
Jan 30, 2022
* fix: cost of poor quality report time filters not working * chore:update cost of poor quality report to use query builder * fix: linter warnings * chore: updated report query * chore: added test filters * fix : cleared linter warnings * chore: formatting * refactor: query generation - optionally apply date filters - join instead of expensive sub-query - return as dictionary * test: simplify test Co-authored-by: Ankush Menat <ankush@frappe.io> (cherry picked from commit 0f7c2a1)
ankush
pushed a commit
that referenced
this pull request
Jan 30, 2022
…29521) * fix: cost of poor quality report time filters not working * chore:update cost of poor quality report to use query builder * fix: linter warnings * chore: updated report query * chore: added test filters * fix : cleared linter warnings * chore: formatting * refactor: query generation - optionally apply date filters - join instead of expensive sub-query - return as dictionary * test: simplify test Co-authored-by: Ankush Menat <ankush@frappe.io> (cherry picked from commit 0f7c2a1) Co-authored-by: aaronmenezes <ron2805@gmail.com>
KrithiRamani
pushed a commit
to KrithiRamani/erpnext
that referenced
this pull request
Mar 14, 2022
…) (frappe#29521) * fix: cost of poor quality report time filters not working * chore:update cost of poor quality report to use query builder * fix: linter warnings * chore: updated report query * chore: added test filters * fix : cleared linter warnings * chore: formatting * refactor: query generation - optionally apply date filters - join instead of expensive sub-query - return as dictionary * test: simplify test Co-authored-by: Ankush Menat <ankush@frappe.io> (cherry picked from commit 0f7c2a1) Co-authored-by: aaronmenezes <ron2805@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Issue :
In the Cost of Poor Quality report, Time and date filter had no effect on the report.
Fix:
Update report query to fix this incorrect behavior.