mosazaid
|
f5d478fd27
|
re-design child vaccine and fix some funcrionalities
|
5 years ago |
Mohammad Aljammal
|
de1b7cc1d0
|
fix merge issues
|
5 years ago |
Mohammad Aljammal
|
aa89a05f1d
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter
Conflicts:
ios/Flutter/.last_build_id
lib/config/config.dart
lib/config/localized_values.dart
lib/config/shared_pref_kay.dart
lib/core/service/client/base_app_client.dart
lib/core/service/medical/prescriptions_service.dart
lib/core/viewModels/project_view_model.dart
lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
lib/pages/BookAppointment/BookConfirm.dart
lib/pages/BookAppointment/DoctorProfile.dart
lib/pages/DrawerPages/family/my-family.dart
lib/pages/MyAppointments/MyAppointments.dart
lib/pages/MyAppointments/models/ArrivedButtons.dart
lib/pages/MyAppointments/widgets/AppointmentActions.dart
lib/pages/MyAppointments/widgets/AppointmentCardView.dart
lib/pages/ToDoList/ToDo.dart
lib/pages/feedback/send_feedback_page.dart
lib/pages/insurance/insurance_approval_screen.dart
lib/pages/insurance/insurance_card_screen.dart
lib/pages/landing/home_page.dart
lib/pages/landing/landing_page.dart
lib/pages/login/confirm-login.dart
lib/pages/login/login.dart
lib/pages/medical/balance/my_balance_page.dart
lib/pages/medical/labs/laboratory_result_page.dart
lib/pages/medical/labs/labs_home_page.dart
lib/pages/medical/medical_profile_page.dart
lib/pages/medical/patient_sick_leave_page.dart
lib/pages/medical/prescriptions/prescription_details_page.dart
lib/pages/medical/prescriptions/prescription_items_page.dart
lib/pages/medical/radiology/radiology_details_page.dart
lib/pages/medical/radiology/radiology_home_page.dart
lib/pages/medical/reports/report_home_page.dart
lib/pages/medical/reports/reports_page.dart
lib/pages/pharmacies/pharmacies_list_screen.dart
lib/pages/settings/profile_setting.dart
lib/services/authentication/auth_provider.dart
lib/uitl/translations_delegate_base.dart
lib/widgets/buttons/floatingActionButton.dart
lib/widgets/data_display/medical/LabResult/LabResultWidget.dart
lib/widgets/data_display/medical/LabResult/laboratory_result_widget.dart
lib/widgets/data_display/medical/doctor_card.dart
lib/widgets/drawer/app_drawer_widget.dart
lib/widgets/others/app_scaffold_widget.dart
|
5 years ago |
Mohammad Aljammal
|
f38f53587b
|
fix issues
|
5 years ago |
Haroon Amjad
|
b9269f525a
|
hot fixes
|
5 years ago |
Mohammad Aljammal
|
08aa2de69b
|
fix Prescriptions Service and design issues
|
5 years ago |
Mohammad Aljammal
|
4d203c8a5b
|
fix LabResult
|
5 years ago |
Zohaib Kambrani
|
27182ee8db
|
no message
|
5 years ago |
haroon amjad
|
b89c1f03b3
|
language translation fixes
|
5 years ago |
mosazaid
|
d1ac4080ca
|
working on pharmacy home page
|
5 years ago |
jammal
|
9328f942ba
|
done ER service
|
5 years ago |
Mohammad Aljammal
|
3ffff9686d
|
Done allergies service
|
5 years ago |
Mohammad Aljammal
|
82c2577d36
|
Done ask doctor service
|
5 years ago |
Mohammad Aljammal
|
c01e6095f2
|
done my trackers
|
5 years ago |
haroon amjad
|
73cf37a3a5
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
# lib/core/service/client/base_app_client.dart
|
5 years ago |
Mohammad Aljammal
|
32e2732c43
|
feedback service
|
5 years ago |
haroon amjad
|
750746aabe
|
updates & fixes
|
6 years ago |
Mohammad Aljammal
|
d093ecd5e6
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into vital_sign
Conflicts:
ios/Podfile
ios/Runner.xcodeproj/project.pbxproj
lib/config/config.dart
lib/uitl/translations_delegate_base.dart
|
6 years ago |
Mohammad Aljammal
|
a1fa2c0727
|
done vital sign
|
6 years ago |
haroon amjad
|
7d0efda1c4
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
# android/app/src/main/AndroidManifest.xml
# lib/config/localized_values.dart
# lib/core/service/client/base_app_client.dart
# lib/pages/landing/landing_page.dart
# lib/pages/login/confirm-login.dart
# lib/pages/medical/medical_profile_page.dart
# lib/services/authentication/auth_provider.dart
# lib/uitl/translations_delegate_base.dart
# pubspec.yaml
|
6 years ago |
Mohammad Aljammal
|
a84341af58
|
fix merge issues
|
6 years ago |
Mohammad Aljammal
|
5ea0df9f1e
|
Merge remote-tracking branch 'origin/sultan' into sultan
# Conflicts:
# lib/uitl/date_uitl.dart
|
6 years ago |
Sultan Khan
|
e735855c33
|
registration done.
|
6 years ago |
Mohammad Aljammal
|
940b327561
|
done Prescriptions
|
6 years ago |
haroon amjad
|
049d455e3c
|
Implementing appointment details functions
|
6 years ago |
haroon amjad
|
9842c3a0b1
|
Translation updates
|
6 years ago |
Mohammad Aljammal
|
3ed5c3878f
|
init project structure By Mohammad and Elham
|
6 years ago |