report fix

app/db/repository/report.py

@@ -153,6 +153,13 @@ def get_pdf(driver_id: int, db: Session):
 
     vehicle = report_data["Driver"]["AssignedVehicle"].__dict__
     print(vehicle)
+    if (
+        vehicle["CurrentLocation"] is None
+        or vehicle["CurrentLocation"] == ""
+        or vehicle["CurrentLocation"] == False
+        or len(vehicle["CurrentLocation"]) == 0
+    ):
+        vehicle["CurrentLocation"] = ["Unknown", "Unknown"]
     loc = vehicle["CurrentLocation"][0]
     if len(vehicle["CurrentLocation"]) > 1:
         loc += ", " + vehicle["CurrentLocation"][1]
@@ -211,7 +218,10 @@ def get_pdf(driver_id: int, db: Session):
     else:
         task_values = [entry["DistanceAtTime"] for entry in tasks_data]
         task_dates = [
+            # if type(entry["EndDateTime"]) == str parse, else just use
             parser.parse(entry["EndDateTime"]).strftime("%m/%d/%Y, %H:%M:%S")
+            if type(entry["EndDateTime"]) == str
+            else entry["EndDateTime"].strftime("%m/%d/%Y, %H:%M:%S")
             for entry in tasks_data
         ]
 

app/report1.pdf

@@ -2,7 +2,7 @@
 %“Œ‹ž ReportLab Generated PDF document http://www.reportlab.com
 1 0 obj
 <<
-/F1 2 0 R /F2 3 0 R /F3 5 0 R
+/F1 2 0 R /F2 3 0 R /F3 7 0 R
 >>
 endobj
 2 0 obj
@@ -27,11 +27,6 @@ endobj
 endobj
 5 0 obj
 <<
-/BaseFont /Times-Roman /Encoding /WinAnsiEncoding /Name /F3 /Subtype /Type1 /Type /Font
->>
-endobj
-6 0 obj
-<<
 /Contents 13 0 R /MediaBox [ 0 0 612 792 ] /Parent 11 0 R /Resources <<
 /Font 1 0 R /ProcSet [ /PDF /Text /ImageB /ImageC /ImageI ]
 >> /Rotate 0 /Trans <<
@@ -40,7 +35,7 @@ endobj
   /Type /Page
 >>
 endobj
-7 0 obj
+6 0 obj
 <<
 /Contents 14 0 R /MediaBox [ 0 0 612 792 ] /Parent 11 0 R /Resources <<
 /Font 1 0 R /ProcSet [ /PDF /Text /ImageB /ImageC /ImageI ]
@@ -50,6 +45,11 @@ endobj
   /Type /Page
 >>
 endobj
+7 0 obj
+<<
+/BaseFont /Times-Roman /Encoding /WinAnsiEncoding /Name /F3 /Subtype /Type1 /Type /Font
+>>
+endobj
 8 0 obj
 <<
 /Contents 15 0 R /MediaBox [ 0 0 612 792 ] /Parent 11 0 R /Resources <<
@@ -67,42 +67,42 @@ endobj
 endobj
 10 0 obj
 <<
-/Author (\(anonymous\)) /CreationDate (D:20231118192517-06'00') /Creator (\(unspecified\)) /Keywords () /ModDate (D:20231118192517-06'00') /Producer (ReportLab PDF Library - www.reportlab.com) 
+/Author (\(anonymous\)) /CreationDate (D:20231120183332-06'00') /Creator (\(unspecified\)) /Keywords () /ModDate (D:20231120183332-06'00') /Producer (ReportLab PDF Library - www.reportlab.com) 
   /Subject (\(unspecified\)) /Title (\(anonymous\)) /Trapped /False
 >>
 endobj
 11 0 obj
 <<
-/Count 4 /Kids [ 4 0 R 6 0 R 7 0 R 8 0 R ] /Type /Pages
+/Count 4 /Kids [ 4 0 R 5 0 R 6 0 R 8 0 R ] /Type /Pages
 >>
 endobj
 12 0 obj
 <<
-/Filter [ /ASCII85Decode /FlateDecode ] /Length 880
+/Filter [ /ASCII85Decode /FlateDecode ] /Length 837
 >>
 stream
-GauHI?#u2p'Re<2\<#o'mKX;J;j4YbVJ9>41\PZ3CJ"ag!i_B5mq#X86F%0CdFehWbIM9SSiq:k5]BPJNAH*/&\L<*5T)uIJ\$jLd/qUfaj18NaCtX'a:O:bU1;/WJn_T%_OM$;(snpf@BAUa;rY;1^5\HJCgJBJZ@H`$<^l[$U'HK\^oL`H:3hP'J(h]AVsR!bh\<Cu"7th&(^h7nVM;";g;9PTQo#Xc6^Mf"!),R-^^^3/27/0-MoZARoRWX!Z*PVr.-:,b>4"M19X`+26UTi94nN`e&##me$W0r7KEg0"WCIofFK/ac$;l'qo*X@##?VG*0ZNEED7!WJEG(\1dK)B2>O!Ei1k/9%1)m>g21DFn9#N-o-MqBg9Cj*M=VXNBC9BI0f'*-W\L_8o%WE?E0O#e$[7Z4_a?.,r[I6<;n%mZDq>qaf:%C=WgEa\f$lko(LD4Xu$h=uYHU4q>lMq/(=2!I!`-%sFhmiYdhC!:m+kj)9&l8goV&"P*QQdNVIEQo8QI=nF9ks0[g8[c\9GK$O`CL5]Q,;Z/c"UQB%,$I$(J-1L;Snc"<.esFplBWPZJ3";P`OLH;\XA0/lXC%6s8Sc\4m=j%co=lK<poSBcNbU%ZGMHAWfZj)I.eYHCj;]iD,bs[>:#]4",kR\pr-7bk2sgl$%^cgH2)2*)O#5d-lee]A^'qo&6=:kAUsAHeN,tR$f2kI0u)bJ!;Wg\RcGZpDg@ue&Q:\E1Utnb-XVW%W\!XcAC?p`hK?],a0VFRN,jlHaP:pE.,CDP'g2"bG!`0\s[6'Pa0="$2WGboT5Kc,Z6r5QJq4m?_Z-+;rf[XanBBQllKoB1@"B*G0fJ8fXH/3C1$_@O4]qcIq`hgr!#XFAF]~>endstream
+GauI4966RV'SZ;\'mJ=Y77+Y1I5o?U@s8iXG,@nIWt#G,0&U:<mir.tfO2hhFP?9;#''(Ye_q/anDso>hn0#8T>@!i":.Bg$P;h6A2Ca:-GLqL.,tH)'MG\NoCZ5!R`I7kF-8DGFMWJ?jasc.5dBd?<*mh8n8)8EpT0)Q>Dp(@%bWFE0AuN;6r&"Z5DR]7Od^GQ)FRje#<h!921]bqfl]G?p!bo1C1=s,kT4m^7iRQ/is&$eNRQ5tqDq#,MD0Y?XGX\+7=\4-QIKRAR9$CbmSKAK?8>>!(IjL@=u<!KHcj]+4$R_'F,XT\]+S#\/&kfg3-D_L3Pct+3']CR0\*IeMAE&+c,c3^a1'lsQ]'!u99@_S&A4jM9OLftZt6*4NW*K/LP/%uLLF`"`a/N2QHP^SNPk?a#YeNMeeGK3+\L@7$BO(f"lC^']f""cY2m^BKW@GM=":aF'/.6!UkGrJK)[[o*t8!mZCPB6EBVr>3$<^grHEE`j<]Fp]=+g`H1Jf$lXc4_?_&=S2k>jQZ]V(iNS\MeB`>iHN?[b$AGunhB1:*j_r+0Z>N^m'hVDD^qPLFGY+1?=[Y<Wl?W6NThf82%?\(3sJc*//)-o6A2G2l58'j+df/,/7X`O$-/5N%46s`4"W-?,he9f$QU.9Wf]QuXNr*Nc+-qufqIR)2*)'.`q'.kdZUWm'H;o(&p;!oti9[8@%o=Wj4):Mc@kO^Sg<_ignl*I>@)4m]pZ3E6s;`CA0We,.mApGrr8FGW.(/7GIc9OTm/bGOSHEc4-GJ8-dnFiAKrWM^i_22%Q`C(a8PAE^DGjeVDlU-:L:^@!7KGl1uY.%aU~>endstream
 endobj
 13 0 obj
 <<
-/Filter [ /ASCII85Decode /FlateDecode ] /Length 1144
+/Filter [ /ASCII85Decode /FlateDecode ] /Length 202
 >>
 stream
-GauHL966RV&AJ$Cka5ssXORE0gtFkOmGu]M>Gh^e9eoKA88U<aqd#m#?iq_amW]/gCA6K5lB><M6Lb<VFg`LTF%Rd'5_,!hOar5j8ajc<3r1u@Vl;M0'8FXXUUb4<1dWu(88,=r'Lk>,'ZLR$`Q`Sr[TGbVFLlhPI3@c18M:PDGPkIgj,W=IO&9-R`GRnGcSAtbA8AJrbI/[%XKj`[6H7Ri<3kF%s7h3:^Y&@:s6%eU?RVCFJstJ7!]5si\NJD8O$*%I["Yp-X/'9[Qb9RK%gV]S*t7:73fm8U9KF-Ak\TA?ZiLE4L4Fi69co`ZWk%U^l)u>[=N;"'N,q$c!)0>[0Zs/\1qjUpMT[7,KK-L<IrPa;&4]*NqCXS&'=mR^16r+*:7EXD.ER7OL8!5L4@p_g73\jZk]J`f-6ae%Yi_Y2fj#d7V+K[jIBTufifT+dp[3A[$P7QGkBIid8P_;!GWM-lAf.EW]JA4+2_=4?IRUm+^kJK\`[C\1&e450TCD1"2iM*5_]_L1*4MFj@($GagBGaS`>nWKm:oDP@`OEK!q>`$SJJ"QI%!*,jm%PoIdhD%-JG=`J]Dk?5[_J21>S^=qQsM]HE"S)!uCD0D&bo_G<uoE3P;+_F2Vc]UfJ)QA]tkAB&rK&'I>J6>**^T0iRiMFXEJ]Dh?4<'6j29(TX70%lhS8.qbTE(\rAURTW3Tnjk76H'@W-gVrK-Z!#[o"/D".?N":sh<rD`Ai=M2^k5=5\%#_i:ZsS\,EO&k?dN,K;Dt#rgMi-L'h0%krm.`R<H*a,<LpqMFIsQfalNY6r@^Tb!]Bi)H5N)$hjAB>7T!bH>",q4NNBM1f*?@Uh9Dkh(:rZZh$4f7#7akIR<u7B98pRp(ujSh&`3&V%m3%T,"c0BNS%K%KWf$:Ycg!df4DD:RM5-,g("Ue4u#Lbm.'U+FN%Bg+b)cH+W].K3L'6Qq\.SodV]G_D$QSX".Y_X4V!saoKO`#LZ9RIo';M#+-cXmDl^mM/aFmi7]oQiq<'rMbra95f*P>Y&^iurN7S*K-#m0Tn<0/cYu#$;R1\0\0OV2]o+BS*L(\CVRh+1a(h.JoW0_uBZ-=u@@qhlOL0QMC#q!p>k>BlD0i=sq,2)E1H.*5UWgA\D!O.e++o~>endstream
+Gat>N_$\%5$jPX:TAi)8LUknik>g#q#XVj*bW;c*`HCPC9rA8C&<T3g+o2,%OA"!reh++<b]a3<i%rGb#/&!BeP4G4E`o,=Bc34C55)QWaVqi<fkEn&TJ@s"-Y'IHgu*P^Y2V<6_&)Sla[`=S^%bG`j,N.fGHn?!D38;/7i6%IG-1_3[.km1&C@=.i"WiK5'X"f/,;l,~>endstream
 endobj
 14 0 obj
 <<
-/Filter [ /ASCII85Decode /FlateDecode ] /Length 1154
+/Filter [ /ASCII85Decode /FlateDecode ] /Length 172
 >>
 stream
-Gb!$H95bIu&BF88'QYf?EBN:5\jlll6Br+!DMUYK;q*9G:_id%N7Vi`dQD^)U`kVYh4=5_ci3f%$A.=Lf"YQ.!,n_g3Cc>dkq/PD)Q">?DE@VS_PX-0^j>"WCm29on_8lU0LoTE"\0`O.RYEe0i$#Dc/s!<A+oBp++MTX@=#DM]n5K39MYcK'7X%*]!;p".ogDQQg`W,LEA_LpO;c1$eoQ"l8(G%J?j%s23$7)>pC%$G#djZIuT*bs3s!/_mB%H$c<UH-:jJYalNFb-l]('e))[LE!V@7Mh\GaZ"OD9-'fId;Mh6)Y]O@=+Y90dH3h^8V;[]Q[L=gBEHifD9%LEoF(NgR+'2W*JoNs@:UhMF=P>JJ5]rsKR?D?l4P.Fj74n!g`5(D0K8r;.3Y"$sEN#Rk6OeG`C?Y\r`g2=dF<_<[ra1]gA()JK\m6d9SCJ+E@t*_/Nhh=OYG6GnlKrJci:7=?5OFOTG?!D@rUdWlrOkD9QHE`Tp&i9-j`As)DAIBP>jC7EhUjbgX`8OnG7:7%RaHbgV`q=1:m!LqI!FX1/Z9Q"@1VQ#;Vjta*r2qAC)+Y@YbrX:@4eB&o6P=@,2qP9Yf<Hd_NPFm0s%d]SWK]UKu9@7`XDFogj-U,TL2T.@QqBGbumhM1h@ufQBD]?`13dNOck5+1tn6-&c!8?(l@)n4MPnAKK2NMna^@%9F`+VE-jVYhF^j`aOeRtit\q@^e.(OE3mNY\Ye/>2@POD<GM`CP3?EE^V,)":@shZ,'OXN0bpcG`66j$h0_Dug$GCh$C#Dol1_+A3OGdIP1OG$Ltf7"$_b!jnl^kGltV=iBd[R@@Dd?'IETbb2,tM_.3[YZCKuSa7H3#T!tM"r$)N\0-#p'SdNhQ&QdqmbdRTLa\DDFDJp7Pq8go*E.>c50:kpH**C,f$8.S9a_X\>hTnkeK$<mSrTh%c-YdNk!`#N67/V3OjUa.K?lqg(j@Wa8RoMD>//>$30'VRmqXX0&MMNic?n%-N[+bn(]N0'4$E_G&P)9#]PZCObiMu"hDmQshM:`"sH\RL[oA`DHec]AZ*CUhPg9?CqJ[;)86>.7PXG8`!begd_2PuY9h"S44g-'W1:-@nk6;$j"`-lJ0bBF*U)'XZ@b,rNWU"a%2mHk&Vq!WE@Q`W~>endstream
+Gat%Y9+&O$&4H86MH[$<Qu7Y+[K3]I7I1tH8VgoO`m=JJ%O1+3$@:*!]gkUN1uBV]Q!dl2L`n@k-Q]S47blPA]9sJV9%L<IdePhE:1s2Bkp@m66%r1'NNoE(@DMCG`]Nn?0L>OPQB2bjAV,Qs>E\g^-+bs:oA%QRr8?O?%1>$F~>endstream
 endobj
 15 0 obj
 <<
-/Filter [ /ASCII85Decode /FlateDecode ] /Length 742
+/Filter [ /ASCII85Decode /FlateDecode ] /Length 775
 >>
 stream
-Gatm:9lJc?%))O>n<auL,#[!IHe_*r$lt)*^(!.,SQiJ">q?Al^HYnbPrOU62_^Cs&];XZ;D4mZ,eq]5mq[IJ,qQ22OJ$t$bXE$'%=BY3h\emZlbF4Qc>8^$[X-.7L+*aFC5tW2Y)Pct`gD0[4uMZ+=Z6!hI/@-MTR<c?$RhX@]PJI'q:/usSI$k"b;#0/s311d]_TF:kNp5b[f,J;[('.edapdiMSn".L9h</dVAQW-.I>4?XDZ.Vr"n:i?%;%j:idn#3pj[TLP<XHd^d$)rK)b6ZSP=>/:i=HWA9\P%#*>6/!j-/$d#aPZ$p?@3EU3qh=`3kp)qHp#bU96`_&`%(FUddr$]V,mpEH#k52?%HkIf[SRRmm7,"$&kZmTiSEom#Ldtq-;>^*h5P!f*'Lm_g55GO4'$co2BBn-[&I0_q_.Se]<e#tpI)]c#c?a\Z2ad,A^OBi/T-KT]kO/hKN#F83kJ%Ip'45cWJCuiR5UNgX>[tsb8o=/L*i080E`(n@UTgk=0B4C2sjihR$35("V6rf.#bMcLU9*0QG'"WVr7N!*Uo,*2t6%HJTQ/U/^S0-jI?-g\_\CA>CPeC+A@gMA,F10TClWS+sicF0]hVHq#X'Jr@s;L"5/2cp7t"58Y[A8L:H/c4)*QJ+Z$'5A4<-,6&L>KS&)=d]dF7.eD@fU7nM6;,]U1JhBA7scQY;#iQ")$\nFGID5bQ<[VKn_1AAe3h0Pa(bollomXZ@[~>endstream
+Gau`R95iQ=%)2U?n<ars,?!);4mp\u6\f*PDo3&NQOYT^(X%EtmuMcsM4<.;!b4S/9;_OT,:Q5!K&@aIk?SPdVLnUY!YSK,J7VSEFUdf?lt;&Mdoas)@V(i303eIt(l$-F@qrG=JC[jHE].O%Q4M5PeL[3%'n$"o>!qsZY?jNf#h=W=pqjcU95/NV_2aS=o]?8!s7"3%r]b"%^Tm-Pa.`<o";F$0MGY@ZmP14X(il\9V\2ht_bZl^p-lWlRGf-dB]L"^<5c;gBN4U[31Nf.%O:'&*D&7k00CQZLPdKM1^+[jmV?N+Jg?7piihKBQ'Z"hdL.5:?3)?rV"t&YoVCj/77VE0,t;"Ye[>I=6^Z4fbh0d@LI@qXPL1M16uFaue-:RR7"fDJ8!9:+hWJ[C.T1*am?d4#NgZn\'-.P0\Rh4sY8lVualCj&I+'a@*TW]+rE(E[ilH`u]Q3O@/:QA+I[>>pA_b\s[S1k6N9tiHP#<-$*n&?+d*]<C^@`P;LOJPp)Arr!9&N#\]GrqX[m@F_@p;;q#1b<7^W;:d(<2Z%7]XZ#aWC,O%f/<]kf9sA(!qLXC&QP]5jacqdf+-pftF*Gkb1u[@8bmogUqt6[5eYY,R\Bl9_H&$5/@6)H^DSJ>Di^&U&,[\qcMIe$uo$OmTS<0eAZb")O3ID7)3rK:!&i&gXIAG5pjn830oBB9SP^fl%3nVeUF.[`-&c5.g2!u8AnOTI,)X0:(&hKZnafNJrD'CL5J+GN<q.)l%O#6_Jo36p(qm>O?N~>endstream
 endobj
 xref
 0 16
@@ -112,20 +112,20 @@ xref
 0000000231 00000 n 
 0000000343 00000 n 
 0000000538 00000 n 
-0000000647 00000 n 
-0000000842 00000 n 
+0000000733 00000 n 
+0000000928 00000 n 
 0000001037 00000 n 
 0000001232 00000 n 
 0000001301 00000 n 
 0000001585 00000 n 
 0000001663 00000 n 
-0000002634 00000 n 
-0000003870 00000 n 
-0000005116 00000 n 
+0000002591 00000 n 
+0000002884 00000 n 
+0000003147 00000 n 
 trailer
 <<
 /ID 
-[<ee664bded2e591a430d712699aba8e65><ee664bded2e591a430d712699aba8e65>]
+[<a5b8fe316664d3b232625c7797fb5385><a5b8fe316664d3b232625c7797fb5385>]
 % ReportLab generated PDF document -- digest (http://www.reportlab.com)
 
 /Info 10 0 R
@@ -133,5 +133,5 @@ trailer
 /Size 16
 >>
 startxref
-5949
+4013
 %%EOF