feat(core): actual distance travelled by the driver by DeeMysterio · Pull Request #32 · Bloomstack/bloomstack_core

DeeMysterio · 2019-06-11T15:32:02Z

Ref: TASK-2019-00141

Alchez · 2019-06-11T16:06:58Z

Looks good, but a few notes:

The new odometer fields are missing.
- If you used Customize Form, you also need to export them (to an app, in our case it'll be Bloomstack Core) to have them appear in code.
- If you're editing the DocType directly, then they'll go in the main ERPNext repo, since that's where the Delivery Trip doctype lives.
Make sure to validate the odometer values - the end value should not be lower than the start value (there may be an edge case where the driver resets the odometer value on their car, but that shouldn't happen during the trip; might need discussion).
- Also update the stop value in the Vehicle's last odometer value reading. You can even use this value in Vehicle to set a default value in the prompt for the "Start" button.
You don't need to manually reload the page everytime. Just use frm.refresh() after setting the odometer values to reload the fields.
Make the "Actual Distance Travelled" field read-only.
Fix the PR title and use Conventional Commit naming.

Alchez · 2019-06-12T12:17:03Z

+                },
+                ],
+                    function (data) {
+                        frappe.call({


Don't go to the server. Just take the value that the user inputs and set in the form itself.

Alchez · 2019-06-12T12:17:10Z

+                },
+                ],
+                    function (data) {
+                        frappe.call({


Same as above.

Alchez · 2019-06-18T06:39:09Z

+
+
+def set_vehicle_last_odometer_value(self, event):
+    print("reached here!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!")


Remove print

Alchez · 2019-06-18T06:39:46Z

+def set_vehicle_last_odometer_value(self, event):
+    print("reached here!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!")
+    if self.actual_distance_travelled:
+        vehicle = frappe.get_doc("Vehicle", self.vehicle)


get_doc is overkill for this. Just do a simple frappe.db.set_value.

Alchez · 2019-06-18T06:40:55Z

+import frappe
+
+
+def set_vehicle_last_odometer_value(self, event):


The self argument is convention for classes. Change the arguments to (trip, method) to keep it consistent with other hook methods.

Alchez · 2019-06-18T06:42:24Z

@@ -0,0 +1,50 @@
+frappe.ui.form.on('Delivery Trip', {
+    refresh: (frm) => {
+        if (frm.doc.docstatus == 1 && frm.doc.status != "Completed" && frm.doc.odometer_start_value == 0) {


The conditions in the if and else if have some common expressions. Maybe combine them and nest the ifs.

Alchez · 2019-06-18T06:43:35Z

+                            frm.dirty();
+                            frm.save_or_update();
+                        } else{
+                            frappe.throw("Invalid Odometer Stop Value!");


Let the user know what exactly went wrong - the stop value is smaller than the start value.

Alchez · 2019-06-18T06:44:19Z

+                    function (data) {
+                        frm.set_value('odometer_stop_value', data.odometer_stop_value);
+                        frm.set_value('odometer_stop_time', frappe.datetime.now_datetime());
+                        if (data.odometer_stop_value > frm.doc.odometer_start_value && frm.doc.odometer_stop_time > frm.doc.odometer_start_time) {


You don't need the time check. The user does not input that, so it's going to be later always.

Alchez · 2019-06-18T06:44:35Z

 	frappe.db.commit()
+
+@frappe.whitelist()
+def update_odometer(dn, start=None, stop=None):


You don't need this method anymore.

@DeeMysterio?

Alchez · 2019-06-18T06:54:58Z

+                },
+                ],
+                    function (data) {
+                        frm.set_value('odometer_stop_value', data.odometer_stop_value);


Don't update the stop value if it's lower than the start value. Put it inside the check.

Alchez · 2019-06-18T08:17:33Z

+
+
+def set_vehicle_last_odometer_value(trip, method):
+    if self.actual_distance_travelled:


Please test your changes, lol. self is no longer available.

Alchez · 2019-06-18T08:17:55Z

+def set_vehicle_last_odometer_value(trip, method):
+    if self.actual_distance_travelled:
+        frappe.db.set_value('Vehicle', trip.vehicle, 'last_odometer', trip.odometer_stop_value)
+	frappe.db.commit()


You don't need an explicit commit. It'll happen automatically if the hook runs successfully.

Alchez · 2019-06-18T08:18:21Z

 from erpnext.stock.doctype.batch.batch import get_batch_qty
 from python_metrc import METRC
-
+from frappe.utils import now_datetime


Remove all changes from this file.

vjFaLk · 2019-06-21T08:34:37Z

@Alchez Is this approved?

Alchez · 2019-06-21T08:35:33Z

Not yet, it's still missing the fields.

Alchez · 2019-06-28T08:48:32Z

+   "label": "Make Payment Entry", 
+   "modified": "2018-09-28 22:54:48.552714", 
+   "modified_by": "Administrator", 
+   "name": "Delivery Stop-make_payment_entry", 


@DeeMysterio, only add the fields related to this PR (don't manually remove it from this file). The fields you've added are linked to other features, which will also need to be moved.

@neilLasrado, should we move this feature to core now?

Alchez · 2019-06-28T08:48:36Z

 	frappe.db.commit()
+
+@frappe.whitelist()
+def update_odometer(dn, start=None, stop=None):


@DeeMysterio?

…dated with the odometer stop value in delivery trip

fix: Remove child table changes + minor fixes

dti-deploy · 2019-08-12T12:21:49Z

🎉 This PR is included in version 1.3.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

DeeMysterio requested a review from Alchez June 11, 2019 15:32

Alchez suggested changes Jun 12, 2019

View reviewed changes

vjFaLk temporarily deployed to Tugboat June 13, 2019 09:18 Destroyed

DeeMysterio changed the title ~~Actual distance travelled by driver~~ feat(core): actual distance travelled by the driver Jun 13, 2019

vjFaLk temporarily deployed to Tugboat June 13, 2019 09:37 Destroyed

vjFaLk temporarily deployed to Tugboat June 14, 2019 00:54 Destroyed

vjFaLk temporarily deployed to Tugboat June 14, 2019 14:30 Destroyed

vjFaLk temporarily deployed to Tugboat June 15, 2019 01:07 Destroyed

vjFaLk temporarily deployed to Tugboat June 16, 2019 01:05 Destroyed

vjFaLk temporarily deployed to Tugboat June 17, 2019 01:05 Destroyed

vjFaLk temporarily deployed to Tugboat June 18, 2019 00:09 Destroyed

Alchez suggested changes Jun 18, 2019

View reviewed changes

Alchez reviewed Jun 18, 2019

View reviewed changes

vjFaLk temporarily deployed to Tugboat June 18, 2019 07:25 Destroyed

Alchez suggested changes Jun 18, 2019

View reviewed changes

vjFaLk temporarily deployed to Tugboat June 18, 2019 08:59 Destroyed

vjFaLk temporarily deployed to Tugboat June 19, 2019 00:39 Destroyed

vjFaLk temporarily deployed to Tugboat June 20, 2019 00:10 Destroyed

vjFaLk temporarily deployed to Tugboat June 21, 2019 00:12 Destroyed

vjFaLk temporarily deployed to Tugboat June 22, 2019 00:10 Destroyed

vjFaLk temporarily deployed to Tugboat June 23, 2019 00:09 Destroyed

vjFaLk temporarily deployed to Tugboat June 24, 2019 00:09 Destroyed

vjFaLk temporarily deployed to Tugboat June 25, 2019 00:22 Destroyed

vjFaLk temporarily deployed to Tugboat June 25, 2019 10:19 Destroyed

vjFaLk temporarily deployed to Tugboat June 25, 2019 10:28 Destroyed

vjFaLk temporarily deployed to Tugboat June 25, 2019 12:42 Destroyed

vjFaLk temporarily deployed to Tugboat June 26, 2019 00:10 Destroyed

vjFaLk temporarily deployed to Tugboat June 27, 2019 00:11 Destroyed

Alchez suggested changes Jun 28, 2019

View reviewed changes

vjFaLk temporarily deployed to Tugboat June 29, 2019 00:09 Destroyed

vjFaLk temporarily deployed to Tugboat June 30, 2019 00:07 Destroyed

vjFaLk temporarily deployed to Tugboat July 1, 2019 00:08 Destroyed

vjFaLk temporarily deployed to Tugboat July 2, 2019 00:07 Destroyed

DeeMysterio and others added 7 commits July 3, 2019 17:31

feat(core): start and stop buttons on delivery trip

08bce15

feat(core): calculate actual distance travelled by driver

5b64af5

feat(core): refactor code

d6583fb

feat(core): validate odometer stop value and time

cb43333

feat(core): Allow the last odometer value in vehicle doctype to be up…

56db709

…dated with the odometer stop value in delivery trip

feat(core): refactor code

d8478c8

feat(core): add custom fields for odometer

8018418

vjFaLk temporarily deployed to Tugboat July 3, 2019 12:01 Destroyed

Rohan Bansal and others added 2 commits July 3, 2019 17:40

fix: Remove child table changes + minor fixes

261127d

fix: Remove child table changes + minor fixes (#1)

8a56c14

fix: Remove child table changes + minor fixes

vjFaLk temporarily deployed to Tugboat July 3, 2019 12:11 Destroyed

Alchez approved these changes Jul 3, 2019

View reviewed changes

Alchez merged commit dbe75bb into Bloomstack:staging Jul 3, 2019

dti-deploy added the released label Aug 12, 2019



		def set_vehicle_last_odometer_value(self, event):
		print("reached here!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!")

		import frappe


		def set_vehicle_last_odometer_value(self, event):



		def set_vehicle_last_odometer_value(trip, method):
		if self.actual_distance_travelled:

Uh oh!

Conversation

DeeMysterio commented Jun 11, 2019 • edited by Alchez Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Alchez commented Jun 11, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Alchez Jun 18, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Alchez Jun 18, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

vjFaLk commented Jun 21, 2019

Uh oh!

Alchez commented Jun 21, 2019

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

dti-deploy commented Aug 12, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

DeeMysterio commented Jun 11, 2019 •

edited by Alchez

Loading

Alchez commented Jun 11, 2019 •

edited

Loading

Alchez Jun 18, 2019 •

edited

Loading

Alchez Jun 18, 2019 •

edited

Loading