Mark lost delivery as delivered. #spaghetticode
This commit is contained in:
parent
62df2346c3
commit
33118ddb2f
|
@ -8,12 +8,15 @@ import java.util.UUID;
|
||||||
|
|
||||||
public class Delivery {
|
public class Delivery {
|
||||||
|
|
||||||
private String[] states = {"Bestellung eingegangen","Bestellung auf dem Weg","Lieferung erfolgreich"};
|
private String[] states = {"Bestellung eingegangen", "Bestellung auf dem Weg", "Lieferung erfolgreich"};
|
||||||
private int[] timeBorder = {4,24};
|
private int[] timeBorder = {4, 24};
|
||||||
|
|
||||||
private String name;
|
private String name;
|
||||||
private String address;
|
private String address;
|
||||||
|
|
||||||
|
// Why is this a string and creationTime a Date?!
|
||||||
private String estimatedArrival;
|
private String estimatedArrival;
|
||||||
|
|
||||||
private Date creationTime;
|
private Date creationTime;
|
||||||
private String uuid;
|
private String uuid;
|
||||||
|
|
||||||
|
@ -29,6 +32,9 @@ public class Delivery {
|
||||||
public static Delivery lostDelivery(String uuid) {
|
public static Delivery lostDelivery(String uuid) {
|
||||||
Delivery delivery = new Delivery("", "");
|
Delivery delivery = new Delivery("", "");
|
||||||
delivery.uuid = uuid;
|
delivery.uuid = uuid;
|
||||||
|
delivery.creationTime = addDays(new Date(), -1);
|
||||||
|
SimpleDateFormat formatter = new SimpleDateFormat("dd-MM-yyyy");
|
||||||
|
delivery.estimatedArrival = formatter.format(addDays((Date) delivery.creationTime.clone(), 1));
|
||||||
return delivery;
|
return delivery;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -37,6 +43,7 @@ public class Delivery {
|
||||||
long timeNow = now.getTime();
|
long timeNow = now.getTime();
|
||||||
long creationTime = this.creationTime.getTime();
|
long creationTime = this.creationTime.getTime();
|
||||||
|
|
||||||
|
// Wow, that's how calculate date diffs.
|
||||||
long diff = timeNow - creationTime;
|
long diff = timeNow - creationTime;
|
||||||
double hour = (((diff / 1000.0) / 3600.0));
|
double hour = (((diff / 1000.0) / 3600.0));
|
||||||
|
|
||||||
|
@ -54,8 +61,7 @@ public class Delivery {
|
||||||
return estimatedArrival;
|
return estimatedArrival;
|
||||||
}
|
}
|
||||||
|
|
||||||
private Date addDays(Date date, int days)
|
private static Date addDays(Date date, int days) {
|
||||||
{
|
|
||||||
Calendar cal = Calendar.getInstance();
|
Calendar cal = Calendar.getInstance();
|
||||||
cal.setTime(date);
|
cal.setTime(date);
|
||||||
cal.add(Calendar.DATE, days);
|
cal.add(Calendar.DATE, days);
|
||||||
|
|
Reference in New Issue