caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

objectives fix

Browse source
This commit is contained in:
Milos Kozak 2016-09-10 12:20:32 +02:00
parent bdeb7d6061
commit b15fe7541e
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/info/nightscout/androidaps/plugins/Objectives/ObjectivesFragment.java
View file

@ -112,7 +112,7 @@ public class ObjectivesFragment extends Fragment implements View.OnClickListener
holder.progressLayout.setVisibility(View.GONE);
holder.verifyLayout.setVisibility(View.GONE);
holder.started.setVisibility(View.GONE);
} else if (o.started.getTime() > 0 && !enableFake.isChecked() && o.accomplished.getTime() == 0 && o.started.getTime() + o.durationInDays * 24 * 60 * 60 * 1000 > now && !requirementsMet.done) {
} else if (o.started.getTime() > 0 && !enableFake.isChecked() && o.accomplished.getTime() == 0 && !(o.started.getTime() + o.durationInDays * 24 * 60 * 60 * 1000 < now && requirementsMet.done)) {
// Phase 2: started, waiting for duration and met requirements
holder.startButton.setEnabled(false);
holder.verifyLayout.setVisibility(View.GONE);

2
app/src/main/java/info/nightscout/androidaps/plugins/Objectives/ObjectivesPlugin.java
View file

@ -126,7 +126,7 @@ public class ObjectivesPlugin implements PluginBase, ConstraintsInterface {
case 2:
return new RequirementResult(true, "");
default:
return new RequirementResult(false, "");
return new RequirementResult(true, "");
}
}