lovis_ix/Pilldroid
1
1
Fork 0
mirror of https://github.com/jfoucry/Pilldroid.git synced 2024-11-09 23:41:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Change in getDateEndOfStock

Browse source 
comment old code
This commit is contained in:
jacques 2022-07-30 08:32:53 +02:00
parent 57d9b7b010
commit 295ba5f52b
1 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
app/src/main/java/net/foucry/pilldroid/models/Prescription.java
View file

@ -7,7 +7,6 @@ import androidx.annotation.NonNull;
import androidx.room.Entity; import androidx.room.Entity;
import androidx.room.PrimaryKey; import androidx.room.PrimaryKey;
import net.foucry.pilldroid.BuildConfig;
import net.foucry.pilldroid.UtilDate; import net.foucry.pilldroid.UtilDate;
import java.io.Serializable; import java.io.Serializable;
@ -138,18 +137,22 @@ public class Prescription implements Serializable {
} }
public Date getDateEndOfStock() { public Date getDateEndOfStock() {
int numberDayOfTake;
if (this.getTake() > 0) {
numberDayOfTake = (int) Math.floor(this.getStock() / this.getTake());
} else {
numberDayOfTake = 0;
}
Date aDate = UtilDate.dateAtNoon(new Date()); Date aDate = UtilDate.dateAtNoon(new Date());
Calendar calendar = Calendar.getInstance(); Calendar calendar = Calendar.getInstance();
calendar.setTime(aDate);
calendar.add(Calendar.DAY_OF_YEAR, numberDayOfTake);
int numberDayOfTake = 0;
if (getTake() > 0) {
calendar.setTime(aDate);
numberDayOfTake = (int) Math.floor(this.getStock() / this.getTake());
calendar.add(Calendar.DAY_OF_YEAR, numberDayOfTake);
} else {
calendar.set(Calendar.YEAR, 9999);
calendar.set(Calendar.DAY_OF_YEAR, 1);
calendar.set(Calendar.MONTH, 1);
calendar.set(Calendar.HOUR_OF_DAY, 0);
calendar.set(Calendar.MINUTE, 0);
calendar.set(Calendar.SECOND, 0);
}
return calendar.getTime(); return calendar.getTime();
} }
@ -158,10 +161,10 @@ public class Prescription implements Serializable {
int numberOfDays = UtilDate.nbOfDaysBetweenDateAndToday(lastUpdate); int numberOfDays = UtilDate.nbOfDaysBetweenDateAndToday(lastUpdate);
if (BuildConfig.DEBUG) { /*if (BuildConfig.DEBUG) {
numberOfDays = 1; numberOfDays = 1;
Log.d(TAG, "Set NumberOfDays = 1"); Log.d(TAG, "Set NumberOfDays = 1");
} }*/
if (numberOfDays > 0) { if (numberOfDays > 0) {
double takeDuringPeriod = this.take * numberOfDays; double takeDuringPeriod = this.take * numberOfDays;