diff --git a/.gitignore b/.gitignore index af6c1235..28d6f1b2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,14 @@ -*database/auto.cnf -*database/binlog.index -*database/mysql.sock +# *database/auto.cnf +# *database/binlog.index +# *database/mysql.sock *File_Storage/Mzanzi_Innovation_Hub/mih/minio-test.txt/xl.meta *File_Storage/ -*database/ -database/ibdata1 -database/mysql.ibd -database/undo* -database/#innodb_redo/#ib_redo* +database/#innodb_temp/* +database/#innodb_redo/* +database/*.dblwr +database/binlig.* +database/mysql.sock +# database/ibdata1 +# database/mysql.ibd +# database/undo* +# database/#innodb_redo/#ib_redo* diff --git a/File_Storage/Mzanzi_Innovation_Hub/.minio.sys/buckets/.tracker.bin b/File_Storage/Mzanzi_Innovation_Hub/.minio.sys/buckets/.tracker.bin index 30b5bba9..6ba531b8 100644 Binary files a/File_Storage/Mzanzi_Innovation_Hub/.minio.sys/buckets/.tracker.bin and b/File_Storage/Mzanzi_Innovation_Hub/.minio.sys/buckets/.tracker.bin differ diff --git a/database/#innodb_redo/#ib_redo32_tmp b/database/#innodb_redo/#ib_redo32_tmp deleted file mode 100644 index 1ff1962e..00000000 Binary files a/database/#innodb_redo/#ib_redo32_tmp and /dev/null differ diff --git a/database/#innodb_redo/#ib_redo33_tmp b/database/#innodb_redo/#ib_redo33_tmp deleted file mode 100644 index 1ff1962e..00000000 Binary files a/database/#innodb_redo/#ib_redo33_tmp and /dev/null differ diff --git a/database/#innodb_redo/#ib_redo34_tmp b/database/#innodb_redo/#ib_redo34_tmp deleted file mode 100644 index 1ff1962e..00000000 Binary files a/database/#innodb_redo/#ib_redo34_tmp and /dev/null differ diff --git a/database/#innodb_redo/#ib_redo35_tmp b/database/#innodb_redo/#ib_redo35_tmp deleted file mode 100644 index 1ff1962e..00000000 Binary files a/database/#innodb_redo/#ib_redo35_tmp and /dev/null differ diff --git a/database/#innodb_redo/#ib_redo36_tmp b/database/#innodb_redo/#ib_redo36_tmp deleted file mode 100644 index 1ff1962e..00000000 Binary files a/database/#innodb_redo/#ib_redo36_tmp and /dev/null differ diff --git a/database/#innodb_redo/#ib_redo37_tmp b/database/#innodb_redo/#ib_redo37_tmp deleted file mode 100644 index 1ff1962e..00000000 Binary files a/database/#innodb_redo/#ib_redo37_tmp and /dev/null differ diff --git a/database/#innodb_redo/#ib_redo38_tmp b/database/#innodb_redo/#ib_redo38_tmp deleted file mode 100644 index 1ff1962e..00000000 Binary files a/database/#innodb_redo/#ib_redo38_tmp and /dev/null differ diff --git a/database/#innodb_redo/#ib_redo39_tmp b/database/#innodb_redo/#ib_redo39_tmp deleted file mode 100644 index 1ff1962e..00000000 Binary files a/database/#innodb_redo/#ib_redo39_tmp and /dev/null differ diff --git a/database/#innodb_redo/#ib_redo40_tmp b/database/#innodb_redo/#ib_redo40_tmp deleted file mode 100644 index 1ff1962e..00000000 Binary files a/database/#innodb_redo/#ib_redo40_tmp and /dev/null differ diff --git a/database/#innodb_redo/#ib_redo41_tmp b/database/#innodb_redo/#ib_redo41_tmp deleted file mode 100644 index 1ff1962e..00000000 Binary files a/database/#innodb_redo/#ib_redo41_tmp and /dev/null differ diff --git a/database/#innodb_redo/#ib_redo42_tmp b/database/#innodb_redo/#ib_redo42_tmp deleted file mode 100644 index 1ff1962e..00000000 Binary files a/database/#innodb_redo/#ib_redo42_tmp and /dev/null differ diff --git a/database/#innodb_redo/#ib_redo43_tmp b/database/#innodb_redo/#ib_redo43_tmp deleted file mode 100644 index 1ff1962e..00000000 Binary files a/database/#innodb_redo/#ib_redo43_tmp and /dev/null differ diff --git a/database/#innodb_redo/#ib_redo44_tmp b/database/#innodb_redo/#ib_redo44_tmp deleted file mode 100644 index 1ff1962e..00000000 Binary files a/database/#innodb_redo/#ib_redo44_tmp and /dev/null differ diff --git a/database/#innodb_redo/#ib_redo45_tmp b/database/#innodb_redo/#ib_redo45_tmp deleted file mode 100644 index 1ff1962e..00000000 Binary files a/database/#innodb_redo/#ib_redo45_tmp and /dev/null differ diff --git a/database/#innodb_redo/#ib_redo46_tmp b/database/#innodb_redo/#ib_redo46_tmp deleted file mode 100644 index 1ff1962e..00000000 Binary files a/database/#innodb_redo/#ib_redo46_tmp and /dev/null differ diff --git a/database/#innodb_redo/#ib_redo47_tmp b/database/#innodb_redo/#ib_redo47_tmp deleted file mode 100644 index 1ff1962e..00000000 Binary files a/database/#innodb_redo/#ib_redo47_tmp and /dev/null differ diff --git a/database/#innodb_redo/#ib_redo48_tmp b/database/#innodb_redo/#ib_redo48_tmp deleted file mode 100644 index 1ff1962e..00000000 Binary files a/database/#innodb_redo/#ib_redo48_tmp and /dev/null differ diff --git a/database/#innodb_redo/#ib_redo49_tmp b/database/#innodb_redo/#ib_redo49_tmp deleted file mode 100644 index 1ff1962e..00000000 Binary files a/database/#innodb_redo/#ib_redo49_tmp and /dev/null differ diff --git a/database/#innodb_redo/#ib_redo50_tmp b/database/#innodb_redo/#ib_redo50_tmp deleted file mode 100644 index 1ff1962e..00000000 Binary files a/database/#innodb_redo/#ib_redo50_tmp and /dev/null differ diff --git a/database/#innodb_redo/#ib_redo51_tmp b/database/#innodb_redo/#ib_redo51_tmp deleted file mode 100644 index 1ff1962e..00000000 Binary files a/database/#innodb_redo/#ib_redo51_tmp and /dev/null differ diff --git a/database/#innodb_redo/#ib_redo52_tmp b/database/#innodb_redo/#ib_redo52_tmp deleted file mode 100644 index 1ff1962e..00000000 Binary files a/database/#innodb_redo/#ib_redo52_tmp and /dev/null differ diff --git a/database/#innodb_redo/#ib_redo53_tmp b/database/#innodb_redo/#ib_redo53_tmp deleted file mode 100644 index 1ff1962e..00000000 Binary files a/database/#innodb_redo/#ib_redo53_tmp and /dev/null differ diff --git a/database/#innodb_redo/#ib_redo54_tmp b/database/#innodb_redo/#ib_redo54_tmp deleted file mode 100644 index 1ff1962e..00000000 Binary files a/database/#innodb_redo/#ib_redo54_tmp and /dev/null differ diff --git a/database/#innodb_redo/#ib_redo55_tmp b/database/#innodb_redo/#ib_redo55_tmp deleted file mode 100644 index 1ff1962e..00000000 Binary files a/database/#innodb_redo/#ib_redo55_tmp and /dev/null differ diff --git a/database/#innodb_redo/#ib_redo56_tmp b/database/#innodb_redo/#ib_redo56_tmp deleted file mode 100644 index 1ff1962e..00000000 Binary files a/database/#innodb_redo/#ib_redo56_tmp and /dev/null differ diff --git a/database/#innodb_redo/#ib_redo57_tmp b/database/#innodb_redo/#ib_redo57_tmp deleted file mode 100644 index 1ff1962e..00000000 Binary files a/database/#innodb_redo/#ib_redo57_tmp and /dev/null differ diff --git a/database/#innodb_redo/#ib_redo58_tmp b/database/#innodb_redo/#ib_redo58_tmp deleted file mode 100644 index 1ff1962e..00000000 Binary files a/database/#innodb_redo/#ib_redo58_tmp and /dev/null differ diff --git a/database/#innodb_temp/temp_1.ibt b/database/#innodb_temp/temp_1.ibt deleted file mode 100644 index 1793d3a8..00000000 Binary files a/database/#innodb_temp/temp_1.ibt and /dev/null differ diff --git a/database/#innodb_temp/temp_10.ibt b/database/#innodb_temp/temp_10.ibt deleted file mode 100644 index 7e92cbe0..00000000 Binary files a/database/#innodb_temp/temp_10.ibt and /dev/null differ diff --git a/database/#innodb_temp/temp_2.ibt b/database/#innodb_temp/temp_2.ibt deleted file mode 100644 index fca121c4..00000000 Binary files a/database/#innodb_temp/temp_2.ibt and /dev/null differ diff --git a/database/#innodb_temp/temp_3.ibt b/database/#innodb_temp/temp_3.ibt deleted file mode 100644 index 3f99ea8e..00000000 Binary files a/database/#innodb_temp/temp_3.ibt and /dev/null differ diff --git a/database/#innodb_temp/temp_4.ibt b/database/#innodb_temp/temp_4.ibt deleted file mode 100644 index a622ec8b..00000000 Binary files a/database/#innodb_temp/temp_4.ibt and /dev/null differ diff --git a/database/#innodb_temp/temp_5.ibt b/database/#innodb_temp/temp_5.ibt deleted file mode 100644 index 3fc7f17d..00000000 Binary files a/database/#innodb_temp/temp_5.ibt and /dev/null differ diff --git a/database/#innodb_temp/temp_6.ibt b/database/#innodb_temp/temp_6.ibt deleted file mode 100644 index 22c1edd3..00000000 Binary files a/database/#innodb_temp/temp_6.ibt and /dev/null differ diff --git a/database/#innodb_temp/temp_7.ibt b/database/#innodb_temp/temp_7.ibt deleted file mode 100644 index 242429c0..00000000 Binary files a/database/#innodb_temp/temp_7.ibt and /dev/null differ diff --git a/database/#innodb_temp/temp_8.ibt b/database/#innodb_temp/temp_8.ibt deleted file mode 100644 index 639ac1eb..00000000 Binary files a/database/#innodb_temp/temp_8.ibt and /dev/null differ diff --git a/database/#innodb_temp/temp_9.ibt b/database/#innodb_temp/temp_9.ibt deleted file mode 100644 index 5157fae5..00000000 Binary files a/database/#innodb_temp/temp_9.ibt and /dev/null differ diff --git a/database/auto.cnf b/database/auto.cnf new file mode 100644 index 00000000..487f61ae --- /dev/null +++ b/database/auto.cnf @@ -0,0 +1,2 @@ +[auto] +server-uuid=14a0f86a-ebaf-11ee-ade3-0242ac1d0003 diff --git a/database/binlog.000070 b/database/binlog.000070 index 9101db78..91207c3d 100644 Binary files a/database/binlog.000070 and b/database/binlog.000070 differ diff --git a/database/binlog.000071 b/database/binlog.000071 new file mode 100644 index 00000000..e3288d1d Binary files /dev/null and b/database/binlog.000071 differ diff --git a/database/binlog.000072 b/database/binlog.000072 new file mode 100644 index 00000000..bf679d26 Binary files /dev/null and b/database/binlog.000072 differ diff --git a/database/binlog.index b/database/binlog.index new file mode 100644 index 00000000..553b9227 --- /dev/null +++ b/database/binlog.index @@ -0,0 +1,59 @@ +./binlog.000014 +./binlog.000015 +./binlog.000016 +./binlog.000017 +./binlog.000018 +./binlog.000019 +./binlog.000020 +./binlog.000021 +./binlog.000022 +./binlog.000023 +./binlog.000024 +./binlog.000025 +./binlog.000026 +./binlog.000027 +./binlog.000028 +./binlog.000029 +./binlog.000030 +./binlog.000031 +./binlog.000032 +./binlog.000033 +./binlog.000034 +./binlog.000035 +./binlog.000036 +./binlog.000037 +./binlog.000038 +./binlog.000039 +./binlog.000040 +./binlog.000041 +./binlog.000042 +./binlog.000043 +./binlog.000044 +./binlog.000045 +./binlog.000046 +./binlog.000047 +./binlog.000048 +./binlog.000049 +./binlog.000050 +./binlog.000051 +./binlog.000052 +./binlog.000053 +./binlog.000054 +./binlog.000055 +./binlog.000056 +./binlog.000057 +./binlog.000058 +./binlog.000059 +./binlog.000060 +./binlog.000061 +./binlog.000062 +./binlog.000063 +./binlog.000064 +./binlog.000065 +./binlog.000066 +./binlog.000067 +./binlog.000068 +./binlog.000069 +./binlog.000070 +./binlog.000071 +./binlog.000072 diff --git a/database/ib_buffer_pool b/database/ib_buffer_pool index 0e82c057..2762e44d 100644 --- a/database/ib_buffer_pool +++ b/database/ib_buffer_pool @@ -1,7 +1,8 @@ -4294967294,2304 -4294967279,384 -4294967278,448 -4294967278,398 +4294967294,2305 +4294967294,2363 +4294967294,1204 +4294967279,385 +4294967278,449 4294967293,131 4294967293,130 4294967293,129 @@ -273,9 +274,9 @@ 4294967278,7 4294967278,280 4294967278,6 +4294967278,448 4294967278,258 4294967278,5 -4294967278,389 4294967278,257 4294967278,4 4294967278,3 @@ -287,99 +288,3 @@ 4294967279,452 4294967279,381 4294967279,130 -4294967279,459 -4294967279,344 -4294967279,129 -4294967279,451 -4294967279,128 -4294967279,450 -4294967279,320 -4294967279,127 -4294967279,449 -4294967279,442 -4294967279,126 -4294967279,441 -4294967279,256 -4294967279,125 -4294967279,255 -4294967279,124 -4294967279,439 -4294967279,254 -4294967279,123 -4294967279,253 -4294967279,252 -4294967279,122 -4294967279,250 -4294967279,121 -4294967279,249 -4294967279,248 -4294967279,120 -4294967279,247 -4294967279,246 -4294967279,119 -4294967279,245 -4294967279,244 -4294967279,118 -4294967279,242 -4294967279,117 -4294967279,369 -4294967279,240 -4294967279,116 -4294967279,497 -4294967279,238 -4294967279,115 -4294967279,438 -4294967279,237 -4294967279,114 -4294967279,373 -4294967279,235 -4294967279,113 -4294967279,360 -4294967279,233 -4294967279,112 -4294967279,359 -4294967279,231 -4294967279,111 -4294967279,511 -4294967279,229 -4294967279,110 -4294967279,340 -4294967279,227 -4294967279,109 -4294967279,471 -4294967279,225 -4294967279,108 -4294967279,339 -4294967279,223 -4294967279,107 -4294967279,463 -4294967279,221 -4294967279,106 -4294967279,220 -4294967279,219 -4294967279,105 -4294967279,217 -4294967279,104 -4294967279,277 -4294967279,368 -4294967279,103 -4294967279,437 -4294967279,215 -4294967279,102 -4294967279,474 -4294967279,214 -4294967279,101 -4294967279,379 -4294967279,213 -4294967279,100 -4294967279,434 -4294967279,212 -4294967279,99 -4294967279,338 -4294967279,211 -4294967279,98 -4294967279,432 -4294967279,210 -4294967279,97 -4294967279,431 -4294967279,209 diff --git a/database/ibdata1 b/database/ibdata1 index 6fe1d24a..bbf68076 100644 Binary files a/database/ibdata1 and b/database/ibdata1 differ diff --git a/database/ibtmp1 b/database/ibtmp1 deleted file mode 100644 index e5743531..00000000 Binary files a/database/ibtmp1 and /dev/null differ diff --git a/database/mysql.ibd b/database/mysql.ibd index 3c9081f1..aaf29b7a 100644 Binary files a/database/mysql.ibd and b/database/mysql.ibd differ diff --git a/database/patient_manager/patient_files.ibd b/database/patient_manager/patient_files.ibd index 90a57faa..d3b0bab5 100644 Binary files a/database/patient_manager/patient_files.ibd and b/database/patient_manager/patient_files.ibd differ diff --git a/database/patient_manager/patient_notes.ibd b/database/patient_manager/patient_notes.ibd index 67830d8e..f506ccd1 100644 Binary files a/database/patient_manager/patient_notes.ibd and b/database/patient_manager/patient_notes.ibd differ diff --git a/database/undo_001 b/database/undo_001 index 1d2bb568..8bbeab3c 100644 Binary files a/database/undo_001 and b/database/undo_001 differ diff --git a/database/undo_002 b/database/undo_002 index f16f8ea0..d140b5cc 100644 Binary files a/database/undo_002 and b/database/undo_002 differ diff --git a/docker-compose.yml b/docker-compose.yml index c1efa018..df2e850d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,9 +2,9 @@ services: api: build: ./backend/ container_name: MIH-API-Hub - command: sh -c "sleep 10s; uvicorn backend.main:app --reload --port=81 --host=0.0.0.0" + command: sh -c "sleep 10s; uvicorn backend.main:app --reload --port=80 --host=0.0.0.0" ports: - - 81:81 + - 80:80 volumes: - .:/app depends_on: @@ -41,7 +41,7 @@ services: build: context: ./Frontend/patient_manager ports: - - "8080:8080" + - "443:443" depends_on: - api diff --git a/temp.pdf b/temp.pdf index 3785ca54..7cb2855f 100644 --- a/temp.pdf +++ b/temp.pdf @@ -17,17 +17,17 @@ endobj endobj 4 0 obj << -/BitsPerComponent 8 /ColorSpace /DeviceRGB /Filter [ /ASCII85Decode /FlateDecode ] /Height 100 /Length 1042 /Subtype /Image +/BitsPerComponent 8 /ColorSpace /DeviceRGB /Filter [ /ASCII85Decode /FlateDecode ] /Height 100 /Length 1054 /Subtype /Image /Type /XObject /Width 100 >> stream -Gb"/`8Tr!*$q#CA9;d-[QmedaFhh9"$H)W(eHtAN1e:$Gm$Oq.VXJ-Mc.Lpt$@,2iZGl3;QAnf0gI^'aWj4*).Eg7Zh0CmMMB&!nlCbGq]44oC^>0B%gdRfSht/qo=B9"P1\9cOc70:@?"A1t='!%@=o!5jb_cp/o0]7!^)qQcq4kZ8jnD3CpmA-@n)%b:laubsXSfQb`p0[Y9]_jI>P4-Iq^W_WZL[0eXABtEUNq?o1K1D!;0]FBWA!Y5mcj[+=RhL5]hF=o*%']AZTdG24Eaj>rCnVMKhTt<;F_)b5ooch$tI:543I&iNYLPqGqPMPC!Cm77iC15Ob.s5cQs5\/W)LQ,"$APkan9HB;Y"q%acr1W&5*rkquC/a&;W:7sS#2ZL[\3C7mdQk3Yun!qZ-P3('hg+d/_8,KY[NbNdc^9JRq.)=gbgR1?cLoZKkhN3(Wd-l"L+O\@`K%(VGEb/uq!X77&7.7Fd]1X'H$)'f(qgpaB-l5cs"nao#qM-f!BLm[O&=Ui#SptMDdZWV$!*g07lA``C(b259hd(u]p/3BdQ`JK&^YcJgF4L9-"V9F]mLXY0r@p)s@XNG9#CU-9lB45E?j:'_0%$=g6j7YsRQW71N(hQ9&b`Pe;AM_lHAm([6L!HL+=_`+5ToJH0I9HCCZ?#Xp&X4')j(I\F/i"L*c_dfA.4]&T/eK;e6;1HH),)gHFjS#SG$0s[>\X_/`7)CNKm]YXFl\W^AQ;cD=eRH[Ge*!Gd/=eV.a..EeTuafb%a()3p>J"ZCdP?]Ziq>dPi2`/81s?DLO-_:4f4[rD7+c98?haDC/>CKB42M9A3Q]K7PWl(miorN[oR=Zg#?PEhaulB3nr"]9*=?WLaW++>Oe8Wn:)ok1AM.4]mAA+5KkK'[Bp6[>DgVIgZoT6endstream +Gb"/bbAP3O&-Mh05FpY@Odq[V'TKZDonne2r-EJio*'$srkC=8.0Yh*'mBodq]N=/GHi=WQ@Kc>KiSakO,\DkG&7USCNChH.>S/)SZS]PYfKc^1n7H!j-es(2L7>skX]YTqYYG,+KSqsRphA.8Q\`m]6@s'5A?-9aZ\7AS)+XJ.n[k/DW?W=Fl2\;rEQ;cZ"S=hW6*rO.dTl99rX!;uqZ4[K;%ass^n>f`u:Lm:$pH"+F"A4jgc?;nt3'aaKNXC>?M546,QMVi`-8!=V+.k;[EXE_AeS*[]F^WfEc(f$qKaJ9Qc+!Q/+9Op[T3EWiQ[R/Cia/YLHkqF!#PG]lJ\oT$0fLjR08%hL1'cD+F;2`V3rOYodPeL/I0m4_,2;Wu06NUadlMA]8:X*/9FH*bL'F)6-[8ToWJ[)m!Fl,sL/*;Ta2?Ytc8O^9#K"Qec-d]>IN#9T1][1R1rsr7A6clBKil5jF:UPC2m0NG`k?kRdmRfU%EqeBaWKGI_T!)L%A[N?#f>!6oPVUp1Vik&RjpK56\.mB&[+/K/R:%*?DW&(R9_ttm`Z@XotSY'$8LQ=0;`sendstream endobj 5 0 obj << /Contents 9 0 R /MediaBox [ 0 0 595.2756 841.8898 ] /Parent 8 0 R /Resources << /Font 1 0 R /ProcSet [ /PDF /Text /ImageB /ImageC /ImageI ] /XObject << -/FormXob.38e804a25cd7412fc4aa43f361bf60ca 4 0 R +/FormXob.225dfdaa579e83c5c861653a8b5bf7bc 4 0 R >> >> /Rotate 0 /Trans << @@ -42,7 +42,7 @@ endobj endobj 7 0 obj << -/Author (anonymous) /CreationDate (D:20240704093659+00'00') /Creator (ReportLab PDF Library - www.reportlab.com) /Keywords () /ModDate (D:20240704093659+00'00') /Producer (ReportLab PDF Library - www.reportlab.com) +/Author (anonymous) /CreationDate (D:20240713082604+00'00') /Creator (ReportLab PDF Library - www.reportlab.com) /Keywords () /ModDate (D:20240713082604+00'00') /Producer (ReportLab PDF Library - www.reportlab.com) /Subject (unspecified) /Title (untitled) /Trapped /False >> endobj @@ -53,10 +53,10 @@ endobj endobj 9 0 obj << -/Filter [ /ASCII85Decode /FlateDecode ] /Length 446 +/Filter [ /ASCII85Decode /FlateDecode ] /Length 447 >> stream -Gas2F>>p/.&;B$;($AGb.3p'5qWOc9c<)*(*qV0]K1-q\RbI#@Qh7"dFZO%UYhAK8h1^H&(L>ou"'c*Wf+aH8Pb:/$&9etKkf@tZ7IWSYZ[S485G3!n$jqdp-\V4b^W-W?V\!bXB0S3W7Qc\/_d\R@=Zg)OoX%N%`hdQY8V`Z(na5feUS536;U.#Kg0h5'eWUM,C]`2'QfZC8=hJYu'[-Zq)kDq#g.O%l=ZJ,dS^V2.V/>+R\XHZ*UMOc\Yd*t*+7)a&7b*E2AR9l(`=_A,YOo-#CUDeI>-h;H+N,+hc07.@HO4"oN":$YYbtoj!p!u^$/)+rcRt(B-EER`\[HAHCaX4+k^mcq1,\GGcUu0QjCt%EFAh6h8R0s4EVK@WCd%%Bh`4UNGT&)HHjd]2gW_]sL$0HnBY*I~>endstream +Gas2F:K)m"&B4*cMK`$48kC-jO)!FK1KI#8K,u0=MaF-p[F9%IkoWW8VaCXiS,L%0]+>,$75fA;!&knr0`e!+,tR)ei:e(.n'$!]6UV%=dtG\2#/jj=2-R!)H[n@_4id=Yp+r\Psm"))Rm"0BNb.l=-"&NlWj-H?!8,b`6d3\#4,)*9endstream endobj xref 0 10 @@ -65,15 +65,15 @@ xref 0000000114 00000 n 0000000221 00000 n 0000000333 00000 n -0000001566 00000 n -0000001832 00000 n -0000001900 00000 n -0000002196 00000 n -0000002255 00000 n +0000001578 00000 n +0000001844 00000 n +0000001912 00000 n +0000002208 00000 n +0000002267 00000 n trailer << /ID -[<9654e78acfa3634d4603cd72a8d4f7eb><9654e78acfa3634d4603cd72a8d4f7eb>] +[<19735eb2bf13a11947b390c577b55c6e><19735eb2bf13a11947b390c577b55c6e>] % ReportLab generated PDF document -- digest (http://www.reportlab.com) /Info 7 0 R @@ -81,5 +81,5 @@ trailer /Size 10 >> startxref -2791 +2804 %%EOF