Commit Graph

2810 Commits (eefdb1fa3ec2ec1194b2ed92a263ebf691fd366d)

Author SHA1 Message Date
devamirsaleemahmad c1fd6313b1 changes 2 years ago
Sultan khan c63a1fadf5 code updated in-progress 2 years ago
Sultan khan 6a6ac76973 Merge branch 'dev_v3.13.6' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6 2 years ago
Sultan khan 8a42bf8b2f Merge branch 'dev_v3.13.6' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
#	lib/widgets/buttons/custom_text_button.dart
2 years ago
devamirsaleemahmad dfc6e86442 models updates -> 3.13.6 2 years ago
Sultan khan aa605a2e47 file updated 2 years ago
devamirsaleemahmad 1c19b36d2d models updates -> 3.13.6 2 years ago
devamirsaleemahmad b26f535749 models updates -> 3.13.6 2 years ago
devamirsaleemahmad 9c2948db29 models updates -> 3.13.6 2 years ago
devamirsaleemahmad 50816d452e Merge remote-tracking branch 'origin/dev_v3.13.6' into dev_v3.13.6 2 years ago
devamirsaleemahmad b3587688b8 models updates -> 3.13.6 2 years ago
Sultan khan 391331f508 code update in progress 2 years ago
devamirsaleemahmad 971bab465c models updates -> 3.13.6 2 years ago
devamirsaleemahmad 03d550936e models updates -> 3.13.6 2 years ago
devamirsaleemahmad cb56750e6b models updates -> 3.13.6 2 years ago
Sultan khan 04244675e1 code updated. 2 years ago
Sultan khan 6f8be66f42 Merge branch 'dev_v3.13.6' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6 2 years ago
devamirsaleemahmad 511c9788da models updates -> 3.13.6 2 years ago
devamirsaleemahmad 2a4059fd66 models updates -> 3.13.6 2 years ago
Sultan khan 1eb38b1dc4 Merge branch 'dev_v3.13.6' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6 2 years ago
devamirsaleemahmad 3523daa9fa updates -> 3.13.6 2 years ago
Faiz Hashmi 1492efdedb changes to build app 2 years ago
devamirsaleemahmad 6ff864c4cd updates -> 3.13.6 2 years ago
Sultan khan 8bf5479f56 code updated. 2 years ago
devamirsaleemahmad e8e7a726f5 updates -> 3.13.6 2 years ago
Sultan khan b45cbbcf29 updates 2 years ago
haroon amjad 7c804f77fb updates & fixes 2 years ago
haroon amjad dac842f50c fixes for inpatient advance 2 years ago
haroon amjad d11b12ac9a no message 2 years ago
haroon amjad c5e88ac7ba fixes 2 years ago
haroon amjad 645e266af8 Vida plus updates sent to stores 2 years ago
haroon amjad f0a4bd6925 Commented the CRs code 2 years ago
haroon amjad 3f6c05825d updates 2 years ago
haroon amjad 4e962bda07 Merge branch 'development_v3.3' into PatientApp_VIDA_Plus_3.3
# Conflicts:
#	lib/config/config.dart
#	lib/core/model/labs/request_send_lab_report_email.dart
#	lib/core/service/medical/ask_doctor_services.dart
#	lib/core/service/medical/labs_service.dart
#	lib/core/viewModels/medical/labs_view_model.dart
#	lib/pages/conference/web_rtc/call_home_page_.dart
#	lib/pages/medical/labs/laboratory_result_page.dart
#	lib/pages/medical/patient_sick_leave_page.dart
#	lib/pages/webRTC/call_page.dart
#	lib/pages/webRTC/signaling.dart
#	lib/services/appointment_services/GetDoctorsList.dart
#	lib/uitl/LocalNotification.dart
#	lib/uitl/SignalRUtil.dart
#	lib/uitl/utils.dart
#	lib/widgets/others/floating_button_search.dart
2 years ago
haroon amjad 0f4f98f31c fixes 2 years ago
haroon amjad af5b0766a2 CR 6654, Disable update manual insurance temporarily. 2 years ago
haroon amjad b2f390c19d CR 6204 implemented 2 years ago
haroon amjad 14928ad833 CR 6204 2 years ago
haroon amjad 34d3cf2945 CR 6204 Lab reports enhancements in progress 2 years ago
haroon amjad df610690d5 updates 2 years ago
haroon amjad e780df90e1 updates 2 years ago
haroon amjad d8e9f36844 updates 2 years ago
haroon amjad c0595a8dc6 updates 2 years ago
Sultan khan abcf82346e Excluded change 2 years ago
haroon amjad 31144c7c27 updates 2 years ago
haroon amjad 2048747a62 ancillary updates 2 years ago
haroon amjad 9ed454f67a Cash patient check implemented 2 years ago
haroon amjad 49963911ba Patient eligibility change 2 years ago
haroon amjad 4dd16bde59 Inpatient medical report fixes 2 years ago
haroon amjad a58e4452b8 ancillary changes 2 years ago
haroon amjad 38661621e3 updates & fixes 2 years ago
haroon amjad 6f20f1b871 InPatient Discharge Medications 2 years ago
haroon amjad 72ee34f9a7 Merge branch 'development_v3.3' into Dev_3.3_InPatient_CR
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/core/service/client/base_app_client.dart
#	lib/pages/insurance/AttachInsuranceCardImageDialog.dart
#	lib/uitl/translations_delegate_base.dart
2 years ago
haroon amjad 275c99a4ce updates 2 years ago
haroon amjad 0f863cd259 Updates & fixes 2 years ago
haroon amjad 652c19cdf8 updates 2 years ago
haroon amjad 5ddf8d4b7a View Dr response fix 2 years ago
haroon amjad 66600fe66c Medical report CR implemented 2 years ago
haroon amjad fb9a4d5297 Laser clinic changes 2 years ago
haroon amjad 6b121e7f39 Store build version 4.5.026 2 years ago
haroon amjad 75685b1f61 Project selection added in Laser & advance payment 2 years ago
haroon amjad e64a91855f fixes 2 years ago
haroon amjad 7702960bb5 InPatient medical report & view medical report commented out 2 years ago
haroon amjad 3642ca6a47 InPatient advance payment updates 2 years ago
haroon amjad 1300dadce1 Inpatient advance payment 2 years ago
haroon amjad 4a7ca9cd46 InPatient advance payment history implemented 2 years ago
haroon amjad 5c5ed35df8 Clinic & Doctor ID added 2 years ago
haroon amjad 2bf8d454f5 updates 2 years ago
haroon amjad c58e180c91 Updates 2 years ago
haroon amjad 965df33253 Appointment actions fixes 2 years ago
haroon amjad 7c68779324 Nphies integration 2 years ago
haroon amjad 3e63d80655 Ancillary order updates 2 years ago
haroon amjad ae0fca865d InPatient Advance payment API implemented 2 years ago
haroon amjad a9ae44ca89 Implemented checks for InPatient CR 2 years ago
haroon amjad 2455f48fe1 View medical report done 2 years ago
haroon amjad dd79b1dfca InPatient pending advance payment done 2 years ago
haroon amjad 4afdf5545e Translations added 2 years ago
haroon amjad d251ca0e1c Inpatient medical instructions implemented 2 years ago
haroon amjad 786dd76f57 updates 2 years ago
haroon amjad e4e3377c5c update 2 years ago
haroon amjad 3353c93de9 fixes 3 years ago
haroon amjad 44d8f0efe2 InPatient medical report contd. 3 years ago
haroon amjad da0a164b0e updates 3 years ago
haroon amjad a17b941c63 InPatient Medical Report continued 3 years ago
haroon amjad 9b3c07d3b1 Added AED in advance payment 3 years ago
haroon amjad 657248803f Ask doc disabled for LiveCare appointments 3 years ago
haroon amjad d261557cd7 Admitted patient API changed 3 years ago
haroon amjad ff23f3a8cb fixes 3 years ago
haroon amjad b2ec6c76bf ancillary fix 3 years ago
haroon amjad f624c70cee Merge branch 'development_v3.3' into Dev_3.3_InPatient_CR
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
3 years ago
haroon amjad b92e45aa93 Updates & fixes 3 years ago
haroon amjad a60f66a069 Updates 3 years ago
haroon amjad 3fb8876c31 Manual Insurance Card Update 3 years ago
haroon amjad fe606b7823 InPatient Advance Payment 3 years ago
haroon amjad 1eccaf0aac Regex added to allow characters only. 3 years ago
haroon amjad 1a45dd57e9 LiveCare Fix 3 years ago
haroon amjad 047877fb08 Add Doctor response rate comments validation 3 years ago
haroon amjad 20572f463a meal plan dev completed 3 years ago
Sultan khan 5d6b50a1da Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into development_v3.3 3 years ago
Sultan khan 83859e05f1 family file approve reject button refresh 3 years ago
haroon amjad 0e054429ef Meal Plan implementation completed 3 years ago
haroon amjad d9404d3abe Medical Report changes 3 years ago
haroon amjad bc27121c4e meal plan updates 3 years ago
haroon amjad 96f948a8c8 updates 3 years ago
haroon amjad 4b0a41d7d8 updates 3 years ago
haroon amjad 94296cec0d meal plan continued 3 years ago
haroon amjad 38648df897 Meal Plan development continued 3 years ago
haroon amjad d073eb9d5f MealPlan implementation continued 3 years ago
haroon amjad 77ab9373f8 Meal Plan APIs implementation continued 3 years ago
haroon amjad b337343df3 Project ID fix in ancillary orders 3 years ago
Sultan khan 27373b6972 doctor header. 3 years ago
Sultan khan 5e4ca336c2 Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into development_v3.3 3 years ago
Sultan khan 68f39d965c Merge branch 'sultan_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into development_v3.3
# Conflicts:
#	lib/widgets/new_design/doctor_header.dart
#	pubspec.yaml
3 years ago
haroon amjad 710e6274db mealplan updates 3 years ago
Sultan khan 0306c777ed rating bug fixed 3 years ago
haroon amjad 31d8443f87 insert call info updates 3 years ago
haroon amjad f2ab76eb24 updates 3 years ago
haroon amjad 9f44b25353 Meal Plan API integration in progress 3 years ago
haroon amjad 7bc105c6c7 updates 3 years ago
haroon amjad 12af8bb8a9 updates 3 years ago
haroon amjad 6877244d0e CR# 5805 Ask Doc Improvements dev completed. 3 years ago
haroon amjad 792b3ea249 no message 3 years ago
Sultan khan f29d33d7e7 Changes for voice command search 3 years ago
haroon amjad e4fe4baa27 nearest appo crash fixed 3 years ago
haroon amjad 3fda1da16a updates 3 years ago
haroon amjad 83ca5e8e4c ask doctor date param added 3 years ago
haroon amjad 58e598843b sickleave 3 years ago
haroon amjad 2d93b9753d Ask doctor improvements 3 years ago
haroon amjad f28fcbd006 AdvanceNumber_VP added 3 years ago
haroon amjad 17acae0a95 updates 3 years ago
haroon amjad 101f2dcab8 updates 3 years ago
haroon amjad 60d5ba4a9e Birth Notification implemented 3 years ago
haroon amjad 078482c21d updates 3 years ago
haroon amjad cf30762eec updates 3 years ago
haroon amjad 420aef3195 Updates 3 years ago
haroon amjad 2437d2da9c Updates 3 years ago
haroon amjad 01ee9a2710 Merge branch 'development_v3.3' into Dev_3.3_InPatient_CR
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
3 years ago
haroon amjad 77f3d0a238 radiology API fixes 3 years ago
haroon amjad e098705374 localized strings 3 years ago
haroon amjad 7280e2a1d7 Birth Notification UI Implemented 3 years ago
haroon amjad 17e7886907 VidaPlus Project changes 3 years ago
haroon amjad a7a06f4083 Home page change 3 years ago
haroon amjad b64ba9211e Inpatient services in dev 3 years ago
haroon amjad 906fd5fd6a Inpatient services in dev 3 years ago
haroon amjad 2fea4b2b07 Merge branch 'development_v3.3' into Dev_3.3_InPatient_CR
# Conflicts:
#	lib/config/config.dart
#	lib/pages/landing/fragments/home_page_fragment2.dart
#	lib/pages/landing/widgets/services_view.dart
3 years ago
haroon amjad 15c4f016df update to stores for version 10.5 3 years ago
haroon amjad 3675d05911 config changes 3 years ago
Sultan khan 0514fecae2 lab report email change 3 years ago
haroon amjad badc13d41a sickleave CR Enabled 3 years ago
Sultan khan 83c15196c8 VIDA PLUS CHANGE 3 years ago
Sultan khan ddcd0bb73c Merge branch 'development_v3.3' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into PatientApp_VIDA_Plus_3.3
# Conflicts:
#	lib/config/config.dart
#	lib/core/service/client/base_app_client.dart
#	lib/core/viewModels/pharmacyModule/PharmacyAddressesViewModel.dart
#	lib/pages/ErService/rapid-response-team/rrt-pickup-address-page.dart
#	lib/pages/feedback/send_feedback_page.dart
#	lib/uitl/LocalNotification.dart
#	lib/uitl/push-notification-handler.dart
#	lib/widgets/others/bottom_bar.dart
#	lib/widgets/others/floating_button_search.dart
#	pubspec.yaml
3 years ago
haroon amjad fcf0c589a0 Updates & fixes 3 years ago
haroon amjad b304332526 Patient app release to stores 10.4 3 years ago
haroon amjad 872095c51f Merge branch 'development_v3.3' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_v3.3 3 years ago
haroon amjad 5a741bf270 Sickleave changes 3 years ago
Sultan khan ad068d4f09 Merge branch 'development_v3.3' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_v3.3 3 years ago
Sultan khan d59e436a97 dubai arabic change 3 years ago
haroon amjad 907d05c3d0 register 3 years ago
haroon amjad 9d2df00d87 Get General instructions implemented 3 years ago
Sultan khan baec968ae0 Merge branch 'development_v3.3' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_v3.3
# Conflicts:
#	lib/pages/login/register-info.dart
3 years ago
Sultan khan c48f393f95 Dubai registration fixed 3 years ago
haroon amjad 0e4e285954 InPatient CR dev 3 years ago
haroon amjad 701eedf147 updates 3 years ago
haroon amjad 670991eca4 Lab result fix 3 years ago
haroon amjad e79454973c InPatient API 3 years ago
haroon amjad 9a7d0af6ea InPatient API implemented 3 years ago
haroon amjad af90ab3aa3 Sickleave & chart changes 3 years ago
haroon amjad 128bd2ec54 Inpatient services implementation 3 years ago
haroon amjad dc859b01f7 updates & fixes 3 years ago
haroon amjad dfc2889df7 dental reschedule fix 3 years ago
haroon amjad f45c5de526 Merge branch 'sultan_v3.3' into development_v3.3 3 years ago
Sultan khan 47702b5c01 Merge branch 'development_v3.3' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_v3.3
# Conflicts:
#	lib/config/config.dart
3 years ago
Sultan khan ea82219e9e Appointment logs 3 years ago
haroon amjad 6e9cc39269 Dental fixes 3 years ago
haroon amjad 1eed379889 Lab result flowchart fix 3 years ago
haroon amjad 62b9b3e35c calendar permission handled in iOS 3 years ago
haroon amjad e81a1b8bcc iOS Firebase fix 3 years ago
haroon amjad 63426a691d Ancillary orders family members issue resolved 3 years ago
haroon amjad 5045cc6faa Pharma LiveCare "IsPharmacy" Param added, Added Google API Availability check for Huawei devices 3 years ago
haroon amjad 3bc09f792a Pharma LiveCare fixes 3 years ago
haroon amjad bc8a979438 Upload to stores 3 years ago
haroon amjad a20d6c7c28 Livecare updates 3 years ago
haroon amjad 4ecab57173 Pharma LiveCare updates 3 years ago
haroon amjad da423fe12a Pharma LiveCare updates 3 years ago
haroon amjad f686013692 Pharma LiveCare updates 3 years ago
haroon amjad 4f50c3ff8e Pharmacy LiveCare revamped 3 years ago
haroon amjad 74b0acefd3 Updates & fixes 3 years ago
haroon amjad 8e14084467 updates 3 years ago
haroon amjad 98abc5a069 updates 3 years ago
Sultan khan 9683b3f42f Dubai Reminder fixed. 3 years ago
haroon amjad 6bdb7a3305 Updates & fixes 3 years ago
haroon amjad 0e01835327 Target SDK & Compile SDK bumped to 33 3 years ago
haroon amjad e50a67ea12 Vida Plus changes 3 years ago
haroon amjad 2e72d6a550 LiveCare contact added 3 years ago
haroon amjad aafdf3760d added sick leave status text & color 3 years ago
haroon amjad c8ec536267 Sickleave CR done 3 years ago
haroon amjad e5e5bb5352 Dental book appointment changes 3 years ago
haroon amjad 25af2c23ef Sick leave CR, LiveCare support call, Appo calendar changes 3 years ago
haroon amjad c289afb186 Opentok fixes 3 years ago
haroon amjad 22274ebbb0 updates & fixes 3 years ago
Zohaib Iqbal Kambrani 35b129fb68 migrated project to latest flutter sdk 3 years ago
haroon amjad 22a0e456bc Manual Insurance Updates, Service ID fixes, Tamara Fixes 3 years ago
haroon amjad 52070c8f94 Updates & fixes 3 years ago
haroon amjad e80ac2481a Ancillary order & manual insurance update 3 years ago
haroon amjad 442a94ac08 Updates & fixes 3 years ago
haroon amjad 3709ebcb32 Updates 3 years ago
haroon amjad f6191d9bf7 updates & fixes 3 years ago
haroon amjad 7ae4e7d616 updates & fixes 3 years ago
haroon amjad d75615a2eb Updates & fixes 3 years ago
haroon amjad e03412214e Ambulance request fixes 3 years ago
haroon amjad 106334c9cf updates & fixes 3 years ago
haroon amjad dfa88b7de7 Updates, fixes & release VersionID 9.1 3 years ago
haroon amjad 21cf9da900 HMS Core & LiveCare Schedule fixes 3 years ago
haroon amjad 58a6dc6a6f Tamara & Apple Pay Fixes + Other Updates 3 years ago
haroon amjad 8be9d3ae6e Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_v2.5 4 years ago
haroon amjad 833818e6e3 Rad & Lab email issues fixes 4 years ago
Zohaib Iqbal Kambrani 8c29b5f8e6 WebRTC or Opentok 4 years ago
Zohaib Iqbal Kambrani 8bd5a71318 Merge branch 'development_v2.5' into zik_webrtc_dev_v2.5
* development_v2.5:
  Timezone fixes & Activate/Deactivate file changes
  Updates
  Timezone Updates
  CMC Updates
  updates
  Updates
  Laser Male back image added
  Updates & fixes
  E-Cens sign off
  Analtyics at registration and liveacare payment fail
  analytics events update
  Analytics
  no message
  Updates & fixes
  ED Online Check-In
  Calendar fixes
  updates & fixes
  Analytics statements align to bottom of block
  Analytics for login registration
  updates

# Conflicts: Fixed
#	lib/analytics/flows/appointments.dart
4 years ago
Zohaib Iqbal Kambrani 1aabf08417 no message 4 years ago
haroon amjad 2ba744c3a6 Timezone fixes & Activate/Deactivate file changes 4 years ago
haroon amjad b756bf8caf Updates 4 years ago
haroon amjad 3896f02d13 Timezone Updates 4 years ago
haroon amjad ca43849d9d CMC Updates 4 years ago
haroon amjad 11529c65c5 updates 4 years ago
haroon amjad 4ba229c436 Updates 4 years ago
haroon amjad eb3f5b5cb5 Updates & fixes 4 years ago
Zohaib Iqbal Kambrani e615ca1a16 no message 4 years ago
haroon amjad 72654757c4 Merge branch 'development_v2.5' into 'zik_development_v2.5'
# Conflicts:
#   lib/pages/login/confirm-login.dart
4 years ago
haroon amjad 7018696328 E-Cens sign off 4 years ago
Zohaib Iqbal Kambrani a69e0da77d Merge branch 'development_v2.5' into zik_development_v2.5
* development_v2.5:
  analytics events update
4 years ago
Zohaib Iqbal Kambrani 7051b3ed63 Analtyics at registration and liveacare payment fail 4 years ago
haroon amjad 4cbccd8efb analytics events update 4 years ago
Zohaib Iqbal Kambrani 29c6841888 Analytics 4 years ago
Zohaib Iqbal Kambrani a01b8b82da no message 4 years ago
Zohaib Iqbal Kambrani 86363a15d6 Merge branch 'development_v2.5' into zik_development_v2.5
* development_v2.5:
  Updates & fixes
  ED Online Check-In
  Calendar fixes
  updates & fixes
4 years ago
Zohaib Iqbal Kambrani 5c32e488d0 no message 4 years ago
haroon amjad 3396b4253b Updates & fixes 4 years ago
Zohaib Iqbal Kambrani 6cd660184a no message 4 years ago
haroon amjad 8b7a6e7689 ED Online Check-In 4 years ago
Zohaib Iqbal Kambrani f42e2fb652 Revert "no message"
This reverts commit da7884ff61.
4 years ago
haroon amjad bbb99667f8 Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_v2.5 4 years ago
haroon amjad f9a733884d Calendar fixes 4 years ago
haroon amjad 27c6837f25 updates & fixes 4 years ago
Zohaib Iqbal Kambrani 1c6a62776c Analytics statements align to bottom of block 4 years ago
Zohaib Iqbal Kambrani 1523fd5ade Analytics for login registration 4 years ago
Zohaib Iqbal Kambrani da7884ff61 no message 4 years ago
haroon amjad f50bfda330 updates 4 years ago
Zohaib Iqbal Kambrani a0e619eec6 fixes 4 years ago
Zohaib Iqbal Kambrani 88b904a4b8 analytics changes 4 years ago
Zohaib Iqbal Kambrani fb4fb8d29e Merge branch 'development_v2.5' into zik_webrtc_dev_v2.5
* development_v2.5:
  Google analytics events update
  Updates
  Updates & fixes
  DateTime Fixes
  HHC Fixes
  updates & fixes
  Updates & fixes

# Conflicts:
#	lib/config/config.dart
#	lib/pages/landing/fragments/home_page_fragment2.dart
4 years ago