Commit graph

432 commits

Author SHA1 Message Date
Korina Cordero
e202fb650c Disable the new fields if editing JO form. #324 2020-02-10 08:35:31 +00:00
Korina Cordero
716f263e6b Make editable the new fields in JO form. #324 2020-02-10 08:13:36 +00:00
Korina Cordero
5dc57dc073 Add new fields to customer form. #324 2020-02-10 05:44:00 +00:00
Korina Cordero
e260edc80d Add new fields to incoming job order form. #324 2020-02-10 03:40:00 +00:00
Korina Cordero
60e3d3673f Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 329-transition-branch-for-cmb-and-resq-merging 2020-02-06 05:38:57 +00:00
Korina Cordero
295dbaa254 Remove Rider label and added option AllRiders to Rider dropdown. #319 2020-02-05 05:39:45 +00:00
Korina Cordero
cf783bf1cb Added validations to customer and customer vehicle data. #319 2020-02-05 05:28:59 +00:00
Korina Cordero
a3e40de170 Add adding of customer and customer vehicle from one step form. #319 2020-02-05 03:15:30 +00:00
6cdb5d0312 Fix battery fetching for new customer in one step jo form #319 2020-02-05 05:14:42 +08:00
d943015f4a Merge branch '319-cmb-one-step-form-display-rider-distance' of gitlab.com:jankstudio/resq into 319-cmb-one-step-form-display-rider-distance 2020-02-05 04:37:33 +08:00
746b25ad74 Fix one step form for CMB to allow for new customer and vehicle #319 2020-02-05 04:36:33 +08:00
Korina Cordero
b6700eed36 Add rider and date query parameters for list of to be fulfilled and open job orders. #319 2020-02-04 11:15:10 +00:00
4ad0db07e8 Add new customer option enabling customer and vehicle fields #319 2020-02-04 18:39:14 +08:00
Korina Cordero
3789871f9a Add rider and date filter to search. #319 2020-02-04 08:43:39 +00:00
Korina Cordero
96efa32a12 Fixes for battery_ajax_get. #323 2020-02-04 01:39:14 +00:00
Korina Cordero
6bcdf70902 Display the battery to be added to the form. #323 2020-02-03 11:03:52 +00:00
Korina Cordero
fd2fe4fb6f Add routes and UI elements to add compatible battery to vehicle. #323 2020-02-03 08:59:22 +00:00
84293cb45a Merge branch '317-delete-icon-for-battery-in-vehicle-screen' into '270-final-cmb-fixes'
Resolve "Delete icon for battery in vehicle screen"

See merge request jankstudio/resq!362
2020-01-29 11:18:50 +00:00
e8e97bcd6b Fix jo link in rider and customer popup in dashboard #270 2020-01-29 19:13:49 +08:00
Korina Cordero
234d993d8f Add deletion of compatible battery from vehicle. #317 2020-01-29 09:03:56 +00:00
41a6801c19 Fix string concat bug in jo tracking page #270 2020-01-29 01:20:40 +08:00
c8157b9509 Add functionality to job order tracking page #270 2020-01-29 01:13:47 +08:00
Ramon Gutierrez
e914c6d2e1 Add customer jo tracking view #315 2020-01-28 21:51:32 +08:00
Korina Cordero
bc8ce40b13 Add distance from customer to hub to hub table. #314 2020-01-28 07:24:14 +00:00
Korina Cordero
555bd5ae9a Add Cancel Job Order button to onestep form. #313 2020-01-28 05:20:11 +00:00
Korina Cordero
0daf2a2813 Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 312-cmb-highlight-selected-hub-and-rider-in-onestep-edit 2020-01-28 03:00:42 +00:00
6dd3f3377e Merge branch '309-replace-63-in-templates-with-proper-country-code' into '270-final-cmb-fixes'
Resolve "Replace +63 in templates with proper country code"

See merge request jankstudio/resq!350
2020-01-28 02:54:08 +00:00
Korina Cordero
79b758f547 Fix for rider icons not displaying in map. #312 2020-01-27 06:33:03 +00:00
Korina Cordero
655ead7739 Change color of hubs and riders. #312 2020-01-27 04:30:31 +00:00
Korina Cordero
eb9b8bfdd2 Fix bug for onestep edit when user selects another hub but does not select a new rider. #312 2020-01-27 02:24:52 +00:00
2d6193318a Add ability to remove customer markers via status publish #299 2020-01-27 04:04:30 +08:00
Korina Cordero
adc6cc8c80 Add highlight to selected hub and rider when loading onestepedit form for resq. #312 2020-01-25 10:47:41 +00:00
Korina Cordero
96bed8a49e Add highlight to selected hub and rider when loading onestepedit form. #312 2020-01-25 10:42:26 +00:00
Korina Cordero
6468954316 Display hubs and riders in non-dynamic table for onestep edit. #312 2020-01-25 06:08:14 +00:00
9e00c3f115 Fix publishing and subscribing for new / updated JOs #299 2020-01-25 05:11:53 +08:00
c753be54cb Refactor dashboard map js to use classes #299 2020-01-25 01:57:15 +08:00
Korina Cordero
8e613a43b1 Bug fixes from merge. Remove hardcoded country code prefixes from onestep form. #309 2020-01-24 06:22:12 +00:00
Korina Cordero
5a138ce09f Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 309-replace-63-in-templates-with-proper-country-code 2020-01-24 05:37:30 +00:00
Korina Cordero
69f0612a2d Replace hardcoded country code prefixes with variables set in .env and messages files. #309 2020-01-24 04:05:48 +00:00
68a92b2daf Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 299-cmb-realtime-map 2020-01-23 18:17:10 +08:00
Korina Cordero
d418f0ff5a Remove hardcoded prefix from customer. Add country code to .env and services.yaml. #307 2020-01-22 06:42:28 +00:00
Korina Cordero
d6015978ae Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 307-cmb-fix-customer-hard-coded-country-code 2020-01-22 04:54:01 +00:00
ec5e67a641 Make customer marker popup load via ajax #299 2020-01-22 05:10:49 +08:00
eac8f41d84 Make rider markers load popup via ajax #299 2020-01-22 04:03:25 +08:00
e463876c91 Create marker in dashboard map when rider id is not yet there #299 2020-01-19 21:42:16 +08:00
3667e122d0 Add mqtt websocket server settings in env file #299 2020-01-19 21:26:43 +08:00
67a7b86f32 Add handler for rider location updates in dashboard #299 2020-01-19 03:30:37 +08:00
b435cdfa1b Fix bug in map script for dashboard #299 2020-01-19 00:19:49 +08:00
ece4e6dd4d Add MQTT subscribe functionality in main dashboard #299 2020-01-18 22:45:40 +08:00
bbaaf250c6 Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 299-cmb-realtime-map
Conflicts:
	config/services.yaml
2020-01-18 22:40:25 +08:00