Unified label screen #871
Open
Unified label screen #871
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…e (green) for #1123CB (blue) everywhere
…erything migrated app to latest version and added permissions screen
Pulled out functionality from the InfiniteDiaryListCtrl into the new module, 'infscrolltripitem'. This new scope includes the surveyOpt, itemHt, and showDetail function for the new directive. This relates to issue e-mission#740, Unifying label and diary views.
Created a new module for a diary item directive. Pulled out the necessary functions; created the diary_list_item.html as a template for the directive.
These changes include the stylistic changes to the css layout of the unified diary screen, changes to the multi-label button layout, changes to the java script of the trip item directive, and removing the diary tab from the bottom ion-tab. Issues - - reading in the trip percentages; When I attempted to use the DiaryHelper.getPercentages in converting the trip object to geojson in the trip item directive, the tripgj did not have a sections attribute. I then went into services to see if I could add this, and then I went down a rabbit hole of different functions missing different attributes. I will attempt to fix this soon.
Not yet added displaying the trips only for that date
…fied-Label-Screen
…8/e-mission-phone into Unified-Label-Screen
#91d4ff -> #80D0FF
…8/e-mission-phone into Unified-Label-Screen
This commit should include the commit history from Savoire Faire Linux.
Closed
|
I don't think this is the right approach - it pulls over a bunch of changes that we don't want (notably to the config.xml etc). @lgharib what do you think about this change (unifying the diary and label screens, e-mission/e-mission-docs#740)? Would you be able to pull these changes when you next update the app? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR should include the commit history from SavoireFaire Linux. I cloned the Unified-Diary-Screen branch, pulled the savoire Dev branch, manually resolved the merge conflicts, and then lastly pulled my Unified-Diary-Screen branch changes onto it.