fix: Quality Inspection Rejection issue fixed #606
Merged
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
Pull Request Test Coverage Report for Build 2397
💛 - Coveralls |
Alchez
suggested changes
Sep 29, 2020
| @@ -63,12 +63,23 @@ frappe.ui.form.on("Quality Inspection", { | |||
| frappe.ui.form.on("Quality Inspection Reading", { | |||
| status: function (frm, cdt, cdn) { | |||
| let row = locals[cdt][cdn]; | |||
| let not_rejected = true; | |||
There was a problem hiding this comment.
Couldn't this be:
Suggested change
| let not_rejected = true; | |
| let rejected = false; |
Seems like that'll be more readable
Comment on lines
73
to
82
| else { | ||
| frm.doc.readings.forEach(reading => { | ||
| if (reading.status === "Rejected") { | ||
| not_rejected = false; | ||
| } | ||
| }); | ||
| if (not_rejected) { | ||
| frm.set_value("status", "Accepted"); | ||
| } | ||
| } |
There was a problem hiding this comment.
This should happen on the server side as well
hrwX
suggested changes
Oct 1, 2020
| @@ -68,10 +68,14 @@ def validate_certificate_of_analysis(self): | |||
| frappe.throw(_("Please attach a Certificate of Analysis")) | |||
|
|
|||
| def validate_reading_status(self): | |||
| rejected = False | |||
There was a problem hiding this comment.
Suggested change
| rejected = False | |
| self.status = "Accepted" |
| for reading in self.readings: | ||
| if reading.status == 'Rejected': | ||
| self.status = "Rejected" | ||
| return | ||
| rejected = True |
Comment on lines
77
to
78
| if not rejected: | ||
| self.status = "Accepted" |
There was a problem hiding this comment.
Suggested change
| if not rejected: | |
| self.status = "Accepted" |
hrwX
suggested changes
Oct 6, 2020
Comment on lines
73
to
82
| else { | ||
| frm.doc.readings.forEach(reading => { | ||
| if (reading.status === "Rejected") { | ||
| rejected = true; | ||
| } | ||
| }); | ||
| if (!rejected) { | ||
| frm.set_value("status", "Accepted"); | ||
| } | ||
| } |
There was a problem hiding this comment.
Suggested change
| else { | |
| frm.doc.readings.forEach(reading => { | |
| if (reading.status === "Rejected") { | |
| rejected = true; | |
| } | |
| }); | |
| if (!rejected) { | |
| frm.set_value("status", "Accepted"); | |
| } | |
| } | |
| let status = "Accepted"; | |
| frm.doc.readings.forEach(reading => { | |
| if (reading.status === "Rejected") { | |
| status = "Rejected"; | |
| } | |
| }); | |
| frm.set_value("status", status); |
… qi-rejection-issue
…erpnext into qi-rejection-issue
hrwX
suggested changes
Oct 8, 2020
Co-authored-by: Himanshu <himanshuwarekar@yahoo.com>
hrwX
approved these changes
Oct 13, 2020
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.
TASK
Reported Isssue
PR Reference