-
Notifications
You must be signed in to change notification settings - Fork 23
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
[2016] Configurable chart column interval #276
Open
llvasconcellos
wants to merge
87
commits into
dev
Choose a base branch
from
feature/llvasconcellos-chart-column-interval-config
base: dev
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
[2016] Configurable chart column interval #276
llvasconcellos
wants to merge
87
commits into
dev
from
feature/llvasconcellos-chart-column-interval-config
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
- Bump build tools version to latest. This is required for Multidex. - Delete ic_launcher from OdkCollect, required because later versions of the AAPT build tool handle duplicate resources as errors, and this file was causing the build to fail. - Add dependency upon the legacy HTTP library. API 23 deprecated Apache HTTP, but we're still using it for Health check code. - Update OdkCollect to latest build tools as well, because it was separately including the legacy Apache HTTP library, which was resulting in conflicts from having the same JAR included twice. Updating to the latest build tools means that it can use the same legacy library as `:app`, which eliminates the conflict. - Update support library versions to 23 so that they work with the latest build tools. - Enable Multidex. Tested on API 21 (L) and 19 (KK) - Remove Guava as a direct dependency, and delete code that used it from `JsonPatient`. Note that Guava is still included by Pebble as a transitive dependency, but I don't want developers on this project to be able to use it in code we control, so we have the flexibility to remove the dependency one day. See https://slack-files.com/T02T5LNM4-F0JQ1UDRV-716ebe431f for details.
Enable multidex to temporarily avert the dexocalypse.
- Clean up adding encounters. - Previously, there was functionality to try and "guess" the type of observation. Remove this, the server has knowledge of concept type and can figure it out from the question UUID, and value type isn't used on the client. - Allow an `enterer_uuid` to be specified when an encounter is created, which allows the encounter to be attributed to a user. - Change representation of observations in an encounter from a Map of Question UUIDs --> Values to a List of JsonObservations. This means that we can process them consistently to the way the Observation syncing code does. - Add a notes panel, which slides up from the bottom of the patient chart activity and allows notes to be entered by the user.
Make start and stop (end) times for cell accessible via javascript
Add a notes panel to the patient chart screen.
…der-dosage-frequency Fix Order Dosage and Frequency
…s-dialog-time-format Fix for Observation List Dialog (Void Obs)
…s-abbr-format Fix Observation {1,abbr} format
Fixes #199. - In FormEntryActivity, remove the try{} block that catches RuntimeExceptions and tries to skip forward. It just hides errors. - In FormController, remove assumption that groups are non-empty, and update the "next entry" logic to handle empty groups.
This fixes #176
Allow empty sections in ODK forms.
Fix test compilation
…quired-fields Fix Required Fields
…-patient-like-search Enable like search.
- The notes panel expanding no longer greys out the chart - The notes panel is fixed at 60% height - It's now possible to scroll to the bottom of the patient chart when the notes panel is open, thanks to some layout hackery.
Tweak notes panel to take up less space
…vely Only refresh the patient chart if something changed after a sync.
- You can set the start date when you first create an order, but not when you edit it. - Fix the "stop after X days" logic to be a straightforward duration since start date, instead of being the duration from today. This makes a lot more sense now that we're actually displaying the start date.
If a patient has observations that use question UUIDs that aren't in our forms or charts, we don't download the concept. When we try and load the concept name to tell ODK collect to persist the field, it doesn't work because the concept UUID is null. We fix that with a null check.
Fix a french translation
Fix a crash relating to displaying forms with persistent fields.
Previously, all tiles had their clicking disabled by faulty logic. Pebble doesn't know how to handle the `.length` property of arrays, and interpreted it as null, which prevented the relevant code from firing. This change converts `ChartItem#conceptUuids` to a List instead of an array, such that Pebble is capable of working with the field.
Restore clickability for all tiles with 1 concept.
…calize_stringsxml_to_portuguese Feature/rafaelteixeira localize stringsxml to portuguese
…-br-translation pt-BR translation
|
||
public Chart(String uuid, String name) { | ||
public Chart(String uuid, String name, String format) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please document the format of the format
parameter.
Nice work! You have a good understanding of the code here. |
zestyping
changed the title
Chart column interval config
[2016] Configurable chart column interval
Jun 25, 2019
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 is the client side of this pivotal story: https://www.pivotaltracker.com/story/show/111137168
The server part is here: projectbuendia/buendia#89
This changes allow to specify the column interval for the chart. The configuration should be added to the format column in the profile csv.
Examples:
The column_type accept the following 3 values: