Merge branch 'patients-new-design' into 'development'

Patients new design

See merge request Cloud_Solution/doctor_app_flutter!407

lib/config/config.dart

@@ -121,7 +121,7 @@ const GET_DASHBOARD =
 const GET_SICKLEAVE_STATISTIC =
     'Services/DoctorApplication.svc/REST/PreSickLeaveStatistics';
 const ARRIVED_PATIENT_URL =
-    'Services/DoctorApplication.svc/REST/PatientArrivalList​';
+    'Services/DoctorApplication.svc/REST/PatientArrivalList';
 const ADD_SICK_LEAVE = 'Services/DoctorApplication.svc/REST/PostSickLeave';
 const GET_SICK_LEAVE = 'Services/DoctorApplication.svc/REST/GetAllSickLeaves';
 const EXTEND_SICK_LEAVE = 'Services/DoctorApplication.svc/REST/ExtendSickLeave';
@@ -143,9 +143,6 @@ const GET_PROCEDURE_LIST =
     'Services/DoctorApplication.svc/REST/GetOrderedProcedure';
 const POST_PROCEDURE_LIST = 'Services/DoctorApplication.svc/REST/PostProcedure';
 
-const GET_PATIENT_ARRIVAL_LIST =
-    'Services/DoctorApplication.svc/REST/PatientArrivalList';
-
 ///Lab Order
 const GET_Patient_LAB_ORDERS = 'Services/Patients.svc/REST/GetPatientLabOrders';
 const GET_Patient_LAB_SPECIAL_RESULT =

lib/core/service/base/base_service.dart

@@ -38,15 +38,15 @@ class BaseService {
     body['To'] = date;
     body['PageIndex'] = 0;
     body['PageSize'] = 0;
-    if(patientMrn == -1){
+    if(patientMrn != -1){
       body['PatientMRN'] = patientMrn;
     }
-    if(appointmentNo == -1){
+    if(appointmentNo != -1){
       body['AppointmentNo'] = appointmentNo;
     }
 
     await baseAppClient.post(
-      GET_PATIENT_ARRIVAL_LIST,
+      ARRIVED_PATIENT_URL,
       onSuccess: (dynamic response, int statusCode) {
         patientArrivalList.clear();
 

lib/core/viewModel/patient-referral-viewmodel.dart

@@ -158,8 +158,7 @@ class PatientReferralViewModel extends BaseViewModel {
 
     await _referralPatientService.getPatientArrivalList(toDate,
         fromDate: fromDate,
-        patientMrn: patientMrn,
-        appointmentNo: appointmentNo);
+        patientMrn: patientMrn);
     if (_referralPatientService.hasError) {
       error = _referralPatientService.error;
       setState(ViewState.Error);

lib/screens/patients/profile/referral/my-referral-detail-screen.dart

@@ -70,12 +70,14 @@ class MyReferralDetailScreen extends StatelessWidget {
                                 color: Colors.black, //Colors.black,
                                 onPressed: () => Navigator.pop(context),
                               ),
-                              AppText(
-                                (Helpers.capitalize(model.patientArrivalList[0].patientDetails.fullName)),
-                                fontSize: SizeConfig.textMultiplier * 3,
-                                fontWeight: FontWeight.bold,
-                                backGroundcolor: Colors.white,
-                                fontFamily: 'Poppins',
+                              Expanded(
+                                child: AppText(
+                                  (Helpers.capitalize(model.patientArrivalList[0].patientDetails.fullName)),
+                                  fontSize: SizeConfig.textMultiplier * 3,
+                                  fontWeight: FontWeight.bold,
+                                  backGroundcolor: Colors.white,
+                                  fontFamily: 'Poppins',
+                                ),
                               ),
                               model.patientArrivalList[0].patientDetails.gender == 1
                                   ? Icon(

lib/screens/patients/profile/vital_sign/vital_sign_details_screen.dart

@@ -7,6 +7,7 @@ import 'package:doctor_app_flutter/screens/patients/profile/vital_sign/vital_sig
 import 'package:doctor_app_flutter/screens/patients/profile/vital_sign/vital_sign_item_details_screen.dart';
 import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
 import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design.dart';
+import 'package:doctor_app_flutter/widgets/patients/profile/patient_profile_header_with_appointment_card_app_bar.dart';
 import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
 import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
 import 'package:doctor_app_flutter/widgets/transitions/fade_page.dart';
@@ -38,6 +39,11 @@ class VitalSignDetailsScreen extends StatelessWidget {
       builder: (_, mode, widget) => AppScaffold(
         isShowAppBar: false,
         baseViewModel: mode,
+       /* appBar: PatientProfileHeaderWhitAppointmentAppBar(
+          patient: patient,
+          patientType: patientType,
+          arrivalType: arrivalType,
+        ),*/
         appBarTitle: TranslationBase.of(context).vitalSign,
         body: mode.patientVitalSignsHistory.length > 0
             ? Column(

lib/widgets/patients/profile/patient-profile-header-new-design.dart

@@ -42,10 +42,11 @@ class PatientProfileHeaderNewDesign extends StatelessWidget {
                   onPressed: () => Navigator.pop(context),
                 ),
                 AppText(
+                  patient.firstName != null ?
                   (Helpers.capitalize(patient.firstName) +
                       " " +
                       Helpers.capitalize(
-                          patient.lastName)),
+                          patient.lastName)) : Helpers.capitalize(patient.patientDetails.fullName),
                   fontSize: SizeConfig.textMultiplier * 3,
                   fontWeight: FontWeight.bold,
                   backGroundcolor: Colors.white,

lib/widgets/patients/profile/patient_profile_header_with_appointment_card_app_bar.dart

@@ -64,10 +64,11 @@ class PatientProfileHeaderWhitAppointmentAppBar extends StatelessWidget with Pre
                   onPressed: () => Navigator.pop(context),
                 ),
                 AppText(
+                  patient.firstName != null ?
                   (Helpers.capitalize(patient.firstName) +
                       " " +
                       Helpers.capitalize(
-                          patient.lastName)),
+                          patient.lastName)) : Helpers.capitalize(patient.patientDetails.fullName),
                   fontSize: SizeConfig.textMultiplier * 3,
                   fontWeight: FontWeight.bold,
                   backGroundcolor: Colors.white,