diff --git a/android/app/build.gradle b/android/app/build.gradle index 5457931e..64723504 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -26,7 +26,7 @@ apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 33 + compileSdkVersion 34 signingConfigs { release { @@ -49,7 +49,7 @@ android { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "com.hmg.hmgDr" minSdkVersion 21 - targetSdkVersion 33 + targetSdkVersion 34 versionCode flutterVersionCode.toInteger() versionName flutterVersionName testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index db0fe5f0..e9c14541 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -29,6 +29,10 @@ + + + + 0) { user = _authService.dashboardItemsList[0]; sharedPref.setObj(LAST_LOGIN_USER, _authService.dashboardItemsList[0]); - await sharedPref.setString(VIDA_REFRESH_TOKEN_ID, user!.vidaRefreshTokenID!); - await sharedPref.setString(VIDA_AUTH_TOKEN_ID, user!.vidaAuthTokenID!); + // await sharedPref.setString(VIDA_REFRESH_TOKEN_ID, user!.vidaRefreshTokenID!); + // await sharedPref.setString(VIDA_AUTH_TOKEN_ID, user!.vidaAuthTokenID!); this.unverified = true; } setState(ViewState.Idle); diff --git a/lib/screens/patients/profile/discharge_summary/all_discharge_summary.dart b/lib/screens/patients/profile/discharge_summary/all_discharge_summary.dart index c4bf99a2..9364def5 100644 --- a/lib/screens/patients/profile/discharge_summary/all_discharge_summary.dart +++ b/lib/screens/patients/profile/discharge_summary/all_discharge_summary.dart @@ -68,25 +68,23 @@ class _AllDischargeSummaryState extends State { ], ), ), - Expanded( - child: Container( - padding: EdgeInsetsDirectional.fromSTEB(30, 0, 30, 0), - child: ListView.builder( - scrollDirection: Axis.vertical, - itemCount: model.allDisChargeSummaryList.length, - shrinkWrap: true, - itemBuilder: (BuildContext ctxt, int index) { - return Column( - children: [ - InkWell( - child: DischargeSummaryWidget( - dischargeSummary: model - .allDisChargeSummaryList[index]), - ), - ], - ); - }), - ), + Container( + padding: EdgeInsetsDirectional.fromSTEB(30, 0, 30, 0), + child: ListView.builder( + scrollDirection: Axis.vertical, + itemCount: model.allDisChargeSummaryList.length, + shrinkWrap: true, + itemBuilder: (BuildContext ctxt, int index) { + return Column( + children: [ + InkWell( + child: DischargeSummaryWidget( + dischargeSummary: model + .allDisChargeSummaryList[index]), + ), + ], + ); + }), ), ], ), diff --git a/lib/screens/patients/profile/discharge_summary/discharge_Summary_widget.dart b/lib/screens/patients/profile/discharge_summary/discharge_Summary_widget.dart index 140a72e2..9005d5ef 100644 --- a/lib/screens/patients/profile/discharge_summary/discharge_Summary_widget.dart +++ b/lib/screens/patients/profile/discharge_summary/discharge_Summary_widget.dart @@ -27,13 +27,12 @@ class _DischargeSummaryWidgetState extends State { @override Widget build(BuildContext context) { ProjectViewModel projectViewModel = Provider.of(context); - return Column( children: [ Container( width: double.infinity, - margin: EdgeInsets.only(top: 8.0, left: 8.0, right: 8.0), - padding: EdgeInsets.all(8.0), + // margin: EdgeInsets.only(top: 8.0, left: 8.0, right: 8.0), + // padding: EdgeInsets.all(8.0), decoration: BoxDecoration( color: Colors.white, borderRadius: BorderRadius.all( diff --git a/lib/screens/patients/profile/medical_report/MedicalReportPage.dart b/lib/screens/patients/profile/medical_report/MedicalReportPage.dart index 72a3c742..1e15da45 100644 --- a/lib/screens/patients/profile/medical_report/MedicalReportPage.dart +++ b/lib/screens/patients/profile/medical_report/MedicalReportPage.dart @@ -23,6 +23,7 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; +import '../../../../core/model/doctor/doctor_profile_model.dart'; import '../../../../routes.dart'; import 'AddVerifyMedicalReport.dart'; @@ -42,6 +43,7 @@ class _MedicalReportPageState extends State { return BaseView( onModelReady: (model) async { + await model.getDoctorProfile(isGetProfile: true); await model.getMedicalReportList(patient); await model.getMedicalReportTemplate(); }, diff --git a/lib/screens/patients/profile/soap_update/assessment/update_assessment_page.dart b/lib/screens/patients/profile/soap_update/assessment/update_assessment_page.dart index 65ceb4ff..e04d040d 100644 --- a/lib/screens/patients/profile/soap_update/assessment/update_assessment_page.dart +++ b/lib/screens/patients/profile/soap_update/assessment/update_assessment_page.dart @@ -39,7 +39,8 @@ class UpdateAssessmentPage extends StatefulWidget { class _UpdateAssessmentPageState extends State implements AssessmentCallBack { bool isAssessmentExpand = false; List mySelectedAssessmentList = []; - bool isPrescriptionOrder =false; + bool isPrescriptionOrder = false; + @override Widget build(BuildContext context) { ProjectViewModel projectViewModel = Provider.of(context); @@ -324,20 +325,16 @@ class _UpdateAssessmentPageState extends State implements ), InkWell( onTap: () { - if(model.isPrescriptionOrder && assessment.selectedDiagnosisType!.id ==2) { + if (model.isPrescriptionOrder && assessment.selectedDiagnosisType!.id == 2) { Utils.showErrorToast(TranslationBase.of(context).principalDiagnosisCannot); - }else{ - openAssessmentDialog( - context, isUpdate: true, - assessment: assessment, - model: model); - + } else { + openAssessmentDialog(context, isUpdate: true, assessment: assessment, model: model); } }, child: Icon( DoctorApp.edit, size: 18, - color: model.isPrescriptionOrder && assessment.selectedDiagnosisType!.id ==2 ? Colors.grey : Colors.black , + color: model.isPrescriptionOrder && assessment.selectedDiagnosisType!.id == 2 ? Colors.grey : Colors.black, ), ) ], @@ -393,17 +390,19 @@ class _UpdateAssessmentPageState extends State implements nextFunction(model) { if (mySelectedAssessmentList.isEmpty) { Utils.showErrorToast(TranslationBase.of(context).assessmentErrorMsg); - } else if(!checkPrimaryDiagnosis()) { + } else if (!checkPrimaryDiagnosis()) { Utils.showErrorToast(TranslationBase.of(context).onePrimaryDiagnosis); - }else{ + } else { widget.changeLoadingState(true); widget.changePageViewIndex(3); } } - bool checkPrimaryDiagnosis(){ + + bool checkPrimaryDiagnosis() { ProjectViewModel projectViewModel = Provider.of(context, listen: false); - bool isVidaPlus = Utils.isVidaPlusProject(projectViewModel, widget.patientInfo.projectId!); - List type = mySelectedAssessmentList.where((element) => (element.selectedDiagnosisType!.id==2 && isVidaPlus ==false) || (element.selectedDiagnosisType!.code=='3' && isVidaPlus==true)).toList(); - return type.isEmpty ? false : true; + bool isVidaPlus = Utils.isVidaPlusProject(projectViewModel, widget.patientInfo.projectId!); + List type = + mySelectedAssessmentList.where((element) => (element.selectedDiagnosisType!.id == 2 && isVidaPlus == false) || (element.selectedDiagnosisType!.code == '3' && isVidaPlus == true)).toList(); + return type.isEmpty ? false : true; } } diff --git a/lib/widgets/shared/user-guid/CusomRow.dart b/lib/widgets/shared/user-guid/CusomRow.dart index aea3b1e8..3dcb57d8 100644 --- a/lib/widgets/shared/user-guid/CusomRow.dart +++ b/lib/widgets/shared/user-guid/CusomRow.dart @@ -42,16 +42,13 @@ class CustomRow extends StatelessWidget { SizedBox( width: 1, ), - Expanded( - flex: isExpanded ? 1 : 0, - child: AppText( - value, - fontSize: valueSize ?? SizeConfig.getTextMultiplierBasedOnWidth() * 2.9, - color: valueColor ?? Color(0xFF2B353E), - fontWeight: FontWeight.w700, - letterSpacing: -0.48, - isCopyable: isCopyable, - ), + AppText( + value, + fontSize: valueSize ?? SizeConfig.getTextMultiplierBasedOnWidth() * 2.9, + color: valueColor ?? Color(0xFF2B353E), + fontWeight: FontWeight.w700, + letterSpacing: -0.48, + isCopyable: isCopyable, ), ], ); diff --git a/pubspec.yaml b/pubspec.yaml index 2070e8c1..8083cf66 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -11,7 +11,7 @@ description: A new Flutter project. # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # Read more about iOS versioning at # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -version: 1.4.14+1 +version: 1.4.16+1 environment: @@ -76,7 +76,7 @@ dependencies: # Firebase firebase_messaging: ^14.7.5 firebase_analytics : ^10.7.1 - cloud_firestore: ^4.17.5 + cloud_firestore: ^4.15.8 #GIF image # flutter_gifimage: ^1.0.1