From 76443602f595e6b86f170586dcadace7a5ab736f Mon Sep 17 00:00:00 2001
From: mms37 <melody_shih@sfu.ca>
Date: Sat, 4 Jun 2022 08:53:20 -0700
Subject: [PATCH] done

---
 list.json                                     |   2 +-
 .../TextMenu.class                            | Bin 7089 -> 7009 bytes
 src/TextMenu.java                             |  13 ++++++-------
 3 files changed, 7 insertions(+), 8 deletions(-)

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 75a2eedcd5ac8a626be2248b3e4b381fdae61d8d..54c609badc4cca60d5767631238a72d60b89905a 100644
GIT binary patch
delta 2028
zcma)6Yiv|i5dNlnd++x4cH1u9wp+HPEoE7DyIp9pXiFiK#HgWwimgN>Y-~#kXd9sA
zp`?N&B>M9th7ycP6GM#A&`Op*6sqzNw7yV$KfqTJMNz3z3w6%f?Y1Fm{Bh^bIWy<X
zH#6Uyu6gIm&C}QWjsU2lo4U-^c6&VzTj)WrIB0ik{T5ylgZ6Cwh=rpV5Etzgd9PY{
z4Fd#w)28Z%#^#L;CXVBTfs+<q$0@Nm=@$JB3vXgj>`JPlx5YqGKD{f>B^7wj;9djo
z6CCTpZQ)Ss=B5pyB~6<)C*uslCQN*2;Uj!3d}bAWDjLlq`dmC=R_k9{_zLI58PltO
zZQ&by`{I~6U~}Y|G>!5NDzI=T6^cQ}v0xFwGFLR$hqvW7ZK}v8J9!BjDa}VPmxmu%
zA70y#Kb<XpaWu7%ipBX<FO`U-v{~95!VD2k%QK6XG&iqrZ84}!tWK+<@5TN!Hw}qM
z+U=nWTqy@^EG=kAVbBizpjO24W?aON{3rYbo#l`yN#9Es#L4u<%cR$BFkpuZm+&(Z
zFf*>LfmiKm?6W6!hmM{2h5ZP(Vi7LmS3YqEs_+|r=lEB|N@pN6#QuG}l6a~E5!CL3
zqZ?l5eG!x&K&h?DBR4zY<4upYMszvz+Rt{evj&++9>W1<vGl`<AUr5xErd$e7ok)o
zmd}@G@Hz^a!^Gf8Z5V$ryg&I4i~rG`tE^pN-Gt3K3ZfAdV}#cU_=_!1Bk>tlhs51e
z2DvT;8O`moE-gsLDz3~ZuCW9T#e*D*1xd!UxQ;PCn~nV(D}`YNv4@B?4YRSE63B)`
z%)<`UkjB-YkFAtQIw#kPg=CPOZ+;wpN@C5N0Bv%xVJOtX?J7&3z}kf<)caj)8R~IY
znS$!)a6oMwU~LRwHWtJH&cGZpxpB6MAnYHD!DktI$|y_&>qar3CKZQAM%ISu)5w2W
zhwc5STX`7WOM9@ZLK9mu9SwE1a^0mz+qx{^(j!<ifcgr<ZA1{+hjLE`a@?9+^+oV<
z2U3Dkf2!^Prh4`vD{gwF17^&$Tc-nKF9dsVEO?NEGB?Df%&c|~7tV(^lwk`qVk?$l
z8|U#b*5VO7#J0_Nly`S3mfXc~%TP(lWO2c#;U2{oU8WGP)OJcyeBnKEaI<8J8!46d
zY+REEahaQ?G1nSZ0~6a-`7+r}9!OCwiXOPi2PDP3(8f5HVaQ_E5q}0AGq8i{F^X~n
z^&`j{VNR%)QW}#nJ=#(}+rf9psmb*Rv<Obu6szH}<nX-3!_(z2HY4bajf%+0o~D{F
zhk?(;Q_77s-#{igIgx}(n59k9Dr&pRHi_8|8buaEo#;DF`6pDi8&IXc6NNPi)v5o1
zD&s#;WiY;fMI~Qiw#pag1ZOQtUm0U#jcq}0pcn5EI<w&m<o4o&1TYB|0iDHaL$tdy
zd1{_?M++yX#^jepz9O=OmGKf*VwhZ9Cgu-i-T+qGvf{RJuslE4q8;~5bT^y3>mIKo
zRd5hVzBYd#;=|d=-Tfq9#(u0@*^Lc{(Xv#w{WGyDCsg=Fbe@<K=Xuke7{POW_zsY#
z_(C}w&*v-*%SUSghgg9E#rZ@TES^(aj21dtVmW!ST)hr9%tf_&9kfYQk^Yh@QGb=E
ysF|8oGyWFYD2MM)psD2HzZW{?a=O!%oT21QC1)uaP%=m%_BGjWHkHy`xc>%~QL}ac

delta 2112
zcmah}Yiv|i5dLQG_TJmu+wHcr-QBV+%WG+OTNWs`u%%RMLVQrD2~v?q*jOMfBrTK{
zh|+=(NR0eCe{7>MkQib}j774PqJV;kD85C+C-_1OK2f1A;GDa+TjKN2xpQacocU(v
zn>km}TWOrU-hT){HBIX^mgpH<u;0X^=p&Sik*beML`3r$1{%?C;vk+Et-8;7$i!i>
zL-(pLns^CE#U4Fc^s<TLI7-l)+G>|AZ&|a<zzMvn;iQSz@VZdar>k$6coT1l+VpCA
zM{G(D(0gKM`sm<k+^69Kf~z^!5sS31ZCVwX-PE==1E&!)VBoBYkMOa$z}G$%L1P?!
zF77sJ)$=C4z?VW8LG^1B-{8V?hm9kOYqUXQXskx#Ox#1`#SYi8i4zE>F|VaDwjt2e
z77dV2B?Ko~QkalYAA4YBY{jy`SemR;ndr<KLlLnvD@c>YiL4UmRKj=>a2FZlX1BDg
zY;V=5LKM2I={vE|?V|zF?!Gf}kxS@;!lwx*G8wfCm#jbHa~i(K5Bw$k2$jzPamoD{
zT@>50Z=Wl@?tlgzdH4xG!+{AYX(@u1&dEO8?Kf0x#xLwgn1$PL8Nc$4yHJha@H@x9
zBD^`_t^xM%<3EY#)^Hs2d*IrOV9vrgDt2R%Qtg+@T?n$$-;c!r8(0qe<5+qGjd3hz
z#a0LHzHz3P-*7_aSHviR5<Wx7K^gp*h+;%Ao#h%#vGNUY%-ni}?Nm6t4O>cAG03q0
z;73gUCN&9`uCQ!C$zhoW`SEM~@4$7oJc*}R8W6c7PI0-;k7((V<!VI+7IDFD@FP0^
z?@PtlXUE9E(?sOpyIwp_3O7VyklRVN#)(PTN@=7b4VBo4I?}i)Gq9d{k<Q7rqlOI1
z;Fljkh)kA@Vax^xy9x`mIGbCZJq)$ihFX-jLUuN<+=3e7aKQW&!1*>nFJ{^R$73>O
zazB;fAnb3);JXYxGXX<Ga{@EyrrPi*$=Wch*6}x;T{{n=VZnavozsVhqfRj`-__NJ
zcvMv?v^*`@@wwqVE!pF!?$hHq(1QwpHwt{J{CgpeBi+a>lkyV{yD`$=15e6ytQ&@H
z+Nv=%o+<0YD`n4e;3Pky%z0on7j6xsZbL5Cb|Jv^EJX)bdL5HwJ?gOm_v1mV#6#@X
z&YDduZMMj>h_k3f6}c#j9~p~#Efz`Ab*2i~Np6cptfOr1p@Tg;D2H{j%d4@Cd+6lQ
z%~oH#(ip%JTxO+e)i<9n$g6Ivhsmo6zA7nL0_P2ms%x^^4a|xL4O=v9<dcb(K!t|J
zL3jq4H&)we1oJgF*>=9(&CkezD-4C5ah$3v<q`Atz?6gcHjh(ph&8+HaS|szqb!2R
zf#Ex;{0eP?Xvn8L&dPBUY-y9!OWG1_ldyGA0v<*?%ni!_CsfK1DjQVxyMIHq!TbNH
zJpX~p!}$IcmE7WNmCNZkXDtV#%4TexGP5vz0Phoac~KlLJb*I}Sc`}Wnp0{iM8ucR
zlQqkigeWJ=;O!%KrYvDqs)SXzN?tCLj&kz-1+26cq-;ZAdB(0Kn_fKJ-I3f~|4<z%
z%0W~P(-8{Ci}9h=UAvB-q{?^@%?tKo)qb?jkzM~xm<5qB=aTcrocM~BzO*>@^y6D=
z<qnZyaY0Q?F1DE*Vjf0Y1CS<zrE==9X`!Ok&MAm`YlA45idt)fIB%kg^p{jg`dfL5
yYXzRVp?#%LA;0gSA{xctAXEx)x<TtKw$6}smRjdT>zqVWAQv@JIo(2)@cju{6uu(>

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<PackageInfo> sortList(ArrayList<PackageInfo> pList, boolean due){
         ArrayList<PackageInfo> 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()) {