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

fix for entries between 12.00 and 12.59 #5

Merged
merged 2 commits into from
Sep 27, 2016
Merged

Conversation

AdrianLxM
Copy link
Contributor

Treatments with time between 12.00 and 12.59 were mapped to the hour after midnight - as well as 00.01 to 00.59.

According to http://docs.oracle.com/javase/6/docs/api/java/text/SimpleDateFormat.html
hh represents the hours in 1-12 hour format and HH in 0-23 hour format.

@AdrianLxM
Copy link
Contributor Author

I added another thing: while it make no sense to enter "0 carbs", a time that equals 0 ("0:00" = midnight) is a valid time.
This is what happened before:
screenshot_2016-09-27-03-17-43

Now:
screenshot_2016-09-27-03-19-01

Copy link
Collaborator

@jamorham jamorham left a comment

Choose a reason for hiding this comment

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

I think this makes sense, I will merge it and test it further.

I still want to do something for phones in AM/PM mode but looking at the existing code this isn't supported at the moment so there is no reason to delay this fix.

Copy link
Collaborator

@jamorham jamorham left a comment

Choose a reason for hiding this comment

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

Will merge

@jamorham jamorham merged commit 08586f8 into master Sep 27, 2016
@AdrianLxM AdrianLxM deleted the adrian-timeentryfix branch September 28, 2016 23:41
jamorham pushed a commit that referenced this pull request Jun 20, 2018
jamorham pushed a commit that referenced this pull request Jun 27, 2018
* include bluereader basis

* include bluereader basis

* include bluereader basis

* Repair Speak trend, and add translation (initial en/de)

* Add Bridge_battery upload Nightscout toright bridge name

* correct typo double down

* correct minor differeces to master origin

* correct wrong import class

* Correct Spacing and lining changes to be in sync with origin

* Correct speak bug (switch from mol to everytime)
Include Translation for trend
Include translation for Speak settings

* Correct speak bug (switch from mol to everytime)
Include Translation for trend
Include translation for Speak settings

* Translation Croatian v1.0

* Update locales.xml

* Follower and MDNS fixes

* isCollecting() proguard exclusion

* WebServices: Add status.json endpoint and sgv brief mode

* BluetoothScan: Concurrent modification race condition fix

* ActivityRecognizedService: concurrency fix

* Add code to receive more data and close the gaps.

Signed-off-by: Tzachi Dar <tzachi.dar@gmail.com>

* Use existing code to close per 5 minutes gaps.

Signed-off-by: Tzachi Dar <tzachi.dar@gmail.com>

* Multiply the "raw data" by 1000 and devide it by Constants.LIBRE_MULTIPLIER to make it feet the normal behavior.

Signed-off-by: Tzachi Dar <tzachi.dar@gmail.com>

* Simple fill the 10 minutes gap, by adding the last point to the interpolation graph.

Signed-off-by: Tzachi Dar <tzachi.dar@gmail.com>

* Receive an array of results instead of one result only.

Signed-off-by: Tzachi Dar <tzachi.dar@gmail.com>

* Disable external_blukon_algorithm to allow more testing.

Signed-off-by: Tzachi Dar <tzachi.dar@gmail.com>

* undo unneeded changes

* LicenseAgreementActivity: fix null pointer exception

* ImportDatabaseActivity: fix null pointer exception

* Nightscout: Extra de-duplication and activity endpoint initial support

* WebServices: sgv endpoint add count= parameter
jamorham pushed a commit that referenced this pull request Jun 27, 2018
* include bluereader basis

* include bluereader basis

* include bluereader basis

* Repair Speak trend, and add translation (initial en/de)

* Add Bridge_battery upload Nightscout toright bridge name

* correct typo double down

* correct minor differeces to master origin

* correct wrong import class

* Correct Spacing and lining changes to be in sync with origin

* Correct speak bug (switch from mol to everytime)
Include Translation for trend
Include translation for Speak settings

* Correct speak bug (switch from mol to everytime)
Include Translation for trend
Include translation for Speak settings

* Translation Croatian v1.0

* Update locales.xml

* Follower and MDNS fixes

* isCollecting() proguard exclusion

* WebServices: Add status.json endpoint and sgv brief mode

* BluetoothScan: Concurrent modification race condition fix

* ActivityRecognizedService: concurrency fix

* Add code to receive more data and close the gaps.

Signed-off-by: Tzachi Dar <tzachi.dar@gmail.com>

* Use existing code to close per 5 minutes gaps.

Signed-off-by: Tzachi Dar <tzachi.dar@gmail.com>

* Multiply the "raw data" by 1000 and devide it by Constants.LIBRE_MULTIPLIER to make it feet the normal behavior.

Signed-off-by: Tzachi Dar <tzachi.dar@gmail.com>

* Simple fill the 10 minutes gap, by adding the last point to the interpolation graph.

Signed-off-by: Tzachi Dar <tzachi.dar@gmail.com>

* Receive an array of results instead of one result only.

Signed-off-by: Tzachi Dar <tzachi.dar@gmail.com>

* Disable external_blukon_algorithm to allow more testing.

Signed-off-by: Tzachi Dar <tzachi.dar@gmail.com>

* undo unneeded changes

* LicenseAgreementActivity: fix null pointer exception

* ImportDatabaseActivity: fix null pointer exception

* Nightscout: Extra de-duplication and activity endpoint initial support

* WebServices: sgv endpoint add count= parameter
jamorham pushed a commit that referenced this pull request Jun 27, 2018
jamorham pushed a commit that referenced this pull request Jan 15, 2020
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