From e656b4817ea2c746766fe20e9e507e7a34d7545b Mon Sep 17 00:00:00 2001 From: mms37 Date: Fri, 3 Jun 2022 21:23:10 -0700 Subject: [PATCH] buggy --- list.json | 2 +- .../Main$1.class | Bin 1552 -> 1552 bytes .../Main.class | Bin 4319 -> 4261 bytes .../PackageInfo.class | Bin 3011 -> 3067 bytes src/Main.java | 5 +---- src/PackageInfo.java | 13 +++++++------ 6 files changed, 9 insertions(+), 11 deletions(-) diff --git a/list.json b/list.json index 759f080..3f4e0ad 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"}] \ No newline at end of file +[{"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 diff --git a/out/production/cmpt213.assignment1.packagedeliveriestracker/Main$1.class b/out/production/cmpt213.assignment1.packagedeliveriestracker/Main$1.class index b7ad65474455f061eb347f8978d6902e66a42f99..0ffb20ce15a68764df07553023bd50ae09a079db 100644 GIT binary patch delta 41 ucmbQhGl6GAEeoUIOUSYjC^Co8cA0!2$$y@BKb)&Kz25ef?c delta 41 ucmbQhGl6GAEeoU2 diff --git a/out/production/cmpt213.assignment1.packagedeliveriestracker/Main.class b/out/production/cmpt213.assignment1.packagedeliveriestracker/Main.class index 5a2f52e75c8870b3d13dc9ce71b43e0212224227..bcebd1797d94f7b8abb4d95d808f9e5fe96b9ea0 100644 GIT binary patch delta 984 zcmX|=OHf-?9L9gQT#}n`c^DTAW1#_|0}7(jjsrMVX;jc)E3`tYmR^$6kdg-tff9>S zEn?|IE2k8v3*Q}d9Gw<4#9{Bky{>eeabtb!(#MSc6K1-(=R4o|zrOF>^IiSb`fEP3 z!D85;GMmk|_4l_$BL3dqu0+DiA)a>gjLowg)_Y2mJC7KY?RUcCPE_?JkESd}4a}sI zP+lS^H%D!rB&t*9L08P?7~}d&vuVyEQ3y+Alts#*bRr!KOGbd>HfbiMW>jS!nhd0- zM&rt$q`4(vF=gO7p<>aojKv89PejFI(<-eZg~Y7QbDT7=i-|p{R9rd9V&)->=Y>}@ z6Dpihk${s?175t$*_`6VLUSiQDNQ<>gU6g{r#XyXQ zi7mS({qd9&DNKKfWjB{?R`lOygATYqHO}k5+ylnA4qA)GCH=M4V=U?#AmKI{2+ zn_=s$oo%Y(R&Jx3TI#8zg&nlv=N=l_MFYFJolcr`b$Op>4jUKnmX4J-%|%;lbL`78 z*k$^L@`Sod*YIyL5~?wMPL6PnF+uU0C|N`k!ewrv=^~mDZgwj!&kGy8l;h>0`4VIG zzm+x4`CiYVSFwWyd`0kejDqh=Eb|5>d?OP*AsV1r=sQHooouI-oucDz?&3b$2?}~j zG#%ky`FT3Xh_+M0&r94{iCCgrs&#UiF5cvRzLjddxFzcVKX3z6V*2@!pX83}i1RbQ zG)n7gPVy_i$voSc=6C*Jo0PEloc#&X6}!97`L4?Bo2-V`_;7=d`&)Bd z%d@_xw#xk;R;~Fi6$OQ#7uC)P`!=`a*%VF>SI(*jr0#>1(L*JBrE@?o=V6iih+NU5 za?&U0G5J0&4<#sL?_-wzoR-}J16*K`i^8sOkSk)vI}GtY!+b=DPvkXz#$ob|=+3HG Z%|d8{uh#Kj7ZZ%4y)IdyLT^?z{tuZ4@`3;W delta 975 zcmYL|?{8CO6vsagYwx}5?p7!)qz2~QSP4_+R5lZb5?O|9aTEDvR|NI0y(@)wom)3n z986>&D1(iMABOls5=c#q3maNy_&az9A>obUZ)1FC#M6@CoAZ3ndG7h1^F8-D*X!@s z-w64tE9oOE^ru@8g>E+iWMUcuG4JEA)NeCd0EC zAgR~*BUJ%X956X(lh*$l4H1h$MKGVwH~027ClXFqS9>NCV2BS)hHXa3DH`-_ph3rc z-IHUAs<+(uK{x4j4-RB4#udInH{)3xE}?8r(1gN2G@Ob{Kb;)4ndBo$OM1D@Bc0jN z{bS!r!WY$d{b4;5Xl!iiIpB`DExA<2Yw5|x-E?U%yTscVV3e~qe$MHz(N#6e zc@u4Ofr~nAwANZ&mO%_X7B}Lgvu?smXvh3k_31n24wcmFtkWu`7px9-LH}*_tJ#}< zmH#YJ)q1y`k1S(3t5``L^*l`z4$XpIAVMo^XrqyrS*!oDyDKkZV*vAdOLb&2zkYR* zZAEsr`xc0XeW86t-Yb$QvOknrB-`#^z`4z6Os)<+z7mvwf<7#xBN99I1RXD<6aSNi z{fnHw#dMLG=v0L&JUSt@LYJh*WC6RUJpqTQ3Tm zS<7=gPYbV!-6{(A@}j)14f14KIV?)2c!~28za-y&A*!$OsxWTkD_-FSo46;8U6_(R zzz^;Gh)-y?@sOY7-_&uGpZP_~uVk8E`Au3{#VLO050(gp#RL8%n|PI&DBHu=vW;^xgYRVb7IF2XU@ANt WyTzTGIP;=ZmFH;42|;~qY2$x7dF$T* diff --git a/out/production/cmpt213.assignment1.packagedeliveriestracker/PackageInfo.class b/out/production/cmpt213.assignment1.packagedeliveriestracker/PackageInfo.class index 78e18735757a536e27fcddb9ad1ed7b46ea782fc..840393d4f66d44dc7f3afaf2ab6aea15073b8b0b 100644 GIT binary patch delta 1281 zcmah|OHUI~6#j0f)0vi0NUbzH1=0wV)*|nRpasMNEuw&kFDP~jMcTnKk#yCSKR~XD z(S>nGVq6qaLRc6R7cTt?{t%6LrbVa~HJST3=brDL^L^*eC+9b3W`oVha5EIAQYmjJ zIs7Q>(_?Yf7uAySu*^HQ!&y^TlMGfZIuX`s zn_%c_;ID+TrGFxNZE&GQK`ZJQgoL(k*zF2B(8*xQg%dX{QB~% z%E5TtY9wp45ox;kh-EEfDr~+*CzF3EV0O+n4LB|fH4I@g!oreThUca zNVulpIwpCwP%dfeh)gwy6b3=WMHGDzbX2I=JONO!A{Ik?8-UY)wF3O#3j`zv+ z#q(5h020k-5yk>vll|%Y7%`&A=cAR;D!Si6%FxDyIhrk5XC>xoujB#@Fj)){s5BRX zop0zcA6#=RxE6I_=|9jFg{fV~qN7+mNZn7lOq9{$u6PgU)?sd2*4qFPjoBMYb5RGy z8^p>`ZZKj-Ka9)x2WwUOh_g2jrX0c)ED?JHMUTQjkq}-|#zKjg?Tx!=3hv^3$kVig zwwbr+@{pVrJLn&v)%hHEfGO^bB^d(M_?R){Hb`PV# zCT(^xzK1Db57U65l8|jsc{X(m&8@JZ4JBwtCH;mTbY=;(kpfiO0Ram&tphPC+(xI% zs3uh^F^&gVq5C{Y_ajbhL?j3_1M?3wNbpE-nf(&9eKbRqARoBM0}D;`2|{k&hg=vT p{T@M9iJv5Ym=lkx&h^jgZu$t>wS$|5@5iY0*WarRz zv}ZPbU4bSjEgtdot;S50?~(2rv|SqZU1(rltdf z#$r4*9rO)5;X%EE22?T#DSd_KO$sifnIYTIqxz(pAQgwk;P(2~eiYONooGdygmwi% zbTGIwMa7d^ApCSuHR5`TL7LEv6-}erfceYT(VdYtPJ)6mI!SX?Tas~&!Iskb#@7|x zK$yW{=wWqri2z<-uM0p#K^MABU1-Yg#VrX@1%2o@H-yUEhzmB{;lJNySTVl|{t@zxYyEOT?G8MJ>jVGiZ=}pE^IJP9!u5l<;x_C0Fyh!`Y}l0LHt{|fM$L%a!p6+!a#h{~@}nCPjTi9{Mcl{G_hffMu)Xn22NHo08XZi;R#e4Pm|s6PLV6lBws)!So%M9>1k=t znd}Kn9!Pgmp*CJteKnT6 zZs$Hz3EF%d_CN4R zNJ{WXXbnlw_envNARjH#8XPpxD+m^jFxmfOq<=A#<%h`o1@1jbHBucmKTWc#Yra6< T!QknO{ @@ -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"); + } }