diff --git a/list.json b/list.json index 3f4e0ad..18167f8 100644 --- a/list.json +++ b/list.json @@ -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"}] \ No newline at end of file +[{"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"}] \ No newline at end of file diff --git a/out/production/cmpt213.assignment1.packagedeliveriestracker/TextMenu.class b/out/production/cmpt213.assignment1.packagedeliveriestracker/TextMenu.class index 75a2eed..54c609b 100644 Binary files a/out/production/cmpt213.assignment1.packagedeliveriestracker/TextMenu.class and b/out/production/cmpt213.assignment1.packagedeliveriestracker/TextMenu.class differ diff --git a/src/TextMenu.java b/src/TextMenu.java index fda127c..6b74bb3 100644 --- a/src/TextMenu.java +++ b/src/TextMenu.java @@ -33,7 +33,7 @@ public void display(){ Calendar cal=Calendar.getInstance(); System.out.println("\nToday is: " + today.format(cal.getTime())); 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{ 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()); } } @@ -53,7 +53,7 @@ else{ Scanner scan = new Scanner(System.in); String pName; do { - System.out.println("enter package a valid name:"); + System.out.println("enter a valid package name:"); pName = scan.nextLine(); } while (pName.length()==0); @@ -62,10 +62,9 @@ else{ boolean checkDate = false; DateTimeFormatter format = DateTimeFormatter.ofPattern("yyy-MM-dd HH:mm"); LocalDateTime pDate=LocalDateTime.now(); - while (checkDate == false){ 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); checkDate = true; } @@ -111,9 +110,9 @@ else{ //due=true returns overdue packages, else upcoming packages public ArrayList sortList(ArrayList pList, boolean due){ ArrayList sortedList = new ArrayList<>(); - LocalDateTime now = LocalDateTime.now(); + LocalDateTime today = LocalDateTime.now(); 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++) { PackageInfo p = pList.get(i); if (!p.getDelivered()) {