From 3aabb1537c1e90301f3895a719e1e394066b43f2 Mon Sep 17 00:00:00 2001 From: Sultan Khan Date: Wed, 21 Apr 2021 16:07:42 +0300 Subject: [PATCH] in patient --- lib/screens/home/home_screen.dart | 128 ++++++++++-------- .../patients/patient_search_screen.dart | 1 + lib/widgets/dashboard/activity_button.dart | 2 +- lib/widgets/patients/PatientCard.dart | 5 +- 4 files changed, 80 insertions(+), 56 deletions(-) diff --git a/lib/screens/home/home_screen.dart b/lib/screens/home/home_screen.dart index c9f89cb8..eed35f17 100644 --- a/lib/screens/home/home_screen.dart +++ b/lib/screens/home/home_screen.dart @@ -13,6 +13,7 @@ import 'package:doctor_app_flutter/models/doctor/profile_req_Model.dart'; import 'package:doctor_app_flutter/models/patient/patient_model.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/screens/medicine/search_medicine_patient_screen.dart'; +import 'package:doctor_app_flutter/screens/patients/patient_search_screen.dart'; import 'package:doctor_app_flutter/screens/patients/profile/referral/patient_referral_screen.dart'; import 'package:doctor_app_flutter/util/date-utils.dart'; import 'package:doctor_app_flutter/util/dr_app_shared_pref.dart'; @@ -61,30 +62,11 @@ class _HomeScreenState extends State { var _isInit = true; DoctorProfileModel profile; bool isExpanded = false; - String isInpatient = ""; + bool isInpatient = false; var clinicName = []; int sliderActiveIndex = 0; var clinicId; - var _patientSearchFormValues = PatientModel( - FirstName: "0", - MiddleName: "0", - LastName: "0", - PatientMobileNumber: "0", - PatientIdentificationID: "0", - PatientID: 0, - From: DateUtils.convertDateToFormat(DateTime.now(), 'yyyy-MM-dd') - .toString(), - To: DateUtils.convertDateToFormat(DateTime.now(), 'yyyy-MM-dd') - .toString(), - LanguageID: 2, - stamp: "2020-03-02T13:56:39.170Z", - IPAdress: "11.11.11.11", - VersionID: 1.2, - Channel: 9, - TokenID: "2Fi7HoIHB0eDyekVa6tCJg==", - SessionID: "5G0yXn0Jnq", - IsLoginForDoctorApp: true, - PatientOutSA: false); + var _patientSearchFormValues; void didChangeDependencies() async { super.didChangeDependencies(); @@ -338,17 +320,7 @@ class _HomeScreenState extends State { ], ), new Container( - height: MediaQuery.of(context) - .orientation == - Orientation.portrait - ? MediaQuery.of(context) - .size - .height * - 0.15 - : MediaQuery.of(context) - .size - .height * - 0.20, + height: 130, child: new ListView( scrollDirection: Axis.horizontal, @@ -381,17 +353,7 @@ class _HomeScreenState extends State { ], ), new Container( - height: MediaQuery.of(context) - .orientation == - Orientation.portrait - ? MediaQuery.of(context) - .size - .height * - 0.15 - : MediaQuery.of(context) - .size - .height * - 0.20, + height: 130, child: new ListView( scrollDirection: Axis .horizontal, @@ -427,17 +389,7 @@ class _HomeScreenState extends State { ], ), new Container( - height: MediaQuery.of(context) - .orientation == - Orientation.portrait - ? MediaQuery.of(context) - .size - .height * - 0.15 - : MediaQuery.of(context) - .size - .height * - 0.20, + height: 130, child: new ListView( scrollDirection: Axis .horizontal, @@ -573,6 +525,7 @@ class _HomeScreenState extends State { ), hasBorder: false, onTap: () { + getRequestHeader(false); Navigator.of(context) .pushNamed(PATIENTS, arguments: { "patientSearchForm": @@ -622,6 +575,46 @@ class _HomeScreenState extends State { SizedBox( height: 10, ), + Row( + children: [ + HomePageCard( + color: Colors.black, + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Padding( + padding: EdgeInsets.only( + top: 10, left: 10, right: 0), + child: Icon( + DoctorApp.search, + size: 32, + color: Colors.white, + )), + Container( + padding: EdgeInsets.all(10), + child: AppText( + TranslationBase.of(context).inPatient, + color: Colors.white, + textAlign: TextAlign.start, + fontSize: 13, + )) + ], + ), + hasBorder: false, + onTap: () { + getRequestHeader(true); + Navigator.of(context) + .pushNamed(PATIENTS, arguments: { + "patientSearchForm": + _patientSearchFormValues, + "selectedType": "1", + "arrivalType": "1" + }); + }, + ) + ], + ), SizedBox( height: 20, ), @@ -832,4 +825,31 @@ class _HomeScreenState extends State { ])), ]; } + + getRequestHeader(isInpatient) { + _patientSearchFormValues = PatientModel( + FirstName: "0", + MiddleName: "0", + LastName: "0", + PatientMobileNumber: "0", + PatientIdentificationID: "0", + PatientID: 0, + From: isInpatient == true + ? '0' + : DateUtils.convertDateToFormat(DateTime.now(), 'yyyy-MM-dd') + .toString(), + To: isInpatient == true + ? '0' + : DateUtils.convertDateToFormat(DateTime.now(), 'yyyy-MM-dd') + .toString(), + LanguageID: 2, + stamp: "2020-03-02T13:56:39.170Z", + IPAdress: "11.11.11.11", + VersionID: 1.2, + Channel: 9, + TokenID: "2Fi7HoIHB0eDyekVa6tCJg==", + SessionID: "5G0yXn0Jnq", + IsLoginForDoctorApp: true, + PatientOutSA: false); + } } diff --git a/lib/screens/patients/patient_search_screen.dart b/lib/screens/patients/patient_search_screen.dart index c745fd61..17d44839 100644 --- a/lib/screens/patients/patient_search_screen.dart +++ b/lib/screens/patients/patient_search_screen.dart @@ -593,6 +593,7 @@ class _PatientSearchScreenState extends State { children: [ AppButton( title: TranslationBase.of(context).search, + color: Colors.red[800], onPressed: () { _validateInputs(); }, diff --git a/lib/widgets/dashboard/activity_button.dart b/lib/widgets/dashboard/activity_button.dart index 0dad5cec..8258a1df 100644 --- a/lib/widgets/dashboard/activity_button.dart +++ b/lib/widgets/dashboard/activity_button.dart @@ -22,7 +22,7 @@ class GetActivityButton extends StatelessWidget { Padding( padding: EdgeInsets.all(10), child: AppText(value.value.toString(), - fontSize: 28, fontWeight: FontWeight.bold)), + fontSize: 32, fontWeight: FontWeight.bold)), Expanded( child: AppText( value.kPIParameter, diff --git a/lib/widgets/patients/PatientCard.dart b/lib/widgets/patients/PatientCard.dart index f204d28e..3d10e9d5 100644 --- a/lib/widgets/patients/PatientCard.dart +++ b/lib/widgets/patients/PatientCard.dart @@ -136,6 +136,7 @@ class PatientCard extends StatelessWidget { : "", fontWeight: FontWeight.bold, fontSize: 14, + textOverflow: TextOverflow.ellipsis, ), patientInfo.nationality != null || patientInfo.nationalityId != null @@ -143,7 +144,9 @@ class PatientCard extends StatelessWidget { borderRadius: BorderRadius.circular(20.0), child: Image.network( - patientInfo.nationalityFlagURL, + patientInfo.nationalityFlagURL != null + ? patientInfo.nationalityFlagURL + : '', height: 25, width: 30, errorBuilder: (BuildContext context,