master
mms37 2 years ago
parent e656b4817e
commit 76443602f5

@ -1 +1 @@
[{"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"}] [{"name":"name","note":"notes","price":15.0,"weight":5.0,"delivered":true,"expectedDate":"2022-07-20T12:12"},{"name":"n2","note":"n2","price":15.0,"weight":16.0,"delivered":false,"expectedDate":"2023-05-20T15:20"},{"name":"n3","note":"n3","price":5.0,"weight":10.0,"delivered":false,"expectedDate":"2020-05-05T12:15"}]

@ -33,7 +33,7 @@ public void display(){
Calendar cal=Calendar.getInstance(); Calendar cal=Calendar.getInstance();
System.out.println("\nToday is: " + today.format(cal.getTime())); System.out.println("\nToday is: " + today.format(cal.getTime()));
for (int i = 0; i < options.length; i++){ for (int i = 0; i < options.length; i++){
System.out.println(i+1 + ": " + options[i]); System.out.println((i+1) + ": " + options[i]);
} }
} }
@ -43,7 +43,7 @@ if (packageList.size() == 0){
} }
else{ else{
for (int i=0; i < packageList.size(); i++){ for (int i=0; i < packageList.size(); i++){
System.out.println("Package #" + i+1); System.out.println("Package #" + (i+1));
System.out.println(packageList.get(i).toString()); System.out.println(packageList.get(i).toString());
} }
} }
@ -53,7 +53,7 @@ else{
Scanner scan = new Scanner(System.in); Scanner scan = new Scanner(System.in);
String pName; String pName;
do { do {
System.out.println("enter package a valid name:"); System.out.println("enter a valid package name:");
pName = scan.nextLine(); pName = scan.nextLine();
} }
while (pName.length()==0); while (pName.length()==0);
@ -62,10 +62,9 @@ else{
boolean checkDate = false; boolean checkDate = false;
DateTimeFormatter format = DateTimeFormatter.ofPattern("yyy-MM-dd HH:mm"); DateTimeFormatter format = DateTimeFormatter.ofPattern("yyy-MM-dd HH:mm");
LocalDateTime pDate=LocalDateTime.now(); LocalDateTime pDate=LocalDateTime.now();
while (checkDate == false){ while (checkDate == false){
try { try {
System.out.println("enter date as yyyy-mm-dd hh-mm:"); System.out.println("enter date as yyyy-mm-dd hh:mm:");
pDate = LocalDateTime.parse(scan.nextLine(), format); pDate = LocalDateTime.parse(scan.nextLine(), format);
checkDate = true; checkDate = true;
} }
@ -111,9 +110,9 @@ else{
//due=true returns overdue packages, else upcoming packages //due=true returns overdue packages, else upcoming packages
public ArrayList<PackageInfo> sortList(ArrayList<PackageInfo> pList, boolean due){ public ArrayList<PackageInfo> sortList(ArrayList<PackageInfo> pList, boolean due){
ArrayList<PackageInfo> sortedList = new ArrayList<>(); ArrayList<PackageInfo> sortedList = new ArrayList<>();
LocalDateTime now = LocalDateTime.now(); LocalDateTime today = LocalDateTime.now();
DateTimeFormatter format = DateTimeFormatter.ofPattern("yyy-MM-dd HH:mm"); DateTimeFormatter format = DateTimeFormatter.ofPattern("yyy-MM-dd HH:mm");
LocalDateTime today = LocalDateTime.parse(now.format(format)); today.format(format);
for (int i = 0; i < pList.size(); i++) { for (int i = 0; i < pList.size(); i++) {
PackageInfo p = pList.get(i); PackageInfo p = pList.get(i);
if (!p.getDelivered()) { if (!p.getDelivered()) {

Loading…
Cancel
Save