haroon amjad
|
7ed401fb1c
|
Riyal symbol update & sent to stores VersionID 17.8
|
11 months ago |
haroon amjad
|
f74a3301da
|
SAR new symbol integrated
|
11 months ago |
Sultan khan
|
08b4c8f86e
|
Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
# ios/Runner.xcodeproj/project.pbxproj
# lib/config/config.dart
# lib/core/viewModels/project_view_model.dart
# lib/main.dart
# lib/pages/BookAppointment/BookConfirm.dart
# lib/pages/landing/landing_page.dart
# lib/pages/livecare/widgets/LiveCareHistoryCard.dart
# lib/pages/medical/eye/ContactLensPage.dart
# lib/pages/medical/medical_profile_page_new.dart
# lib/uitl/LocalNotification.dart
# lib/uitl/gif_loader_dialog_utils.dart
# lib/widgets/Loader/gif_loader_container.dart
# lib/widgets/data_display/medical/time_line_new_widget.dart
# lib/widgets/drawer/app_drawer_widget.dart
# pubspec.yaml
|
2 years ago |
Sultan khan
|
a4ed832147
|
Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
# lib/config/config.dart
# lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart
# lib/pages/BookAppointment/BookSuccess.dart
# lib/pages/Covid-DriveThru/covid-payment-summary.dart
# lib/pages/ErService/AmbulanceRequestIndexPages/AmbulanceRequestIndex.dart
# lib/pages/ErService/AmbulanceRequestIndexPages/PickupLocation.dart
# lib/pages/ErService/AmbulanceRequestIndexPages/SelectTransportationMethod.dart
# lib/pages/ErService/AmbulanceRequestIndexPages/Summary.dart
# lib/pages/ErService/OrderLogPage.dart
# lib/pages/ErService/rapid-response-team/rrt-request-page.dart
# lib/pages/ToDoList/ToDo.dart
# lib/pages/livecare/widgets/clinic_list.dart
# lib/pages/medical/balance/confirm_payment_page.dart
# lib/services/payfort_services/payfort_service.dart
# lib/services/payfort_services/payfort_view_model.dart
# lib/splashPage.dart
# pubspec.yaml
|
2 years ago |
haroon amjad
|
a12558076f
|
Merge branch 'development_v3.3' into dev_3.3_AmbulanceRequestCR
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
|
2 years ago |
Sultan khan
|
30c14c2167
|
Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
# ios/Runner.xcodeproj/project.pbxproj
# ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
# lib/core/model/reports/Reports.dart
# lib/core/service/client/base_app_client.dart
# lib/core/viewModels/medical/ask_doctor_view_model.dart
# lib/pages/BookAppointment/BookConfirm.dart
# lib/pages/BookAppointment/BookSuccess.dart
# lib/pages/BookAppointment/DoctorProfile.dart
# lib/pages/BookAppointment/QRCode.dart
# lib/pages/Covid-DriveThru/Covid-TimeSlots.dart
# lib/pages/DrawerPages/family/my-family.dart
# lib/pages/MyAppointments/AppointmentDetails.dart
# lib/pages/MyAppointments/MyAppointments.dart
# lib/pages/MyAppointments/widgets/PrescriptionReport.dart
# lib/pages/ToDoList/ObGyne/ObGyne-TimeSlots.dart
# lib/pages/ToDoList/ToDo.dart
# lib/pages/medical/eye/EyeHomePage.dart
# lib/pages/medical/reports/report_list_widget.dart
# lib/services/appointment_services/GetDoctorsList.dart
# lib/uitl/location_util.dart
# lib/uitl/utils.dart
# lib/widgets/drawer/app_drawer_widget.dart
# pubspec.yaml
|
2 years ago |
haroon amjad
|
e5d8505c2d
|
Updates & fixes
|
2 years ago |
haroon amjad
|
a0bca92195
|
CR Implemented
|
2 years ago |
Sultan khan
|
8c46d2577d
|
updated with assets
|
2 years ago |
Sultan khan
|
4d52f639aa
|
Merge branch 'dev_v3.13.6' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
# lib/pages/livecare/live_care_payment_page.dart
# lib/pages/medical/smart_watch_health_data/steps/stepsTracker.dart
# lib/pages/medical/vital_sign/vital_sign_details_screen.dart
# lib/pages/medical/vital_sign/vital_sign_item_details_screen.dart
# lib/pages/medical/vital_sign/vital_sing_chart_and_detials.dart
# lib/pages/medical/vital_sign/vital_sing_chart_blood_pressure.dart
|
2 years ago |
Sultan khan
|
0c534cffae
|
code update in progress
|
2 years ago |
devamirsaleemahmad
|
2c9e51aef0
|
changes
|
2 years ago |
devamirsaleemahmad
|
49d3df8c87
|
changes
|
2 years ago |
devamirsaleemahmad
|
1c19b36d2d
|
models updates -> 3.13.6
|
2 years ago |
devamirsaleemahmad
|
cb56750e6b
|
models updates -> 3.13.6
|
2 years ago |
haroon amjad
|
0e01835327
|
Target SDK & Compile SDK bumped to 33
|
3 years ago |
haroon amjad
|
d75615a2eb
|
Updates & fixes
|
3 years ago |
haroon amjad
|
dfa88b7de7
|
Updates, fixes & release VersionID 9.1
|
3 years ago |
haroon amjad
|
8d988ba994
|
updates & fixes
|
4 years ago |
haroon amjad
|
4ba37d342c
|
RRT Updates
|
4 years ago |
Sikander Saleem
|
e3bf988df5
|
map picker, firebase improvement and changes for v2.5
|
4 years ago |
haroon amjad
|
894cc0e336
|
Updates & fixes
|
4 years ago |
haroon amjad
|
72784f68b9
|
Fixes & updates
|
4 years ago |
haroon amjad
|
1fff2dad25
|
Smartwatch updates
|
4 years ago |
Mirza.Shafique
|
0ba4e9047b
|
design fixes 1.0
|
4 years ago |
haroon amjad
|
5f963b0327
|
Translation updates, CMC, HHC & RRT APIs updates
|
4 years ago |
haroon amjad
|
259581c4f8
|
updates & fixes
|
4 years ago |
Sultan Khan
|
2c1d7c511e
|
family file changes
|
4 years ago |
Sultan Khan
|
1b387c2dbf
|
changes pushed
|
4 years ago |
Sultan Khan
|
76e16594ba
|
FAMILY FILES
|
4 years ago |
Sultan Khan
|
fee23de1fd
|
hhc changes
|
4 years ago |
haroon amjad
|
f6d779431a
|
fixes
|
4 years ago |
Sultan Khan
|
5fe0214e04
|
bug fixes
|
4 years ago |
Sultan Khan
|
5b988dff4f
|
BUG FIXES
|
4 years ago |
Sultan Khan
|
fc9f2fc34e
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design
|
4 years ago |
Sultan Khan
|
08933632d3
|
tracker services done rrt in progress
|
4 years ago |
haroon amjad
|
46d800c0c6
|
UI updates & fixes
|
4 years ago |
haroon amjad
|
92bfe27a6e
|
updates & fixes
|
4 years ago |
haroon amjad
|
7467da7409
|
Imports organized
|
4 years ago |
haroon amjad
|
4469ae1209
|
updates & fixes
|
4 years ago |
Zohaib Iqbal Kambrani
|
429fcb1e60
|
Merge branch 'development' into ZohaibIqbalKambrani
* development: (32 commits)
changes
package name changed
Jira Fixes
Jira fixes
PAP-664
PAP-664
PAP-664
langauge issue
bug fix
PAP-777
PAP-729
fix button
fix translate issues
CONFIG
PAP-715 : Y –axis and X –axis values should be display in the yearly graph details.
bug fixes
fix bugs
fixing dashboard issue
fixing dashboard issue
jira bugs
...
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/core/service/client/base_app_client.dart
# lib/uitl/translations_delegate_base.dart
# lib/uitl/utils.dart
|
5 years ago |
Zohaib Iqbal Kambrani
|
10a147860c
|
no message
|
5 years ago |
Zohaib Iqbal Kambrani
|
bf303a7be0
|
RRT Implementation
|
5 years ago |
Zohaib Iqbal Kambrani
|
e4256d6874
|
RRT in progress (Service implementations)
|
5 years ago |
Zohaib Iqbal Kambrani
|
4da163d186
|
RRT in progress in stage
|
5 years ago |