diff --git a/Frontend/patient_manager/lib/components/buildFilesList.dart b/Frontend/patient_manager/lib/components/buildFilesList.dart index c738c6d6..22bf9732 100644 --- a/Frontend/patient_manager/lib/components/buildFilesList.dart +++ b/Frontend/patient_manager/lib/components/buildFilesList.dart @@ -29,35 +29,56 @@ class BuildFilesList extends StatefulWidget { class _BuildFilesListState extends State { int indexOn = 0; final baseAPI = AppEnviroment.baseApiUrl; + final basefile = AppEnviroment.baseFileUrl; String fileUrl = ""; Future getFileUrlApiCall(String filePath) async { - var url; if (AppEnviroment.getEnv() == "Dev") { - url = "$baseAPI/minio/pull/file/$filePath/dev"; + return "$basefile/mih/$filePath"; } else { - url = "$baseAPI/minio/pull/file/$filePath/prod"; + var url = "$baseAPI/minio/pull/file/$filePath/prod"; + //print(url); + var response = await http.get(Uri.parse(url)); + // print("here1"); + //print(response.statusCode); + + if (response.statusCode == 200) { + //print("here2"); + String body = response.body; + //print(body); + //print("here3"); + var decodedData = jsonDecode(body); + //print("Dedoced: ${decodedData['minioURL']}"); + + return decodedData['minioURL']; + //AppUser u = AppUser.fromJson(decodedData); + // print(u.email); + //return "AlometThere"; + } else { + throw Exception( + "Error: GetUserData status code ${response.statusCode}"); + } } //print(url); - var response = await http.get(Uri.parse(url)); - // print("here1"); - //print(response.statusCode); + // var response = await http.get(Uri.parse(url)); + // // print("here1"); + // //print(response.statusCode); - if (response.statusCode == 200) { - //print("here2"); - String body = response.body; - //print(body); - //print("here3"); - var decodedData = jsonDecode(body); - //print("Dedoced: ${decodedData['minioURL']}"); + // if (response.statusCode == 200) { + // //print("here2"); + // String body = response.body; + // //print(body); + // //print("here3"); + // var decodedData = jsonDecode(body); + // //print("Dedoced: ${decodedData['minioURL']}"); - return decodedData['minioURL']; - //AppUser u = AppUser.fromJson(decodedData); - // print(u.email); - //return "AlometThere"; - } else { - throw Exception("Error: GetUserData status code ${response.statusCode}"); - } + // return decodedData['minioURL']; + // //AppUser u = AppUser.fromJson(decodedData); + // // print(u.email); + // //return "AlometThere"; + // } else { + // throw Exception("Error: GetUserData status code ${response.statusCode}"); + // } } Future deleteFileApiCall(String filePath, int fileID) async { diff --git a/Frontend/patient_manager/web/index.html b/Frontend/patient_manager/web/index.html index 0ea4e7ee..5872fd0f 100644 --- a/Frontend/patient_manager/web/index.html +++ b/Frontend/patient_manager/web/index.html @@ -68,7 +68,7 @@ - +
diff --git a/backend/routers/fileStorage.py b/backend/routers/fileStorage.py index 660ce5ce..72052af0 100644 --- a/backend/routers/fileStorage.py +++ b/backend/routers/fileStorage.py @@ -75,7 +75,7 @@ async def delete_File_of_user(requestItem: minioDeleteRequest, session: SessionC path = requestItem.file_path try: # uploudFile(app_id, file.filename, extension[1], content) - client = Minio_Storage.minioConnection.minioConnect() + client = Minio_Storage.minioConnection.minioConnect("dev") minioError = client.remove_object("mih", path) except Exception as error: @@ -103,7 +103,7 @@ async def upload_File_to_user(requestItem: medCertUploud, session: SessionContai return {"message": "Successfully Generated File"} def uploudFile(app_id, fileName, extension, content): - client = Minio_Storage.minioConnection.minioConnect() + client = Minio_Storage.minioConnection.minioConnect("dev") found = client.bucket_exists("mih") if not found: client.make_bucket("mih") @@ -121,7 +121,7 @@ def uploudFile(app_id, fileName, extension, content): #"minio""localhost:9000" def uploudMedCert(app_id, fullName, docfname, startDate, endDate, returnDate): - client = Minio_Storage.minioConnection.minioConnect() + client = Minio_Storage.minioConnection.minioConnect("dev") generateMedCertPDF(fullName, docfname, startDate, endDate, returnDate) found = client.bucket_exists("mih") if not found: