Haroon6138
/
HMG_Patient_App_New
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

family screen & widgets

Browse Source
pull/76/head
aamir-csol 1 month ago
parent 060e7a8d68
commit 1335d3a7c8
9 changed files with 249 additions and 95 deletions
Show Stats Download Patch File Download Diff File

8
assets/images/svg/switch_user.svg
Unescape Escape View File

@ -0,0 +1,8 @@
<svg width="17" height="18" viewBox="0 0 17 18" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M4.37427 0.9375C3.12631 0.9375 2.12427 1.95016 2.12427 3.1875C2.12427 4.42484 3.12631 5.4375 4.37427 5.4375C5.62222 5.4375 6.62427 4.42484 6.62427 3.1875C6.62427 1.95016 5.62222 0.9375 4.37427 0.9375Z" fill="#ED1C2B"/>
<path d="M6.67566 6.3702C5.2645 5.6266 3.48447 5.6266 2.0733 6.3702C2.03796 6.38882 1.99128 6.41204 1.93632 6.43938C1.67362 6.57008 1.22162 6.79494 0.913308 7.062C0.724359 7.22567 0.488314 7.48646 0.444083 7.84456C0.394558 8.24552 0.602042 8.58044 0.898469 8.83036C1.3683 9.22647 1.95554 9.5625 2.72106 9.5625L6.02791 9.5625C6.79342 9.5625 7.38067 9.22647 7.85049 8.83035C8.14692 8.58044 8.35441 8.24552 8.30488 7.84456C8.26065 7.48646 8.0246 7.22567 7.83565 7.062C7.52733 6.79493 7.07534 6.57007 6.81264 6.43938C6.75768 6.41204 6.71101 6.38882 6.67566 6.3702Z" fill="#ED1C2B"/>
<path d="M9.36201 1.8557C9.49867 1.63459 9.74007 1.5 10 1.5C12.9021 1.5 15.25 3.84793 15.25 6.75C15.25 7.16421 14.9142 7.5 14.5 7.5C14.0858 7.5 13.75 7.16421 13.75 6.75C13.75 5.30962 12.9412 4.06093 11.7522 3.43259L11.1504 4.03441C11.0364 4.14842 10.9065 4.25631 10.7469 4.27867C10.4366 4.32214 10.1199 4.16679 9.97204 3.87112L9.32918 2.58541C9.21293 2.35292 9.22536 2.07681 9.36201 1.8557Z" fill="#ED1C2B"/>
<path d="M2.5 10.5C2.91421 10.5 3.25 10.8358 3.25 11.25C3.25 12.6904 4.05882 13.9391 5.24779 14.5674L5.84961 13.9656C5.96361 13.8516 6.09348 13.7437 6.25314 13.7213C6.56336 13.6779 6.88013 13.8332 7.02796 14.1289L7.67082 15.4146C7.78707 15.6471 7.77464 15.9232 7.63799 16.1443C7.50133 16.3654 7.25993 16.5 7 16.5C4.09793 16.5 1.75 14.1521 1.75 11.25C1.75 10.8358 2.08579 10.5 2.5 10.5Z" fill="#ED1C2B"/>
<path d="M10.375 10.6875C10.375 9.45016 11.377 8.4375 12.625 8.4375C13.873 8.4375 14.875 9.45016 14.875 10.6875C14.875 11.9248 13.873 12.9375 12.625 12.9375C11.377 12.9375 10.375 11.9248 10.375 10.6875Z" fill="#ED1C2B"/>
<path d="M10.324 13.8702C11.7352 13.1266 13.5152 13.1266 14.9264 13.8702C14.9617 13.8888 15.0084 13.912 15.0634 13.9394C15.3261 14.0701 15.7781 14.2949 16.0864 14.562C16.2753 14.7257 16.5114 14.9865 16.5556 15.3446C16.6051 15.7455 16.3977 16.0804 16.1012 16.3304C15.6314 16.7265 15.0442 17.0625 14.2786 17.0625H10.9718C10.2063 17.0625 9.61903 16.7265 9.1492 16.3304C8.85277 16.0804 8.64529 15.7455 8.69482 15.3446C8.73905 14.9865 8.97509 14.7257 9.16404 14.562C9.47235 14.2949 9.92433 14.0701 10.187 13.9394C10.242 13.9121 10.2887 13.8888 10.324 13.8702Z" fill="#ED1C2B"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.5 KiB

1
lib/core/app_assets.dart
Unescape Escape View File

@ -141,6 +141,7 @@ class AppAssets {
static const String ic_normal_result = '$svgBasePath/normal_result.svg';
static const String ic_low_result = '$svgBasePath/low_result.svg';
static const String ic_critical_low_result = '$svgBasePath/critical_low_result.svg';
static const String switch_user = '$svgBasePath/switch_user.svg';
//bottom navigation//
static const String homeBottom = '$svgBasePath/home_bottom.svg';

2
lib/core/app_state.dart
Unescape Escape View File

@ -57,7 +57,7 @@ class AppState {
}
}
int? get superUserID => _superUserID;
int? get getSuperUserID => _superUserID;
set setSuperUserID(int? value) => _superUserID = value;

11
lib/features/authentication/authentication_repo.dart
Unescape Escape View File

@ -205,6 +205,7 @@ class AuthenticationRepoImp implements AuthenticationRepo {
bool isSwitchUser = false,
int? patientID,
int? loginType}) async {
AppState appState = getIt.get<AppState>();
if (isRegister) {
newRequest["activationCode"] = activationCode ?? "0000";
newRequest["isSilentLogin"] = activationCode != null ? false : true;
@ -243,6 +244,16 @@ class AuthenticationRepoImp implements AuthenticationRepo {
} else {
switchRequest['LoginType'] = 2;
}
if (appState.getSuperUserID == responseID) {
switchRequest['LoginType'] = 3;
switchRequest['PatientIdentificationID'] = "";
// switchRequest['ProjectOutSA'] = newRequest.zipCode == '966' ? false : true;
switchRequest.remove('NationalID');
switchRequest.remove('isDentalAllowedBackend');
switchRequest.remove('ProjectOutSA');
switchRequest.remove('ForRegisteration');
}
}
final endpoint = isFormFamilyFile

2
lib/features/authentication/authentication_view_model.dart
Unescape Escape View File

@ -518,7 +518,7 @@ class AuthenticationViewModel extends ChangeNotifier {
responseID: responseID,
isSwitchUser: isSwitchUser,
patientID: patientID,
loginType: _appState.superUserID != null ? 0 : 2,
loginType: _appState.getSuperUserID != null ? 0 : 2,
);
resultEither.fold(

198
lib/features/medical_file/medical_file_view_model.dart
Unescape Escape View File

@ -257,7 +257,7 @@ class MedicalFileViewModel extends ChangeNotifier {
}
Future<void> getFamilyFiles({int? status, Function(dynamic)? onSuccess, Function(String)? onError}) async {
final result = await medicalFileRepo.getPatientFamilyFiles(status, _appState.superUserID != null ? _appState.superUserID! : _appState.getAuthenticatedUser()!.patientId!);
final result = await medicalFileRepo.getPatientFamilyFiles(status, _appState.getSuperUserID != null ? _appState.getSuperUserID! : _appState.getAuthenticatedUser()!.patientId!);
result.fold(
(failure) async => await errorHandlerService.handleError(
@ -288,61 +288,157 @@ class MedicalFileViewModel extends ChangeNotifier {
),
);
// final List<FamilyFileResponseModelLists> activeFamilyFiles = [];
// final List<FamilyFileResponseModelLists> tempPendingFamilyFiles = [];
// for (var element in apiResponse.data!) {
// if (element.status != null && element.status == FamilyFileEnum.active.toInt) {
// activeFamilyFiles.add(FamilyFileResponseModelLists(
// patientId: element.patientId,
// patientName: element.patientName!,
// isActive: element.status == FamilyFileEnum.active.toInt ? true : false,
// gender: element.gender!,
// responseId: element.patientId,
// mobileNumber: element.mobileNumber,
// age: element.age,
// patientIdenficationNumber: element.patientIdenficationNumber,
// relationship: element.relationship,
// relationshipId: element.relationshipId,
// relationshipN: element.relationshipN,
// status: element.status,
// statusDescription: element.statusDescription,
// createdOn: element.createdOn,
// editedOn: element.editedOn,
// patientDataVerified: element.patientDataVerified,
// regionId: element.regionId,
// familyRegionId: element.familyRegionId,
// genderDescription: element.genderDescription,
// genderImage: element.genderImage,
// emaiLAddress: element.emaiLAddress));
// }
//
// if (element.status != null && element.status == FamilyFileEnum.pending.toInt) {
// tempPendingFamilyFiles.add(FamilyFileResponseModelLists(
// patientId: element.patientId,
// patientName: element.patientName!,
// isActive: element.status == FamilyFileEnum.active.toInt ? true : false,
// gender: element.gender!,
// responseId: element.patientId,
// mobileNumber: element.mobileNumber,
// age: element.age,
// patientIdenficationNumber: element.patientIdenficationNumber,
// relationship: element.relationship,
// relationshipId: element.relationshipId,
// relationshipN: element.relationshipN,
// status: element.status,
// statusDescription: element.statusDescription,
// createdOn: element.createdOn,
// editedOn: element.editedOn,
// patientDataVerified: element.patientDataVerified,
// regionId: element.regionId,
// familyRegionId: element.familyRegionId,
// genderDescription: element.genderDescription,
// genderImage: element.genderImage,
// emaiLAddress: element.emaiLAddress));
// }
// }
// patientFamilyFiles.addAll(activeFamilyFiles.where((element) => !patientFamilyFiles.any((e) => e.patientId == element.patientId)));
// pendingFamilyFiles.addAll(tempPendingFamilyFiles);
final List<FamilyFileResponseModelLists> activeFamilyFiles = [];
final List<FamilyFileResponseModelLists> tempPendingFamilyFiles = [];
for (var element in apiResponse.data!) {
if (element.status != null && element.status == FamilyFileEnum.active.toInt) {
activeFamilyFiles.add(FamilyFileResponseModelLists(
patientId: element.patientId,
patientName: element.patientName!,
isActive: element.status == FamilyFileEnum.active.toInt ? true : false,
gender: element.gender!,
responseId: element.patientId,
mobileNumber: element.mobileNumber,
age: element.age,
patientIdenficationNumber: element.patientIdenficationNumber,
relationship: element.relationship,
relationshipId: element.relationshipId,
relationshipN: element.relationshipN,
status: element.status,
statusDescription: element.statusDescription,
createdOn: element.createdOn,
editedOn: element.editedOn,
patientDataVerified: element.patientDataVerified,
regionId: element.regionId,
familyRegionId: element.familyRegionId,
genderDescription: element.genderDescription,
genderImage: element.genderImage,
emaiLAddress: element.emaiLAddress));
}
// final Set<dynamic> pendingIds = {};
// for (var element in apiResponse.data!) {
// if (element.status != null && element.status == FamilyFileEnum.pending.toInt) {
// tempPendingFamilyFiles.add(FamilyFileResponseModelLists(
// patientId: element.patientId,
// patientName: element.patientName!,
// isActive: false,
// gender: element.gender!,
// responseId: element.patientId,
// mobileNumber: element.mobileNumber,
// age: element.age,
// patientIdenficationNumber: element.patientIdenficationNumber,
// relationship: element.relationship,
// relationshipId: element.relationshipId,
// relationshipN: element.relationshipN,
// status: element.status,
// statusDescription: element.statusDescription,
// createdOn: element.createdOn,
// editedOn: element.editedOn,
// patientDataVerified: element.patientDataVerified,
// regionId: element.regionId,
// familyRegionId: element.familyRegionId,
// genderDescription: element.genderDescription,
// genderImage: element.genderImage,
// emaiLAddress: element.emaiLAddress));
// } else if (element.status != null && element.status == FamilyFileEnum.active.toInt) {
// activeFamilyFiles.add(FamilyFileResponseModelLists(
// patientId: element.patientId,
// patientName: element.patientName!,
// isActive: element.status == FamilyFileEnum.active.toInt ? true : false,
// gender: element.gender!,
// responseId: element.patientId,
// mobileNumber: element.mobileNumber,
// age: element.age,
// patientIdenficationNumber: element.patientIdenficationNumber,
// relationship: element.relationship,
// relationshipId: element.relationshipId,
// relationshipN: element.relationshipN,
// status: element.status,
// statusDescription: element.statusDescription,
// createdOn: element.createdOn,
// editedOn: element.editedOn,
// patientDataVerified: element.patientDataVerified,
// regionId: element.regionId,
// familyRegionId: element.familyRegionId,
// genderDescription: element.genderDescription,
// genderImage: element.genderImage,
// emaiLAddress: element.emaiLAddress));
// }
// }
if (element.status != null && element.status == FamilyFileEnum.pending.toInt) {
tempPendingFamilyFiles.add(FamilyFileResponseModelLists(
patientId: element.patientId,
patientName: element.patientName!,
isActive: element.status == FamilyFileEnum.active.toInt ? true : false,
gender: element.gender!,
responseId: element.patientId,
mobileNumber: element.mobileNumber,
age: element.age,
patientIdenficationNumber: element.patientIdenficationNumber,
relationship: element.relationship,
relationshipId: element.relationshipId,
relationshipN: element.relationshipN,
status: element.status,
statusDescription: element.statusDescription,
createdOn: element.createdOn,
editedOn: element.editedOn,
patientDataVerified: element.patientDataVerified,
regionId: element.regionId,
familyRegionId: element.familyRegionId,
genderDescription: element.genderDescription,
genderImage: element.genderImage,
emaiLAddress: element.emaiLAddress));
for (var element in apiResponse.data!) {
if (element.status == null) continue;
final isPending = element.status == FamilyFileEnum.pending.toInt;
final isActive = element.status == FamilyFileEnum.active.toInt;
if (!isPending && !isActive) continue;
final familyFile = FamilyFileResponseModelLists(
patientId: element.patientId,
patientName: element.patientName!,
isActive: isActive,
gender: element.gender!,
responseId: element.patientId,
mobileNumber: element.mobileNumber,
age: element.age,
patientIdenficationNumber: element.patientIdenficationNumber,
relationship: element.relationship,
relationshipId: element.relationshipId,
relationshipN: element.relationshipN,
status: element.status,
statusDescription: element.statusDescription,
createdOn: element.createdOn,
editedOn: element.editedOn,
patientDataVerified: element.patientDataVerified,
regionId: element.regionId,
familyRegionId: element.familyRegionId,
genderDescription: element.genderDescription,
genderImage: element.genderImage,
emaiLAddress: element.emaiLAddress,
);
if (isPending) {
tempPendingFamilyFiles.add(familyFile);
} else if (isActive) {
activeFamilyFiles.add(familyFile);
}
}
patientFamilyFiles.addAll(activeFamilyFiles.where((element) => !patientFamilyFiles.any((e) => e.patientId == element.patientId)));
pendingFamilyFiles.addAll(tempPendingFamilyFiles);
patientFamilyFiles.addAll(activeFamilyFiles.where((element) => patientFamilyFiles.every((e) => e.patientId != element.patientId || e.status != FamilyFileEnum.active.toInt)));
pendingFamilyFiles.addAll(tempPendingFamilyFiles.where((element) => pendingFamilyFiles.every((e) => e.patientId != element.patientId)));
}
notifyListeners();

8
lib/presentation/medical_file/medical_file_page.dart
Unescape Escape View File

@ -73,13 +73,16 @@ class _MedicalFilePageState extends State<MedicalFilePage> {
@override
void initState() {
appState = getIt.get<AppState>();
scheduleMicrotask(() {
if (appState.isAuthenticated) {
insuranceViewModel.initInsuranceProvider();
medicalFileViewModel.setIsPatientSickLeaveListLoading(true);
medicalFileViewModel.getPatientSickLeaveList();
medicalFileViewModel.getFamilyFiles(); //TODO: Remove status: 1 by Aamir Need to Discuss With Sultan
medicalFileViewModel.getAllPendingRecordsByResponseId(); //TODO: Added By Aamir
if (appState.getSuperUserID == null) {
medicalFileViewModel.getFamilyFiles(status: 3); //TODO: Remove status: 1 by Aamir Need to Discuss With Sultan
medicalFileViewModel.getAllPendingRecordsByResponseId(); //TODO: Added By Aamir
}
medicalFileViewModel.onTabChanged(0);
}
@ -93,7 +96,6 @@ class _MedicalFilePageState extends State<MedicalFilePage> {
myAppointmentsViewModel = Provider.of<MyAppointmentsViewModel>(context, listen: false);
medicalFileViewModel = Provider.of<MedicalFileViewModel>(context, listen: false);
bookAppointmentsViewModel = Provider.of<BookAppointmentsViewModel>(context, listen: false);
appState = getIt.get<AppState>();
NavigationService navigationService = getIt.get<NavigationService>();
return Scaffold(
backgroundColor: AppColors.bgScaffoldColor,

107
lib/presentation/my_family/my_Family.dart
Unescape Escape View File

@ -13,6 +13,7 @@ import 'package:hmg_patient_app_new/features/authentication/authentication_view_
import 'package:hmg_patient_app_new/features/medical_file/medical_file_view_model.dart';
import 'package:hmg_patient_app_new/features/medical_file/models/family_file_response_model.dart';
import 'package:hmg_patient_app_new/generated/locale_keys.g.dart';
import 'package:hmg_patient_app_new/presentation/lab/collapsing_list_view.dart';
import 'package:hmg_patient_app_new/presentation/my_family/widget/family_cards.dart';
import 'package:hmg_patient_app_new/services/dialog_service.dart';
import 'package:hmg_patient_app_new/theme/colors.dart';
@ -51,33 +52,23 @@ class _FamilyMedicalScreenState extends State<FamilyMedicalScreen> {
@override
Widget build(BuildContext context) {
return Scaffold(
backgroundColor: AppColors.scaffoldBgColor,
appBar: CustomAppBar(
onBackPressed: () {
Navigator.of(context).pop();
},
onLanguageChanged: (lang) {},
hideLogoAndLang: true,
),
body: SingleChildScrollView(
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
LocaleKeys.myMedicalFile.tr().toText26(color: AppColors.textColor, weight: FontWeight.w600, letterSpacing: -2),
SizedBox(height: 25.h),
CustomTabBar(
tabs: tabs,
onTabChange: (index) {
medicalVM!.onFamilyFileTabChange(index);
},
),
SizedBox(height: 25.h),
Consumer<MedicalFileViewModel>(builder: (context, medicalVM, child) => getFamilyTabs(index: medicalVM.getSelectedFamilyFileTabIndex)),
SizedBox(height: 20.h),
],
),
).paddingSymmetrical(20, 0),
body: CollapsingListView(
title: "My Medical File".needTranslation,
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
CustomTabBar(
tabs: tabs,
onTabChange: (index) {
medicalVM!.onFamilyFileTabChange(index);
},
),
SizedBox(height: 25.h),
Consumer<MedicalFileViewModel>(builder: (context, medicalVM, child) => getFamilyTabs(index: medicalVM.getSelectedFamilyFileTabIndex)),
SizedBox(height: 20.h),
],
).paddingSymmetrical(20, 0)),
bottomSheet: Container(
decoration: RoundedRectangleBorder().toSmoothCornerDecoration(
color: AppColors.whiteColor,
@ -85,15 +76,58 @@ class _FamilyMedicalScreenState extends State<FamilyMedicalScreen> {
),
padding: EdgeInsets.symmetric(vertical: 10.h, horizontal: 20.h),
child: CustomButton(
text: "Add a new family member",
onPressed: () {
showModelSheet();
},
icon: AppAssets.add_icon,
height: 56.h,
fontWeight: FontWeight.w600,
)),
text: "Add a new family member",
onPressed: () {
showModelSheet();
},
icon: AppAssets.add_icon,
height: 56.h,
fontWeight: FontWeight.w600)),
);
// return Scaffold(
// backgroundColor: AppColors.scaffoldBgColor,
// appBar: CustomAppBar(
// onBackPressed: () {
// Navigator.of(context).pop();
// },
// onLanguageChanged: (lang) {},
// hideLogoAndLang: true,
// ),
// body: SingleChildScrollView(
// child: Column(
// mainAxisSize: MainAxisSize.min,
// crossAxisAlignment: CrossAxisAlignment.start,
// children: [
// LocaleKeys.myMedicalFile.tr().toText26(color: AppColors.textColor, weight: FontWeight.w600, letterSpacing: -2),
// SizedBox(height: 25.h),
// CustomTabBar(
// tabs: tabs,
// onTabChange: (index) {
// medicalVM!.onFamilyFileTabChange(index);
// },
// ),
// SizedBox(height: 25.h),
// Consumer<MedicalFileViewModel>(builder: (context, medicalVM, child) => getFamilyTabs(index: medicalVM.getSelectedFamilyFileTabIndex)),
// SizedBox(height: 20.h),
// ],
// ).paddingSymmetrical(20, 0),
// ),
// bottomSheet: Container(
// decoration: RoundedRectangleBorder().toSmoothCornerDecoration(
// color: AppColors.whiteColor,
// customBorder: BorderRadius.only(topLeft: Radius.circular(24), topRight: Radius.circular(24)),
// ),
// padding: EdgeInsets.symmetric(vertical: 10.h, horizontal: 20.h),
// child: CustomButton(
// text: "Add a new family member",
// onPressed: () {
// showModelSheet();
// },
// icon: AppAssets.add_icon,
// height: 56.h,
// fontWeight: FontWeight.w600,
// )),
// );
}
Widget getFamilyTabs({required int index}) {
@ -113,7 +147,8 @@ class _FamilyMedicalScreenState extends State<FamilyMedicalScreen> {
// medicalVM!.switchFamilyFiles(responseID: profile.responseId, patientID: profile.patientId, phoneNumber: profile.mobileNumber);
},
isShowDetails: true,
); default:
);
default:
return SizedBox.shrink();
}
}

7
lib/presentation/my_family/widget/family_cards.dart
Unescape Escape View File

@ -33,7 +33,7 @@ class _FamilyCardsState extends State<FamilyCards> {
Widget build(BuildContext context) {
return GridView.builder(
shrinkWrap: true,
physics: const NeverScrollableScrollPhysics(),
physics: NeverScrollableScrollPhysics(),
itemCount: widget.profiles.length,
gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
crossAxisCount: 2,
@ -41,6 +41,7 @@ class _FamilyCardsState extends State<FamilyCards> {
mainAxisSpacing: 10.h,
childAspectRatio: widget.isShowDetails ? 0.56.h : 0.74.h,
),
padding: EdgeInsets.only(bottom: 80.h),
itemBuilder: (context, index) {
final profile = widget.profiles[index];
final isActive = (profile.responseId == appState.getAuthenticatedUser()?.patientId);
@ -99,12 +100,12 @@ class _FamilyCardsState extends State<FamilyCards> {
CustomButton(
height: 40.h,
onPressed: () => widget.onSelect(profile),
text: LocaleKeys.select.tr(),
text: LocaleKeys.switchAccount.tr(),
backgroundColor: AppColors.secondaryLightRedColor,
borderColor: AppColors.secondaryLightRedColor,
textColor: AppColors.primaryRedColor,
fontSize: 13.h,
icon: widget.isBottomSheet ? null : AppAssets.heart,
icon: widget.isBottomSheet ? null : AppAssets.switch_user,
iconColor: AppColors.primaryRedColor,
padding: EdgeInsets.symmetric(vertical: 0, horizontal: 0),
).paddingOnly(top: 0, bottom: 0),

Write Preview
Loading…
Cancel
Save