Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Patch2 #15

Open
wants to merge 15 commits into
base: master
Choose a base branch
from
Open

Patch2 #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
4724425
mdms model changes
naveenr-egov Mar 14, 2024
77b7368
trip_info ui changes
naveenr-egov Mar 14, 2024
5d7c004
toast ui fix
naveenr-egov Mar 15, 2024
95973a7
added loader for button actions
naveenr-egov Mar 15, 2024
ff33588
UI changes as per figma for outline button and icon button
naveenr-egov Mar 21, 2024
f2e07e6
changed TripControllers class to singleton to fix the repeated timers…
naveenr-egov Mar 21, 2024
372ac56
added package override of digit components for web
naveenr-egov Mar 21, 2024
7d0e86e
updating current location while ending trip
naveenr-egov May 3, 2024
692331f
Update domain url
JithendarKumar-eGov Nov 21, 2024
8eee9c2
Merge pull request #33 from JithendarKumar-eGov/patch-1
naveenr-egov Nov 21, 2024
5312d83
Update sample-env.txt
JithendarKumar-eGov Nov 21, 2024
33012af
Merge pull request #34 from JithendarKumar-eGov/patch-2
naveenr-egov Nov 21, 2024
ba6f7a1
Update sample-env.txt
JithendarKumar-eGov Nov 21, 2024
687c127
Merge pull request #35 from JithendarKumar-eGov/patch-3
JithendarKumar-eGov Nov 21, 2024
3805ef4
Update Constants.java
JithendarKumar-eGov Nov 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions trackingservice/sample-env.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
DB_JDBC_URL=jdbc:postgresql://db-postgresql.com:25060/defaultdb
DB_USER=doadmin
DB_PASSWORD=AVNS_VOzqloso05
DIGIT_FSM_URL=https://unified-dev.digit.org/fsm/v1/
DIGIT_VEHICLE_TRIP_URL=https://unified-dev.digit.org/vehicle/trip/v1/
DIGIT_FSM_URL=https://fsm-demo.digit.org/fsm/v1
DIGIT_VEHICLE_TRIP_URL=https://fsm-demo.digit.org/vehicle/trip/v1/
4 changes: 2 additions & 2 deletions trackingservice/src/main/java/org/digit/tracking/util/Constants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ public class Constants {
final public static int POI_MATCH_THRESHOLD_METERS = 100;
final public static String MONITORING_USER_ID = "MonitoringService";
@Value("${DIGIT_FSM_URL}")
final public static String DIGIT_FSM_URL = "https://unified-dev.digit.org/fsm/v1/";
final public static String DIGIT_FSM_URL = "https://fsm-demo.digit.org/fsm/v1";
@Value("${DIGIT_VEHICLE_TRIP_URL}")
final public static String DIGIT_VEHICLE_TRIP_URL = "https://unified-dev.digit.org/vehicle/trip/v1/";
final public static String DIGIT_VEHICLE_TRIP_URL = "https://fsm-demo.digit.org/vehicle/trip/v1";
final public static String ILLEGAL_DUMP_YARD_STOPPAGE_CODE = "Stoppage";
final public static int ILLEGAL_DUMP_YARD_STOPPAGE_THRESHOLD = 5;
final public static int TRIP_PROGRESS_FETCH_LIMIT = 1000;
Expand Down
53 changes: 22 additions & 31 deletions vehicle-tracker/map_web_app/pubspec.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,10 +149,10 @@ packages:
dependency: transitive
description:
name: collection
sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c"
url: "https://pub.dev"
source: hosted
version: "1.18.0"
version: "1.17.1"
convert:
dependency: transitive
description:
Expand Down Expand Up @@ -188,10 +188,9 @@ packages:
digit_components:
dependency: "direct main"
description:
name: digit_components
sha256: "261f4407e5fe2ab3be3800dfbdc69112b632baa90f87c0e66b5c93f12e10df39"
url: "https://pub.dev"
source: hosted
path: "../packages/digit_components"
relative: true
source: path
version: "0.0.1+8"
fake_async:
dependency: transitive
Expand Down Expand Up @@ -417,10 +416,10 @@ packages:
dependency: transitive
description:
name: intl
sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d"
sha256: a3715e3bc90294e971cb7dc063fbf3cd9ee0ebf8604ffeafabd9e6f16abbdbe6
url: "https://pub.dev"
source: hosted
version: "0.18.1"
version: "0.18.0"
io:
dependency: transitive
description:
Expand Down Expand Up @@ -513,26 +512,26 @@ packages:
dependency: transitive
description:
name: matcher
sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb"
url: "https://pub.dev"
source: hosted
version: "0.12.16"
version: "0.12.15"
material_color_utilities:
dependency: transitive
description:
name: material_color_utilities
sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
url: "https://pub.dev"
source: hosted
version: "0.5.0"
version: "0.2.0"
meta:
dependency: transitive
description:
name: meta
sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
url: "https://pub.dev"
source: hosted
version: "1.10.0"
version: "1.9.1"
mgrs_dart:
dependency: transitive
description:
Expand Down Expand Up @@ -702,26 +701,26 @@ packages:
dependency: transitive
description:
name: source_span
sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
url: "https://pub.dev"
source: hosted
version: "1.10.0"
version: "1.9.1"
stack_trace:
dependency: transitive
description:
name: stack_trace
sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
url: "https://pub.dev"
source: hosted
version: "1.11.1"
version: "1.11.0"
stream_channel:
dependency: transitive
description:
name: stream_channel
sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
url: "https://pub.dev"
source: hosted
version: "2.1.2"
version: "2.1.1"
stream_transform:
dependency: transitive
description:
Expand Down Expand Up @@ -750,10 +749,10 @@ packages:
dependency: transitive
description:
name: test_api
sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb
url: "https://pub.dev"
source: hosted
version: "0.6.1"
version: "0.5.1"
timing:
dependency: transitive
description:
Expand Down Expand Up @@ -794,14 +793,6 @@ packages:
url: "https://pub.dev"
source: hosted
version: "1.1.0"
web:
dependency: transitive
description:
name: web
sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152
url: "https://pub.dev"
source: hosted
version: "0.3.0"
web_socket_channel:
dependency: transitive
description:
Expand All @@ -827,5 +818,5 @@ packages:
source: hosted
version: "3.1.2"
sdks:
dart: ">=3.2.0-194.0.dev <4.0.0"
dart: ">=3.0.0 <4.0.0"
flutter: ">=3.10.0"
2 changes: 1 addition & 1 deletion vehicle-tracker/map_web_app/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
version: 1.0.0+1

environment:
sdk: '>=3.0.2 <4.0.0'
sdk: '>=3.0.0 <4.0.0'

# Dependencies specify other packages that your package needs in order to work.
# To automatically upgrade your package dependencies to the latest versions
Expand Down
3 changes: 3 additions & 0 deletions vehicle-tracker/map_web_app/pubspec_overrides.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
dependency_overrides:
digit_components:
path: ../packages/digit_components
3 changes: 3 additions & 0 deletions vehicle-tracker/map_web_app/route_map/lib/blocs/polygon_map/controllers/map_controllers.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@ class MapControllers extends GetxController {

final alertPolygons = await Map2HttpRepository.getAllPolygonsWithAlerts(tenantId);

if(alertMarkers.isNotEmpty) alertMarkers.clear();
if(this.alertPolygons.isNotEmpty) this.alertPolygons.clear();

Comment on lines +48 to +50
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Correct the typo in the variable name alartPolygon to alertPolygon.

Add user feedback (e.g., using a toaster) to inform about the success or failure of adding a new polygon.

Refactor the method to reduce redundancy, especially in the construction of the LocationDetails list, to improve code efficiency.

for (var alartPolygon in alertPolygons) {
if (alartPolygon.type == "point") {
alertMarkers.add(alartPolygon);
Expand Down
82 changes: 25 additions & 57 deletions vehicle-tracker/map_web_app/route_map/pubspec.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,10 +149,10 @@ packages:
dependency: transitive
description:
name: collection
sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c"
url: "https://pub.dev"
source: hosted
version: "1.18.0"
version: "1.17.1"
convert:
dependency: transitive
description:
Expand Down Expand Up @@ -377,10 +377,10 @@ packages:
dependency: transitive
description:
name: geolocator_android
sha256: "136f1c97e1903366393bda514c5d9e98843418baea52899aa45edae9af8a5cd6"
sha256: "06e37fa32392f69f133e166ef6b358a8b6afddbf4c418fc236988184cc115a49"
url: "https://pub.dev"
source: hosted
version: "4.5.2"
version: "4.4.1"
geolocator_apple:
dependency: transitive
description:
Expand Down Expand Up @@ -473,10 +473,10 @@ packages:
dependency: transitive
description:
name: intl
sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d"
sha256: a3715e3bc90294e971cb7dc063fbf3cd9ee0ebf8604ffeafabd9e6f16abbdbe6
url: "https://pub.dev"
source: hosted
version: "0.18.1"
version: "0.18.0"
io:
dependency: transitive
description:
Expand Down Expand Up @@ -517,30 +517,6 @@ packages:
url: "https://pub.dev"
source: hosted
version: "0.9.0"
leak_tracker:
dependency: transitive
description:
name: leak_tracker
sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa"
url: "https://pub.dev"
source: hosted
version: "10.0.0"
leak_tracker_flutter_testing:
dependency: transitive
description:
name: leak_tracker_flutter_testing
sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0
url: "https://pub.dev"
source: hosted
version: "2.0.1"
leak_tracker_testing:
dependency: transitive
description:
name: leak_tracker_testing
sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47
url: "https://pub.dev"
source: hosted
version: "2.0.1"
lints:
dependency: transitive
description:
Expand Down Expand Up @@ -593,26 +569,26 @@ packages:
dependency: transitive
description:
name: matcher
sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb"
url: "https://pub.dev"
source: hosted
version: "0.12.16+1"
version: "0.12.15"
material_color_utilities:
dependency: transitive
description:
name: material_color_utilities
sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
url: "https://pub.dev"
source: hosted
version: "0.8.0"
version: "0.2.0"
meta:
dependency: transitive
description:
name: meta
sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
url: "https://pub.dev"
source: hosted
version: "1.11.0"
version: "1.9.1"
mgrs_dart:
dependency: transitive
description:
Expand Down Expand Up @@ -657,10 +633,10 @@ packages:
dependency: transitive
description:
name: path
sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
url: "https://pub.dev"
source: hosted
version: "1.9.0"
version: "1.8.3"
plugin_platform_interface:
dependency: transitive
description:
Expand Down Expand Up @@ -782,10 +758,10 @@ packages:
dependency: transitive
description:
name: source_span
sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
url: "https://pub.dev"
source: hosted
version: "1.10.0"
version: "1.9.1"
sprintf:
dependency: transitive
description:
Expand All @@ -798,18 +774,18 @@ packages:
dependency: transitive
description:
name: stack_trace
sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
url: "https://pub.dev"
source: hosted
version: "1.11.1"
version: "1.11.0"
stream_channel:
dependency: transitive
description:
name: stream_channel
sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
url: "https://pub.dev"
source: hosted
version: "2.1.2"
version: "2.1.1"
stream_transform:
dependency: transitive
description:
Expand Down Expand Up @@ -838,10 +814,10 @@ packages:
dependency: transitive
description:
name: test_api
sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb
url: "https://pub.dev"
source: hosted
version: "0.6.1"
version: "0.5.1"
timing:
dependency: transitive
description:
Expand Down Expand Up @@ -878,10 +854,10 @@ packages:
dependency: transitive
description:
name: uuid
sha256: cd210a09f7c18cbe5a02511718e0334de6559871052c90a90c0cca46a4aa81c8
sha256: "22c94e5ad1e75f9934b766b53c742572ee2677c56bc871d850a57dad0f82127f"
url: "https://pub.dev"
source: hosted
version: "4.3.3"
version: "4.2.2"
vector_math:
dependency: transitive
description:
Expand All @@ -890,14 +866,6 @@ packages:
url: "https://pub.dev"
source: hosted
version: "2.1.4"
vm_service:
dependency: transitive
description:
name: vm_service
sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957
url: "https://pub.dev"
source: hosted
version: "13.0.0"
watcher:
dependency: transitive
description:
Expand Down Expand Up @@ -931,5 +899,5 @@ packages:
source: hosted
version: "3.1.2"
sdks:
dart: ">=3.2.0-0 <4.0.0"
dart: ">=3.0.0 <4.0.0"
flutter: ">=3.10.0"
Loading