From 64965977e332c34a79893924bc613f94621e279f Mon Sep 17 00:00:00 2001 From: mms37 Date: Mon, 30 May 2022 21:15:13 -0700 Subject: [PATCH] not working yet --- .idea/vcs.xml | 6 ++ .../PackageInfo.class | Bin 1467 -> 1658 bytes .../TextMenu.class | Bin 3588 -> 4479 bytes src/PackageInfo.java | 13 +++ src/TextMenu.java | 91 ++++++++++++++++-- 5 files changed, 100 insertions(+), 10 deletions(-) create mode 100644 .idea/vcs.xml diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/out/production/cmpt213.assignment1.packagedeliveriestracker/PackageInfo.class b/out/production/cmpt213.assignment1.packagedeliveriestracker/PackageInfo.class index 1c967026919d235b8218762b924cd35bf45a8730..0ffbf3606691de321455756e1bc72f8e943f1966 100644 GIT binary patch delta 754 zcmXX^T~8BH5IwWIWw+aF`=G;9F{ISd*|Bk)^n8TxeGZ*v2 zfM17cApnaIcwF4vDwf@R{Z(WCSNxfQpoKHyi&k&6T#?;pA&j#G-%hi-=@MvJM57k^ zMYQLgTP;^wA~a~h#yNt&lbIwc2>8 zl&n;yYc&%IT(aQ92q8LFcwO8r=C+IVa_&j1S*@36((49B3F@Bv#z2~&)EnMQ`bbOO zdm5z;uS2$yUiW^}fi^>kcrTO)A2;W9lzi}xi6t!SxN9Mcd!DX-r&aH#`kWqk8O_nw zi0Mse@iq@sXf(Fo?qG;{E38`&uPhaNiV#L3>miX9kjP_8(TWsl$h9j;R$h6u_YF_`=V*i2gxPM-8V zC2VrR4NUQ=Hew67DH-45G-m!6{W_)>bS+k C^JcaH delta 608 zcmXX?%Wl(95Itijwc}jU)+Gh=YFeHN4dzh_q!cKWM<78+NJy|iGL1MB2g zkRq>;*dn$dAysN6R;*a?1^fgX7N|lTJ6Jk%?#!KY&v^c*t*rI^@8(wki?}2F4X^ObD{~yp`u()31h4 zJAzEZUv01XUB4laM<((DecgX$VwXS*JF(VL*n_=-ROki1z^*;>);xFB3!Co!Ubh`K z7viq{3I~Q=ot_^T3JTMhDGJgry6qJTWjQV%QaFqm!N_aB-E8&Z(ouzDC=PxckDkce zXkPmumFTDD$i?WlR?RJ0xQc5AmKA1kJ*w;9Cz!cpA*V|lkk84r%NSpSi#^Gxh7CA{)64{CFvr-B z)o)-zC(muccxY!fkgb)zAomWYz4If|_GF#uZekxXMI0oK%xC6< z9pn?!!tmYyrWOTfF;82E|9FnjDmYK6g0_uG0~eMIEKst@nubfbOg7nmg}8xR%q*U& IxPv;Jf8iZin*aa+ diff --git a/out/production/cmpt213.assignment1.packagedeliveriestracker/TextMenu.class b/out/production/cmpt213.assignment1.packagedeliveriestracker/TextMenu.class index 97b771014d6fc991e7322149ded0287ebbe49f94..2203af1c4246a0c301f89d8c45a3d63b4773c3c5 100644 GIT binary patch delta 2333 zcmbVNYj6`)6#i~E?JnC;uoO%nEuplfrPkDOra%fPLq)?BsE92ssNFW(CLztnWJ_rk zBU%NYAnT))r}(H3P$?R)RRqBoz7-YJAO7(#{%08Dxtj!vQXEY(ch8=C?|07m&UbHm z9f?BuI{~szekm@ zn&y{k&al$DMrl{0PF-_GeOgy8GH|CAx8g2_iKU*hS`#CvgxX!V=@EaZy_yG6tY|?i zgV3%LVtUaZdN%@`J@mIQFO6`6=I*h-UW`8Ag(6zX2t#3z))xwuKPPwSDO~;P;^&~ zqN^+DeUbU9tCYwXt*uVc$qX^fP9+so43BVC`4x8(i4USz#6wm*jE%-7i=$WwXud>9IH9zxM#3`;W0T9fRDZiqA4eO!c#gNIk6~e{ zaYoEvp3+QBP1A_%E-kC9o-3-~itX4z*oxQ76*WS4DLIujmjg8`o=C6q- zd4=Xxx}E;0+sPz+OQ(vN*7p|`@0`xAlkfvWK6Cn%sIx^?Lr$tr_42c(`&4I;&f_!! z^MpcbWMNQ=M%Ac@(?*vx)ABPzfzcxs7{?_C+hzPF+1YO6oaAxsq4S{FdAoLFJ7Q0!;8qGakmi}(-+%Ap82#6u#moTuj3v z6k;)^;|>&2|BLA`6p=<}m@#gF2niGM5?-cjV#Wol86~FALJ>BmGRVRP4A44;MR{0& zSMVxrSxi^eYj~Z~-)HQUi(~uo26=bWw!`G(Mcr5)M}0qX22ql`DvqiFR0{JP+_@Je z1KblNG~Ry@HST1EjGy} z3wH4ko{eK$!ysZM6+_r*(s_}$CQPEltEhlEm;g6yB#Wukw;3d%3SzF3sF_6_or{Gu z-UJUxW(97hzno?Cr%*@N`*LWwo$lXyx=~l6muC90ilngG6j2+IN5pWVV`OkM$#gb$ z;2mmh28G;=L!@tk0``zJxY8>L@Ldei?J^5tEWt1-c`nxAJ-kmX_EBO-@ByiFJ$2+L zS@MX^@d)Y8&4lGVvPA?EsEk1pA&Y3BR}ne%V5v{8x!Q3)}*qF{+~TZ-Uu#` zjiHXhGbYaBoPqNeKF0<5SLk8%l7MBdNhj=`5jPW$h#-C!&;%n+G$@%CC+$qe$r!jM zP%ZxrRr?KGmqp=uA|so_<-(I4;fClA>RkvwtqBcbS_{1#SrD|d@fG^$1$H7p>&eIA zlUbEBA4Rm|iIy@dqb)@RCZHPc;R8%WjD9XAVJRkK1tQpp_tA+;?500}s$7lbFc3ru zcHwLI*wm3|3#Q~SjTH{&cMw27zTrB7rSD=PzQuP;S;4E4C8Zzz(k!UX?!jK79@Ccb z^YIgdG=8WZtNjC0bCt(GpUiWs^X%S*whvqiNiro?5aqqH+A+lNHzIhvJaN{o_x%)~fTXQL6H zU^V8Tm8j~fQoNCx|Ae2Z2T$-qfwsH?VXVY2IK(rTVG({s0nb{?=P)CUMW*979N|y) zQYn?Gl packageList){ - +if (packageList.size() == 0){ + System.out.println("No packages to show"); +} +else{ + for (int i=0; i < packageList.size(); i++){ + System.out.println("Package #" + i+1); + System.out.println(packageList.get(i).toString()); + } +} } + public void add(ArrayList packageList){ Scanner scan = new Scanner(System.in); String pName; @@ -49,19 +62,52 @@ public void list(ArrayList packageList){ System.out.println("notes:"); String pNotes = scan.nextLine(); boolean checkDate = false; - while (checkDate == false) { - try { + DateTimeFormatter format = DateTimeFormatter.ofPattern("yyyy-mm-dd hh-mm"); + LocalDateTime pDate=LocalDateTime.now(); + + while (checkDate == false){ + //try { System.out.println("enter date as yyyy-mm-dd hh-mm:"); - LocalDateTime pDate = LocalDateTime.parse(scan.nextLine()); - } catch (DateTimeParseException e) { - System.out.println("invalid date format"); - } - checkDate = true; + pDate = LocalDateTime.parse(scan.nextLine(), format); + checkDate = true; + //} + //catch (DateTimeParseException e) { + //System.out.println("invalid date format"); + //} } - } + double pPrice; + do { + System.out.println("enter price:"); + pPrice = scan.nextDouble(); + } + while (pPrice < 0); + double pWeight; + do { + System.out.println("enter weight:"); + pWeight = scan.nextDouble(); + } + while (pWeight <= 0); - public void remove(ArrayList packageList){ + packageList.add(new PackageInfo(pName, pNotes, pPrice, pWeight, false, pDate)); + System.out.println(pName + " has been added to the list!"); + } + public void remove(ArrayList packageList) { + this.list(packageList); + if (packageList.size() == 0){ + return; + } + Scanner scan = new Scanner(System.in); + int n; + do { + System.out.println("enter item number you want to remove (0 to cancel):"); + n = scan.nextInt(); + } + while (n < 0 || n > packageList.size()); + if (n > 0){ + System.out.println(packageList.get(n-1).getName() + " has been removed from the list."); + packageList.remove(n-1); + } } public void overDueList(ArrayList packageList){ @@ -72,7 +118,32 @@ public void list(ArrayList packageList){ } + public ArrayList getUndelivered(List packageList){ + ArrayList undelivered = new ArrayList<>(); + for (PackageInfo package: packageList){ + if (package.getDelivered() == false){ + undelivered.add(package); + } + } +return undelivered; + } + public void markDelivered(ArrayList packageList){ + ArrayList undelivered=getUndelivered(packageList); + if (packageList.size() == 0){ + return; + } + Scanner scan = new Scanner(System.in); + int n; + do { + System.out.println("enter item number you want to mark delivered (0 to cancel):"); + n = scan.nextInt(); + } + while (n < 0 || n > packageList.size()); + if (n > 0){ + System.out.println(packageList.get(n-1).getName() + " has been removed from the list."); + packageList.remove(n-1); + } }