 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
|
df610690d5
|
updates
|
2 years ago |
|
haroon amjad
|
d8e9f36844
|
updates
|
2 years ago |
|
haroon amjad
|
c0595a8dc6
|
updates
|
2 years ago |
|
haroon amjad
|
31144c7c27
|
updates
|
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
|
6b121e7f39
|
Store build version 4.5.026
|
2 years ago |
|
haroon amjad
|
e64a91855f
|
fixes
|
2 years ago |
|
haroon amjad
|
c58e180c91
|
Updates
|
2 years ago |
|
haroon amjad
|
7c68779324
|
Nphies integration
|
2 years ago |
|
haroon amjad
|
ae0fca865d
|
InPatient Advance payment API implemented
|
2 years ago |
|
haroon amjad
|
da0a164b0e
|
updates
|
2 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
|
2 years ago |
|
haroon amjad
|
b92e45aa93
|
Updates & fixes
|
2 years ago |
|
haroon amjad
|
a60f66a069
|
Updates
|
2 years ago |
|
haroon amjad
|
3fb8876c31
|
Manual Insurance Card Update
|
2 years ago |
|
haroon amjad
|
96f948a8c8
|
updates
|
2 years ago |
|
haroon amjad
|
38648df897
|
Meal Plan development continued
|
2 years ago |
Sultan khan
|
27373b6972
|
doctor header.
|
2 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
|
2 years ago |
|
Sultan khan
|
0306c777ed
|
rating bug fixed
|
2 years ago |
|
Sultan khan
|
f29d33d7e7
|
Changes for voice command search
|
2 years ago |
|
haroon amjad
|
2d93b9753d
|
Ask doctor improvements
|
2 years ago |
|
haroon amjad
|
60d5ba4a9e
|
Birth Notification implemented
|
2 years ago |
|
haroon amjad
|
2437d2da9c
|
Updates
|
2 years ago |
|
haroon amjad
|
7280e2a1d7
|
Birth Notification UI Implemented
|
2 years ago |
|
haroon amjad
|
17e7886907
|
VidaPlus Project changes
|
2 years ago |
|
haroon amjad
|
906fd5fd6a
|
Inpatient services in dev
|
2 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
|
2 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
|
2 years ago |
|
haroon amjad
|
b304332526
|
Patient app release to stores 10.4
|
3 years ago |
|
haroon amjad
|
5a741bf270
|
Sickleave changes
|
3 years ago |
|
haroon amjad
|
9d2df00d87
|
Get General instructions implemented
|
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
|
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
|
1eed379889
|
Lab result flowchart 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
|
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
|
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 |
|
haroon amjad
|
0e01835327
|
Target SDK & Compile SDK bumped to 33
|
3 years ago |
|
haroon amjad
|
aafdf3760d
|
added sick leave status text & color
|
3 years ago |
|
haroon amjad
|
25af2c23ef
|
Sick leave CR, LiveCare support call, Appo calendar changes
|
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
|
e80ac2481a
|
Ancillary order & manual insurance update
|
3 years ago |
|
haroon amjad
|
442a94ac08
|
Updates & fixes
|
3 years ago |
|
haroon amjad
|
f6191d9bf7
|
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 |
|
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
|
3 years ago |
|
haroon amjad
|
2ba744c3a6
|
Timezone fixes & Activate/Deactivate file changes
|
3 years ago |
|
haroon amjad
|
b756bf8caf
|
Updates
|
3 years ago |
|
haroon amjad
|
3896f02d13
|
Timezone Updates
|
3 years ago |
|
haroon amjad
|
ca43849d9d
|
CMC Updates
|
3 years ago |
|
haroon amjad
|
11529c65c5
|
updates
|
3 years ago |
|
haroon amjad
|
4ba229c436
|
Updates
|
3 years ago |
|
Zohaib Iqbal Kambrani
|
e615ca1a16
|
no message
|
3 years ago |
|
haroon amjad
|
7018696328
|
E-Cens sign off
|
3 years ago |
|
haroon amjad
|
3396b4253b
|
Updates & fixes
|
3 years ago |
|
haroon amjad
|
8b7a6e7689
|
ED Online Check-In
|
3 years ago |
|
Zohaib Iqbal Kambrani
|
1c6a62776c
|
Analytics statements align to bottom of block
|
3 years ago |
|
Zohaib Iqbal Kambrani
|
88b904a4b8
|
analytics changes
|
3 years ago |
|
Zohaib Iqbal Kambrani
|
8a95daff7c
|
Google analytics events update
|
3 years ago |
|
haroon amjad
|
1faf27959a
|
Updates
|
3 years ago |
|
haroon amjad
|
9057a96d7f
|
Updates & fixes
|
3 years ago |
|
haroon amjad
|
842e099953
|
DateTime Fixes
|
3 years ago |
|
haroon amjad
|
a9e48e487f
|
HHC Fixes
|
3 years ago |
|
haroon amjad
|
f1129cc14c
|
updates & fixes
|
3 years ago |
|
haroon amjad
|
fd96869d89
|
Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_v2.5
# Conflicts:
# lib/pages/landing/fragments/home_page_fragment2.dart
|
3 years ago |
|
haroon amjad
|
c3538ebdb6
|
Updates & fixes
|
3 years ago |
|
Zohaib Iqbal Kambrani
|
94a99a911e
|
Offer And Packages (View Only)
|
3 years ago |
|
haroon amjad
|
8d988ba994
|
updates & fixes
|
4 years ago |
|
haroon amjad
|
4ba37d342c
|
RRT Updates
|
4 years ago |
|
haroon amjad
|
72e5d0a2be
|
Pharma LiveCare
|
4 years ago |
|
haroon amjad
|
aae48f2555
|
Android permission dialog updates
|
4 years ago |
|
haroon amjad
|
887303fcde
|
updates
|
4 years ago |
 Sikander Saleem
|
27d0d80017
|
Merge branch 'development_v2.5' into sikander_family_profile_switch
# Conflicts:
# lib/pages/DrawerPages/family/my-family.dart
# lib/widgets/drawer/app_drawer_widget.dart
|
4 years ago |
|
Sikander Saleem
|
1b82146303
|
my family switch profile on dashboard.
|
4 years ago |
|
haroon amjad
|
d344169399
|
Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_v2.5
# Conflicts:
# lib/pages/BookAppointment/BookSuccess.dart
|
4 years ago |
|
haroon amjad
|
a918d409fb
|
updates & fixes
|
4 years ago |
|
Zohaib Iqbal Kambrani
|
99bdd25bd3
|
added more analytics logs
|
4 years ago |
|
haroon amjad
|
60a44f9a42
|
OpenTok fixes
|
4 years ago |
|
haroon amjad
|
32edb2e71e
|
updates
|
4 years ago |
|
Zohaib Iqbal Kambrani
|
936b7c28f9
|
Merge branch 'development_v2.5' into zik_new_design_flutter_v2.5
* development_v2.5:
Covid updates & other fixes
# Conflicts: Resolved
# lib/config/config.dart
# lib/pages/webRTC/signaling.dart
# lib/widgets/drawer/app_drawer_widget.dart
# lib/widgets/in_app_browser/InAppBrowser.dart
|
4 years ago |
|
haroon amjad
|
927db41068
|
Covid updates & other fixes
|
4 years ago |
|
Zohaib Iqbal Kambrani
|
a398220033
|
no message
|
4 years ago |
|
Zohaib Iqbal Kambrani
|
a26b17f52d
|
Merge branch 'development_v2.5' into zik_new_design_flutter_v2.5
* development_v2.5:
Translation fixes
OBGyne updates
updates
OB Gyne appo updates
no message
updates & fixes
no message
no message
Ancillary Orders completed
updates & fixes
# Conflicts: Resolved
# lib/pages/BookAppointment/widgets/DentalComplaintCard.dart
# lib/widgets/drawer/app_drawer_widget.dart
|
4 years ago |
|
Zohaib Iqbal Kambrani
|
a8e1ba6b86
|
no message
|
4 years ago |
|
haroon amjad
|
4b4ac4819f
|
no message
|
4 years ago |
|
haroon amjad
|
3eb7a4325b
|
updates & fixes
|
4 years ago |
Zohaib Iqbal
|
364ff3344a
|
Merge branch 'development_v2.5' into 'zik_new_design_flutter_v2.5'
# Conflicts:
# lib/pages/BookAppointment/QRCode.dart
# lib/pages/login/register-info.dart
# lib/pages/medical/balance/confirm_payment_page.dart
|
4 years ago |
|
Zohaib Iqbal Kambrani
|
940a19d4d7
|
Merge branch 'zik_new_design_flutter_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into zik_new_design_flutter_v2.5
* 'zik_new_design_flutter_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter:
ancillary orders update
Updates & fixes
fix category issue
fixes & updates
lakum fix
Updates & fixes
fix translation issue
Compare duplication fixed
Updates & fixes
Updates & fixes
fix compare issue
pharmacy fixes
fix categories & cantact design
pharmacy fixes
Updates & fixes
fix conflict
Updates & fixes
Updates & fixes
Login fixes
# Conflicts: Resolved
# lib/pages/BookAppointment/QRCode.dart
# lib/pages/BookAppointment/SearchResults.dart
|
4 years ago |
|
Zohaib Iqbal Kambrani
|
d974a7430c
|
Google Analytics as per e-Cense document
|
4 years ago |
|
haroon amjad
|
efced34ffa
|
Updates
|
4 years ago |
|
haroon amjad
|
19dadd2b35
|
Merge branch 'development_v2.5' into haroon_development_2.5
|
4 years ago |
|
haroon amjad
|
a6c6651363
|
Updates & fixes
|
4 years ago |
|
Zohaib Iqbal
|
259e27d4a7
|
Merge branch 'development_v2.5' into 'zik_new_design_flutter_v2.5'
# Conflicts:
# lib/pages/landing/fragments/home_page_fragment2.dart
# lib/uitl/app_shared_preferences.dart
# lib/widgets/in_app_browser/InAppBrowser.dart
|
4 years ago |
|
Zohaib Iqbal Kambrani
|
ab8b62bc3a
|
Packages and offers fixes, HMG Internet work in progress,
|
4 years ago |
|
haroon amjad
|
4acdad0e99
|
fixes & updates
|
4 years ago |
|
haroon amjad
|
40d649dfa4
|
Updates & fixes
|
4 years ago |
Fatimah Alshammari
|
7634c35e3d
|
Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima_v2
# Conflicts:
# lib/widgets/input/text_field.dart
|
4 years ago |
|
Fatimah Alshammari
|
d7c3cb3dbc
|
fix conflict
|
4 years ago |
|
haroon amjad
|
c2b0326676
|
Updates & fixes
|
4 years ago |
|
Sikander Saleem
|
c8b5602d8e
|
flutter 2.8 improvements.
|
4 years ago |
|
Sikander Saleem
|
684add0090
|
merge improvements
|
4 years ago |
|
Sikander Saleem
|
9ba7b3b44b
|
Merge branch 'development_new_design_2.0' into development_v2.5
# Conflicts:
# lib/pages/BookAppointment/BookConfirm.dart
# lib/pages/medical/smart_watch_health_data/syncHealthData.dart
# lib/pages/vaccine/my_vaccines_screen.dart
# lib/widgets/in_app_browser/InAppBrowser.dart
# pubspec.yaml
|
4 years ago |
|
haroon amjad
|
4c2410cfd5
|
Health plugin updated
|
4 years ago |
|
haroon amjad
|
9c0337aa01
|
updates & fixes
|
4 years ago |
|
haroon amjad
|
330f2d6c86
|
Fixes & updates
|
4 years ago |
|
Sikander Saleem
|
2a92478d01
|
nfc plugin improvement.
|
4 years ago |
|
haroon amjad
|
d5b58c07ca
|
Smartwatch fixes
|
4 years ago |
|
Sikander Saleem
|
628439ddf8
|
video call camera view issue fix, barcode plugin change, smart watches improvements.
|
4 years ago |
|
haroon amjad
|
bb9aaf9945
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/pages/pharmacies/screens/product-details/availability_info.dart
|
4 years ago |
|
haroon amjad
|
207525e31a
|
Fixes
|
4 years ago |
|
Fatimah Alshammari
|
749b89b67d
|
fix issue
|
4 years ago |
|
haroon amjad
|
94aab4a737
|
Speech to text fix in iOS
|
4 years ago |
|
Fatimah Alshammari
|
a1b4e1c8a3
|
Merge branch 'development_new_design_2.0' into Fatima-New-Design
|
4 years ago |
|
Fatimah Alshammari
|
7ffb431454
|
added map luncher
|
4 years ago |
|
haroon amjad
|
302e9dbadd
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
|
Fatimah Alshammari
|
1b9e3b75bd
|
fix issue of navigation
|
4 years ago |
|
Sikander Saleem
|
e3bf988df5
|
map picker, firebase improvement and changes for v2.5
|
4 years ago |
|
Fatimah Alshammari
|
a55ca33c1b
|
Merge branch 'development_new_design_2.0' into Fatima-New-Design
# Conflicts:
# lib/pages/search_products_page.dart
# lib/widgets/pharmacy/product_tile.dart
|
4 years ago |
|
Fatimah Alshammari
|
bc9fc5a878
|
fix issue
|
4 years ago |
|
haroon amjad
|
eb64962d7c
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
|
haroon amjad
|
b0ae08d6a5
|
updates & fixes
|
4 years ago |
Elham Rababh
|
16c1064a45
|
PMAU-19
|
4 years ago |
|
Elham Rababh
|
8f044a635a
|
fix footer design
|
4 years ago |
haroon amjad
|
14b0c4c125
|
Merge branch 'products_tails' into 'development_new_design_2.0'
fix on design
See merge request Cloud_Solution/diplomatic-quarter!550
|
4 years ago |
|
haroon amjad
|
75423e5501
|
Updates
|
4 years ago |
|
Elham Rababh
|
d6eeb02c91
|
fix on design
|
4 years ago |
|
haroon amjad
|
d1fcdcc898
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/config/localized_values.dart
|
4 years ago |
hussam al-habibeh
|
141e650276
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hussam_pharmacy_fix
Conflicts:
lib/pages/pharmacies/screens/product-details/product-name-and-price.dart
|
4 years ago |
|
haroon amjad
|
cf27c3e796
|
Incoming call & LiveCare pending UI revamped
|
4 years ago |
|
Elham Rababh
|
c6be53d800
|
first step from product details
|
4 years ago |