Dr app update to stores 9.3

update_flutter_3.16.0_merge_vida_plus
haroon amjad 1 year ago
parent f125efb8c9
commit 8bd73827f8

@ -26,7 +26,7 @@ apply plugin: 'kotlin-android'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
android { android {
compileSdkVersion 33 compileSdkVersion 34
signingConfigs { signingConfigs {
release { release {
@ -49,7 +49,7 @@ android {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId "com.hmg.hmgDr" applicationId "com.hmg.hmgDr"
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 33 targetSdkVersion 34
versionCode flutterVersionCode.toInteger() versionCode flutterVersionCode.toInteger()
versionName flutterVersionName versionName flutterVersionName
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

@ -29,6 +29,10 @@
<uses-feature android:name="android.hardware.camera" /> <uses-feature android:name="android.hardware.camera" />
<uses-feature android:name="android.hardware.camera.autofocus" /> <uses-feature android:name="android.hardware.camera.autofocus" />
<uses-permission android:name="com.google.android.gms.permission.AD_ID" tools:node="remove"/>
<uses-permission android:name="android.permission.ACCESS_ADSERVICES_ATTRIBUTION" tools:node="remove"/>
<uses-permission android:name="android.permission.ACCESS_ADSERVICES_AD_ID" tools:node="remove"/>
<application <application
android:name=".AppApplication" android:name=".AppApplication"
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"

@ -122,8 +122,8 @@ class BaseAppClient {
// print("ProjectID :"); // print("ProjectID :");
// print(body['ProjectID']); // print(body['ProjectID']);
// debugPrint("URL : $url"); debugPrint("URL : $url");
// debugPrint("Body : ${json.encode(body)}"); debugPrint("Body : ${json.encode(body)}");
var asd = json.encode(body); var asd = json.encode(body);
var asd2; var asd2;
if (await Utils.checkConnection()) { if (await Utils.checkConnection()) {

@ -317,7 +317,7 @@ const TRANSACTION_NO = 0;
const LANGUAGE_ID = 2; const LANGUAGE_ID = 2;
const STAMP = '2020-04-27T12:17:17.721Z'; const STAMP = '2020-04-27T12:17:17.721Z';
const IP_ADDRESS = '9.9.9.9'; const IP_ADDRESS = '9.9.9.9';
const VERSION_ID = 9.1; const VERSION_ID = 9.3;
const CHANNEL = 9; const CHANNEL = 9;
const SESSION_ID = 'BlUSkYymTt'; const SESSION_ID = 'BlUSkYymTt';
const IS_LOGIN_FOR_DOCTOR_APP = true; const IS_LOGIN_FOR_DOCTOR_APP = true;

@ -46,7 +46,7 @@ class AuthenticationService extends BaseService {
}, onFailure: (String error, int statusCode) { }, onFailure: (String error, int statusCode) {
hasError = true; hasError = true;
super.error = error; super.error = error;
}, body: {"IMEI": imei}); }, body: {"IMEI": imei, "TokenID": "@dm!n"});
} catch (error) { } catch (error) {
hasError = true; hasError = true;
super.error = error.toString(); super.error = error.toString();

@ -1,4 +1,5 @@
import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/config/config.dart';
import 'package:doctor_app_flutter/core/model/doctor/doctor_profile_model.dart';
import 'package:doctor_app_flutter/core/service/base/base_service.dart'; import 'package:doctor_app_flutter/core/service/base/base_service.dart';
import 'package:doctor_app_flutter/core/model/patient/MedicalReport/MedicalReportTemplate.dart'; import 'package:doctor_app_flutter/core/model/patient/MedicalReport/MedicalReportTemplate.dart';
import 'package:doctor_app_flutter/core/model/patient/MedicalReport/MeidcalReportModel.dart'; import 'package:doctor_app_flutter/core/model/patient/MedicalReport/MeidcalReportModel.dart';
@ -14,7 +15,7 @@ class PatientMedicalReportService extends BaseService {
await getDoctorProfile(); await getDoctorProfile();
body['AdmissionNo'] = patient.admissionNo; body['AdmissionNo'] = patient.admissionNo;
body['SetupID'] = doctorProfile!.setupID; body['SetupID'] = doctorProfile!.setupID;
body['ProjectID'] = doctorProfile!.projectID; // body['ProjectID'] = doctorProfile!.projectID;
medicalReportList = []; medicalReportList = [];
await baseAppClient.postPatient(PATIENT_MEDICAL_REPORT_GET_LIST, onSuccess: (dynamic response, int statusCode) { await baseAppClient.postPatient(PATIENT_MEDICAL_REPORT_GET_LIST, onSuccess: (dynamic response, int statusCode) {
if (response['DAPP_ListMedicalReportList'] != null) { if (response['DAPP_ListMedicalReportList'] != null) {

@ -363,8 +363,8 @@ class AuthenticationViewModel extends BaseViewModel {
if (_authService.dashboardItemsList.length > 0) { if (_authService.dashboardItemsList.length > 0) {
user = _authService.dashboardItemsList[0]; user = _authService.dashboardItemsList[0];
sharedPref.setObj(LAST_LOGIN_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_REFRESH_TOKEN_ID, user!.vidaRefreshTokenID!);
await sharedPref.setString(VIDA_AUTH_TOKEN_ID, user!.vidaAuthTokenID!); // await sharedPref.setString(VIDA_AUTH_TOKEN_ID, user!.vidaAuthTokenID!);
this.unverified = true; this.unverified = true;
} }
setState(ViewState.Idle); setState(ViewState.Idle);

@ -68,25 +68,23 @@ class _AllDischargeSummaryState extends State<AllDischargeSummary> {
], ],
), ),
), ),
Expanded( Container(
child: Container( padding: EdgeInsetsDirectional.fromSTEB(30, 0, 30, 0),
padding: EdgeInsetsDirectional.fromSTEB(30, 0, 30, 0), child: ListView.builder(
child: ListView.builder( scrollDirection: Axis.vertical,
scrollDirection: Axis.vertical, itemCount: model.allDisChargeSummaryList.length,
itemCount: model.allDisChargeSummaryList.length, shrinkWrap: true,
shrinkWrap: true, itemBuilder: (BuildContext ctxt, int index) {
itemBuilder: (BuildContext ctxt, int index) { return Column(
return Column( children: [
children: [ InkWell(
InkWell( child: DischargeSummaryWidget(
child: DischargeSummaryWidget( dischargeSummary: model
dischargeSummary: model .allDisChargeSummaryList[index]),
.allDisChargeSummaryList[index]), ),
), ],
], );
); }),
}),
),
), ),
], ],
), ),

@ -27,13 +27,12 @@ class _DischargeSummaryWidgetState extends State<DischargeSummaryWidget> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
ProjectViewModel projectViewModel = Provider.of(context); ProjectViewModel projectViewModel = Provider.of(context);
return Column( return Column(
children: [ children: [
Container( Container(
width: double.infinity, width: double.infinity,
margin: EdgeInsets.only(top: 8.0, left: 8.0, right: 8.0), // margin: EdgeInsets.only(top: 8.0, left: 8.0, right: 8.0),
padding: EdgeInsets.all(8.0), // padding: EdgeInsets.all(8.0),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.white, color: Colors.white,
borderRadius: BorderRadius.all( borderRadius: BorderRadius.all(

@ -23,6 +23,7 @@ import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import '../../../../core/model/doctor/doctor_profile_model.dart';
import '../../../../routes.dart'; import '../../../../routes.dart';
import 'AddVerifyMedicalReport.dart'; import 'AddVerifyMedicalReport.dart';
@ -42,6 +43,7 @@ class _MedicalReportPageState extends State<MedicalReportPage> {
return BaseView<PatientMedicalReportViewModel>( return BaseView<PatientMedicalReportViewModel>(
onModelReady: (model) async { onModelReady: (model) async {
await model.getDoctorProfile(isGetProfile: true);
await model.getMedicalReportList(patient); await model.getMedicalReportList(patient);
await model.getMedicalReportTemplate(); await model.getMedicalReportTemplate();
}, },

@ -39,7 +39,8 @@ class UpdateAssessmentPage extends StatefulWidget {
class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> implements AssessmentCallBack { class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> implements AssessmentCallBack {
bool isAssessmentExpand = false; bool isAssessmentExpand = false;
List<MySelectedAssessment> mySelectedAssessmentList = []; List<MySelectedAssessment> mySelectedAssessmentList = [];
bool isPrescriptionOrder =false; bool isPrescriptionOrder = false;
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
ProjectViewModel projectViewModel = Provider.of(context); ProjectViewModel projectViewModel = Provider.of(context);
@ -324,20 +325,16 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> implements
), ),
InkWell( InkWell(
onTap: () { onTap: () {
if(model.isPrescriptionOrder && assessment.selectedDiagnosisType!.id ==2) { if (model.isPrescriptionOrder && assessment.selectedDiagnosisType!.id == 2) {
Utils.showErrorToast(TranslationBase.of(context).principalDiagnosisCannot); Utils.showErrorToast(TranslationBase.of(context).principalDiagnosisCannot);
}else{ } else {
openAssessmentDialog( openAssessmentDialog(context, isUpdate: true, assessment: assessment, model: model);
context, isUpdate: true,
assessment: assessment,
model: model);
} }
}, },
child: Icon( child: Icon(
DoctorApp.edit, DoctorApp.edit,
size: 18, 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<UpdateAssessmentPage> implements
nextFunction(model) { nextFunction(model) {
if (mySelectedAssessmentList.isEmpty) { if (mySelectedAssessmentList.isEmpty) {
Utils.showErrorToast(TranslationBase.of(context).assessmentErrorMsg); Utils.showErrorToast(TranslationBase.of(context).assessmentErrorMsg);
} else if(!checkPrimaryDiagnosis()) { } else if (!checkPrimaryDiagnosis()) {
Utils.showErrorToast(TranslationBase.of(context).onePrimaryDiagnosis); Utils.showErrorToast(TranslationBase.of(context).onePrimaryDiagnosis);
}else{ } else {
widget.changeLoadingState(true); widget.changeLoadingState(true);
widget.changePageViewIndex(3); widget.changePageViewIndex(3);
} }
} }
bool checkPrimaryDiagnosis(){
bool checkPrimaryDiagnosis() {
ProjectViewModel projectViewModel = Provider.of<ProjectViewModel>(context, listen: false); ProjectViewModel projectViewModel = Provider.of<ProjectViewModel>(context, listen: false);
bool isVidaPlus = Utils.isVidaPlusProject(projectViewModel, widget.patientInfo.projectId!); bool isVidaPlus = Utils.isVidaPlusProject(projectViewModel, widget.patientInfo.projectId!);
List<MySelectedAssessment> type = mySelectedAssessmentList.where((element) => (element.selectedDiagnosisType!.id==2 && isVidaPlus ==false) || (element.selectedDiagnosisType!.code=='3' && isVidaPlus==true)).toList(); List<MySelectedAssessment> type =
return type.isEmpty ? false : true; mySelectedAssessmentList.where((element) => (element.selectedDiagnosisType!.id == 2 && isVidaPlus == false) || (element.selectedDiagnosisType!.code == '3' && isVidaPlus == true)).toList();
return type.isEmpty ? false : true;
} }
} }

@ -42,16 +42,13 @@ class CustomRow extends StatelessWidget {
SizedBox( SizedBox(
width: 1, width: 1,
), ),
Expanded( AppText(
flex: isExpanded ? 1 : 0, value,
child: AppText( fontSize: valueSize ?? SizeConfig.getTextMultiplierBasedOnWidth() * 2.9,
value, color: valueColor ?? Color(0xFF2B353E),
fontSize: valueSize ?? SizeConfig.getTextMultiplierBasedOnWidth() * 2.9, fontWeight: FontWeight.w700,
color: valueColor ?? Color(0xFF2B353E), letterSpacing: -0.48,
fontWeight: FontWeight.w700, isCopyable: isCopyable,
letterSpacing: -0.48,
isCopyable: isCopyable,
),
), ),
], ],
); );

@ -11,7 +11,7 @@ description: A new Flutter project.
# In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
# Read more about iOS versioning at # Read more about iOS versioning at
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
version: 1.4.14+1 version: 1.4.16+1
environment: environment:
@ -76,7 +76,7 @@ dependencies:
# Firebase # Firebase
firebase_messaging: ^14.7.5 firebase_messaging: ^14.7.5
firebase_analytics : ^10.7.1 firebase_analytics : ^10.7.1
cloud_firestore: ^4.17.5 cloud_firestore: ^4.15.8
#GIF image #GIF image
# flutter_gifimage: ^1.0.1 # flutter_gifimage: ^1.0.1

Loading…
Cancel
Save