Commit Graph

1465 Commits (2669378da422bbfc4975f9d764a2231a88d31f2e)

Author SHA1 Message Date
Mirza.Shafique 24b7a8a4c4 Merge branch 'mirza_home_page' into development_new_design_2.0 3 years ago
Sikander Saleem 6c8f1c6185 merge improvement. 3 years ago
Mirza.Shafique cbadcd5feb Vital Sings Detail Page 1.0 3 years ago
Sikander Saleem 197e7d5742 Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/medical/patient_sick_leave_page.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/uitl/utils.dart
3 years ago
Elham Rababh f85c359cf4 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into foote_in_all_pages
 Conflicts:
	lib/pages/landing/landing_page.dart
3 years ago
Elham Rababh d028ce22dc remove unused code 3 years ago
hussam al-habibeh fe83b91602 body fat texfield fix 3 years ago
Elham Rababh 69df61afb1 remove footer from pharmacy pages 3 years ago
Mirza.Shafique e91cf4762a Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0 3 years ago
Mirza.Shafique d865e97ce1 Vital Sings Home Page 3 years ago
Sikander Saleem b3fd1cb93d lab result detail flow chart screen & improvement. 3 years ago
hussam al-habibeh 864f849425 Baby age in ovulation period 3 years ago
Fatimah Alshammari 787b55a803 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
# Conflicts:
#	lib/pages/medical/my_trackers/blood_pressure/AddBloodPressurePage.dart
#	lib/uitl/translations_delegate_base.dart
3 years ago
Fatimah Alshammari 34ccb132dc fixed issues 3 years ago
Mohammad Aljammal d9fabbab17 Fix feedback 3 years ago
Fatimah Alshammari 74d0826342 fixed issues 3 years ago
Sultan khan 04a68c5bd3 Merge branch 'sultan-patientapp' into 'development'
Sultan patientapp

See merge request Cloud_Solution/diplomatic-quarter!358
3 years ago
Sultan khan b8d75b5604 Merge branch 'blood_pressure' into 'development'
add blood pressure translation issue

See merge request Cloud_Solution/diplomatic-quarter!356
3 years ago
Sultan khan 6a0acd8afb Merge branch 'fix-bugs' into 'development'
Fix bugs

See merge request Cloud_Solution/diplomatic-quarter!355
3 years ago
Sultan Khan 5b656b0b51 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 3 years ago
Sultan Khan 9610ff640e feedback changes 3 years ago
haroon amjad cbbef80bd5 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
3 years ago
haroon amjad eadba3f767 Working on livecare appointment booking page 3 years ago
hussam al-habibeh b9d4195e20 Blood pressure translation issue 3 years ago
hussam al-habibeh 9c6f83600b Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into blood_pressure
 Conflicts:
	lib/pages/medical/my_trackers/blood_pressure/AddBloodPressurePage.dart
3 years ago
mosazaid 3077624c58 fix bugs 3 years ago
Sultan khan 3c2a89cd8e Merge branch 'Aug_fixes' into 'development'
fix issues related to wight and  sugar blood

See merge request Cloud_Solution/diplomatic-quarter!354
3 years ago
Sultan khan cd56881d7a Merge branch 'pharmacy-bugs' into 'development'
hide Covid19-driveThrow for patient out of KSA

See merge request Cloud_Solution/diplomatic-quarter!353
3 years ago
Sultan khan 8eb67791ca Merge branch 'fatima-new' into 'development'
Fatima new

See merge request Cloud_Solution/diplomatic-quarter!349
3 years ago
Elham Rababh 8629b62fcb fix issue 3 years ago
Elham Rababh 1568698b98 fix issues related to wight and sugar blood 3 years ago
Sikander Saleem 6ee56cba0d Merge branch 'login_design_sikander' into development_new_design_2.0
# Conflicts:
#	lib/widgets/data_display/medical/doctor_card.dart
#	lib/widgets/new_design/doctor_header.dart
3 years ago
Sikander Saleem bb20d65b40 lab result detail screen. 3 years ago
Mirza.Shafique 66efbc1bac Radiology Implementation 3 years ago
hussam al-habibeh 8f5fef87e9 add blood pressure translation issue 3 years ago
Mirza.Shafique 26c30038c9 Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0 3 years ago
Mirza.Shafique 29fd552874 Weight, height and blood pressure on Home Page 3 years ago
Sikander Saleem 35b5d38b82 Merge branch 'login_design_sikander' into development_new_design_2.0 3 years ago
Sikander Saleem 3a1af590ff lab result detail screen (cont.) 3 years ago
hussam al-habibeh a33a6b0b2f push request after conflict resolve 3 years ago
hussam al-habibeh 0a3c44b5e8 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into medication_availability
 Conflicts:
	lib/config/localized_values.dart
	lib/uitl/translations_delegate_base.dart
3 years ago
hussam al-habibeh 352cda4c70 hide Covid19-driveThrow for patient out of KSA 3 years ago
Elham Rababh 8626b4f269 first step from add footer for all pages 3 years ago
haroon amjad 5c8e9f4e19 Merge branch 'Haroon' into 'development'
Haroon

See merge request Cloud_Solution/diplomatic-quarter!352
3 years ago
haroon amjad 2242b78116 Merge branch 'development' into Haroon
# Conflicts:
#	lib/config/config.dart
3 years ago
haroon amjad e28fdaade1 Dental Invoices implementation completed 3 years ago
Zohaib Iqbal Kambrani c215b22cf7 Merge branch 'development' into ZohaibIqbalKambrani
* development:
  fixes
  registration
3 years ago
Zohaib Iqbal Kambrani f442cc251c Pre Post Images Dental Doctor Profile 3 years ago
Mirza.Shafique 876463c945 Home Page Font weight 3 years ago
Sikander Saleem d1b45c8bcc Merge branch 'login_design_sikander' into development_new_design_2.0 3 years ago
Mirza.Shafique 85c759a4a5 Merge branch 'mirza_home_page' into development_new_design_2.0 3 years ago
Sikander Saleem 5b778f0493 appointment ui (cont.) & improvement. 3 years ago
Sultan Khan 1586f02542 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 3 years ago
Sultan Khan 6b7eaaafb9 fixes 3 years ago
Mirza.Shafique a699740897 Medical File Fonts Implementation 3 years ago
Mirza.Shafique 5f44dece71 Ganaric Font and font implementaion 3 years ago
Fatimah Alshammari bbb8e04066 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new 3 years ago
Sultan khan ce867b85f2 Merge branch 'ZohaibIqbalKambrani' into 'development'
Zohaib iqbal kambrani

See merge request Cloud_Solution/diplomatic-quarter!347
3 years ago
haroon amjad a32501f3dc My invoices implementation continued 3 years ago
Sikander Saleem ff55ae1908 improvements 3 years ago
Sikander Saleem bb3d11ccf8 remove spaces. 3 years ago
Sikander Saleem 56c0adaada Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
3 years ago
Sikander Saleem bb9d1bfcd5 improvements 3 years ago
hussam al-habibeh 4b90f16ab9 baby age in ovulation period 3 years ago
Fatimah Alshammari e86dfd1a34 Merge branch 'development' into fatima-new 3 years ago
Fatimah Alshammari 86d67247be Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development 3 years ago
Fatimah Alshammari 0d3f6237ce fixed issues 3 years ago
Sikander Saleem 80c50e29bf Merge branch 'login_design_sikander' into development_new_design_2.0
# Conflicts:
#	lib/config/config.dart
#	lib/pages/landing/landing_page.dart
3 years ago
Sikander Saleem 4db432b351 lab results working(cont.) & improvements 3 years ago
Sultan Khan b1453b52e3 registration 3 years ago
Mirza.Shafique 38465eaafb Home page icons and drawer 3 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
3 years ago
hussam al-habibeh d3868844de Medication availability 3 years ago
Mirza.Shafique 1bea9d39b5 Merge branch 'mirza_home_page' into development_new_design_2.0 3 years ago
Mirza.Shafique 06f877b8d4 Home page new design & drawer 3 years ago
Sultan Khan 57864f949d Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development 3 years ago
Sultan Khan bd85854fa4 changes 3 years ago
Zohaib Iqbal Kambrani 10a147860c no message 3 years ago
Zohaib Iqbal Kambrani bf303a7be0 RRT Implementation 3 years ago
Sultan Khan 97d7f9225e package name changed 3 years ago
haroon amjad 709877b5f1 Merge branch 'development' into Haroon
# Conflicts:
#	lib/pages/login/forgot-password.dart
#	lib/pages/medical/radiology/radiology_details_page.dart
3 years ago
haroon amjad 90db04cee1 Jira Fixes 3 years ago
Fatimah Alshammari b8ba80b361 Merge branch 'fatima-new' into development 3 years ago
Fatimah Alshammari 39ba2cfde7 fixed issues. 3 years ago
Sikander Saleem 2d64426cd4 Merge branch 'login_design_sikander' into development_new_design_2.0 3 years ago
Sikander Saleem 70614d3555 merge improvements-1. 3 years ago
haroon amjad 5007064105 Jira fixes 3 years ago
Mirza.Shafique 99c6318410 Merge branch 'mirza_home_page' into development_new_design_2.0 3 years ago
Mirza.Shafique 2d62822536 Medical Profile Page improvements 3 years ago
Sikander Saleem f482595d6b merge improvements. 3 years ago
Sikander Saleem 083d696c62 Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/landing/landing_page.dart
#	lib/pages/login/login.dart
#	lib/uitl/translations_delegate_base.dart
3 years ago
Mirza.Shafique 4ebf5f900b improvements. 3 years ago
Mirza.Shafique 32e867421f Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0
# Conflicts:
#	lib/uitl/date_uitl.dart
#	lib/uitl/translations_delegate_base.dart
3 years ago
Mirza.Shafique e9e3b079b3 Medical Profile Complete 1.1 3 years ago
hussam al-habibeh 02df6f4d85 PAP-664 3 years ago
hussam al-habibeh 60aaf2a31a Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-bugs
 Conflicts:
	lib/pages/medical/my_trackers/blood_pressure/AddBloodPressurePage.dart
3 years ago
hussam al-habibeh 352fd912de PAP-664 3 years ago
hussam al-habibeh 29249dc9a9 PAP-664 3 years ago
Sultan Khan e5fb16ad69 langauge issue 3 years ago
Mirza.Shafique bbaeec5b85 Medical Profile Complete 3 years ago
Sikander Saleem f6ae7ed770 merge changes-4 3 years ago
Sikander Saleem 889ae24f07 merge changes-3 3 years ago
Sikander Saleem c07a8f54c7 merge changes-2 3 years ago
Sikander Saleem 14561d0ac6 merge changes-1 3 years ago
Sultan Khan c9fe036b99 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 3 years ago
Sultan Khan 7c398ba40d bug fix 3 years ago
Sikander Saleem a5d40f090a improvements-test 3 years ago
hussam al-habibeh 146fc5d2b2 PAP-777 3 years ago
Mirza.Shafique 2665e4cd0c Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0 3 years ago
Mirza.Shafique a20185b2b9 Home page 1.4 (Homepage changes) 3 years ago
Sikander Saleem 2cb59a286f Merge branch 'login_design_sikander' into development_new_design_2.0 3 years ago
Sikander Saleem 473315f8a1 improvements 3 years ago
hussam al-habibeh 6ea06ce442 PAP-729 3 years ago
Mirza.Shafique 3c438406b5 Merge branch 'mirza_home_page' into development_new_design_2.0
# Conflicts:
#	lib/uitl/translations_delegate_base.dart
3 years ago
Sikander Saleem 53e4815866 no auth ui modifications 3 years ago
Mirza.Shafique 49bfa2e9a7 Home page 1.3 3 years ago
Elham Rababh 8b8e239d3f fix button 3 years ago
Zohaib Iqbal Kambrani e4256d6874 RRT in progress (Service implementations) 3 years ago
Elham Rababh b01961e45f fix translate issues 3 years ago
Sultan Khan d88e3faa6b Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 3 years ago
Sultan Khan d6fd03b571 CONFIG 3 years ago
Sultan khan 772dcba287 Merge branch 'Aug_fixes' into 'development'
PAP-715 : Y –axis and X –axis values should be display in the yearly graph details.

See merge request Cloud_Solution/diplomatic-quarter!338
3 years ago
Sultan khan ba32a37a17 Merge branch 'ZohaibIqbalKambrani' into 'development'
RRT in progress

See merge request Cloud_Solution/diplomatic-quarter!339
3 years ago
Zohaib Iqbal Kambrani 4da163d186 RRT in progress in stage 3 years ago
Sultan Khan 6534ca8349 Merge branches 'sultan-patientapp' and 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 3 years ago
Sultan khan 54e1d51f18 Merge branch 'ZohaibIqbalKambrani' into 'development'
RRT in progress

See merge request Cloud_Solution/diplomatic-quarter!337
3 years ago
Zohaib Iqbal Kambrani 5f1d753895 no message 3 years ago
Sikander Saleem 907d90b987 login ui and forgot password ui added. 3 years ago
Sultan Khan ed20ba65b3 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 3 years ago
Elham Rababh 7ad4e03c1a PAP-715 : Y –axis and X –axis values should be display in the yearly graph details. 3 years ago
Sultan Khan 23ca95b9b6 bug fixes 3 years ago
Mohammad Aljammal 9b3a679948 Merge branch 'fix-bugs' into 'development'
fix bugs

See merge request Cloud_Solution/diplomatic-quarter!336
3 years ago
Mohammad Aljammal b34402ffa8 Merge branch 'Haroon' into 'development'
Haroon

See merge request Cloud_Solution/diplomatic-quarter!335
3 years ago
Mohammad Aljammal ed5079e3a0 Merge branch 'pharmacy-bugs' into 'development'
Pharmacy bugs

See merge request Cloud_Solution/diplomatic-quarter!334
3 years ago
mosazaid e9dbc4be7a fix bugs 3 years ago
Haroon Amjad 47e521fe1d Merge branch 'development' into Haroon
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/pages/feedback/send_feedback_page.dart
#	lib/pages/landing/home_page.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/widgets/in_app_browser/InAppBrowser.dart
3 years ago
hussam al-habibeh 50d3a42743 fixing dashboard issue 3 years ago
hussam al-habibeh 1ed76e91aa fixing dashboard issue 3 years ago
Sultan Khan 6442ce178d Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 3 years ago
Sultan khan a67e320a8e Merge branch 'ZohaibIqbalKambrani' into 'development'
Zohaib iqbal kambrani

See merge request Cloud_Solution/diplomatic-quarter!333
3 years ago
Sultan Khan 8766a69928 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 3 years ago
hussam al-habibeh d5c76b5400 jira bugs 3 years ago
hussam al-habibeh 6dc0d89f61 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-bugs
 Conflicts:
	lib/pages/medical/my_trackers/blood_pressure/AddBloodPressurePage.dart
	lib/uitl/utils.dart
3 years ago
hussam al-habibeh 981e78936e jira bugs 3 years ago
Zohaib Iqbal Kambrani 08e0ce52c8 Merge branch 'development' into ZohaibIqbalKambrani
* development:
  fix bugs
3 years ago
Zohaib Iqbal Kambrani 4abdd9bde7 no message 3 years ago
Mohammad Aljammal 4ac6bf628b Merge branch 'fix-bugs' into 'development'
fix bugs

See merge request Cloud_Solution/diplomatic-quarter!331
3 years ago
Zohaib Iqbal Kambrani 882d5f090a Merge branch 'zik-analytics' into ZohaibIqbalKambrani
* zik-analytics:
  no message
3 years ago
mosazaid 2e33c2b240 fix bugs 3 years ago
Mirza.Shafique b0dfbef52a Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
3 years ago
Mirza.Shafique d37f225c1b Home page 1.2 3 years ago
Sikander Saleem 3707b13986 login type ui & icons added. 3 years ago
Sultan Khan 446f86dbcf Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 3 years ago
Elham Rababh 5d05b09345 PAP-712 : fixes on Blood sugar 3 years ago
Sultan Khan c88bea4461 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 3 years ago
Sultan Khan 9acb5b087d bug fixes 3 years ago
Mirza.Shafique 090556f4d1 Merge branch 'mirza_home_page' into development_new_design_2.0 3 years ago
Mirza.Shafique 5dc88f51c3 Home Page 1.0 3 years ago
Sikander Saleem 8b2feb03ea last login and login options ui. 3 years ago
Elham Rababh 86414b46fd PAP-304 : show CBC details 3 years ago
Elham Rababh 52816a9cfe PAP-723 : system should display the empty graph in the blood pressure screen. 3 years ago
Elham Rababh f824063e82 PAP-726 : fix show Arabic values for the select Arm 3 years ago
Elham Rababh f92567f877 PAP-718 : fix show data after save 3 years ago
Elham Rababh f830bfdb19 PAP-722 : fix send email 3 years ago
Sultan khan 9196367da4 Merge branch 'bug_fix_mirza' into 'development'
Medical Profile Buttons Lock

See merge request Cloud_Solution/diplomatic-quarter!329
3 years ago
Sultan khan f54b9a63aa Merge branch 'sultan-patientapp' into 'development'
Sultan patientapp

See merge request Cloud_Solution/diplomatic-quarter!328
3 years ago
Mirza.Shafique 2fda47baf6 Medical Profile Buttons Lock 3 years ago
Zohaib Iqbal Kambrani dbf525c484 no message 3 years ago
Haroon Amjad 213d104d57 Covid test procedure selection implemented 3 years ago
Sultan khan 487d63ec7f Merge branch 'bug_fix_mirza' into 'development'
Check-In NFC

See merge request Cloud_Solution/diplomatic-quarter!326
3 years ago
Sikander Saleem eb9005510d bug fixes and insurance approvals improvements. 3 years ago
Sultan Khan 3c2539d5b9 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 3 years ago
Sultan Khan 14ef096c32 changes and fixes 3 years ago
Mirza.Shafique b31813770e Check-In NFC done 3 years ago
Haroon Amjad fde658fd5d Merge branch 'development' into Haroon
# Conflicts:
#	lib/config/config.dart
3 years ago
Mirza.Shafique fb0a67e5bd PAP 828 and 792 issue fix 3 years ago
Mirza.Shafique e934e7cd2c Merge Fix 3 years ago
haroon amjad 7cf66934bc Merge branch 'Haroon' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon 3 years ago
haroon amjad 4504b4bf75 config 3 years ago
haroon amjad f310f9d0ab config 3 years ago
haroon amjad 0d2a91c124 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon 3 years ago
hussam al-habibeh 8d8fbc3edc jira bugs 3 years ago
Sultan khan 15f620d720 Merge branch 'Jul_fixes' into 'development'
Jul fixes

See merge request Cloud_Solution/diplomatic-quarter!322
3 years ago
hussam al-habibeh fefde8f575 jira bugs 3 years ago
haroon amjad 7b6270c67f Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon 3 years ago
haroon amjad bcb4f48785 build fix 3 years ago
Sultan khan f048f5229b Merge branch 'sultan-patientapp' into 'development'
Sultan patientapp

See merge request Cloud_Solution/diplomatic-quarter!321
3 years ago
Sultan khan 924f9bedc0 Merge branch 'bug_fixing' into 'development'
Bug fixing

See merge request Cloud_Solution/diplomatic-quarter!319
3 years ago
Sultan khan 10f8ee5e81 Merge branch 'bug_fix_mirza' into 'development'
Bug Fix: 873, 878 to 881

See merge request Cloud_Solution/diplomatic-quarter!320
3 years ago
Sultan Khan 33465b04e5 permission 3 years ago
Mirza.Shafique 58d5734f1a Bug Fix: 873, 878 to 881 3 years ago
Sultan Khan d5d48703f9 camera permission fixed 3 years ago
Sultan Khan 85e803651c permission issue fixed 3 years ago
Sikander Saleem 38f134b6ff Bug PAP-884 fixed, email was not updating. 3 years ago
Sultan Khan b4a7235fc8 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 3 years ago
hussam al-habibeh 446021eb90 adding doctor list to health calculator 3 years ago
hussam al-habibeh 854352d9ce jira bugs 3 years ago
Sikander Saleem d0c8c4f017 Bug PAP-671, PAP-672 fixed, bottom nav added on H2O screen. 3 years ago
Sikander Saleem b2e9060c3f Bug PAP-877 fixed, blood tracker exception. 3 years ago
Elham Rababh 2e1c9780d7 PAP-610: prevent show send email button if user have no vaccine 3 years ago