1849 show more trajectory information by abbybernstein · Pull Request #1481 · cambridge-cares/TheWorldAvatar

abbybernstein · 2025-03-04T03:22:39Z

No description provided.

…ting

Agents/SensorLoggerMobileAppAgent/sensorloggermobileappagent/src/main/resources/ontop.obda

Agents/TrajectoryQueryAgent/trajectoryqueryagent/src/main/resources/functions.sql

...jectoryQueryAgent/trajectoryqueryagent/src/main/resources/line_layer_user_id_by_activity.sql

...eature/timeline/src/main/java/uk/ac/cam/cares/jps/timeline/ui/manager/TrajectoryManager.java

...App/core/model/src/main/java/uk/ac/cam/cares/jps/model/bottomsheet/SessionSummaryByDate.java

...melineApp/core/model/src/main/java/uk/ac/cam/cares/jps/model/bottomsheet/UniqueSessions.java

...imeline/src/main/java/uk/ac/cam/cares/jps/timeline/viewmodel/NormalBottomSheetViewModel.java

Apps/TimelineApp/feature/timeline/src/main/res/drawable/baseline_directions_bike_24.xml

Apps/TimelineApp/feature/timeline/src/main/res/drawable/baseline_man_24.xml

sandradeng20 · 2025-03-05T07:33:30Z

need to update the version of trajectory agent and sensorlogger agent

docker-compose.yml
src/pom.xml
Dockerfile change from COPY --from=builder /root/sensorloggermobileappagent/output/SensorLoggerMobileAppAgent##2.0.0.war $CATALINA_HOME/webapps/ to COPY --from=builder /root/sensorloggermobileappagent/output/SensorLoggerMobileAppAgent##*.war $CATALINA_HOME/webapps/ (same for trajectory agent)

Apps/TimelineApp/feature/timeline/src/main/res/layout/activity_item.xml

Apps/TimelineApp/feature/timeline/src/main/res/layout/unique_session.xml

Agents/TrajectoryQueryAgent/trajectoryqueryagent/src/main/resources/line_layer_user_id.sql

...jectoryQueryAgent/trajectoryqueryagent/src/main/resources/line_layer_user_id_by_activity.sql

Agents/TrajectoryQueryAgent/trajectoryqueryagent/src/main/resources/functions.sql

.../feature/timeline/src/main/java/uk/ac/cam/cares/jps/timeline/ui/adapter/SessionsAdapter.java

...ature/timeline/src/main/java/uk/ac/cam/cares/jps/timeline/ui/manager/BottomSheetManager.java

...ature/timeline/src/main/java/uk/ac/cam/cares/jps/timeline/viewmodel/TrajectoryViewModel.java

...e/sensor/src/main/java/uk/ac/cam/cares/jps/sensor/source/network/UserPhoneNetworkSource.java

sandradeng20 · 2025-03-18T10:03:20Z

the trajectoryUserIdByActivity isn't working as expected. It returns 'walking' activity even when the trajectory not having transport mode data.

...imeline/src/main/java/uk/ac/cam/cares/jps/timeline/viewmodel/NormalBottomSheetViewModel.java

...re/timeline/src/main/java/uk/ac/cam/cares/jps/timeline/ui/bottomsheet/NormalBottomSheet.java

...ature/timeline/src/main/java/uk/ac/cam/cares/jps/timeline/viewmodel/TrajectoryViewModel.java

...imeline/src/main/java/uk/ac/cam/cares/jps/timeline/viewmodel/NormalBottomSheetViewModel.java

Apps/TimelineApp/feature/timeline/src/main/res/layout/unique_session.xml

...elineApp/core/network/src/main/java/uk/ac/cam/cares/jps/network/TrajectoryNetworkSource.java

...ature/timeline/src/main/java/uk/ac/cam/cares/jps/timeline/ui/manager/BottomSheetManager.java

...ne/src/main/java/uk/ac/cam/cares/jps/timeline/model/bottomsheet/TrajectorySummaryByDate.java

...p/feature/timeline/src/main/java/uk/ac/cam/cares/jps/timeline/model/bottomsheet/Session.java

...e/timeline/src/main/java/uk/ac/cam/cares/jps/timeline/model/trajectory/TrajectoryByDate.java

Apps/TimelineApp/feature/timeline/src/main/res/layout/bottom_sheet_widget.xml

...imeline/src/main/java/uk/ac/cam/cares/jps/timeline/viewmodel/NormalBottomSheetViewModel.java

Deploy/stacks/dynamic/common-scripts/build.sh

sandradeng20 and others added 19 commits December 3, 2024 14:01

1849-show-more-trajectory-information: make string as resource

80a2229

1849-show-more-trajectory-information: update mapbox secret token set…

bf90357

…ting

1849-show-more-trajectory-information: fix empty trajectory processing

6001ead

1849-show-more-trajectory-information: refactor code

c56a4bc

1849-show-more-trajectory-information: reformat code

62ff6d4

Merge branch 'main' into 1849-show-more-trajectory-information

a6d0653

add postgres logic to create layer by activity

0c76715

connect trajectory by activity layer to timeline app

f6591ba

change colors by activity type

30b4b96

add activity summary functionality

1cadf91

fix postgres activity type assignment

3d98c44

add trajectory summary colorcoded

4b21e40

fix summary updating error

a5f395c

fix colors

b4f3f42

Print trajectory info by session

d795199

add summary to bottom sheet

5fabc91

fix page switch loaidng behavior

c46519b

fix centering trajectory

880728f

refactor files

3a37197

abbybernstein requested a review from sandradeng20 March 4, 2025 03:22

sandradeng20 reviewed Mar 4, 2025

View reviewed changes

sandradeng20 reviewed Mar 5, 2025

View reviewed changes

abbybernstein added 3 commits March 6, 2025 15:47

resolve comments

e8d375a

resolve comments

1cc4285

simplifying sql

bbe55ea

sandradeng20 reviewed Mar 11, 2025

View reviewed changes

abbybernstein added 3 commits March 11, 2025 17:19

interactable trajectoryline

7f06941

fix sql script for layer creation

407e686

fix sql script

935da95

fix trajectory interactability

205fd14

sandradeng20 reviewed Mar 14, 2025

View reviewed changes

abbybernstein added 2 commits March 17, 2025 10:37

resolve comments

f8b3eed

update user agent

773669c

abbybernstein force-pushed the 1849-show-more-trajectory-information branch from ad91829 to 773669c Compare March 17, 2025 05:44

abbybernstein added 2 commits March 17, 2025 13:46

upate trajectoryqueryagent image

dda320e

Merge branch 'main' into 1849-show-more-trajectory-information

59a1fa1

sandradeng20 reviewed Mar 18, 2025

View reviewed changes

...e/sensor/src/main/java/uk/ac/cam/cares/jps/sensor/source/network/UserPhoneNetworkSource.java Outdated Show resolved Hide resolved

fix errors

62242c6

sandradeng20 reviewed Mar 18, 2025

View reviewed changes

...imeline/src/main/java/uk/ac/cam/cares/jps/timeline/viewmodel/NormalBottomSheetViewModel.java Outdated Show resolved Hide resolved

sandradeng20 reviewed Mar 19, 2025

View reviewed changes

sandradeng20 force-pushed the 1849-show-more-trajectory-information branch from ad247d0 to 62242c6 Compare March 19, 2025 08:33

sandradeng20 and others added 5 commits March 19, 2025 16:47

1849-show-more-trajectory-information: resolve comments

f1b2bff

redesign trajectory classes

b64c5cd

fix xml

f064269

clickability fixed

59a9842

fix trajectory line clicking

6a73793

sandradeng20 reviewed Apr 1, 2025

View reviewed changes

Apps/TimelineApp/feature/timeline/src/main/res/layout/bottom_sheet_widget.xml Show resolved Hide resolved

resolve comments

c65834b

sandradeng20 approved these changes Apr 1, 2025

View reviewed changes

...imeline/src/main/java/uk/ac/cam/cares/jps/timeline/viewmodel/NormalBottomSheetViewModel.java Outdated Show resolved Hide resolved

sandradeng20 requested changes Apr 1, 2025

View reviewed changes

Deploy/stacks/dynamic/common-scripts/build.sh Outdated Show resolved Hide resolved

abbybernstein added 3 commits April 2, 2025 09:26

resolve comments

e9ef455

resolve comments

a6a2ffd

fix error

f1a34ce

abbybernstein requested a review from sandradeng20 April 2, 2025 02:19

sandradeng20 approved these changes Apr 2, 2025

View reviewed changes

abbybernstein merged commit 665862f into main Apr 2, 2025

abbybernstein deleted the 1849-show-more-trajectory-information branch April 2, 2025 02:22

Conversation

abbybernstein commented Mar 4, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

sandradeng20 commented Mar 5, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

sandradeng20 commented Mar 18, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants