caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

exams cleanup

Browse source
This commit is contained in:
Milos Kozak 2019-09-07 18:52:17 +02:00
parent 1f37aef9ce
commit c0d65df330
4 changed files with 73 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective.java
View file

@ -27,7 +27,7 @@ public abstract class Objective {
private int gate; private int gate;
private long startedOn; private long startedOn;
private long accomplishedOn; private long accomplishedOn;
private List<Task> tasks = new ArrayList<>(); List<Task> tasks = new ArrayList<>();
public boolean hasSpecialInput = false; public boolean hasSpecialInput = false;
public Objective(String spName, @StringRes int objective, @StringRes int gate) { public Objective(String spName, @StringRes int objective, @StringRes int gate) {

42
app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective2.java
View file

@ -10,6 +10,9 @@ public class Objective2 extends Objective {
public Objective2() { public Objective2() {
super("exam", R.string.objectives_exam_objective, R.string.objectives_exam_gate); super("exam", R.string.objectives_exam_objective, R.string.objectives_exam_gate);
for (Task task : tasks) {
if (!task.isCompleted()) setAccomplishedOn(0);
}
} }
@Override @Override
@ -46,6 +49,7 @@ public class Objective2 extends Objective {
.option(new Option(R.string.objectives_doexportafterchange, true)) .option(new Option(R.string.objectives_doexportafterchange, true))
.option(new Option(R.string.objectives_doexportafterfirtssettings, true)) .option(new Option(R.string.objectives_doexportafterfirtssettings, true))
.hint(new Hint(R.string.objectives_hint1)) .hint(new Hint(R.string.objectives_hint1))
.hint(new Hint(R.string.objectives_hint2))
); );
tasks.add(new ExamTask(R.string.noisycgm, R.string.noisycgm_whattodo,"noisycgm") tasks.add(new ExamTask(R.string.noisycgm, R.string.noisycgm_whattodo,"noisycgm")
.option(new Option(R.string.nothing, false)) .option(new Option(R.string.nothing, false))
@ -131,6 +135,44 @@ public class Objective2 extends Objective {
.option(new Option(R.string.sensitivityaaps, false)) .option(new Option(R.string.sensitivityaaps, false))
.hint(new Hint(R.string.sensitivity_hint1)) .hint(new Hint(R.string.sensitivity_hint1))
); );
tasks.add(new ExamTask(R.string.wrongcarbs, R.string.wrongcarbs_whattodo,"wrongcarbs")
.option(new Option(R.string.disableloop, false))
.option(new Option(R.string.wrongcarbs_treatmentstab, true))
.hint(new Hint(R.string.sensitivity_hint1))
);
tasks.add(new ExamTask(R.string.extendedcarbs, R.string.extendedcarbs_handling,"extendedcarbs")
.option(new Option(R.string.extendedcarbs_useextendedcarbs, true))
.option(new Option(R.string.extendedcarbs_add, false))
.option(new Option(R.string.extendedcarbs_useextendedbolus, false))
.hint(new Hint(R.string.sensitivity_hint1))
);
tasks.add(new ExamTask(R.string.nsclient_monitoring, R.string.nsclient_howcanyou,"nsclient")
.option(new Option(R.string.nightscout, true))
.option(new Option(R.string.nsclientinternal, true))
.option(new Option(R.string.dexcomfollow, true))
.option(new Option(R.string.dexcomfollowxdrip, false))
.option(new Option(R.string.xdripfollower, true))
.option(new Option(R.string.looponiphone, false))
.option(new Option(R.string.spikeiphone, true))
.hint(new Hint(R.string.sensitivity_hint1))
);
tasks.add(new ExamTask(R.string.nsprofileview_isf_label, R.string.whatistrue,"isf")
.option(new Option(R.string.isf_increasingvalue, true))
.option(new Option(R.string.isf_decreasingvalue, false))
.option(new Option(R.string.isf_noeffect, false))
.option(new Option(R.string.isf_preferences, false))
.option(new Option(R.string.isf_profile, false))
.hint(new Hint(R.string.isf_hint1))
.hint(new Hint(R.string.isf_hint2))
);
tasks.add(new ExamTask(R.string.nsprofileview_ic_label, R.string.whatistrue,"ic")
.option(new Option(R.string.ic_increasingvalue, true))
.option(new Option(R.string.id_decreasingvalue, false))
.option(new Option(R.string.ic_noeffect, false))
.option(new Option(R.string.ic_different, false))
.option(new Option(R.string.ic_meaning, false))
.hint(new Hint(R.string.ic_hint1))
);
for (Task task : tasks) for (Task task : tasks)
Collections.shuffle(((ExamTask)task).options); Collections.shuffle(((ExamTask)task).options);

29
app/src/main/res/values/exam.xml
View file

@ -100,5 +100,34 @@
<string name="sensitivity_which">Which sensitivity plugin has user defined time range for detection?</string> <string name="sensitivity_which">Which sensitivity plugin has user defined time range for detection?</string>
<string name="sensitivity_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Sensitivity-detection-and-COB.html</string> <string name="sensitivity_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Sensitivity-detection-and-COB.html</string>
<string name="sensitivityuam_which">Which sensitivity plugin must be used for UAM?</string> <string name="sensitivityuam_which">Which sensitivity plugin must be used for UAM?</string>
<string name="wrongcarbs">Wrong carbs</string>
<string name="wrongcarbs_whattodo">You see you have entered wrong carbs. What should you do?</string>
<string name="wrongcarbs_treatmentstab">Go to treatments, delete wrong carbs and enter new carbs</string>
<string name="extendedcarbs">Food with fat and protein</string>
<string name="extendedcarbs_handling">What to do if your food contains larger amount of fat or proteins?</string>
<string name="extendedcarbs_useextendedcarbs">Recalculate fat and proteins to carbs and use \"Extended carbs\" feature to tell system about it</string>
<string name="extendedcarbs_add">Recalculate fat and proteins to carbs and add it to bolus calculation</string>
<string name="extendedcarbs_useextendedbolus">Use extended bolus to cover fat and proteins</string>
<string name="nsclient_monitoring">Monitoring children</string>
<string name="nsclient_howcanyou">How can you monitor AAPS of your child remotely?</string>
<string name="nightscout">Nightscout</string>
<string name="dexcomfollow">Dexcom follow if you are using original Dexcom app</string>
<string name="dexcomfollowxdrip">Dexcom follow if you are using xDrip</string>
<string name="xdripfollower">xDrip in follower mode</string>
<string name="looponiphone">Loop app on iPhone</string>
<string name="spikeiphone">Spike on iPhone</string>
<string name="isf_increasingvalue">Assume you have high glycemia. Increasing ISF number will lead to giving less insulin if you try to correct high glycemia by bolus wizard</string>
<string name="isf_decreasingvalue">Assume you have high glycemia. Decreasing ISF number will lead to giving less insulin if you try to correct high glycemia by bolus wizard</string>
<string name="isf_noeffect">Changing ISF has no effect on amount of insulin given by APS when trying to correct high glycemia</string>
<string name="isf_preferences">You have to enter ISF in preferences</string>
<string name="isf_profile">Changing ISF in profile is enough to apply the change</string>
<string name="isf_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#insulin-sensitivity-factor-isf-mmol-l-u-or-mg-dl-u</string>
<string name="isf_hint2">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html</string>
<string name="ic_increasingvalue">Increasing IC value will lead to giving less insulin for the same amount of carbs</string>
<string name="id_decreasingvalue">Decreasing IC value will lead to giving less insulin for the same amount of carbs</string>
<string name="ic_noeffect">Assume you have no active carbs. Changing IC will lead to different amount of insuling to correct your glycemia</string>
<string name="ic_different">IC will be different if you count bread unit as 10g or 12g</string>
<string name="ic_meaning">IC meaning is: How much bread units is covered by 1U of insulin</string>
<string name="ic_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#carbohydrate-to-insulin-ratio-cr-g-u</string>
</resources> </resources>

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

@ -1638,6 +1638,7 @@
<string name="key_objectives_request_code" translatable="false">objectives_request_code</string> <string name="key_objectives_request_code" translatable="false">objectives_request_code</string>
<string name="requestcode">Request code: %1$s</string> <string name="requestcode">Request code: %1$s</string>
<string name="objectives_hint">(check all correct answers)</string> <string name="objectives_hint">(check all correct answers)</string>
<string name="objectives_hint2">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#what-emergency-equipment-is-recommended-to-take-with-me</string>
<plurals name="objective_days"> <plurals name="objective_days">
<item quantity="one">%1$d day</item> <item quantity="one">%1$d day</item>