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.

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

Add start time, end time, and date to each Place card #8

Merged
merged 3 commits into from
Mar 29, 2023

Conversation

sebastianbarry
Copy link
Owner

infinite_scroll_list.js

  • Increased the default height of the place cards in getCardHeight() by 82px

place_list_item.html

  • Added place start time tag
  • Added place display date to be centered above the place name
  • Added place end time tag

infinite_scroll_list.js
- Increased the default height of the place cards in getCardHeight() by 82px

place_list_item.html
- Added place start time tag
- Added place display date to be centered above the place name
- Added place end time tag
infinite_scroll_list.js
- Added a check that if we are showing places and the last entry does not have a display_end_time, we create a display_end_time to be 1 hour later than the start time
@sebastianbarry
Copy link
Owner Author

sebastianbarry commented Mar 29, 2023

Testing:

Simulator Screen Shot - iPhone 11 - 2023-03-28 at 22 38 36

Simulator Screen Shot - iPhone 11 - 2023-03-28 at 23 06 24

@sebastianbarry
Copy link
Owner Author

@JGreenlee @shankari could you take a quick look and make sure this seems correct with what UNSW asked for?

start time, end time, and date to each Place card, similar to what we have on Trip cards

@sebastianbarry
Copy link
Owner Author

sebastianbarry commented Mar 29, 2023

ToDo:
Make sure this solution is inline with @MaliheTabasi comment

  1. Make the end time of the last place be the end of the day
  2. If there are multiple days in between 2 trip objects, there will be place cards to fill in for each day: Testing the time-use of API 32 version of the app e-mission/e-mission-docs#871 (comment)

Copy link

@shankari shankari left a comment

Choose a reason for hiding this comment

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

Please read the actual request from e-mission/e-mission-docs#871 for context.

Comment on lines 326 to 327
if (!$scope.data.displayTimelineEntries[$scope.data.displayTimelineEntries.length-1].display_end_time && $scope.showPlaces) {
$scope.data.displayTimelineEntries[$scope.data.displayTimelineEntries.length-1].display_end_time = moment($scope.data.displayTimelineEntries[$scope.data.displayTimelineEntries.length-1].enter_fmt_time).parseZone().add(1, 'hour').format("h:mm A");

Choose a reason for hiding this comment

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

If you see the discussion on e-mission/e-mission-docs#871, I think that they expect it to be the end of the day.

@shankari
Copy link

shankari commented Mar 29, 2023

@sebastianbarry I would suggest that you hold off on the change below

If there are multiple days in between 2 trip objects, there will be place cards to fill in for each day: e-mission/e-mission-docs#871 (comment)

pending the discussion in
e-mission/e-mission-docs#871 (comment)

Please do fix my comment above and indicate when this is ready to merge.

@sebastianbarry
Copy link
Owner Author

sebastianbarry commented Mar 29, 2023

Addressed comment #8 (comment) in commit e521390

Testing:
Simulator Screen Shot - iPhone 11 - 2023-03-29 at 09 16 57

Holding off on the other change, as indicated in your message @shankari. This should be ready to merge then

@sebastianbarry sebastianbarry merged commit 1796319 into places-survey Mar 29, 2023
@shankari
Copy link

shankari commented Mar 29, 2023

@sebastianbarry we are deploying code from https://github.com/e-mission/e-mission-phone/tree/survey_refactor_expansion
to staging. I am not sure where this code is going...

In general, I review code and then merge it...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants