master
mms37 2 years ago
parent 5a8141d3da
commit e656b4817e

@ -1 +1 @@
[{"name":"name","note":"notes","price":15.0,"weight":5.0,"delivered":false,"expectedDate":"2022-07-20T12:12"}]
[{"name":"name","note":"notes","price":15.0,"weight":5.0,"delivered":false,"expectedDate":"2022-07-20T12:12"},{"name":"n2","note":"n2","price":15.0,"weight":16.0,"delivered":false,"expectedDate":"2023-05-20T15:20"}]

@ -1,7 +1,6 @@
import com.google.gson.*;
import com.google.gson.stream.JsonReader;
import com.google.gson.stream.JsonWriter;
import java.io.*;
import java.time.LocalDateTime;
import java.time.chrono.ChronoLocalDate;
@ -44,15 +43,13 @@ try{
JsonArray array = element.getAsJsonArray();
for (int i = 0; i < array.size(); i++){
JsonObject pObj = array.get(i).getAsJsonObject();
System.out.println(pObj.get("expectedDate").getAsString());
DateTimeFormatter format = DateTimeFormatter.ofPattern("yyy-MM-dd HH:mm");
packageList.add(new PackageInfo(pObj.get("name").getAsString(),
pObj.get("note").getAsString(),
pObj.get("price").getAsDouble(),
pObj.get("weight").getAsDouble(),
pObj.get("delivered").getAsBoolean(),
//fix date
LocalDateTime.parse(pObj.get("expectedDate").getAsString(), format))
LocalDateTime.parse(pObj.get("expectedDate").getAsString()))
);
}
System.out.println("packages loaded");

@ -3,8 +3,8 @@ import java.text.SimpleDateFormat;
import java.time.Duration;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.Locale;
import java.time.format.DateTimeFormatter;
import java.time.temporal.ChronoUnit;
import static java.lang.Math.abs;
public class PackageInfo implements Comparable<PackageInfo>{
@ -47,10 +47,11 @@ private String name;
@Override
public String toString() {
DateFormat date = new SimpleDateFormat("yyyy-mm-dd hh:mm");
DateTimeFormatter format = DateTimeFormatter.ofPattern("yyy-MM-dd HH:mm");
LocalDateTime today = LocalDateTime.now();
Duration diff = Duration.between(expectedDate.toLocalDate(), today.toLocalDate());
today.format(format);
long diff = ChronoUnit.DAYS.between(today, expectedDate);
String isDelivered = delivered ? "yes" : "no";
return "Name: " + name + "\n" + "Notes: " + note + "\n" + "Price: " + price + "\n" + "Weight: " + weight + "\n" + "Expected Delivery Date: " + expectedDate + "\n" + "Delivered? " + isDelivered + "\n" + ((diff.toDays() > 0 && !delivered)? diff.toDays() + " days remaining" : abs(diff.toDays()) + " days overdue");
}
return "Name: " + name + "\n" + "Notes: " + note + "\n" + "Price: " + price + "\n" + "Weight: " + weight + "\n" + "Expected Delivery Date: " + expectedDate.toString() + "\n" + "Delivered? " + isDelivered + "\n" + ((diff > 0 && !delivered) ? diff + " days remaining" : abs(diff) + " days overdue");
}
}

Loading…
Cancel
Save