caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Some fixes in merge

Browse source
This commit is contained in:
Andy Rozman 2018-07-26 17:31:38 +01:00
parent 1b8ceb83cf
commit 8e99482723
5 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/info/nightscout/androidaps/plugins/PumpCommon/PumpPluginAbstract.java
View file

@ -458,7 +458,7 @@ public abstract class PumpPluginAbstract extends PluginBase implements PumpInter
return deliverBolus(detailedBolusInfo); return deliverBolus(detailedBolusInfo);
} else { } else {
// no bolus required, carb only treatment // no bolus required, carb only treatment
TreatmentsPlugin.getPlugin().addToHistoryTreatment(detailedBolusInfo); TreatmentsPlugin.getPlugin().addToHistoryTreatment(detailedBolusInfo, true);
EventOverviewBolusProgress bolusingEvent = EventOverviewBolusProgress.getInstance(); EventOverviewBolusProgress bolusingEvent = EventOverviewBolusProgress.getInstance();
bolusingEvent.t = new Treatment(); bolusingEvent.t = new Treatment();

2
app/src/main/java/info/nightscout/androidaps/plugins/PumpMedtronic/MedtronicPumpPlugin.java
View file

@ -470,7 +470,7 @@ public class MedtronicPumpPlugin extends PumpPluginAbstract implements PumpInter
if (response) { if (response) {
// FIXME this needs to be fixed to read info from history // FIXME this needs to be fixed to read info from history
boolean treatmentCreated = TreatmentsPlugin.getPlugin().addToHistoryTreatment(detailedBolusInfo); boolean treatmentCreated = TreatmentsPlugin.getPlugin().addToHistoryTreatment(detailedBolusInfo, true);
getMDTPumpStatus().reservoirRemainingUnits -= detailedBolusInfo.insulin; // we subtract insulin, exact amount will be visible with next remainingInsulin update. getMDTPumpStatus().reservoirRemainingUnits -= detailedBolusInfo.insulin; // we subtract insulin, exact amount will be visible with next remainingInsulin update.

2
app/src/main/java/info/nightscout/androidaps/plugins/PumpVirtual/VirtualPumpDriver.java
View file

@ -186,7 +186,7 @@ public class VirtualPumpDriver extends PumpDriverAbstract {
LOG.debug("Delivering treatment insulin: " + detailedBolusInfo.insulin + "U carbs: " + detailedBolusInfo.carbs + "g " + result); LOG.debug("Delivering treatment insulin: " + detailedBolusInfo.insulin + "U carbs: " + detailedBolusInfo.carbs + "g " + result);
MainApp.bus().post(new EventVirtualPumpUpdateGui()); MainApp.bus().post(new EventVirtualPumpUpdateGui());
pumpStatusData.setLastCommunicationToNow(); pumpStatusData.setLastCommunicationToNow();
TreatmentsPlugin.getPlugin().addToHistoryTreatment(detailedBolusInfo); TreatmentsPlugin.getPlugin().addToHistoryTreatment(detailedBolusInfo, true);
return result; return result;
} }

12
app/src/main/res/values/strings.xml
View file

@ -1170,6 +1170,18 @@
<string name="key_plugin_stats_report_timestamp" translatable="false">key_plugin_stats_report_timestamp</string> <string name="key_plugin_stats_report_timestamp" translatable="false">key_plugin_stats_report_timestamp</string>
<string name="openaps_noasdata">No autosens data available</string> <string name="openaps_noasdata">No autosens data available</string>
<plurals name="objective_days">
<item quantity="one">%d day</item>
<item quantity="other">%d days</item>
</plurals>
<plurals name="objective_hours">
<item quantity="one">%d hour</item>
<item quantity="other">%d hours</item>
</plurals>
<plurals name="objective_minutes">
<item quantity="one">%d minute</item>
<item quantity="other">%d minutes</item>
</plurals>
<string name="virtualpump_type">Virtual Pump Type</string> <string name="virtualpump_type">Virtual Pump Type</string>
<string name="virtualpump_definition">Pump Definition</string> <string name="virtualpump_definition">Pump Definition</string>

4
app/src/main/res/values/styles.xml
View file

@ -27,13 +27,11 @@
<style name="ButtonSmallFontStyle"> <style name="ButtonSmallFontStyle">
<item name="android:textSize">10sp</item> <item name="android:textSize">10sp</item>
</style> </style>
<<<<<<< HEAD
<style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" /> <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
<style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" /> <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
<!-- Preferences --> <!-- Preferences -->
=======
>>>>>>> dev
</resources> </resources>