diff --git a/File_Storage/Mzanzi_Innovation_Hub/.gitignore b/File_Storage/Mzanzi_Innovation_Hub/.gitignore new file mode 100644 index 00000000..6f2cf330 --- /dev/null +++ b/File_Storage/Mzanzi_Innovation_Hub/.gitignore @@ -0,0 +1,3 @@ +temp/ + +.minio.sys/buckets/.tracker.bin \ No newline at end of file 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 d8867c80..30b5bba9 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/Frontend/patient_manager/lib/env/env.dart b/Frontend/patient_manager/lib/env/env.dart index 6de55e0c..6aa88e43 100644 --- a/Frontend/patient_manager/lib/env/env.dart +++ b/Frontend/patient_manager/lib/env/env.dart @@ -1,5 +1,6 @@ enum Enviroment { dev, prod } +// abstract class AppEnviroment { static late String baseApiUrl; static late String baseFileUrl; @@ -10,13 +11,13 @@ abstract class AppEnviroment { switch (env) { case Enviroment.dev: { - baseApiUrl = "http://localhost:80"; + baseApiUrl = "http://localhost:81"; baseFileUrl = "http://localhost:9000"; break; } case Enviroment.prod: { - baseApiUrl = "http://MIH_API_Hub:80"; + baseApiUrl = "http://MIH_API_Hub:81"; baseFileUrl = "http://MIH_Minio:9000"; break; } diff --git a/Frontend/patient_manager/lib/pages/patientManager.dart b/Frontend/patient_manager/lib/pages/patientManager.dart index af6d2512..160f081b 100644 --- a/Frontend/patient_manager/lib/pages/patientManager.dart +++ b/Frontend/patient_manager/lib/pages/patientManager.dart @@ -23,6 +23,7 @@ class PatientManager extends StatefulWidget { State createState() => _PatientManagerState(); } +// class _PatientManagerState extends State { TextEditingController searchController = TextEditingController(); String endpoint = "${AppEnviroment.baseApiUrl}/patients/user/"; diff --git a/database/#ib_16384_0.dblwr b/database/#ib_16384_0.dblwr index 1e3dec39..80fddea4 100644 Binary files a/database/#ib_16384_0.dblwr and b/database/#ib_16384_0.dblwr differ diff --git a/database/#innodb_redo/#ib_redo27 b/database/#innodb_redo/#ib_redo27 index 07dc8f70..0f257e8c 100644 Binary files a/database/#innodb_redo/#ib_redo27 and b/database/#innodb_redo/#ib_redo27 differ diff --git a/database/#innodb_temp/temp_1.ibt b/database/#innodb_temp/temp_1.ibt index d4375392..1793d3a8 100644 Binary files a/database/#innodb_temp/temp_1.ibt and b/database/#innodb_temp/temp_1.ibt differ diff --git a/database/#innodb_temp/temp_10.ibt b/database/#innodb_temp/temp_10.ibt index 48e1bef9..7e92cbe0 100644 Binary files a/database/#innodb_temp/temp_10.ibt and b/database/#innodb_temp/temp_10.ibt differ diff --git a/database/#innodb_temp/temp_2.ibt b/database/#innodb_temp/temp_2.ibt index 734a8072..fca121c4 100644 Binary files a/database/#innodb_temp/temp_2.ibt and b/database/#innodb_temp/temp_2.ibt differ diff --git a/database/#innodb_temp/temp_3.ibt b/database/#innodb_temp/temp_3.ibt index 4401142e..3f99ea8e 100644 Binary files a/database/#innodb_temp/temp_3.ibt and b/database/#innodb_temp/temp_3.ibt differ diff --git a/database/#innodb_temp/temp_4.ibt b/database/#innodb_temp/temp_4.ibt index a5de5f26..a622ec8b 100644 Binary files a/database/#innodb_temp/temp_4.ibt and b/database/#innodb_temp/temp_4.ibt differ diff --git a/database/#innodb_temp/temp_5.ibt b/database/#innodb_temp/temp_5.ibt index 3b3c2360..3fc7f17d 100644 Binary files a/database/#innodb_temp/temp_5.ibt and b/database/#innodb_temp/temp_5.ibt differ diff --git a/database/#innodb_temp/temp_6.ibt b/database/#innodb_temp/temp_6.ibt index 3c325059..22c1edd3 100644 Binary files a/database/#innodb_temp/temp_6.ibt and b/database/#innodb_temp/temp_6.ibt differ diff --git a/database/#innodb_temp/temp_7.ibt b/database/#innodb_temp/temp_7.ibt index dbe6cc00..242429c0 100644 Binary files a/database/#innodb_temp/temp_7.ibt and b/database/#innodb_temp/temp_7.ibt differ diff --git a/database/#innodb_temp/temp_8.ibt b/database/#innodb_temp/temp_8.ibt index eeb5ef58..639ac1eb 100644 Binary files a/database/#innodb_temp/temp_8.ibt and b/database/#innodb_temp/temp_8.ibt differ diff --git a/database/#innodb_temp/temp_9.ibt b/database/#innodb_temp/temp_9.ibt index 80e5b9e2..5157fae5 100644 Binary files a/database/#innodb_temp/temp_9.ibt and b/database/#innodb_temp/temp_9.ibt differ diff --git a/database/binlog.000069 b/database/binlog.000069 index 91e887b1..88762110 100644 Binary files a/database/binlog.000069 and b/database/binlog.000069 differ diff --git a/database/binlog.000070 b/database/binlog.000070 new file mode 100644 index 00000000..9101db78 Binary files /dev/null and b/database/binlog.000070 differ diff --git a/database/ib_buffer_pool b/database/ib_buffer_pool index 549c5dd6..0e82c057 100644 --- a/database/ib_buffer_pool +++ b/database/ib_buffer_pool @@ -1,29 +1,7 @@ -4294967278,87 -4294967278,86 -4294967278,84 -4294967278,83 -4294967278,82 -4294967278,81 -4294967278,80 -4294967278,79 -4294967278,77 -4294967278,76 -4294967278,75 -4294967278,74 -4294967278,73 -4294967279,90 -4294967279,89 -4294967279,86 -4294967279,85 -4294967279,84 -4294967279,78 -4294967279,77 -4294967279,76 -4294967279,75 -4294967279,74 -4294967279,73 -4294967279,72 -4294967279,71 +4294967294,2304 +4294967279,384 +4294967278,448 +4294967278,398 4294967293,131 4294967293,130 4294967293,129 @@ -67,6 +45,7 @@ 4294967293,91 4294967293,90 4294967293,89 +4294967293,88 4294967293,87 4294967293,86 4294967293,85 @@ -152,583 +131,255 @@ 4294967293,5 4294967293,4 4294967293,3 -4294967278,116 -4294967278,105 -4294967278,104 -4294967278,103 -4294967278,102 -4294967278,100 -4294967278,99 -4294967278,97 -4294967278,96 -4294967278,94 -4294967278,93 -4294967278,92 -4294967278,91 -4294967278,404 -4294967278,68 -4294967278,431 -4294967278,67 -4294967278,66 -4294967278,65 -4294967278,64 -4294967278,63 -4294967278,62 -4294967278,59 -4294967278,58 -4294967278,57 -4294967278,55 -4294967278,54 -4294967278,53 -4294967278,52 +4294967293,2 +4243767290,0 +4243767289,0 +4243767288,0 +4243767287,0 +4243767286,0 +4243767285,0 +4243767284,0 +4243767283,0 +4243767282,0 +4243767281,0 +4294967293,0 4294967278,51 +4294967278,425 +4294967278,162 4294967278,50 +4294967278,324 +4294967278,161 4294967278,49 +4294967278,160 4294967278,48 +4294967278,322 +4294967278,159 4294967278,47 -4294967278,46 -4294967278,45 -4294967278,44 -4294967278,43 -4294967278,42 -4294967278,41 -4294967278,40 -4294967278,39 -4294967278,38 -4294967278,37 -4294967278,36 -4294967278,35 -4294967278,34 -4294967278,33 -4294967278,32 -4294967278,31 -4294967278,30 -4294967278,29 -4294967278,28 -4294967278,27 -4294967278,25 -4294967278,24 -4294967278,17 -4294967278,14 -4294967278,174 -4294967278,260 -4294967278,88 -4294967278,0 -4294967278,350 -4294967279,126 -4294967279,120 -4294967279,119 -4294967279,118 -4294967279,117 -4294967279,105 -4294967279,97 -4294967279,96 -4294967279,87 -4294967279,83 -4294967279,327 -4294967279,70 -4294967279,404 -4294967279,69 -4294967279,461 -4294967279,68 -4294967279,67 -4294967279,66 -4294967279,64 -4294967279,63 -4294967279,324 -4294967279,60 -4294967279,394 -4294967279,59 -4294967279,58 -4294967279,57 -4294967279,55 -4294967279,54 -4294967279,52 -4294967279,51 -4294967279,46 -4294967279,45 -4294967279,174 -4294967279,88 -4294967279,2 -4294967279,0 -4294967279,410 -4294967278,430 -4294967278,340 -4294967294,332 -4294967294,334 -4294967294,331 -4294967294,411 -4294967294,1297 -4294967294,1308 -4294967294,1502 -4294967294,1283 -4294967294,330 -4294967294,2340 -4294967294,1281 -4294967294,99 -1,0 -4294967294,1305 -4294967294,104 -4294967294,106 -4294967294,107 -4294967294,407 -4294967294,1004 -4294967294,1001 -4294967294,1000 -4294967294,999 -4294967294,997 -4294967294,996 -4294967294,995 -4294967294,994 -4294967294,993 -4294967294,992 -4294967294,733 -4294967294,990 -4294967294,989 -4294967294,988 -4294967294,986 -4294967294,985 -4294967294,983 -4294967294,982 -4294967294,981 -4294967294,980 -4294967294,979 -4294967294,978 -4294967294,977 -4294967294,976 -4294967294,975 -4294967294,974 -4294967294,973 -4294967294,971 -4294967294,970 -4294967294,969 -4294967294,968 -4294967294,967 -4294967294,965 -4294967294,964 -4294967294,963 -4294967294,962 -4294967294,961 -4294967294,960 -4294967294,958 -4294967294,956 -4294967294,954 -4294967294,953 -4294967294,952 -4294967294,727 -4294967294,951 -4294967294,950 -4294967294,949 -4294967294,948 -4294967294,947 -4294967294,946 -4294967294,945 -4294967294,944 -4294967294,943 -4294967294,942 -4294967294,940 -4294967294,939 -4294967294,938 -4294967294,937 -4294967294,936 -4294967294,935 -4294967294,934 -4294967294,933 -4294967294,931 -4294967294,930 -4294967294,929 -4294967294,928 -4294967294,927 -4294967294,926 -4294967294,925 -4294967294,924 -4294967294,923 -4294967294,921 -4294967294,920 -4294967294,919 -4294967294,918 -4294967294,917 -4294967294,916 -4294967294,911 -4294967294,909 -4294967294,905 -4294967294,904 -4294967294,903 -4294967294,902 -4294967294,900 -4294967294,899 -4294967294,898 -4294967294,897 -4294967294,896 -4294967294,895 -4294967294,894 -4294967294,893 -4294967294,890 -4294967294,888 -4294967294,721 -4294967294,886 -4294967294,885 -4294967294,884 -4294967294,877 -4294967294,876 -4294967294,722 -4294967294,874 -4294967294,871 -4294967294,870 -4294967294,869 -4294967294,868 -4294967294,867 -4294967294,866 -4294967294,865 -4294967294,864 -4294967294,863 -4294967294,862 -4294967294,861 -4294967294,859 -4294967294,857 -4294967294,854 -4294967294,853 -4294967294,852 -4294967294,851 -4294967294,849 -4294967294,731 -4294967294,847 -4294967294,723 -4294967294,845 -4294967294,844 -4294967294,843 -4294967294,840 -4294967294,839 -4294967294,837 -4294967294,835 -4294967294,720 -4294967294,834 -4294967294,833 -4294967294,832 -4294967294,830 -4294967294,829 -4294967294,828 -4294967294,826 -4294967294,825 -4294967294,823 -4294967294,822 -4294967294,821 -4294967294,819 -4294967294,711 -4294967294,815 -4294967294,814 -4294967294,813 -4294967294,812 -4294967294,811 -4294967294,810 -4294967294,808 -4294967294,806 -4294967294,804 -4294967294,714 -4294967294,801 -4294967294,800 -4294967294,799 -4294967294,798 -4294967294,716 -4294967294,797 -4294967294,795 -4294967294,794 -4294967294,790 -4294967294,789 -4294967294,788 -4294967294,787 -4294967294,786 -4294967294,785 -4294967294,784 -4294967294,782 -4294967294,781 -4294967294,779 -4294967294,778 -4294967294,775 -4294967294,772 -4294967294,770 -4294967294,712 -4294967294,703 -4294967294,701 -4294967294,700 -4294967294,715 -4294967294,697 -4294967294,713 -4294967294,708 -4294967294,696 -4294967294,705 -4294967294,695 -4294967294,694 -4294967294,693 -4294967294,637 -4294967294,691 -4294967294,718 -4294967294,690 -4294967294,688 -4294967294,687 -4294967294,72 -4294967294,686 -4294967294,71 -4294967294,685 -4294967294,70 -4294967294,684 -4294967294,683 -4294967294,681 -4294967294,680 -4294967294,679 -4294967294,677 -4294967294,674 -4294967294,673 -4294967294,671 -4294967294,669 -4294967294,663 -4294967294,662 -4294967294,660 -4294967294,659 -4294967294,653 -4294967294,651 -4294967294,650 -4294967294,648 -4294967294,647 -4294967294,645 -4294967294,643 -4294967294,641 -4294967294,636 -4294967294,633 -4294967294,632 -4294967294,631 -4294967294,625 -4294967294,624 -4294967294,639 -4294967294,732 -4294967294,620 -4294967294,628 -4294967294,617 -4294967294,616 -4294967294,615 -4294967294,614 -4294967294,706 -4294967294,613 -4294967294,719 -4294967294,612 -4294967294,611 -4294967294,610 -4294967294,730 -4294967294,609 -4294967294,710 -4294967294,608 -4294967294,729 -4294967294,607 -4294967294,627 -4294967294,606 -4294967294,605 -4294967294,728 -4294967294,604 -4294967294,724 -4294967294,707 -4294967294,717 -4294967294,638 -4294967294,603 -4294967294,726 -4294967294,915 -4294967294,725 -4294967294,878 -4294967294,704 -4294967294,875 -4294967294,792 -4294967294,709 -4294967294,791 -4294967294,1201 -4294967294,2339 -4294967294,1087 -4294967294,1317 -4294967294,1403 -4294967294,2338 -4294967294,1024 -4294967294,2336 -4294967294,2337 -4294967294,1404 -4294967294,765 -4294967294,1296 -4294967278,410 -4294967279,383 -4294967279,393 -4294967278,419 -4294967279,346 -4294967278,448 -4294967278,327 -4294967279,387 -4294967278,326 -4294967279,333 -4294967279,319 -4294967279,157 -4294967278,230 -4294967278,284 -4294967279,382 -4294967279,381 -4294967279,380 -4294967294,326 -4294967294,2335 -4294967294,1326 -4294967294,1327 -4294967294,1401 -4294967294,767 -4294967294,1197 -4294967294,2 -4294967294,2333 -4294967294,2332 -4294967294,1330 -4294967294,1396 -4294967294,2334 -4294967294,1400 -4294967294,139 -4294967294,24 -4294967294,1399 -4294967294,2331 -4294967294,1392 -4294967294,2330 -4294967294,1753 -4294967294,130 -4294967294,1379 -4294967294,2329 -4294967294,756 -4294967294,157 -4294967294,140 -4294967294,760 -4294967294,1200 -4294967294,46 -4294967294,747 -4294967294,1366 -4294967294,166 -4294967294,2328 -4294967294,1377 -4294967294,324 -4294967294,328 -4294967294,325 -4294967294,2327 -4294967294,1465 -4294967294,2326 -4294967294,2325 -4294967294,413 -4294967294,581 -4294967294,1302 -4294967294,1 -4294967294,164 -4294967294,1368 -4294967294,1199 -4294967294,1064 -4294967294,91 -4294967294,90 -4294967294,88 -4294967294,87 -4294967294,86 -4294967294,1182 -4294967294,82 -4294967294,83 -4294967294,1732 -4294967294,1769 -4294967294,1731 -4294967294,1730 -4294967294,1728 -4294967294,1729 -4294967294,53 -4294967294,51 -4294967294,52 -4294967294,45 -4294967294,43 -4294967294,44 -4294967294,3 -4294967294,8 -4294967278,345 -4294967279,378 -4294967279,423 -4294967278,344 4294967278,321 -4294967279,377 -4294967278,343 -4294967278,314 -4294967278,301 -4294967278,309 -4294967278,342 -4294967278,341 -4294967279,375 -4294967279,374 -4294967278,228 -4294967278,308 -4294967279,249 -4294967279,373 -4294967278,364 -4294967278,307 -4294967279,379 -4294967279,386 -4294967278,335 -4294967278,363 -4294967278,362 -4294967278,267 -4294967279,424 -4294967278,298 -4294967279,372 -4294967279,278 -4294967278,285 -4294967279,243 -4294967279,369 -4294967279,368 -4294967279,432 -4294967279,431 -4294967279,367 -4294967278,261 -4294967279,366 -4294967279,419 -4294967278,432 -4294967279,365 -4294967279,364 +4294967278,158 +4294967278,46 4294967278,320 +4294967278,157 +4294967278,45 4294967278,319 +4294967278,156 +4294967278,44 +4294967278,440 +4294967278,155 +4294967278,43 +4294967278,401 +4294967278,154 +4294967278,42 +4294967278,316 +4294967278,153 +4294967278,41 +4294967278,343 +4294967278,152 +4294967278,40 +4294967278,314 +4294967278,151 +4294967278,39 4294967278,313 +4294967278,150 +4294967278,38 4294967278,312 -4294967279,376 -4294967279,275 +4294967278,149 +4294967278,37 +4294967278,302 +4294967278,148 +4294967278,36 +4294967278,409 +4294967278,147 +4294967278,35 +4294967278,288 +4294967278,146 +4294967278,34 +4294967278,301 +4294967278,145 +4294967278,33 +4294967278,423 +4294967278,144 +4294967278,32 4294967278,299 -4294967278,137 -4294967278,277 -4294967279,371 -4294967279,370 -4294967279,363 -4294967279,362 +4294967278,143 +4294967278,31 +4294967278,298 +4294967278,142 +4294967278,30 +4294967278,310 +4294967278,141 +4294967278,29 +4294967278,422 +4294967278,140 +4294967278,28 +4294967278,309 +4294967278,139 +4294967278,27 +4294967278,279 +4294967278,138 +4294967278,26 +4294967278,278 +4294967278,464 +4294967278,25 +4294967278,136 +4294967278,24 +4294967278,276 +4294967278,135 +4294967278,23 +4294967278,439 +4294967278,134 +4294967278,22 +4294967278,342 +4294967278,133 +4294967278,21 +4294967278,230 +4294967278,274 +4294967278,20 +4294967278,462 +4294967278,273 +4294967278,19 +4294967278,461 +4294967278,272 +4294967278,18 +4294967278,285 +4294967278,271 +4294967278,17 +4294967278,459 +4294967278,270 +4294967278,16 +4294967278,341 +4294967278,269 +4294967278,15 +4294967278,268 +4294967278,14 +4294967278,283 +4294967278,13 +4294967278,266 +4294967278,12 +4294967278,259 +4294967278,265 +4294967278,11 4294967278,336 -4294967278,447 -4294967278,311 +4294967278,264 +4294967278,10 +4294967278,437 +4294967278,263 +4294967278,9 +4294967278,420 +4294967278,262 +4294967278,8 +4294967278,397 +4294967278,434 +4294967278,7 +4294967278,280 +4294967278,6 +4294967278,258 +4294967278,5 +4294967278,389 +4294967278,257 +4294967278,4 +4294967278,3 +4294967279,454 +4294967279,132 +4294967279,453 +4294967279,445 +4294967279,131 +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 -4294967278,290 +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 -4294967278,289 -4294967294,1459 -4294967294,1369 -4294967294,2324 -4294967294,1083 -4294967294,156 -4294967294,2322 -4294967294,1076 -4294967294,2321 -4294967294,2320 -4294967294,1065 -4294967294,322 -4294967294,403 -4294967294,1288 -4294967294,404 -4294967294,1054 -4294967294,2319 -4294967294,2317 -4294967294,149 -4294967294,323 -4294967294,142 -4294967294,2316 -4294967294,144 -4294967294,1062 -4294967294,2315 -4294967294,320 -4294967294,2313 -4294967294,1301 -4294967294,1061 +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 f80439a3..6fe1d24a 100644 Binary files a/database/ibdata1 and b/database/ibdata1 differ diff --git a/database/ibtmp1 b/database/ibtmp1 index 67b698d7..e5743531 100644 Binary files a/database/ibtmp1 and b/database/ibtmp1 differ diff --git a/database/mysql.ibd b/database/mysql.ibd index e2f8e1c9..3c9081f1 100644 Binary files a/database/mysql.ibd and b/database/mysql.ibd differ diff --git a/database/undo_001 b/database/undo_001 index 7b1fc84e..1d2bb568 100644 Binary files a/database/undo_001 and b/database/undo_001 differ diff --git a/database/undo_002 b/database/undo_002 index 00744dfd..f16f8ea0 100644 Binary files a/database/undo_002 and b/database/undo_002 differ diff --git a/docker-compose.yml b/docker-compose.yml index 00b76d30..c1efa018 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=80 --host=0.0.0.0" + command: sh -c "sleep 10s; uvicorn backend.main:app --reload --port=81 --host=0.0.0.0" ports: - - 80:80 + - 81:81 volumes: - .:/app depends_on: