From d553e757c294b78566ef6ba4d79637eeec759742 Mon Sep 17 00:00:00 2001 From: Elham Rababh Date: Thu, 17 Mar 2022 11:08:18 +0300 Subject: [PATCH] first step form home screen --- assets/images/cloud_logo.png | Bin 0 -> 11123 bytes assets/images/doctoricon.svg | 6 + assets/images/hmglogo.svg | 18 + assets/images/nurseicon.svg | 5 + lib/core/config/config.dart | 451 +----------------- lib/header/app_header.dart | 47 ++ lib/home/home_screen.dart | 13 +- lib/home/que_item.dart | 61 +++ lib/utils/signalR_utils.dart | 2 +- lib/widget/data_display/app_texts_widget.dart | 2 +- pubspec.yaml | 48 +- 11 files changed, 170 insertions(+), 483 deletions(-) create mode 100644 assets/images/cloud_logo.png create mode 100644 assets/images/doctoricon.svg create mode 100644 assets/images/hmglogo.svg create mode 100644 assets/images/nurseicon.svg diff --git a/assets/images/cloud_logo.png b/assets/images/cloud_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..650532522842eb21097e6681107501e380c381bd GIT binary patch literal 11123 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 FV1nwjdYu3O literal 0 HcmV?d00001 diff --git a/assets/images/doctoricon.svg b/assets/images/doctoricon.svg new file mode 100644 index 0000000..a8dd640 --- /dev/null +++ b/assets/images/doctoricon.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/assets/images/hmglogo.svg b/assets/images/hmglogo.svg new file mode 100644 index 0000000..d2b7d58 --- /dev/null +++ b/assets/images/hmglogo.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/assets/images/nurseicon.svg b/assets/images/nurseicon.svg new file mode 100644 index 0000000..55de01f --- /dev/null +++ b/assets/images/nurseicon.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/lib/core/config/config.dart b/lib/core/config/config.dart index 12ec7ca..130d644 100644 --- a/lib/core/config/config.dart +++ b/lib/core/config/config.dart @@ -5,446 +5,7 @@ const ONLY_NUMBERS = "[0-9]"; const ONLY_LETTERS = "[a-zA-Z &'\"]"; const ONLY_DATE = "[0-9/]"; const BASE_URL_LIVE_CARE = 'https://livecare.hmg.com/'; -// const BASE_URL = 'https://hmgwebservices.com/'; -const BASE_URL = 'https://uat.hmgwebservices.com/'; -const PHARMACY_ITEMS_URL = "Services/Lists.svc/REST/GetPharmcyItems_Region_enh"; -const PHARMACY_LIST_URL = "Services/Patients.svc/REST/GetPharmcyList"; -const PATIENT_PROGRESS_NOTE_URL = - "Services/DoctorApplication.svc/REST/GetProgressNoteForInPatient"; -const PATIENT_INSURANCE_APPROVALS_URL = - "Services/DoctorApplication.svc/REST/GetApprovalStatusForInpatient"; -const PATIENT_REFER_TO_DOCTOR_URL = - "Services/DoctorApplication.svc/REST/ReferToDoctor"; -const PATIENT_GET_DOCTOR_BY_CLINIC_URL = - "Services/DoctorApplication.svc/REST/GetDoctorsByClinicID"; - -const PATIENT_GET_DOCTOR_BY_CLINIC_Hospital = - "Services/Doctors.svc/REST/SearchDoctorsByTime"; - -const GET_CLINICS_FOR_DOCTOR = - 'Services/DoctorApplication.svc/REST/GetClinicsForDoctor'; -const PATIENT_GET_LIST_REFERAL_URL = - "Services/Lists.svc/REST/GetList_STPReferralFrequency"; -const PATIENT_GET_CLINIC_BY_PROJECT_URL = - "Services/DoctorApplication.svc/REST/GetClinicsByProjectID"; -const PROJECT_GET_INFO = "Services/DoctorApplication.svc/REST/GetProjectInfo"; -const GET_CLINICS = "Services/DoctorApplication.svc/REST/GetClinics"; - -const GET_REFERRAL_FACILITIES = - 'Services/DoctorApplication.svc/REST/GetReferralFacilities'; - -const GET_PROJECTS = 'Services/DoctorApplication.svc/REST/GetProjectInfo'; - -const GET_PATIENT_VITAL_SIGN = - 'Services/Doctors.svc/REST/Doctor_GetPatientVitalSign'; -const GET_PATIENT_VITAL_SIGN_DATA = - 'Services/DoctorApplication.svc/REST/GetVitalSigns'; -const GET_PATIENT_LAB_OREDERS = - 'Services/DoctorApplication.svc/REST/GetPatientLabOreders'; -const GET_PRESCRIPTION = 'Services/Patients.svc/REST/GetPrescriptionApptList'; - -const GET_LIVECARE_PENDINGLIST = - 'Services/DoctorApplication.svc/REST/GetPendingPatientER'; -const START_LIVE_CARE_CALL = 'LiveCareApi/DoctorApp/CallPatient'; -const LIVE_CARE_STATISTICS_FOR_CERTAIN_DOCTOR_URL = - "Lists.svc/REST/DashBoard_GetLiveCareDoctorsStatsticsForCertainDoctor"; - -const GET_PRESCRIPTION_REPORT = - 'Services/Patients.svc/REST/GetPrescriptionReport'; - -const GT_MY_PATIENT_QUESTION = - 'Services/DoctorApplication.svc/REST/GtMyPatientsQuestions'; - -const PRM_SEARCH_PATIENT = - 'Services/Patients.svc/REST/GetPatientInformation_PRM'; - -const GET_PATIENT = 'Services/DoctorApplication.svc/REST/'; - -const GET_PRESCRIPTION_REPORT_FOR_IN_PATIENT = - 'Services/DoctorApplication.svc/REST/GetPrescriptionReportForInPatient'; - -const GET_MY_REFERRAL_PATIENT = - 'Services/DoctorApplication.svc/REST/GtMyReferralPatient'; - -const REFER_TO_DOCTOR = 'Services/DoctorApplication.svc/REST/ReferToDoctor'; - -const ADD_REFERRED_DOCTOR_REMARKS = - 'Services/DoctorApplication.svc/REST/AddReferredDoctorRemarks'; - -const GET_MY_REFERRED_PATIENT = - 'Services/DoctorApplication.svc/REST/GtMyReferredPatient'; - -const GET_MY_REFERRED_OUT_PATIENT = - 'Services/DoctorApplication.svc/REST/GtMyReferredOutPatient'; - -const GET_PENDING_REFERRAL_PATIENT = - 'Services/DoctorApplication.svc/REST/PendingReferrals'; - -const CREATE_REFERRAL_PATIENT = - 'Services/DoctorApplication.svc/REST/CreateReferral'; - -const RESPONSE_PENDING_REFERRAL_PATIENT = - 'Services/DoctorApplication.svc/REST/RespondReferral'; - -const GET_PATIENT_REFERRAL = 'Services/DoctorApplication.svc/REST/GetRefferal'; - -const POST_UCAF = 'Services/DoctorApplication.svc/REST/PostUCAF'; - -const GET_DOCTOR_WORKING_HOURS_TABLE = - 'Services/Doctors.svc/REST/GetDoctorWorkingHoursTable'; - -const GET_PATIENT_LAB_RESULTS = - 'Services/DoctorApplication.svc/REST/GetPatientLabResults'; -const LOGIN_URL = 'Services/Sentry.svc/REST/MemberLogIN_New'; -const INSERT_DEVICE_IMEI = - 'Services/DoctorApplication.svc/REST/DoctorApp_InsertOrUpdateDeviceDetails'; -// 'Services/Sentry.svc/REST/DoctorApplication_INSERTDeviceIMEI'; -// const SELECT_DEVICE_IMEI = -// 'Services/Sentry.svc/REST/DoctorApplication_SELECTDeviceIMEIbyIMEI'; - -const SELECT_DEVICE_IMEI = - 'Services/DoctorApplication.svc/REST/DoctorApp_GetDeviceDetailsByIMEI'; - -const SEND_ACTIVATION_CODE_BY_OTP_NOTIFICATION_TYPE = - 'Services/Sentry.svc/REST/DoctorApplication_SendActivationCodebyOTPNotificationType'; - -const SEND_ACTIVATION_CODE_FOR_DOCTOR_APP = - 'Services/DoctorApplication.svc/REST/SendActivationCodeForDoctorApp'; - -const SEND_ACTIVATION_CODE_FOR_VERIFICATION_SCREEN = - 'Services/DoctorApplication.svc/REST/SendVerificationCode'; -const MEMBER_CHECK_ACTIVATION_CODE_NEW = - 'Services/Sentry.svc/REST/MemberCheckActivationCode_New'; - -const CHECK_ACTIVATION_CODE_FOR_DOCTOR_APP = - 'Services/DoctorApplication.svc/REST/CheckActivationCodeForDoctorApp'; - -const GET_DOC_PROFILES = 'Services/Doctors.svc/REST/GetDocProfiles'; -const TRANSFERT_TO_ADMIN = 'LiveCareApi/DoctorApp/TransferToAdmin'; -const SEND_SMS_INSTRUCTIONS = 'LiveCareApi/DoctorApp/SendSMSInstruction'; -const GET_ALTERNATIVE_SERVICE = 'LiveCareApi/DoctorApp/GetAlternativeServices'; -const END_CALL = 'LiveCareApi/DoctorApp/EndCall'; -const END_CALL_WITH_CHARGE = 'LiveCareApi/DoctorApp/CompleteCallWithCharge'; -const GET_DASHBOARD = - 'Services/DoctorApplication.svc/REST/GetDoctorDashboardKPI'; -const GET_SICKLEAVE_STATISTIC = - 'Services/DoctorApplication.svc/REST/PreSickLeaveStatistics'; -const ARRIVED_PATIENT_URL = - 'Services/DoctorApplication.svc/REST/PatientArrivalList'; -const ADD_SICK_LEAVE = 'Services/DoctorApplication.svc/REST/PostSickLeave'; -const GET_SICK_LEAVE = 'Services/Patients.svc/REST/GetPatientSickLeave'; -const EXTEND_SICK_LEAVE = 'Services/DoctorApplication.svc/REST/ExtendSickLeave'; - -const GET_MASTER_LOOKUP_LIST = 'Services/DoctorApplication.svc/REST/GetMasterLookUpList'; -const GET_COVERING_DOCTORS = - 'Services/DoctorApplication.svc/REST/GetCoveringDoctor'; -const ADD_RESCHDEULE = 'Services/DoctorApplication.svc/REST/PostRequisition'; -const UPDATE_RESCHDEULE = - 'Services/DoctorApplication.svc/REST/PatchRequisition'; -const GET_RESCHEDULE_LEAVE = - 'Services/DoctorApplication.svc/REST/GetRequisition'; -const GET_PRESCRIPTION_LIST = - 'Services/DoctorApplication.svc/REST/GetPrescription'; - -const POST_PRESCRIPTION_LIST = - 'Services/DoctorApplication.svc/REST/PostPrescription'; -const GET_PROCEDURE_LIST = - 'Services/DoctorApplication.svc/REST/GetOrderedProcedure'; -const POST_PROCEDURE_LIST = 'Services/DoctorApplication.svc/REST/PostProcedure'; - - -const GET_PATIENT_IN_PATIENT_LIST = - 'Services/DoctorApplication.svc/REST/GetMyInPatient'; - -const Verify_Referral_Doctor_Remarks = - 'Services/DoctorApplication.svc/REST/VerifyReferralDoctorRemarks'; - -///Lab Order -const GET_Patient_LAB_ORDERS = 'Services/Patients.svc/REST/GetPatientLabOrders'; -const GET_Patient_LAB_SPECIAL_RESULT = - 'Services/Patients.svc/REST/GetPatientLabSpecialResults'; -const SEND_LAB_RESULT_EMAIL = - 'Services/Notifications.svc/REST/SendLabReportEmail'; -const GET_Patient_LAB_RESULT = - 'Services/Patients.svc/REST/GetPatientLabResults'; -const GET_Patient_LAB_ORDERS_RESULT = - 'Services/Patients.svc/REST/GetPatientLabOrdersResults'; -const GET_PATIENT_LAB_ORDERS_RESULT_HISTORY_BY_DESCRIPTION = - 'Services/Patients.svc/REST/GetPatientLabOrdersResultsHistoryByDescription'; - -// SOAP - -const GET_ALLERGIES = 'Services/DoctorApplication.svc/REST/GetAllergies'; - -const POST_EPISODE = 'Services/DoctorApplication.svc/REST/PostEpisode'; -const POST_EPISODE_FOR_IN_PATIENT = - 'Services/DoctorApplication.svc/REST/PostEpisodeForInpatient'; - -const POST_ALLERGY = 'Services/DoctorApplication.svc/REST/PostAllergies'; -const POST_HISTORY = 'Services/DoctorApplication.svc/REST/PostHistory'; -const POST_CHIEF_COMPLAINT = - 'Services/DoctorApplication.svc/REST/PostChiefcomplaint'; -const POST_PHYSICAL_EXAM = - 'Services/DoctorApplication.svc/REST/PostPhysicalExam'; -const POST_PROGRESS_NOTE = - '/Services/DoctorApplication.svc/REST/PostProgressNote'; -const POST_ASSESSMENT = 'Services/DoctorApplication.svc/REST/PostAssessment'; - -const PATCH_ALLERGY = 'Services/DoctorApplication.svc/REST/PatchAllergies'; -const PATCH_HISTORY = 'Services/DoctorApplication.svc/REST/PatchHistory'; -const PATCH_CHIEF_COMPLAINT = - 'Services/DoctorApplication.svc/REST/PatchChiefcomplaint'; - -const PATCH_PHYSICAL_EXAM = - 'Services/DoctorApplication.svc/REST/PatchPhysicalExam'; -const PATCH_PROGRESS_NOTE = - 'Services/DoctorApplication.svc/REST/PatchProgressNote'; -const PATCH_ASSESSMENT = 'Services/DoctorApplication.svc/REST/PatchAssessment'; - -const GET_HISTORY = 'Services/DoctorApplication.svc/REST/GetHistory'; -const GET_CHIEF_COMPLAINT = - 'Services/DoctorApplication.svc/REST/GetChiefcomplaint'; -const GET_PHYSICAL_EXAM = 'Services/DoctorApplication.svc/REST/GetPhysicalExam'; -const GET_PROGRESS_NOTE = 'Services/DoctorApplication.svc/REST/GetProgressNote'; -const GET_ASSESSMENT = 'Services/DoctorApplication.svc/REST/GetAssessment'; - - -const GET_LIST_CATEGORISE = - 'Services/DoctorApplication.svc/REST/GetProcedureCategories'; - -const GET_CATEGORISE_PROCEDURE = - 'Services/DoctorApplication.svc/REST/GetProcedure'; -const UPDATE_PROCEDURE = 'Services/DoctorApplication.svc/REST/PatchProcedure'; -const UPDATE_PRESCRIPTION = - 'Services/DoctorApplication.svc/REST/PatchPrescription'; -const SEARCH_DRUG = 'Services/DoctorApplication.svc/REST/GetMedicationList'; -const DRUG_TO_DRUG = - 'Services/DoctorApplication.svc/REST/DrugToDrugInteraction'; -const GET_MEDICAL_FILE = 'Services/DoctorApplication.svc/REST/GetMedicalFile'; -const GET_FLOORS = 'Services/DoctorApplication.svc/REST/GetFloors'; -const GET_WARDS = 'Services/DoctorApplication.svc/REST/GetWards'; -const GET_ROOM_CATEGORIES = - 'Services/DoctorApplication.svc/REST/GetRoomCategories'; -const GET_DIAGNOSIS_TYPES = - 'Services/DoctorApplication.svc/REST/DiagnosisTypes'; -const GET_DIET_TYPES = 'Services/DoctorApplication.svc/REST/DietTypes'; -const GET_ICD_CODES = 'Services/DoctorApplication.svc/REST/GetICDCodes'; -const POST_ADMISSION_REQUEST = - 'Services/DoctorApplication.svc/REST/PostAdmissionRequest'; -const GET_ITEM_BY_MEDICINE = - 'Services/DoctorApplication.svc/REST/GetItemByMedicineCode'; - -const GET_PROCEDURE_VALIDATION = - 'Services/DoctorApplication.svc/REST/ValidateProcedures'; -const GET_BOX_QUANTITY = - 'Services/DoctorApplication.svc/REST/CalculateBoxQuantity'; - -///GET ECG -const GET_ECG = "Services/Patients.svc/REST/HIS_GetPatientMuseResults"; - -const GET_MY_REFERRAL_INPATIENT = - "Services/DoctorApplication.svc/REST/GtMyReferralPatient"; - -const GET_MY_REFERRAL_OUT_PATIENT = - "Services/DoctorApplication.svc/REST/GtMyReferralForOutPatient"; - -const GET_MY_DISCHARGE_PATIENT = - "Services/DoctorApplication.svc/REST/GtMyDischargeReferralPatient"; -const GET_DISCHARGE_PATIENT = - "Services/DoctorApplication.svc/REST/GtMyDischargePatient"; - -const GET_PAtIENTS_INSURANCE_APPROVALS = - "Services/Patients.svc/REST/GetApprovalStatus"; - -const GET_RAD_IMAGE_URL = 'Services/Patients.svc/Rest/GetRadImageURL'; -const GET_PATIENT_ORDERS = 'Services/Patients.svc/REST/GetPatientRadOrders'; -const GET_IN_PATIENT_ORDERS = - 'Services/DoctorApplication.svc/REST/GetPatientRadResult'; - -///Prescriptions -const GET_PRESCRIPTIONS_ALL_ORDERS = - 'Services/Patients.svc/REST/PatientER_GetPatientAllPresOrders'; -const GET_PRESCRIPTION_REPORT_NEW = - 'Services/Patients.svc/REST/INP_GetPrescriptionReport'; -const SEND_PRESCRIPTION_EMAIL = - 'Services/Notifications.svc/REST/SendPrescriptionEmail'; -const GET_PRESCRIPTION_REPORT_ENH = - 'Services/Patients.svc/REST/GetPrescriptionReport_enh'; -const UPDATE_PROGRESS_NOTE_FOR_INPATIENT = - "Services/DoctorApplication.svc/REST/UpdateProgressNoteForInPatient"; -const CREATE_PROGRESS_NOTE_FOR_INPATIENT = - "Services/DoctorApplication.svc/REST/CreateProgressNoteForInPatient"; - -const GET_SICK_LEAVE_PATIENT = "Services/Patients.svc/REST/GetPatientSickLeave"; -const GET_MY_OUT_PATIENT = - "Services/DoctorApplication.svc/REST/GetMyOutPatient"; - -const PATIENT_MEDICAL_REPORT_GET_LIST = - "Services/Patients.svc/REST/DAPP_ListMedicalReport"; -const PATIENT_MEDICAL_REPORT_GET_TEMPLATE = - "Services/Patients.svc/REST/DAPP_GetTemplateByID"; -const PATIENT_MEDICAL_REPORT_INSERT = - "Services/Patients.svc/REST/DAPP_InsertMedicalReport"; -const PATIENT_MEDICAL_REPORT_VERIFIED = - "Services/Patients.svc/REST/DAPP_VerifiedMedicalReport"; - -const GET_PROCEDURE_TEMPLETE = - 'Services/Doctors.svc/REST/DAPP_ProcedureTemplateGet'; - -const GET_TEMPLETE_LIST = 'Services/Doctors.svc/REST/DAPP_TemplateGet'; - -const GET_PROCEDURE_TEMPLETE_DETAILS = - "Services/Doctors.svc/REST/DAPP_ProcedureTemplateDetailsGet"; -const GET_PENDING_PATIENT_ER_FOR_DOCTOR_APP = - 'Services/DoctorApplication.svc/REST/GetPendingPatientERForDoctorApp'; - -const DOCTOR_CHECK_HAS_LIVE_CARE = - "Services/DoctorApplication.svc/REST/CheckDoctorHasLiveCare"; - -const LIVE_CARE_IS_LOGIN = "LiveCareApi/DoctorApp/UseIsLogin"; -const ADD_REFERRED_REMARKS_NEW = - "Services/DoctorApplication.svc/REST/AddReferredDoctorRemarks_New"; -const GET_SPECIAL_CLINICAL_CARE_LIST = - "Services/DoctorApplication.svc/REST/GetSpecialClinicalCareList"; -const GET_SPECIAL_CLINICAL_CARE_MAPPING_LIST = - "Services/DoctorApplication.svc/REST/GetSpecialClinicalCareMappingList"; - -const INSERT_MEDICAL_REPORT = - "Services/Patients.svc/REST/DAPP_InsertMedicalReport_New"; - -const UPDATE_MEDICAL_REPORT = - "Services/Patients.svc/REST/DAPP_UpdateMedicalReport"; -const GET_SICK_LEAVE_DOCTOR_APP = - "Services/DoctorApplication.svc/REST/GetAllSickLeaves"; -const ADD_PATIENT_TO_DOCTOR = "LiveCareApi/DoctorApp/AssignPatientToDoctor"; -const REMOVE_PATIENT_FROM_DOCTOR = "LiveCareApi/DoctorApp/BackPatientToQueue"; -const CREATE_DOCTOR_RESPONSE = - "Services/DoctorApplication.svc/REST/CreateDoctorResponse"; -const GET_DOCTOR_NOT_REPLIED_COUNTS = - "Services/DoctorApplication.svc/REST/DoctorApp_GetDoctorNotRepliedCounts"; -const ALL_SPECIAL_LAB_RESULT = - "services/Patients.svc/REST/GetPatientLabSpecialResultsALL"; -const GET_MEDICATION_FOR_IN_PATIENT = - "Services/DoctorApplication.svc/REST/Doctor_GetMedicationForInpatient"; -const GET_EPISODE_FOR_INPATIENT = - "/Services/DoctorApplication.svc/REST/DoctorApp_GetEpisodeForInpatient"; - -///Operation Details Services - -const GET_RESERVATIONS = - "Services/DoctorApplication.svc/REST/DoctorApp_GetReservationDetails"; -const GET_OPERATION_DETAILS = - "Services/DoctorApplication.svc/REST/DoctorApp_GetOperationDetails"; -const UPDATE_OPERATION_REPORT = - "Services/DoctorApplication.svc/REST/DoctorApp_CreateUpdateOperationReport"; - -const NURSING_PROGRESS_NOTE = - "Services/DoctorApplication.svc/REST/DoctorApp_GetNursingProgressNote"; -const GET_DIAGNOSIS_FOR_IN_PATIENT = - "Services/DoctorApplication.svc/REST/DoctorApp_GetDiagnosisForInPatient"; - -const GET_DIABETIC_CHART_VALUES = - "Services/DoctorApplication.svc/REST/DoctorApp_GetDiabeticChartValues"; - -const GET_PENDING_ORDERS = - "Services/DoctorApplication.svc/REST/DoctorApp_GetPendingOrdersForInPatient"; - -const GET_ADMISSION_ORDERS = - "/Services/DoctorApplication.svc/REST/DoctorApp_GetAdmissionOrders"; - -///Patient Registration Services -const CHECK_PATIENT_FOR_REGISTRATION = - "Services/Authentication.svc/REST/CheckPatientForRegisteration"; -const SEND_ACTIVATION_CODE_BY_OTP_NOT_TYPE_FOR_REGISTRATION = - "Services/Authentication.svc/REST/SendActivationCodebyOTPNotificationTypeForRegistration"; -const CHECK_ACTIVATION_CODE_FOR_PATIENT = - "Services/Authentication.svc/REST/CheckActivationCode"; -const PATIENT_REGISTRATION = - "Services/Authentication.svc/REST/PatientRegistration"; -const GET_PATIENT_INFO = "Services/NHIC.svc/REST/GetPatientInfo"; - -/// Discharge Summary -const GET_PENDING_DISCHARGE_SUMMARY = - "Services/DoctorApplication.svc/REST/DoctorApp_GetPendingDischargeSummary"; -const GET_ALL_DISCHARGE_SUMMARY = - "Services/DoctorApplication.svc/REST/DoctorApp_GetDischargeSummary"; - -const VTE_ASSESSMENT = - "Services/Patients.svc/REST/INP_GetVTEHistoryByTransactionNo"; - -const GET_INTERVENTION_MEDICATION = - "Services/DoctorApplication.svc/REST/DoctorApp_GetInterventionMedications"; - -const GET_INTERVENTION_MEDICATION_HISTORY = - "Services/DoctorApplication.svc/REST/DoctorApp_GetInterventionHistory"; - -const SET_ACCEPTED_OR_REJECTED = - "Services/DoctorApplication.svc/REST/DoctorApp_AcceptOrRejectIntervention"; - -const GET_STP_MASTER_LIST = - "Services/DoctorApplication.svc/REST/DoctorApp_GetSTPMasterList"; - -var selectedPatientType = 1; - -//*********change value to decode json from Dropdown ************ -var SERVICES_PATIANT = [ - "GetMyOutPatient", - "GetMyInPatient", - "GtMyDischargePatient", - "GtMyReferredPatient", - "GtMyDischargeReferralPatient", - "GtMyTomorrowPatient", - "GtMyReferralPatient", - "PatientArrivalList" -]; -var SERVICES_PATIANT2 = [ - "List_MyOutPatient", - "List_MyInPatient", - "List_MyDischargePatient", - "List_MyReferredPatient", - "List_MyDischargeReferralPatient", - "List_MyTomorrowPatient", - "List_MyReferralPatient", - "patientArrivalList" -]; -var SERVICES_PATIANT_HEADER = [ - "My OutPatient", - "My InPatient", - "Discharge", - "Referred", - "Referral Discharge", - "Tomorrow", - "Referral", - "Arrival Patient" -]; -var SERVICES_PATIANT_HEADER_AR = [ - "المريض الخارجي", - "المريض المنوم", - "المريض المعافى", - "المريض المحول الي", - "المريض المحال المعافى", - "مريض الغد", - "المريض المحول مني", - "المريض الواصل" -]; - -const PRIMARY_COLOR = 0xff515B5D; - -const TRANSACTION_NO = 0; -const LANGUAGE_ID = 2; -const STAMP = '2020-04-27T12:17:17.721Z'; -const IP_ADDRESS = '9.9.9.9'; -const VERSION_ID = 6.7; -const CHANNEL = 9; -const SESSION_ID = 'BlUSkYymTt'; -const IS_LOGIN_FOR_DOCTOR_APP = true; -const PATIENT_OUT_SA = false; -const IS_DENTAL_ALLOWED_BACKEND = false; -const PATIENT_OUT_SA_PATIENT_REQ = 0; -const SETUP_ID = '91877'; -const GENERAL_ID = 'Cs2020@2016\$2958'; -const PATIENT_TYPE = 1; -const PATIENT_TYPE_ID = 1; +const BASE_URL = 'https://hmgwebservices.com/'; /// Timer Info @@ -452,10 +13,10 @@ const TIMER_MIN = 10; class AppGlobal { static var CONTEX; - static Color appRedColor = Color(0xFFD02127); - static Color appGreenColor = Color(0xFF359846); - static Color appTextColor = Color(0xFF2B353E); - static Color scheduleTextColor = Color(0xFF2E303A); - static Color inProgressColor = Color(0xFFCC9B14); + static Color appRedColor = const Color(0xFFD02127); + static Color appGreenColor = const Color(0xFF359846); + static Color appTextColor = const Color(0xFF2B353E); + static Color scheduleTextColor = const Color(0xFF2E303A); + static Color inProgressColor = const Color(0xFFCC9B14); } diff --git a/lib/header/app_header.dart b/lib/header/app_header.dart index e69de29..480dd39 100644 --- a/lib/header/app_header.dart +++ b/lib/header/app_header.dart @@ -0,0 +1,47 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_svg/flutter_svg.dart'; +import 'package:provider/provider.dart'; +import 'package:queuing_system/core/base/project_view_model.dart'; +import 'package:queuing_system/core/config/config.dart'; +import 'package:queuing_system/core/config/size_config.dart'; +import 'package:queuing_system/widget/data_display/app_texts_widget.dart'; + +class AppHeader extends StatelessWidget with PreferredSizeWidget { + @override + Widget build(BuildContext context) { + + return Container( + padding: const EdgeInsets.only( + left: 0, + right: 5, + bottom: 5, + ), + decoration: BoxDecoration( + color: AppGlobal.appRedColor + , + border: const Border(bottom: BorderSide(color: Color(0xFFEFEFEF)))), + child: Container( + padding: const EdgeInsets.only(left: 30, right: 50, bottom: 10,), + margin: EdgeInsets.only(top: SizeConfig.isHeightVeryShort ? 30 : 50), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + AppText( + " Current Serving", + letterSpacing: -2.48, + color: Colors.white, + + ), + SvgPicture.asset( "assets/images/hmglogo.svg", height: 120,), + ], + ), + ), + ); + } + + @override + Size get preferredSize => Size( + double.maxFinite, + 280); +} diff --git a/lib/home/home_screen.dart b/lib/home/home_screen.dart index 3cc43af..2e171be 100644 --- a/lib/home/home_screen.dart +++ b/lib/home/home_screen.dart @@ -1,6 +1,9 @@ import 'package:flutter/material.dart'; import 'package:queuing_system/core/base/app_scaffold_widget.dart'; +import 'package:queuing_system/header/app_header.dart'; +import 'package:queuing_system/home/que_item.dart'; import 'package:queuing_system/utils/signalR_utils.dart'; +import 'package:queuing_system/widget/data_display/app_texts_widget.dart'; class MyHomePage extends StatefulWidget { @@ -16,16 +19,12 @@ class _MyHomePageState extends State { Widget build(BuildContext context) { SignalRHelper signalRHelper= SignalRHelper(); return AppScaffold( - appBar: AppBar( - title: Text(widget.title), - ), + appBar: AppHeader(), body: Center( child: Column( mainAxisAlignment: MainAxisAlignment.center, - children: [ - Text( - signalRHelper.msg, - ), + children: const [ + QueItem(queNo: "OBG-T45", isFirstLine: true,), ], ), ), // This trailing comma makes auto-formatting nicer for build methods. diff --git a/lib/home/que_item.dart b/lib/home/que_item.dart index e69de29..8f8634c 100644 --- a/lib/home/que_item.dart +++ b/lib/home/que_item.dart @@ -0,0 +1,61 @@ +import 'package:flutter/cupertino.dart'; +import 'package:flutter_svg/flutter_svg.dart'; +import 'package:queuing_system/core/config/config.dart'; +import 'package:queuing_system/core/config/size_config.dart'; +import 'package:queuing_system/widget/data_display/app_texts_widget.dart'; + +class QueItem extends StatelessWidget { + const QueItem({ + Key key, + this.isFirstLine = false, + this.isSecondLine = false, + this.isInListLine = false, + this.queNo, + this.isNurseVisit = false, + this.idDoctorVisit = false, + }) : super(key: key); + final bool isFirstLine; + final bool isSecondLine; + final bool isInListLine; + final bool isNurseVisit; + final bool idDoctorVisit; + final String queNo; + + @override + Widget build(BuildContext context) { + return Column( + children: [ + AppText( + queNo, + fontSize: SizeConfig.getWidthMultiplier() * + (isFirstLine + ? 8 + : isSecondLine + ? 3.5 + : 3.2), + letterSpacing: -9.32, + fontWeight: FontWeight.bold, + ), + Row( + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + SvgPicture.asset(isNurseVisit + ? "assets/images/nurseicon.svg" + : "assets/images/doctoricon.svg", height:80 ,), + SizedBox(width: 10,), + AppText( + isNurseVisit ? "Please visit Nurse" : "Please visit doctor", + color: isNurseVisit + ? AppGlobal.appGreenColor + : AppGlobal.appRedColor, + fontSize: SizeConfig.getWidthMultiplier() * (2.5), + letterSpacing: -2.6, + fontWeight: FontWeight.w600, + ), + ], + ) + ], + ); + } +} diff --git a/lib/utils/signalR_utils.dart b/lib/utils/signalR_utils.dart index 7c10276..31e4f03 100644 --- a/lib/utils/signalR_utils.dart +++ b/lib/utils/signalR_utils.dart @@ -4,7 +4,7 @@ import 'package:signalr_core/signalr_core.dart'; class SignalRHelper{ String hubBaseURL =""; - String msg ="Elham"; + String msg ="Awaiting Patients Arrival"; HubConnection connection; SignalRHelper(){ connection = HubConnectionBuilder() diff --git a/lib/widget/data_display/app_texts_widget.dart b/lib/widget/data_display/app_texts_widget.dart index 90e5986..9708e36 100644 --- a/lib/widget/data_display/app_texts_widget.dart +++ b/lib/widget/data_display/app_texts_widget.dart @@ -300,7 +300,7 @@ class _AppTextState extends State { case "date": return 24.0; default: - return SizeConfig.textMultiplier * 2; + return SizeConfig.textMultiplier * 2.5; } } diff --git a/pubspec.yaml b/pubspec.yaml index f2656a8..446205c 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -69,32 +69,22 @@ flutter: uses-material-design: true # To add assets to your application, add an assets section, like this: - # assets: - # - images/a_dot_burr.jpeg - # - images/a_dot_ham.jpeg - - # An image asset can refer to one or more resolution-specific "variants", see - # https://flutter.dev/assets-and-images/#resolution-aware. - - # For details regarding adding assets from package dependencies, see - # https://flutter.dev/assets-and-images/#from-packages - - # To add custom fonts to your application, add a fonts section here, - # in this "flutter" section. Each entry in this list should have a - # "family" key with the font family name, and a "fonts" key with a - # list giving the asset and other descriptors for the font. For - # example: - # fonts: - # - family: Schyler - # fonts: - # - asset: fonts/Schyler-Regular.ttf - # - asset: fonts/Schyler-Italic.ttf - # style: italic - # - family: Trajan Pro - # fonts: - # - asset: fonts/TrajanPro.ttf - # - asset: fonts/TrajanPro_Bold.ttf - # weight: 700 - # - # For details regarding fonts from package dependencies, - # see https://flutter.dev/custom-fonts/#from-packages + assets: + - assets/images/ + + + fonts: + - family: Poppins + fonts: + - asset: assets/fonts/Poppins/Poppins-Regular.ttf + weight: 400 + - asset: assets/fonts/Poppins/Poppins-Medium.ttf + weight: 500 + - asset: assets/fonts/Poppins/Poppins-SemiBold.ttf + weight: 600 + - asset: assets/fonts/Poppins/Poppins-Bold.ttf + weight: 700 + - asset: assets/fonts/Poppins/Poppins-Bold.ttf + weight: 800 + - asset: assets/fonts/Poppins/Poppins-Bold.ttf + weight: 900