Compare commits

..

46 Commits

Author SHA1 Message Date
Elham Rababh 83bd7c64f4 fix gradel 4 years ago
Elham Rababh 6ca54f885c fix header 4 years ago
Elham Rababh 6628b6d67c small fix after fix 4 years ago
Elham Rababh 94e92e8937 fix home 4 years ago
Elham Rababh 94a699a58f fix all the screenshots 4 years ago
Elham Rababh f097005b8c screen fixes 4 4 years ago
Elham Rababh efd4b0221b screen fixes 3 4 years ago
Elham Rababh 8eaf834734 screen fixes 2 4 years ago
Elham Rababh fbb029e320 screen fixes 4 years ago
Elham Rababh 9292b38d5a fix shaerd 4 years ago
Elham Rababh ed4f949053 fix helper 4 years ago
Elham Rababh a623f5418e fix issues 4 years ago
Elham Rababh 44c5621b3f reverting manully step 3 4 years ago
Elham Rababh 47d18dacfd reverting manully step 2 4 years ago
Elham Rababh 6fe3cecc9b reverting manully 4 years ago
Elham Rababh 351d5a79e7 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into dev_v2.8
 Conflicts:
	ios/Runner.xcodeproj/project.pbxproj
	ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
	lib/core/viewModel/PatientRegistrationViewModel.dart
	lib/core/viewModel/project_view_model.dart
	lib/models/SOAP/selected_items/my_selected_history.dart
	lib/screens/doctor/doctor_replay/not_replaied_doctor_questions.dart
	lib/screens/home/home_screen.dart
	lib/screens/live_care/end_call_screen.dart
	lib/screens/patient-sick-leave/add_patient_sick_leave_screen.dart
	lib/screens/patients/In_patient/InPatientHeader.dart
	lib/screens/patients/In_patient/in_patient_screen.dart
	lib/screens/patients/profile/UCAF/UCAF-detail-screen.dart
	lib/screens/patients/profile/UCAF/UCAF-input-screen.dart
	lib/screens/patients/profile/UCAF/page-stepper-widget.dart
	lib/screens/patients/profile/diabetic_chart/line_chart_for_diabetic.dart
	lib/screens/patients/profile/discharge_summary/discharge_Summary_widget.dart
	lib/screens/patients/profile/lab_result/LineChartCurved.dart
	lib/screens/patients/profile/lab_result/LineChartCurvedLabHistory.dart
	lib/screens/patients/profile/operation_report/operation_report.dart
	lib/screens/patients/profile/operation_report/update_operation_report.dart
	lib/screens/patients/profile/pending_orders/pending_orders_screen.dart
	lib/screens/patients/profile/profile_screen/patient_profile_screen.dart
	lib/screens/patients/profile/profile_screen/profile_gird_for_InPatient.dart
	lib/screens/patients/profile/profile_screen/profile_gird_for_other.dart
	lib/screens/patients/profile/profile_screen/profile_gird_for_search.dart
	lib/screens/patients/profile/referral/my-referral-detail-screen.dart
	lib/screens/patients/profile/referral/refer-patient-screen.dart
	lib/screens/patients/profile/soap_update/objective/add_examination_widget.dart
	lib/screens/patients/profile/soap_update/objective/examinations_list_search_widget.dart
	lib/screens/patients/profile/soap_update/plan/update_plan_page.dart
	lib/screens/patients/profile/soap_update/shared_soap_widgets/SOAP_step_header.dart
	lib/screens/patients/profile/soap_update/shared_soap_widgets/steper/steps_widget.dart
	lib/screens/patients/profile/soap_update/subjective/allergies/add_allergies.dart
	lib/screens/patients/profile/soap_update/subjective/allergies/allergies_item.dart
	lib/screens/patients/profile/soap_update/subjective/allergies/master_key_checkbox_search_allergies_widget.dart
	lib/screens/patients/profile/soap_update/subjective/history/update_history_widget.dart
	lib/screens/patients/profile/soap_update/subjective/medication/add_medication.dart
	lib/screens/patients/profile/vital_sign/LineChartCurved.dart
	lib/screens/patients/profile/vital_sign/LineChartCurvedBloodPressure.dart
	lib/screens/patients/profile/vital_sign/vital_sign_details_screen.dart
	lib/screens/patients/register_patient/CustomEditableText.dart
	lib/screens/patients/register_patient/RegisterConfirmationPatientPage.dart
	lib/screens/patients/register_patient/RegisterSearchPatientPage.dart
	lib/screens/prescription/add_prescription_form.dart
	lib/screens/prescription/prescription_text_filed.dart
	lib/screens/reschedule-leaves/reschedule_leave.dart
	lib/util/dr_app_toast_msg.dart
	lib/widgets/patients/patient_card/PatientCard.dart
	lib/widgets/patients/profile/patient-profile-app-bar.dart
	lib/widgets/patients/profile/profile_medical_info_widget_search.dart
	lib/widgets/shared/TextFields.dart
	lib/widgets/shared/bottom_navigation_item.dart
	lib/widgets/shared/text_fields/app-textfield-custom.dart
	lib/widgets/shared/text_fields/app_text_field_custom_serach.dart
	lib/widgets/shared/text_fields/new_text_Field.dart
	pubspec.yaml
4 years ago
Elham Rababh 8b68183fd1 add pbxproj 4 years ago
Elham Rababh 4b89b78ab4 fix issues 4 years ago
Elham Rababh 79103a5c84 remove unworking packages 4 years ago
Elham Rababh 07553ac22d first step from v2.1 4 years ago
Elham Rababh 6d445fd72c small fix 4 years ago
Elham Rababh 0e58e6bdbc fix issues 4 years ago
Elham Rababh 88e68830bd small fixes 4 years ago
Elham Rababh ba52eba353 fixes in episode 4 years ago
Elham Rababh 0134e8f5de small fixes inside HEADERS 4 years ago
Elham Rababh 7af43f5f1d fix flutter 2 4 years ago
Elham Rababh 8df3cf8a33 fixes ios on flutter 2 4 years ago
Elham Rababh 2d4c0a8f50 d
f

fixes
4 years ago
Elham Rababh e4f452fdbc small fixes 4 years ago
Elham Rababh 7e2bddbce9 small fixes 4 years ago
Elham Rababh 3a8d8f9aa7 fix the last errors 4 years ago
Elham Rababh 02e4a37d00 Merge branch 'flutter_2_developemt' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into flutter_vervion_2_by_elham
 Conflicts:
	lib/screens/patients/profile/UCAF/UCAF-detail-screen.dart
	lib/screens/patients/profile/UCAF/page-stepper-widget.dart
	lib/screens/patients/register_patient/RegisterConfirmationPatientPage.dart
	lib/screens/patients/register_patient/RegisterSearchPatientPage.dart
4 years ago
Elham Ali 0c10d49ac7 Merge branch 'hussam_flutter_2' into 'flutter_2_developemt'
Hussam flutter 2

See merge request Cloud_Solution/doctor_app_flutter!897
4 years ago
Elham Rababh 26f5e57417 8 step from fix screen 4 years ago
hussam al-habibeh 7d3e59e060 flutter version 2 4 years ago
hussam al-habibeh f53920d040 Merge branch 'flutter_2_developemt' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into hussam_flutter_2
 Conflicts:
	lib/core/viewModel/PatientRegistrationViewModel.dart
	lib/screens/patients/profile/profile_screen/profile_gird_for_other.dart
	lib/screens/patients/profile/profile_screen/profile_gird_for_search.dart
	lib/screens/patients/profile/referral/my-referral-detail-screen.dart
	lib/screens/reschedule-leaves/reschedule_leave.dart
4 years ago
Elham Rababh bd64603e82 7 step from fix screen 4 years ago
hussam al-habibeh 8720e281ff flutter version 2 4 years ago
Elham Ali 209954ca55 Merge branch 'flutter_vervion_2_by_elham' into 'flutter_2_developemt'
Flutter vervion 2 by elham

See merge request Cloud_Solution/doctor_app_flutter!896
4 years ago
Elham Rababh 359b337b27 6 step from fix screen 4 years ago
Elham Rababh 28d8449345 Merge branch 'flutter_2_developemt' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into flutter_vervion_2_by_elham
 Conflicts:
	lib/models/SOAP/selected_items/my_selected_allergy.dart
4 years ago
hussam al-habibeh 772c2d300d Merge branch 'flutter_2_developemt' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into hussam_flutter_2 4 years ago
Elham Ali 49ab6382c3 Merge branch 'hussam_flutter_2' into 'flutter_2_developemt'
flutter 2 models

See merge request Cloud_Solution/doctor_app_flutter!895
4 years ago
Elham Rababh a54ec0ef78 5 step from fix screen 4 years ago
hussam al-habibeh fe20bfd9b9 Merge branch 'flutter_2_developemt' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into hussam_flutter_2 4 years ago
Elham Ali 7d835ee280 Merge branch 'hussam_flutter_2' into 'flutter_2_developemt'
Hussam flutter 2

See merge request Cloud_Solution/doctor_app_flutter!892
4 years ago

@ -28,14 +28,14 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
android { android {
compileSdkVersion 30 compileSdkVersion 30
signingConfigs { // signingConfigs {
release { // release {
storeFile file('/Users/nextwo/Desktop/Elham/keys/doctor app key') // storeFile file('C:\\Users\\admin\\Downloads\\DQKey.jks')
storePassword 'Hmgdoctor1234' // storePassword 'HmGsa123'
keyAlias 'hmgdoctor' // keyAlias 'key'
keyPassword 'Hmgdoctor1234' // keyPassword 'HmGsa123'
} // }
} // }
sourceSets { sourceSets {
main.java.srcDirs += 'src/main/kotlin' main.java.srcDirs += 'src/main/kotlin'
@ -59,8 +59,7 @@ android {
buildTypes { buildTypes {
release { release {
// TODO: Add your own signing config for the release build. // TODO: Add your own signing config for the release build.
signingConfig signingConfigs.release signingConfig signingConfigs.debug
} }
debug { debug {
// Signing with the debug keys for now, so `flutter run --release` works. // Signing with the debug keys for now, so `flutter run --release` works.

@ -1,4 +1,3 @@
#Fri Jun 23 08:50:38 CEST 2017
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 348 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 247 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 412 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 946 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 651 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 655 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 577 KiB

@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 24.1.2, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 73 74" style="enable-background:new 0 0 73 74;" xml:space="preserve">
<style type="text/css">
.st0{fill:#E3E3E3;}
.st1{fill:none;stroke:#CCCCCC;}
.st2{fill:#B4B4B4;}
</style>
<g id="Ellipse_123-2" transform="translate(2933 475)">
<circle class="st0" cx="-2896.5" cy="-437.5" r="35"/>
<circle class="st1" cx="-2896.5" cy="-437.5" r="34.5"/>
</g>
<path class="st2" d="M40.25,43.44c-0.02-0.24-0.04-0.63-0.05-1.04c3.94-0.38,6.7-1.26,6.7-2.29c-0.01,0-0.01-0.04-0.01-0.06
c-2.94-2.48,2.55-20.09-7.68-19.73c-0.64-0.51-1.77-0.96-3.38-0.96c-13.86,0.98-7.73,17.61-10.89,20.75c0,0,0,0-0.01,0
c0,0,0,0,0,0.01c0,0,0,0,0,0s0,0,0,0c0.01,1.01,2.68,1.87,6.51,2.26c-0.01,0.25-0.03,0.55-0.08,1.06
c-1.59,3.99-12.3,2.87-12.8,10.56H53C52.51,46.31,41.84,47.43,40.25,43.44z"/>
</svg>

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

@ -0,0 +1,7 @@
<svg id="enter" xmlns="http://www.w3.org/2000/svg" width="42" height="42" viewBox="0 0 42 42">
<path id="Path_1146" data-name="Path 1146" d="M17.938,210.625H1.313a1.313,1.313,0,1,1,0-2.625H17.938a1.313,1.313,0,1,1,0,2.625Zm0,0" transform="translate(22.749 -190.938)"/>
<path id="Path_1147" data-name="Path 1147" d="M123.984,143.736a1.313,1.313,0,0,1-.928-2.242l5.635-5.635-5.635-5.633a1.313,1.313,0,0,1,1.857-1.857l6.563,6.562a1.313,1.313,0,0,1,0,1.857l-6.562,6.562A1.31,1.31,0,0,1,123.984,143.736Zm0,0" transform="translate(-89.86 -117.486)"/>
<path id="Path_1148" data-name="Path 1148" d="M312.668,42.076a3.5,3.5,0,0,0,3.5-3.5V7.076A3.522,3.522,0,0,0,313.8,3.753L303.284.248a3.537,3.537,0,0,0-4.616,3.329v31.5a3.524,3.524,0,0,0,2.368,3.321L311.553,41.9A3.662,3.662,0,0,0,312.668,42.076ZM302.168,2.7a1.03,1.03,0,0,1,.313.046l10.47,3.491a.9.9,0,0,1,.592.838v31.5a.922.922,0,0,1-1.188.83l-10.47-3.491a.905.905,0,0,1-.591-.838V3.576A.876.876,0,0,1,302.168,2.7Zm0,0" transform="translate(-298.668 -0.076)"/>
<path id="Path_1149" data-name="Path 1149" d="M195.168,8.75a1.313,1.313,0,0,0,1.313-1.312V4.813A4.816,4.816,0,0,0,191.668,0H171.98a1.313,1.313,0,0,0,0,2.625h19.688a2.19,2.19,0,0,1,2.187,2.188V7.438A1.313,1.313,0,0,0,195.168,8.75Zm0,0" transform="translate(-168.48)"/>
<path id="Path_1150" data-name="Path 1150" d="M171.98,350.082h7a4.816,4.816,0,0,0,4.812-4.813v-2.625a1.313,1.313,0,0,0-2.625,0v2.625a2.19,2.19,0,0,1-2.187,2.188h-7a1.313,1.313,0,0,0,0,2.625Zm0,0" transform="translate(-155.793 -313.332)"/>
</svg>

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 753 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 246 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 206 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 987 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 409 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 942 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 765 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 232 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 616 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1007 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 819 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 631 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 940 B

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 24.1.2, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 73 74" style="enable-background:new 0 0 73 74;" xml:space="preserve">
<style type="text/css">
.st0{fill:#E3E3E3;}
.st1{fill:none;stroke:#CCCCCC;}
.st2{fill:#B4B4B4;}
</style>
<g id="Ellipse_123-2" transform="translate(2933 475)">
<circle class="st0" cx="-2896.5" cy="-437.5" r="35"/>
<circle class="st1" cx="-2896.5" cy="-437.5" r="34.5"/>
</g>
<path id="Icon_awesome-user-alt" class="st2" d="M36.5,39.75c5.59,0,10.13-4.53,10.13-10.13S42.09,19.5,36.5,19.5
s-10.13,4.53-10.13,10.13C26.38,35.22,30.91,39.75,36.5,39.75z M45.5,42h-3.87c-3.25,1.5-7,1.5-10.25,0H27.5c-4.97,0-9,4.03-9,9
v1.13c0,1.86,1.51,3.37,3.38,3.38h29.25c1.86,0,3.37-1.51,3.38-3.38V51C54.5,46.03,50.47,42,45.5,42z"/>
</svg>

After

Width:  |  Height:  |  Size: 970 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 KiB

@ -0,0 +1,6 @@
<svg xmlns="http://www.w3.org/2000/svg" width="26.552" height="20.755" viewBox="0 0 26.552 20.755">
<g id="mail-reply" transform="translate(0 -40.338)">
<path id="Path_4384" data-name="Path 4384" d="M21.236,51.705h.129a1.8,1.8,0,0,1,2.761-2.272l.788.788V42.437a2.1,2.1,0,0,0-2.1-2.1H2.1a2.1,2.1,0,0,0-2.1,2.1V56.921a2.1,2.1,0,0,0,2.1,2.1H16.575a5.14,5.14,0,0,1,4.66-7.314ZM5.213,43.167H19.7l-7.244,5.312Z" fill="#989898"/>
<path id="Path_4385" data-name="Path 4385" d="M245.767,175.159l-2.8-2.8a.9.9,0,1,0-1.27,1.27l1.265,1.265h-2.25a4.245,4.245,0,0,0,0,8.489.9.9,0,1,0,0-1.8,2.448,2.448,0,0,1,0-4.9h2.25l-1.265,1.265a.9.9,0,0,0,1.27,1.27l2.8-2.8a.9.9,0,0,0,0-1.27Z" transform="translate(-219.478 -122.292)" fill="#989898"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 749 B

@ -0,0 +1,3 @@
<svg xmlns="http://www.w3.org/2000/svg" width="28.123" height="26.245" viewBox="0 0 28.123 26.245">
<path id="XMLID_219_" d="M28.984,15.637A2.077,2.077,0,0,1,27.025,17h-.716V27.309a.938.938,0,0,1-.937.937H19.748V21.685a4.687,4.687,0,0,0-9.374,0v6.562H4.749a.938.938,0,0,1-.937-.937V17H3.095a2.1,2.1,0,0,1-1.378-3.675L12.665,2.955a3.486,3.486,0,0,1,4.792,0L28.431,13.347A2.066,2.066,0,0,1,28.984,15.637Z" transform="translate(-0.999 -2.001)" fill="#989898"/>
</svg>

After

Width:  |  Height:  |  Size: 467 B

@ -0,0 +1,9 @@
<svg xmlns="http://www.w3.org/2000/svg" width="24.899" height="24.899" viewBox="0 0 24.899 24.899">
<g id="Layer_76" data-name="Layer 76" transform="translate(-2 -2)">
<path id="Path_4380" data-name="Path 4380" d="M3.245,11.96A1.245,1.245,0,0,0,4.49,10.715V5.735A1.245,1.245,0,0,1,5.735,4.49h4.98a1.245,1.245,0,1,0,0-2.49H5.735A3.735,3.735,0,0,0,2,5.735v4.98A1.245,1.245,0,0,0,3.245,11.96Z" transform="translate(0 0)" fill="#989898"/>
<path id="Path_4381" data-name="Path 4381" d="M20.225,2h-4.98a1.245,1.245,0,0,0,0,2.49h4.98A1.245,1.245,0,0,1,21.47,5.735v4.98a1.245,1.245,0,1,0,2.49,0V5.735A3.735,3.735,0,0,0,20.225,2Z" transform="translate(2.94 0)" fill="#989898"/>
<path id="Path_4382" data-name="Path 4382" d="M22.715,14a1.245,1.245,0,0,0-1.245,1.245v4.98a1.245,1.245,0,0,1-1.245,1.245h-4.98a1.245,1.245,0,0,0,0,2.49h4.98a3.735,3.735,0,0,0,3.735-3.735v-4.98A1.245,1.245,0,0,0,22.715,14Z" transform="translate(2.94 2.94)" fill="#989898"/>
<path id="Path_4383" data-name="Path 4383" d="M10.715,21.47H5.735A1.245,1.245,0,0,1,4.49,20.225v-4.98a1.245,1.245,0,0,0-2.49,0v4.98A3.735,3.735,0,0,0,5.735,23.96h4.98a1.245,1.245,0,1,0,0-2.49Z" transform="translate(0 2.94)" fill="#989898"/>
<rect id="Rectangle_17370" data-name="Rectangle 17370" width="15" height="15" rx="2" transform="translate(7 6.899)" fill="#989898"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 1.3 KiB

@ -0,0 +1,3 @@
<svg id="weekly-calendar-page-symbol" xmlns="http://www.w3.org/2000/svg" width="25.034" height="25.034" viewBox="0 0 25.034 25.034">
<path id="Path_4379" data-name="Path 4379" d="M22.53,0H2.5A2.511,2.511,0,0,0,0,2.5V22.53a2.512,2.512,0,0,0,2.5,2.5H22.53a2.512,2.512,0,0,0,2.5-2.5V2.5A2.511,2.511,0,0,0,22.53,0ZM6.756,22.031H2.921V18.62H6.756v3.411Zm0-4.555H2.921v-3.41H6.756v3.41ZM6.467,3.794A1.063,1.063,0,1,1,7.529,2.731,1.062,1.062,0,0,1,6.467,3.794Zm5.406,18.237H8.039V18.62h3.834Zm0-4.555H8.039v-3.41h3.834Zm0-4.552H8.039V9.514h3.834ZM11.455,2.731a1.062,1.062,0,1,1,1.062,1.062A1.062,1.062,0,0,1,11.455,2.731Zm5.54,14.745H13.159v-3.41H17v3.41Zm0-4.552H13.159V9.514H17v3.41ZM17.5,2.731a1.062,1.062,0,1,1,1.062,1.062A1.062,1.062,0,0,1,17.5,2.731Zm4.609,14.745H18.278v-3.41h3.835Zm0-4.552H18.278V9.514h3.835Z" fill="#989898"/>
</svg>

After

Width:  |  Height:  |  Size: 838 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 388 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 594 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 639 B

@ -0,0 +1,13 @@
<svg xmlns="http://www.w3.org/2000/svg" width="670" height="670" viewBox="0 0 670 670">
<g id="user_female" transform="translate(1326 -129)">
<g id="Ellipse_2" data-name="Ellipse 2" transform="translate(-1326 129)" fill="#fff" stroke="#707070" stroke-width="10">
<circle cx="335" cy="335" r="335" stroke="none"/>
<circle cx="335" cy="335" r="330" fill="none"/>
</g>
<g id="woman" transform="translate(-1240.779 224.247)">
<g id="Group_1" data-name="Group 1" transform="translate(71.445 0.001)">
<path id="Path_1" data-name="Path 1" d="M405.661,353.557c-6.505-32.584-37.072-38.13-37.168-38.174h0c-.329-.1,2.8.689-74.547-18.484v-2.625h56.941a21.31,21.31,0,0,0,21.285-21.285v-108.6a26.6,26.6,0,0,0,0-12.282V112.478a7.23,7.23,0,0,0-14.46,0v20.749a37.54,37.54,0,0,0-12.874-4.721,18.857,18.857,0,0,0-15.89-14.533c-8.272-1.087-14.541-5.91-18.633-14.332a12.393,12.393,0,0,0-21.131-1.933c-12.428,16.914-46.978,54.851-106.64,54.849-4.539,0-7.617-.215-8.688-.263a19.121,19.121,0,0,0-20.233,19.085v16.612a98.069,98.069,0,0,0,30.219,70.622,96.826,96.826,0,0,0,20.887,15.194v6.009H148.049a6.834,6.834,0,0,1-6.826-6.825V110.53c0-52.669,42.944-96.069,94.818-96.069l.5,0c18.585.1,40.044,5.378,54.667,13.445,9.268,5.115,14.992,1.05,24.144,1.05,22.338,0,40.239,22.969,42.385,43.628.014.3.045,1.514.049,6.156,0,6.979,7.887,7.515,7.236,7.224a7.23,7.23,0,0,0,7.224-7.236c0-1.284.01-6.318-.111-7.486C369.23,42.485,344.7,14.5,315.355,14.5c-11.461,0-13.247,2.905-17.159.75C281.615,6.1,257.444.115,236.621,0,176.6-.386,126.762,49.618,126.762,110.529V272.99a21.31,21.31,0,0,0,21.286,21.285H204.73V296.9l-74.255,18.4c-.1.024-.195.052-.292.08l-5.425,1.6c-.163.048-.323.1-.482.16-9.681,3.613-26.616,13.146-31.262,36.417C71.008,464.1,71.935,459.38,71.882,459.759c-2.651,18.748,14.13,16.193,14.038,6.1-.04-4.922-.234-.124,21.276-109.475,3.238-16.215,15.012-22.988,21.911-25.611l5.014-1.479,42.642-10.569c47.435,55.882,44.627,52.921,47.368,55.595,15.833,15.444,38.424,14.354,53.293-3.108l44.652-52.447L364.553,329.3c1.229.565,22.375,4.284,26.927,27.088,21.325,108.4,21.317,104.533,21.277,109.472-.073,9.882,14.3,17.818,14.461.116C427.279,457.706,426.786,461.656,405.661,353.557ZM345.31,143.422c6.038,1.8,10.694,5.775,12.4,10.688v8.284c-1.708,4.915-6.364,8.894-12.4,10.688Zm0,45.829v-1.335a37.457,37.457,0,0,0,12.4-4.637V272.99a6.832,6.832,0,0,1-6.825,6.824H293.945v-5.588A95.715,95.715,0,0,0,345.31,189.251Zm-151.483,58.9a83.546,83.546,0,0,1-25.742-60.162c.43-15.742-1.042-17.65,1.47-20.015a4.562,4.562,0,0,1,3.432-1.248c51.841,3.121,96.43-19.669,125.869-57.827,7.938,13.938,19.578,18.277,28.209,19.412a4.346,4.346,0,0,1,3.785,4.284v56.656C330.85,261.191,244.726,296.731,193.828,248.152ZM266.41,361.841c-10.073,11.834-24.175,11.8-34.224-.06L217.1,343.976h64.52Zm27.523-32.326H204.85l-12.425-14.666,21.277-5.274a7.31,7.31,0,0,0,5.49-7.089V280.117a95.766,95.766,0,0,0,60.292.206c.136,23.109-.31,22.58.4,24.618a7.231,7.231,0,0,0,5.086,4.631l21.416,5.308Z" transform="translate(-71.445 7.999)" fill="#707070"/>
</g>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 537 B

@ -0,0 +1,11 @@
<svg xmlns="http://www.w3.org/2000/svg" width="670" height="670" viewBox="0 0 670 670">
<g id="user_male" transform="translate(2097 -129)">
<g id="Group_3" data-name="Group 3">
<g id="Ellipse_1" data-name="Ellipse 1" transform="translate(-2097 129)" fill="#fff" stroke="#707070" stroke-width="10">
<circle cx="335" cy="335" r="335" stroke="none"/>
<circle cx="335" cy="335" r="330" fill="none"/>
</g>
<path id="man" d="M402.025,424.794v47.257a8,8,0,0,1-16,0V424.794a66.534,66.534,0,0,0-66.573-66.571,49.116,49.116,0,0,1-42.258-23.729,8,8,0,1,1,13.664-8.322,33.235,33.235,0,0,0,28.594,16.051A82.524,82.524,0,0,1,402.025,424.794ZM279.141,365.566A60.689,60.689,0,0,1,187.8,350.1a49.167,49.167,0,0,0,22.056-37.259c68.3,20.107,136.619-31.146,137.167-101.823.005-.179,0-30.535,0-30.714a8,8,0,0,0-16,0v29.875a91,91,0,0,1-182,0V145.284c.068-13.789,15.667-19.829,25.271-11.548a129.912,129.912,0,0,0,78.333,31.3A8.008,8.008,0,0,0,259.23,152a27.766,27.766,0,0,1-6.276-18.456,137.588,137.588,0,0,0,86.673,22.484,8,8,0,1,0-1.2-15.955,121.359,121.359,0,0,1-85.4-26.27,8,8,0,0,0-12.309,3,43.278,43.278,0,0,0-1.8,30.593,113.518,113.518,0,0,1-54.17-25.777c-20.169-17.388-51.461-3.37-51.716,23.12l0,52.409a16.518,16.518,0,0,1-9-14.637c0-.122,0-41.614,0-41.736-.4-18.133,2.184-63.7,34.754-95.094,36.389-35.078,93.326-35.091,137.6-19.66l-6.394,2.632c-7.635,3.141-6.039,14.47,2.193,15.352l14.062,1.506A92.422,92.422,0,0,1,372.569,84.45a68.1,68.1,0,0,0-15.542,43.488v54.57a8,8,0,0,0,16,0v-54.57a52.243,52.243,0,0,1,15.118-36.9A8.542,8.542,0,0,0,389.3,80.8c-15.95-25.579-39.684-42.049-66.771-48.655a8.008,8.008,0,0,0-1.556-13.25C297.74,7.1,264.315-1.094,232.968.119,153.1,3.215,106.345,62.864,108.026,141.038v41.473A32.646,32.646,0,0,0,133.1,214.132a107.172,107.172,0,0,0,60.923,92.643v2.107A33.353,33.353,0,0,1,160.6,342.224a82.519,82.519,0,0,0-82.573,82.571v47.257a8,8,0,0,0,16,0V424.795A66.534,66.534,0,0,1,160.6,358.224a49.814,49.814,0,0,0,12.506-1.592,76.7,76.7,0,0,0,116.341,21.176,8,8,0,0,0-10.305-12.242Z" transform="translate(-2002.026 246)" fill="#707070"/>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 579 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 698 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

@ -14,13 +14,13 @@
30F70E6C266F56FD005D8F8E /* MainAppViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30F70E6B266F56FD005D8F8E /* MainAppViewController.swift */; }; 30F70E6C266F56FD005D8F8E /* MainAppViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30F70E6B266F56FD005D8F8E /* MainAppViewController.swift */; };
30F70E6F266F6509005D8F8E /* VideoCallRequestParameters.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30F70E6E266F6509005D8F8E /* VideoCallRequestParameters.swift */; }; 30F70E6F266F6509005D8F8E /* VideoCallRequestParameters.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30F70E6E266F6509005D8F8E /* VideoCallRequestParameters.swift */; };
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
3D7F2AC9B3EBF568D59B943B /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 104DCFE405BA413255D4BDD9 /* Pods_Runner.framework */; };
74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
9CE61EBD24AB366E008D68DD /* VideoCallViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9CE61EBC24AB366E008D68DD /* VideoCallViewController.swift */; }; 9CE61EBD24AB366E008D68DD /* VideoCallViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9CE61EBC24AB366E008D68DD /* VideoCallViewController.swift */; };
9CE61ECD24ADBB4C008D68DD /* ICallProtocoll.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9CE61ECC24ADBB4C008D68DD /* ICallProtocoll.swift */; }; 9CE61ECD24ADBB4C008D68DD /* ICallProtocoll.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9CE61ECC24ADBB4C008D68DD /* ICallProtocoll.swift */; };
E6BEB9F4A2DEF27953D569E9 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 992BD73E4591DE3A72F1559E /* Pods_Runner.framework */; };
/* End PBXBuildFile section */ /* End PBXBuildFile section */
/* Begin PBXCopyFilesBuildPhase section */ /* Begin PBXCopyFilesBuildPhase section */
@ -37,13 +37,10 @@
/* End PBXCopyFilesBuildPhase section */ /* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */ /* Begin PBXFileReference section */
0762701A9540BA69842BCA9C /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
104DCFE405BA413255D4BDD9 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; }; 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; }; 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
29211CD725C165D600DD740D /* RunnerRelease.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = RunnerRelease.entitlements; sourceTree = "<group>"; }; 29211CD725C165D600DD740D /* RunnerRelease.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = RunnerRelease.entitlements; sourceTree = "<group>"; };
29211E4125C172B700DD740D /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; }; 29211E4125C172B700DD740D /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
2ADF20AFB51DAEC9BED1884D /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
300790F9266FB14B0052174C /* VCEmbeder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VCEmbeder.swift; sourceTree = "<group>"; }; 300790F9266FB14B0052174C /* VCEmbeder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VCEmbeder.swift; sourceTree = "<group>"; };
300790FB26710CAB0052174C /* Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Extensions.swift; sourceTree = "<group>"; }; 300790FB26710CAB0052174C /* Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Extensions.swift; sourceTree = "<group>"; };
30F70E6B266F56FD005D8F8E /* MainAppViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainAppViewController.swift; sourceTree = "<group>"; }; 30F70E6B266F56FD005D8F8E /* MainAppViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainAppViewController.swift; sourceTree = "<group>"; };
@ -59,9 +56,12 @@
97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; }; 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; }; 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; }; 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
992BD73E4591DE3A72F1559E /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
9CE61EBC24AB366E008D68DD /* VideoCallViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VideoCallViewController.swift; sourceTree = "<group>"; }; 9CE61EBC24AB366E008D68DD /* VideoCallViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VideoCallViewController.swift; sourceTree = "<group>"; };
9CE61ECC24ADBB4C008D68DD /* ICallProtocoll.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ICallProtocoll.swift; sourceTree = "<group>"; }; 9CE61ECC24ADBB4C008D68DD /* ICallProtocoll.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ICallProtocoll.swift; sourceTree = "<group>"; };
E5CA53445955DBB6BB6D164C /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; }; A84D387F5F98138BD4BA72B2 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
C07B6E73A89564BF8FFFCF16 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
C70DC4E2BF99A6F9702540E3 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
/* End PBXFileReference section */ /* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */ /* Begin PBXFrameworksBuildPhase section */
@ -69,13 +69,21 @@
isa = PBXFrameworksBuildPhase; isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
3D7F2AC9B3EBF568D59B943B /* Pods_Runner.framework in Frameworks */, E6BEB9F4A2DEF27953D569E9 /* Pods_Runner.framework in Frameworks */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
/* End PBXFrameworksBuildPhase section */ /* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */ /* Begin PBXGroup section */
24FE3FDFDCA1524AF4FAB5C6 /* Frameworks */ = {
isa = PBXGroup;
children = (
992BD73E4591DE3A72F1559E /* Pods_Runner.framework */,
);
name = Frameworks;
sourceTree = "<group>";
};
300790F8266FB0F10052174C /* helpers */ = { 300790F8266FB0F10052174C /* helpers */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
@ -104,9 +112,9 @@
7D66D387293CE5376A07EC5F /* Pods */ = { 7D66D387293CE5376A07EC5F /* Pods */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
2ADF20AFB51DAEC9BED1884D /* Pods-Runner.debug.xcconfig */, C70DC4E2BF99A6F9702540E3 /* Pods-Runner.debug.xcconfig */,
E5CA53445955DBB6BB6D164C /* Pods-Runner.release.xcconfig */, A84D387F5F98138BD4BA72B2 /* Pods-Runner.release.xcconfig */,
0762701A9540BA69842BCA9C /* Pods-Runner.profile.xcconfig */, C07B6E73A89564BF8FFFCF16 /* Pods-Runner.profile.xcconfig */,
); );
path = Pods; path = Pods;
sourceTree = "<group>"; sourceTree = "<group>";
@ -129,7 +137,7 @@
97C146F01CF9000F007C117D /* Runner */, 97C146F01CF9000F007C117D /* Runner */,
97C146EF1CF9000F007C117D /* Products */, 97C146EF1CF9000F007C117D /* Products */,
7D66D387293CE5376A07EC5F /* Pods */, 7D66D387293CE5376A07EC5F /* Pods */,
C1938275850F66EAA5D7AC0F /* Frameworks */, 24FE3FDFDCA1524AF4FAB5C6 /* Frameworks */,
); );
sourceTree = "<group>"; sourceTree = "<group>";
}; };
@ -171,14 +179,6 @@
name = "Supporting Files"; name = "Supporting Files";
sourceTree = "<group>"; sourceTree = "<group>";
}; };
C1938275850F66EAA5D7AC0F /* Frameworks */ = {
isa = PBXGroup;
children = (
104DCFE405BA413255D4BDD9 /* Pods_Runner.framework */,
);
name = Frameworks;
sourceTree = "<group>";
};
/* End PBXGroup section */ /* End PBXGroup section */
/* Begin PBXNativeTarget section */ /* Begin PBXNativeTarget section */
@ -186,14 +186,14 @@
isa = PBXNativeTarget; isa = PBXNativeTarget;
buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
buildPhases = ( buildPhases = (
C79BE4619064E868C0DFBD12 /* [CP] Check Pods Manifest.lock */, BB6023ED443DFBCBA86A61AC /* [CP] Check Pods Manifest.lock */,
9740EEB61CF901F6004384FC /* Run Script */, 9740EEB61CF901F6004384FC /* Run Script */,
97C146EA1CF9000F007C117D /* Sources */, 97C146EA1CF9000F007C117D /* Sources */,
97C146EB1CF9000F007C117D /* Frameworks */, 97C146EB1CF9000F007C117D /* Frameworks */,
97C146EC1CF9000F007C117D /* Resources */, 97C146EC1CF9000F007C117D /* Resources */,
9705A1C41CF9048500538489 /* Embed Frameworks */, 9705A1C41CF9048500538489 /* Embed Frameworks */,
3B06AD1E1E4923F5004D2608 /* Thin Binary */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */,
3DBDEDAE0EB70F8613EE7963 /* [CP] Embed Pods Frameworks */, 80BBD7071E3C7754BD0EB296 /* [CP] Embed Pods Frameworks */,
); );
buildRules = ( buildRules = (
); );
@ -215,6 +215,7 @@
TargetAttributes = { TargetAttributes = {
97C146ED1CF9000F007C117D = { 97C146ED1CF9000F007C117D = {
CreatedOnToolsVersion = 7.3.1; CreatedOnToolsVersion = 7.3.1;
DevelopmentTeam = 3A359E86ZF;
LastSwiftMigration = 1100; LastSwiftMigration = 1100;
}; };
}; };
@ -267,7 +268,7 @@
shellPath = /bin/sh; shellPath = /bin/sh;
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
}; };
3DBDEDAE0EB70F8613EE7963 /* [CP] Embed Pods Frameworks */ = { 80BBD7071E3C7754BD0EB296 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase; isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
@ -310,7 +311,7 @@
"${BUILT_PRODUCTS_DIR}/speech_to_text/speech_to_text.framework", "${BUILT_PRODUCTS_DIR}/speech_to_text/speech_to_text.framework",
"${BUILT_PRODUCTS_DIR}/sqflite/sqflite.framework", "${BUILT_PRODUCTS_DIR}/sqflite/sqflite.framework",
"${BUILT_PRODUCTS_DIR}/url_launcher_ios/url_launcher_ios.framework", "${BUILT_PRODUCTS_DIR}/url_launcher_ios/url_launcher_ios.framework",
"${BUILT_PRODUCTS_DIR}/video_player_avfoundation/video_player_avfoundation.framework", "${BUILT_PRODUCTS_DIR}/video_player/video_player.framework",
"${BUILT_PRODUCTS_DIR}/wakelock/wakelock.framework", "${BUILT_PRODUCTS_DIR}/wakelock/wakelock.framework",
"${BUILT_PRODUCTS_DIR}/webview_flutter_wkwebview/webview_flutter_wkwebview.framework", "${BUILT_PRODUCTS_DIR}/webview_flutter_wkwebview/webview_flutter_wkwebview.framework",
); );
@ -352,7 +353,7 @@
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/speech_to_text.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/speech_to_text.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/sqflite.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/sqflite.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/url_launcher_ios.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/url_launcher_ios.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/video_player_avfoundation.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/video_player.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/wakelock.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/wakelock.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/webview_flutter_wkwebview.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/webview_flutter_wkwebview.framework",
); );
@ -375,7 +376,7 @@
shellPath = /bin/sh; shellPath = /bin/sh;
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
}; };
C79BE4619064E868C0DFBD12 /* [CP] Check Pods Manifest.lock */ = { BB6023ED443DFBCBA86A61AC /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase; isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
@ -494,7 +495,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CURRENT_PROJECT_VERSION = 4; CURRENT_PROJECT_VERSION = 4;
DEVELOPMENT_TEAM = ""; DEVELOPMENT_TEAM = 3A359E86ZF;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
@ -632,7 +633,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CURRENT_PROJECT_VERSION = 4; CURRENT_PROJECT_VERSION = 4;
DEVELOPMENT_TEAM = ""; DEVELOPMENT_TEAM = 3A359E86ZF;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
@ -666,7 +667,7 @@
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/RunnerRelease.entitlements; CODE_SIGN_ENTITLEMENTS = Runner/RunnerRelease.entitlements;
CURRENT_PROJECT_VERSION = 4; CURRENT_PROJECT_VERSION = 4;
DEVELOPMENT_TEAM = ""; DEVELOPMENT_TEAM = 3A359E86ZF;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",

@ -1,23 +1,20 @@
// @dart=2.9
import 'dart:io' show Platform; import 'dart:io' show Platform;
import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:url_launcher/url_launcher.dart'; import 'package:url_launcher/url_launcher.dart';
import 'widgets/shared/buttons/secondary_button.dart';
class UpdatePage extends StatelessWidget { class UpdatePage extends StatelessWidget {
final String message; final String? message;
final String androidLink; final String? androidLink;
final String iosLink; final String? iosLink;
const UpdatePage({Key key, this.message, this.androidLink, this.iosLink}) const UpdatePage({Key? key, this.message, this.androidLink, this.iosLink}) : super(key: key);
: super(key: key);
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@ -32,27 +29,18 @@ class UpdatePage extends StatelessWidget {
children: [ children: [
Image.asset( Image.asset(
'assets/images/update_rocket_image.png', 'assets/images/update_rocket_image.png',
width: double.maxFinite, width: double.maxFinite,fit: BoxFit.fill,
fit: BoxFit.fill,
), ),
Image.asset('assets/images/HMG_logo.png'), Image.asset('assets/images/HMG_logo.png'),
SizedBox( SizedBox(height: 8,),
height: 8,
),
AppText( AppText(
TranslationBase.of(context).updateTheApp.toUpperCase(), TranslationBase.of(context).updateTheApp!.toUpperCase(),fontSize: 17,
fontSize: 17,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
), ),
SizedBox( SizedBox(height: 12,),
height: 12,
),
Padding( Padding(
padding: const EdgeInsets.all(8.0), padding: const EdgeInsets.all(8.0),
child: AppText( child: AppText(message??"Update the app",fontSize: 12,),
message ?? "Update the app",
fontSize: 12,
),
) )
], ],
), ),
@ -62,15 +50,15 @@ class UpdatePage extends StatelessWidget {
child: Container( child: Container(
// padding: const EdgeInsets.all(8.0), // padding: const EdgeInsets.all(8.0),
margin: EdgeInsets.all(15), margin: EdgeInsets.all(15),
child: AppButton( child: SecondaryButton(
color: Colors.red[800], color: Colors.red[800],
onPressed: () { onTap: () {
if (Platform.isIOS) if (Platform.isIOS)
launch(iosLink); launch(iosLink!);
else else
launch(androidLink); launch(androidLink!);
}, },
title: TranslationBase.of(context).updateNow.toUpperCase(), label: TranslationBase.of(context).updateNow!.toUpperCase(),
), ),
), ),
), ),

@ -1,5 +1,3 @@
//@dart=2.9
import 'dart:convert'; import 'dart:convert';
import 'dart:io' show Platform; import 'dart:io' show Platform;
@ -7,10 +5,10 @@ import 'package:doctor_app_flutter/config/config.dart';
import 'package:doctor_app_flutter/config/shared_pref_kay.dart'; import 'package:doctor_app_flutter/config/shared_pref_kay.dart';
import 'package:doctor_app_flutter/core/service/NavigationService.dart'; import 'package:doctor_app_flutter/core/service/NavigationService.dart';
import 'package:doctor_app_flutter/core/viewModel/authentication_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/authentication_view_model.dart';
import 'package:doctor_app_flutter/core/model/doctor/doctor_profile_model.dart'; import 'package:doctor_app_flutter/models/doctor/doctor_profile_model.dart';
import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart';
import 'package:doctor_app_flutter/utils/dr_app_shared_pref.dart'; import 'package:doctor_app_flutter/util/dr_app_shared_pref.dart';
import 'package:doctor_app_flutter/utils/utils.dart'; import 'package:doctor_app_flutter/util/helpers.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:http/http.dart' as http; import 'package:http/http.dart' as http;
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
@ -19,14 +17,14 @@ import '../locator.dart';
import '../routes.dart'; import '../routes.dart';
DrAppSharedPreferances sharedPref = new DrAppSharedPreferances(); DrAppSharedPreferances sharedPref = new DrAppSharedPreferances();
Utils helpers = new Utils(); Helpers helpers = new Helpers();
class BaseAppClient { class BaseAppClient {
//TODO change the post fun to nun static when you change all service //TODO change the post fun to nun static when you change all service
post(String endPoint, post(String endPoint,
{Map<String, dynamic> body, {required Map<String, dynamic> body,
Function(dynamic response, int statusCode) onSuccess, required Function(dynamic response, int statusCode) onSuccess,
Function(String error, int statusCode) onFailure, required Function(String error, int statusCode) onFailure,
bool isAllowAny = false, bool isAllowAny = false,
bool isLiveCare = false, bool isLiveCare = false,
bool isFallLanguage = false}) async { bool isFallLanguage = false}) async {
@ -38,37 +36,30 @@ class BaseAppClient {
bool callLog = true; bool callLog = true;
try { try {
Map profile = await sharedPref.getObj(DOCTOR_PROFILE); Map<String, dynamic>? profile = await sharedPref.getObj(DOCTOR_PROFILE);
String token = await sharedPref.getString(TOKEN); String token = await sharedPref.getString(TOKEN);
DoctorProfileModel? doctorProfile;
if (profile != null) { if (profile != null) {
DoctorProfileModel doctorProfile = DoctorProfileModel.fromJson(profile); doctorProfile = DoctorProfileModel.fromJson(profile);
if (body['DoctorID'] == null) { if (body['DoctorID'] == null) body['DoctorID'] = doctorProfile!.doctorID;
body['DoctorID'] = doctorProfile?.doctorID;
}
if (body['DoctorID'] == "") body['DoctorID'] = null; if (body['DoctorID'] == "") body['DoctorID'] = null;
if (body['EditedBy'] == null) if (body['EditedBy'] == null) body['EditedBy'] = doctorProfile!.doctorID;
body['EditedBy'] = doctorProfile?.doctorID;
if (body['ProjectID'] == null) { if (body['ProjectID'] == null) {
body['ProjectID'] = doctorProfile?.projectID; body['ProjectID'] = doctorProfile!.projectID;
} }
if (body['ClinicID'] == null) if (body['ClinicID'] == null) body['ClinicID'] = doctorProfile!.clinicID;
body['ClinicID'] = doctorProfile?.clinicID;
} else {
String doctorID = await sharedPref.getString(DOCTOR_ID);
if (body['DoctorID'] == '') { if (body['DoctorID'] == '') {
body['DoctorID'] = null; body['DoctorID'] = null;
} else if (doctorID != null) body['DoctorID'] = int.parse(doctorID);
} }
if (body['EditedBy'] == '') { if (body['EditedBy'] == '') {
body.remove("EditedBy"); body.remove("EditedBy");
} }
}
if (body['TokenID'] == null) { if (body['TokenID'] == null) {
body['TokenID'] = token ?? ''; body['TokenID'] = token;
} }
// body['TokenID'] = "@dm!n" ?? '';
if (!isFallLanguage) { if (!isFallLanguage) {
String lang = await sharedPref.getString(APP_Language); String lang = await sharedPref.getString(APP_Language);
if (lang != null && lang == 'ar') if (lang != null && lang == 'ar')
@ -77,6 +68,7 @@ class BaseAppClient {
body['LanguageID'] = 2; body['LanguageID'] = 2;
} }
body['stamp'] = DateTime.now().toIso8601String(); body['stamp'] = DateTime.now().toIso8601String();
// if(!body.containsKey("IPAdress"))
body['IPAdress'] = IP_ADDRESS; body['IPAdress'] = IP_ADDRESS;
if (body['VersionID'] == null) { if (body['VersionID'] == null) {
body['VersionID'] = VERSION_ID; body['VersionID'] = VERSION_ID;
@ -88,12 +80,10 @@ class BaseAppClient {
body['IsLoginForDoctorApp'] = IS_LOGIN_FOR_DOCTOR_APP; body['IsLoginForDoctorApp'] = IS_LOGIN_FOR_DOCTOR_APP;
body['PatientOutSA'] = body['PatientOutSA'] ?? 0; // PATIENT_OUT_SA; body['PatientOutSA'] = body['PatientOutSA'] ?? 0; // PATIENT_OUT_SA;
if (body['VidaAuthTokenID'] == null) { if (body['VidaAuthTokenID'] == null) {
body['VidaAuthTokenID'] = body['VidaAuthTokenID'] = await sharedPref.getString(VIDA_AUTH_TOKEN_ID);
await sharedPref.getString(VIDA_AUTH_TOKEN_ID);
} }
if (body['VidaRefreshTokenID'] == null) { if (body['VidaRefreshTokenID'] == null) {
body['VidaRefreshTokenID'] = body['VidaRefreshTokenID'] = await sharedPref.getString(VIDA_REFRESH_TOKEN_ID);
await sharedPref.getString(VIDA_REFRESH_TOKEN_ID);
} }
int projectID = await sharedPref.getInt(PROJECT_ID); int projectID = await sharedPref.getInt(PROJECT_ID);
@ -112,32 +102,24 @@ class BaseAppClient {
print("Body : ${json.encode(body)}"); print("Body : ${json.encode(body)}");
var asd = json.encode(body); var asd = json.encode(body);
var asd2; var asd2;
if (await Utils.checkConnection()) { if (await Helpers.checkConnection()) {
final response = await http.post(Uri.parse(url), final response = await http.post(Uri.parse(url),
body: json.encode(body), body: json.encode(body), headers: {'Content-Type': 'application/json', 'Accept': 'application/json'});
headers: {
'Content-Type': 'application/json',
'Accept': 'application/json'
});
final int statusCode = response.statusCode; final int statusCode = response.statusCode;
if (statusCode < 200 || statusCode >= 400) { if (statusCode < 200 || statusCode >= 400) {
onFailure(Utils.generateContactAdminMsg(), statusCode); onFailure(Helpers.generateContactAdminMsg(), statusCode);
} else { } else {
var parsed = json.decode(response.body.toString()); var parsed = json.decode(response.body.toString());
if (parsed['ErrorType'] == 4) { if (parsed['ErrorType'] == 4) {
helpers.navigateToUpdatePage(parsed['ErrorEndUserMessage'], helpers.navigateToUpdatePage(parsed['ErrorEndUserMessage'], parsed['AndroidLink'], parsed['IOSLink']);
parsed['AndroidLink'], parsed['IOSLink']);
} }
if (parsed['IsAuthenticated'] != null && !parsed['IsAuthenticated']) { if (parsed['IsAuthenticated'] != null && !parsed['IsAuthenticated']) {
if (body['OTP_SendType'] != null) { if (body['OTP_SendType'] != null) {
onFailure(getError(parsed), statusCode); onFailure(getError(parsed), statusCode);
} else if (!isAllowAny) { } else if (!isAllowAny) {
await Provider.of<AuthenticationViewModel>(AppGlobal.CONTEX, await Provider.of<AuthenticationViewModel>(AppGlobal.CONTEX, listen: false).logout();
listen: false) Helpers.showErrorToast('Your session expired Please login again');
.logout();
Utils.showErrorToast('Your session expired Please login again');
locator<NavigationService>().pushNamedAndRemoveUntil(ROOT); locator<NavigationService>().pushNamedAndRemoveUntil(ROOT);
} }
if (isAllowAny) { if (isAllowAny) {
@ -162,30 +144,18 @@ class BaseAppClient {
} }
postPatient(String endPoint, postPatient(String endPoint,
{Map<String, dynamic> body, {required Map<String, dynamic> body,
Function(dynamic response, int statusCode) onSuccess, required Function(dynamic response, int statusCode) onSuccess,
Function(String error, int statusCode) onFailure, required Function(String error, int statusCode) onFailure,
@required PatiantInformtion patient, PatiantInformtion? patient,
bool isExternal = false}) async { bool isExternal = false}) async {
String url = BASE_URL + endPoint; String url = BASE_URL + endPoint;
try { try {
Map<String, String> headers = { Map<String, String> headers = {'Content-Type': 'application/json', 'Accept': 'application/json'};
'Content-Type': 'application/json',
'Accept': 'application/json'
};
String token = await sharedPref.getString(TOKEN); String token = await sharedPref.getString(TOKEN);
Map profile = await sharedPref.getObj(DOCTOR_PROFILE); var languageID = await sharedPref.getStringWithDefaultValue(APP_Language, 'en');
if (profile != null) {
DoctorProfileModel doctorProfile = DoctorProfileModel.fromJson(profile);
if (body['DoctorID'] == null) {
body['DoctorID'] = doctorProfile?.doctorID;
}
}
var languageID =
await sharedPref.getStringWithDefaultValue(APP_Language, 'en');
body['SetupID'] = body.containsKey('SetupID') body['SetupID'] = body.containsKey('SetupID')
? body['SetupID'] != null ? body['SetupID'] != null
? body['SetupID'] ? body['SetupID']
@ -205,8 +175,7 @@ class BaseAppClient {
: PATIENT_OUT_SA_PATIENT_REQ; : PATIENT_OUT_SA_PATIENT_REQ;
if (body.containsKey('isDentalAllowedBackend')) { if (body.containsKey('isDentalAllowedBackend')) {
body['isDentalAllowedBackend'] = body['isDentalAllowedBackend'] = body.containsKey('isDentalAllowedBackend')
body.containsKey('isDentalAllowedBackend')
? body['isDentalAllowedBackend'] != null ? body['isDentalAllowedBackend'] != null
? body['isDentalAllowedBackend'] ? body['isDentalAllowedBackend']
: IS_DENTAL_ALLOWED_BACKEND : IS_DENTAL_ALLOWED_BACKEND
@ -218,7 +187,7 @@ class BaseAppClient {
body['PatientType'] = body.containsKey('PatientType') body['PatientType'] = body.containsKey('PatientType')
? body['PatientType'] != null ? body['PatientType'] != null
? body['PatientType'] ? body['PatientType']
: patient.patientType != null : patient!.patientType != null
? patient.patientType ? patient.patientType
: PATIENT_TYPE : PATIENT_TYPE
: PATIENT_TYPE; : PATIENT_TYPE;
@ -226,15 +195,13 @@ class BaseAppClient {
body['PatientTypeID'] = body.containsKey('PatientTypeID') body['PatientTypeID'] = body.containsKey('PatientTypeID')
? body['PatientTypeID'] != null ? body['PatientTypeID'] != null
? body['PatientTypeID'] ? body['PatientTypeID']
: patient.patientType != null : patient!.patientType != null
? patient.patientType ? patient.patientType
: PATIENT_TYPE_ID : PATIENT_TYPE_ID
: PATIENT_TYPE_ID; : PATIENT_TYPE_ID;
body['TokenID'] = body.containsKey('TokenID') ? body['TokenID']??token : token; body['TokenID'] = body.containsKey('TokenID') ? body['TokenID'] : token;
body['PatientID'] = body['PatientID'] != null body['PatientID'] = body['PatientID'] != null ? body['PatientID'] : patient!.patientId ?? patient.patientMRN;
? body['PatientID']
: patient.patientId ?? patient.patientMRN;
body['PatientOutSA'] = 0; //user['OutSA']; //TODO change it body['PatientOutSA'] = 0; //user['OutSA']; //TODO change it
body['SessionID'] = SESSION_ID; //getSe body['SessionID'] = SESSION_ID; //getSe
@ -249,9 +216,8 @@ class BaseAppClient {
print("Body : ${json.encode(body)}"); print("Body : ${json.encode(body)}");
var asd = json.encode(body); var asd = json.encode(body);
var asd2; var asd2;
if (await Utils.checkConnection()) { if (await Helpers.checkConnection()) {
final response = await http.post(Uri.parse(url.trim()), final response = await http.post(Uri.parse(url.trim()), body: json.encode(body), headers: headers);
body: json.encode(body), headers: headers);
final int statusCode = response.statusCode; final int statusCode = response.statusCode;
print("statusCode :$statusCode"); print("statusCode :$statusCode");
if (statusCode < 200 || statusCode >= 400 || json == null) { if (statusCode < 200 || statusCode >= 400 || json == null) {
@ -263,8 +229,7 @@ class BaseAppClient {
onSuccess(parsed, statusCode); onSuccess(parsed, statusCode);
} else { } else {
if (parsed['ErrorType'] == 4) { if (parsed['ErrorType'] == 4) {
helpers.navigateToUpdatePage(parsed['ErrorEndUserMessage'], helpers.navigateToUpdatePage(parsed['ErrorEndUserMessage'], parsed['AndroidLink'], parsed['IOSLink']);
parsed['AndroidLink'], parsed['IOSLink']);
} }
if (parsed['IsAuthenticated'] == null) { if (parsed['IsAuthenticated'] == null) {
if (parsed['isSMSSent'] == true) { if (parsed['isSMSSent'] == true) {
@ -280,28 +245,20 @@ class BaseAppClient {
onFailure(getError(parsed), statusCode); onFailure(getError(parsed), statusCode);
} }
} }
} else if (parsed['MessageStatus'] == 1 || } else if (parsed['MessageStatus'] == 1 || parsed['SMSLoginRequired'] == true) {
parsed['SMSLoginRequired'] == true) {
onSuccess(parsed, statusCode); onSuccess(parsed, statusCode);
} else if (parsed['MessageStatus'] == 2 && } else if (parsed['MessageStatus'] == 2 && parsed['IsAuthenticated']) {
parsed['IsAuthenticated']) {
if (parsed['SameClinicApptList'] != null) { if (parsed['SameClinicApptList'] != null) {
onSuccess(parsed, statusCode); onSuccess(parsed, statusCode);
} else { } else {
if (parsed['message'] == null && if (parsed['message'] == null && parsed['ErrorEndUserMessage'] == null) {
parsed['ErrorEndUserMessage'] == null) {
if (parsed['ErrorSearchMsg'] == null) { if (parsed['ErrorSearchMsg'] == null) {
onFailure("Server Error found with no available message", onFailure("Server Error found with no available message", statusCode);
statusCode);
} else { } else {
onFailure(parsed['ErrorSearchMsg'], statusCode); onFailure(parsed['ErrorSearchMsg'], statusCode);
} }
} else { } else {
onFailure( onFailure(parsed['message'] ?? parsed['ErrorEndUserMessage'] ?? parsed['ErrorMessage'], statusCode);
parsed['message'] ??
parsed['ErrorEndUserMessage'] ??
parsed['ErrorMessage'],
statusCode);
} }
} }
} else { } else {
@ -311,9 +268,7 @@ class BaseAppClient {
if (parsed['message'] != null) { if (parsed['message'] != null) {
onFailure(parsed['message'] ?? parsed['message'], statusCode); onFailure(parsed['message'] ?? parsed['message'], statusCode);
} else { } else {
onFailure( onFailure(parsed['ErrorEndUserMessage'] ?? parsed['ErrorMessage'], statusCode);
parsed['ErrorEndUserMessage'] ?? parsed['ErrorMessage'],
statusCode);
} }
} }
} }
@ -336,17 +291,13 @@ class BaseAppClient {
if (parsed["ValidationErrors"]["ValidationErrors"] != null && if (parsed["ValidationErrors"]["ValidationErrors"] != null &&
parsed["ValidationErrors"]["ValidationErrors"].length != 0) { parsed["ValidationErrors"]["ValidationErrors"].length != 0) {
for (var i = 0; for (var i = 0; i < parsed["ValidationErrors"]["ValidationErrors"].length; i++) {
i < parsed["ValidationErrors"]["ValidationErrors"].length; error = error + parsed["ValidationErrors"]["ValidationErrors"][i]["Messages"][0] + "\n";
i++) {
error = error +
parsed["ValidationErrors"]["ValidationErrors"][i]["Messages"][0] +
"\n";
} }
} }
} }
if (error == null || error == "null" || error == "null\n") { if (error == null || error == "null" || error == "null\n") {
return Utils.generateContactAdminMsg(); return Helpers.generateContactAdminMsg();
} }
return error; return error;
} }

@ -13,6 +13,8 @@ const PATIENT_PROGRESS_NOTE_URL =
"Services/DoctorApplication.svc/REST/GetProgressNoteForInPatient"; "Services/DoctorApplication.svc/REST/GetProgressNoteForInPatient";
const PATIENT_INSURANCE_APPROVALS_URL = const PATIENT_INSURANCE_APPROVALS_URL =
"Services/DoctorApplication.svc/REST/GetApprovalStatusForInpatient"; "Services/DoctorApplication.svc/REST/GetApprovalStatusForInpatient";
const PATIENT_ORDERS_URL =
"Services/DoctorApplication.svc/REST/GetProgressNoteForInPatient";
const PATIENT_REFER_TO_DOCTOR_URL = const PATIENT_REFER_TO_DOCTOR_URL =
"Services/DoctorApplication.svc/REST/ReferToDoctor"; "Services/DoctorApplication.svc/REST/ReferToDoctor";
const PATIENT_GET_DOCTOR_BY_CLINIC_URL = const PATIENT_GET_DOCTOR_BY_CLINIC_URL =
@ -42,6 +44,7 @@ const GET_PATIENT_VITAL_SIGN_DATA =
const GET_PATIENT_LAB_OREDERS = const GET_PATIENT_LAB_OREDERS =
'Services/DoctorApplication.svc/REST/GetPatientLabOreders'; 'Services/DoctorApplication.svc/REST/GetPatientLabOreders';
const GET_PRESCRIPTION = 'Services/Patients.svc/REST/GetPrescriptionApptList'; const GET_PRESCRIPTION = 'Services/Patients.svc/REST/GetPrescriptionApptList';
const GET_RADIOLOGY = 'Services/DoctorApplication.svc/REST/GetPatientRadResult';
const GET_LIVECARE_PENDINGLIST = const GET_LIVECARE_PENDINGLIST =
'Services/DoctorApplication.svc/REST/GetPendingPatientER'; 'Services/DoctorApplication.svc/REST/GetPendingPatientER';
@ -135,7 +138,7 @@ const ADD_SICK_LEAVE = 'Services/DoctorApplication.svc/REST/PostSickLeave';
const GET_SICK_LEAVE = 'Services/Patients.svc/REST/GetPatientSickLeave'; const GET_SICK_LEAVE = 'Services/Patients.svc/REST/GetPatientSickLeave';
const EXTEND_SICK_LEAVE = 'Services/DoctorApplication.svc/REST/ExtendSickLeave'; const EXTEND_SICK_LEAVE = 'Services/DoctorApplication.svc/REST/ExtendSickLeave';
const GET_MASTER_LOOKUP_LIST = 'Services/DoctorApplication.svc/REST/GetMasterLookUpList'; const GET_OFFTIME = 'Services/DoctorApplication.svc/REST/GetMasterLookUpList';
const GET_COVERING_DOCTORS = const GET_COVERING_DOCTORS =
'Services/DoctorApplication.svc/REST/GetCoveringDoctor'; 'Services/DoctorApplication.svc/REST/GetCoveringDoctor';
const ADD_RESCHDEULE = 'Services/DoctorApplication.svc/REST/PostRequisition'; const ADD_RESCHDEULE = 'Services/DoctorApplication.svc/REST/PostRequisition';
@ -152,6 +155,8 @@ const GET_PROCEDURE_LIST =
'Services/DoctorApplication.svc/REST/GetOrderedProcedure'; 'Services/DoctorApplication.svc/REST/GetOrderedProcedure';
const POST_PROCEDURE_LIST = 'Services/DoctorApplication.svc/REST/PostProcedure'; const POST_PROCEDURE_LIST = 'Services/DoctorApplication.svc/REST/PostProcedure';
const GET_PATIENT_ARRIVAL_LIST =
'Services/DoctorApplication.svc/REST/PatientArrivalList';
const GET_PATIENT_IN_PATIENT_LIST = const GET_PATIENT_IN_PATIENT_LIST =
'Services/DoctorApplication.svc/REST/GetMyInPatient'; 'Services/DoctorApplication.svc/REST/GetMyInPatient';
@ -175,6 +180,8 @@ const GET_PATIENT_LAB_ORDERS_RESULT_HISTORY_BY_DESCRIPTION =
// SOAP // SOAP
const GET_ALLERGIES = 'Services/DoctorApplication.svc/REST/GetAllergies'; const GET_ALLERGIES = 'Services/DoctorApplication.svc/REST/GetAllergies';
const GET_MASTER_LOOKUP_LIST =
'Services/DoctorApplication.svc/REST/GetMasterLookUpList';
const POST_EPISODE = 'Services/DoctorApplication.svc/REST/PostEpisode'; const POST_EPISODE = 'Services/DoctorApplication.svc/REST/PostEpisode';
const POST_EPISODE_FOR_IN_PATIENT = const POST_EPISODE_FOR_IN_PATIENT =
@ -201,13 +208,15 @@ const PATCH_PROGRESS_NOTE =
'Services/DoctorApplication.svc/REST/PatchProgressNote'; 'Services/DoctorApplication.svc/REST/PatchProgressNote';
const PATCH_ASSESSMENT = 'Services/DoctorApplication.svc/REST/PatchAssessment'; const PATCH_ASSESSMENT = 'Services/DoctorApplication.svc/REST/PatchAssessment';
const GET_ALLERGY = 'Services/DoctorApplication.svc/REST/GetAllergies';
const GET_HISTORY = 'Services/DoctorApplication.svc/REST/GetHistory'; const GET_HISTORY = 'Services/DoctorApplication.svc/REST/GetHistory';
const GET_CHIEF_COMPLAINT = const GET_CHIEF_COMPLAINT =
'Services/DoctorApplication.svc/REST/GetChiefcomplaint'; 'Services/DoctorApplication.svc/REST/GetChiefcomplaint';
const GET_PHYSICAL_EXAM = 'Services/DoctorApplication.svc/REST/GetPhysicalExam'; const GET_PHYSICAL_EXAM = 'Services/DoctorApplication.svc/REST/GetPhysicalExam';
const GET_PROGRESS_NOTE = 'Services/DoctorApplication.svc/REST/GetProgressNote'; const GET_PROGRESS_NOTE = 'Services/DoctorApplication.svc/REST/GetProgressNote';
const GET_ASSESSMENT = 'Services/DoctorApplication.svc/REST/GetAssessment'; const GET_ASSESSMENT = 'Services/DoctorApplication.svc/REST/GetAssessment';
const GET_ORDER_PROCEDURE =
'Services/DoctorApplication.svc/REST/GetOrderedProcedure';
const GET_LIST_CATEGORISE = const GET_LIST_CATEGORISE =
'Services/DoctorApplication.svc/REST/GetProcedureCategories'; 'Services/DoctorApplication.svc/REST/GetProcedureCategories';
@ -262,6 +271,7 @@ const GET_IN_PATIENT_ORDERS =
'Services/DoctorApplication.svc/REST/GetPatientRadResult'; 'Services/DoctorApplication.svc/REST/GetPatientRadResult';
///Prescriptions ///Prescriptions
const PRESCRIPTIONS = 'Services/Patients.svc/REST/GetPrescriptionApptList';
const GET_PRESCRIPTIONS_ALL_ORDERS = const GET_PRESCRIPTIONS_ALL_ORDERS =
'Services/Patients.svc/REST/PatientER_GetPatientAllPresOrders'; 'Services/Patients.svc/REST/PatientER_GetPatientAllPresOrders';
const GET_PRESCRIPTION_REPORT_NEW = const GET_PRESCRIPTION_REPORT_NEW =
@ -270,11 +280,18 @@ const SEND_PRESCRIPTION_EMAIL =
'Services/Notifications.svc/REST/SendPrescriptionEmail'; 'Services/Notifications.svc/REST/SendPrescriptionEmail';
const GET_PRESCRIPTION_REPORT_ENH = const GET_PRESCRIPTION_REPORT_ENH =
'Services/Patients.svc/REST/GetPrescriptionReport_enh'; 'Services/Patients.svc/REST/GetPrescriptionReport_enh';
const GET_PHARMACY_LIST = "Services/Patients.svc/REST/GetPharmcyList";
const UPDATE_PROGRESS_NOTE_FOR_INPATIENT = const UPDATE_PROGRESS_NOTE_FOR_INPATIENT =
"Services/DoctorApplication.svc/REST/UpdateProgressNoteForInPatient"; "Services/DoctorApplication.svc/REST/UpdateProgressNoteForInPatient";
const CREATE_PROGRESS_NOTE_FOR_INPATIENT = const CREATE_PROGRESS_NOTE_FOR_INPATIENT =
"Services/DoctorApplication.svc/REST/CreateProgressNoteForInPatient"; "Services/DoctorApplication.svc/REST/CreateProgressNoteForInPatient";
const GET_PRESCRIPTION_IN_PATIENT =
'Services/DoctorApplication.svc/REST/GetPrescriptionReportForInPatient';
const GET_INSURANCE_IN_PATIENT =
"Services/DoctorApplication.svc/REST/GetApprovalStatusForInpatient";
const GET_SICK_LEAVE_PATIENT = "Services/Patients.svc/REST/GetPatientSickLeave"; const GET_SICK_LEAVE_PATIENT = "Services/Patients.svc/REST/GetPatientSickLeave";
const GET_MY_OUT_PATIENT = const GET_MY_OUT_PATIENT =
"Services/DoctorApplication.svc/REST/GetMyOutPatient"; "Services/DoctorApplication.svc/REST/GetMyOutPatient";
@ -369,25 +386,6 @@ const GET_PENDING_DISCHARGE_SUMMARY =
const GET_ALL_DISCHARGE_SUMMARY = const GET_ALL_DISCHARGE_SUMMARY =
"Services/DoctorApplication.svc/REST/DoctorApp_GetDischargeSummary"; "Services/DoctorApplication.svc/REST/DoctorApp_GetDischargeSummary";
const VTE_ASSESSMENT =
"Services/Patients.svc/REST/INP_GetVTEHistoryByTransactionNo";
const GET_INTERVENTION_MEDICATION =
"Services/DoctorApplication.svc/REST/DoctorApp_GetInterventionMedications";
const GET_INTERVENTION_MEDICATION_HISTORY =
"Services/DoctorApplication.svc/REST/DoctorApp_GetInterventionHistory";
const SET_ACCEPTED_OR_REJECTED =
"Services/DoctorApplication.svc/REST/DoctorApp_AcceptOrRejectIntervention";
const GET_STP_MASTER_LIST =
"Services/DoctorApplication.svc/REST/DoctorApp_GetSTPMasterList";
const DOCTOR_ER_SIGN_ASSESSMENT =
"Services/DoctorApplication.svc/REST/DoctorApp_DoctorERSignAssessment";
var selectedPatientType = 1; var selectedPatientType = 1;
//*********change value to decode json from Dropdown ************ //*********change value to decode json from Dropdown ************
@ -438,7 +436,7 @@ const TRANSACTION_NO = 0;
const LANGUAGE_ID = 2; const LANGUAGE_ID = 2;
const STAMP = '2020-04-27T12:17:17.721Z'; const STAMP = '2020-04-27T12:17:17.721Z';
const IP_ADDRESS = '9.9.9.9'; const IP_ADDRESS = '9.9.9.9';
const VERSION_ID = 8.3; const VERSION_ID = 6.4;
const CHANNEL = 9; const CHANNEL = 9;
const SESSION_ID = 'BlUSkYymTt'; const SESSION_ID = 'BlUSkYymTt';
const IS_LOGIN_FOR_DOCTOR_APP = true; const IS_LOGIN_FOR_DOCTOR_APP = true;
@ -450,6 +448,7 @@ const GENERAL_ID = 'Cs2020@2016\$2958';
const PATIENT_TYPE = 1; const PATIENT_TYPE = 1;
const PATIENT_TYPE_ID = 1; const PATIENT_TYPE_ID = 1;
const Color IN_PROGRESS_COLOR = Color(0xFFCC9B14);
/// Timer Info /// Timer Info
const TIMER_MIN = 10; const TIMER_MIN = 10;
@ -459,7 +458,4 @@ class AppGlobal {
static Color appRedColor = Color(0xFFD02127); static Color appRedColor = Color(0xFFD02127);
static Color appGreenColor = Color(0xFF359846); static Color appGreenColor = Color(0xFF359846);
static Color appTextColor = Color(0xFF2B353E); static Color appTextColor = Color(0xFF2B353E);
static Color scheduleTextColor = Color(0xFF2E303A);
static Color inProgressColor = Color(0xFFCC9B14);
} }

@ -14,13 +14,12 @@ const Map<String, Map<String, String>> localizedValues = {
"fileNo": {"en": "File No : ", "ar": "رقم الملف :"}, "fileNo": {"en": "File No : ", "ar": "رقم الملف :"},
"mobileNo": {"en": "Mobile No", "ar": "رقم الجوال"}, "mobileNo": {"en": "Mobile No", "ar": "رقم الجوال"},
"messagesScreenToolbarTitle": {"en": "Messages", "ar": "الرسائل"}, "messagesScreenToolbarTitle": {"en": "Messages", "ar": "الرسائل"},
"mySchedule": {"en": "Schedules", "ar": "جدولي"}, "mySchedule": {"en": "Schedule", "ar": "جدولي"},
"errorNoSchedule": { "errorNoSchedule": {
"en": "You don't have any Schedule", "en": "You don't have any Schedule",
"ar": "ليس لديك أي جدول" "ar": "ليس لديك أي جدول"
}, },
"verify": {"en": "VERIFY", "ar": "تحقق"}, "verify": {"en": "VERIFY", "ar": "تحقق"},
"pharmacy-intervention": {"en": "Pharmacy Intervention", "ar": "التدخل الصيدلاني"},
"referralDoctor": {"en": "Referral Doctor", "ar": "الطبيب المُحول إليه"}, "referralDoctor": {"en": "Referral Doctor", "ar": "الطبيب المُحول إليه"},
"referringClinic": {"en": "Referring Clinic", "ar": "العيادة المُحول إليها"}, "referringClinic": {"en": "Referring Clinic", "ar": "العيادة المُحول إليها"},
"frequency": {"en": "Frequency", "ar": "تكرر"}, "frequency": {"en": "Frequency", "ar": "تكرر"},
@ -57,7 +56,7 @@ const Map<String, Map<String, String>> localizedValues = {
"myInPatient": {"en": "My\n In Patients", "ar": "مرضاي\nالمنومين"}, "myInPatient": {"en": "My\n In Patients", "ar": "مرضاي\nالمنومين"},
"myInPatientTitle": {"en": "My Patients", "ar": "مرضاي المنومين"}, "myInPatientTitle": {"en": "My Patients", "ar": "مرضاي المنومين"},
"inPatientLabel": {"en": "InPatients", "ar": "المريض المنوم"}, "inPatientLabel": {"en": "InPatients", "ar": "المريض المنوم"},
"inPatientAll": {"en": "All Patients", "ar": "المرضى المنومين"}, "inPatientAll": {"en": "All Patients", "ar": "جميع المرضى المنومين"},
"operations": {"en": "Operations", "ar": "عمليات"}, "operations": {"en": "Operations", "ar": "عمليات"},
"patientServices": {"en": "Patient Services", "ar": "خدمات المرضى"}, "patientServices": {"en": "Patient Services", "ar": "خدمات المرضى"},
"searchMedicineDashboard": { "searchMedicineDashboard": {
@ -84,8 +83,8 @@ const Map<String, Map<String, String>> localizedValues = {
"ar": "المريض الذي حضر للموعد" "ar": "المريض الذي حضر للموعد"
}, },
"searchMedicineNameHere": {"en": "Search Medicine ", "ar": "ابحث هنا"}, "searchMedicineNameHere": {"en": "Search Medicine ", "ar": "ابحث هنا"},
"youCanFind": {"en": "You can find ", "ar": "تستطيع ان تجد "}, "youCanFind": {"en": "You Can Find ", "ar": "تستطيع ان تجد "},
"medicineSearchResult": {"en": "as a search result for", "ar": "كنتيجة بحث عن"}, "itemsInSearch": {"en": "items in search", "ar": "عناصر في البحث"},
"qr": {"en": "QR", "ar": "QR"}, "qr": {"en": "QR", "ar": "QR"},
"reader": {"en": "Reader", "ar": "قارىء رمز ال"}, "reader": {"en": "Reader", "ar": "قارىء رمز ال"},
"startScanning": {"en": "Start Scanning", "ar": "بدء المسح"}, "startScanning": {"en": "Start Scanning", "ar": "بدء المسح"},
@ -93,10 +92,6 @@ const Map<String, Map<String, String>> localizedValues = {
"en": "scan Qr code to retrieve patient profile", "en": "scan Qr code to retrieve patient profile",
"ar": "مسح رمزاال QR لاسترداد ملف تعريف المريض" "ar": "مسح رمزاال QR لاسترداد ملف تعريف المريض"
}, },
"scanERQrCode": {
"en": "Scan Qr code to handle ER Sign In",
"ar": "امسح رمز ال ER للتعامل مع تسجيل الدخول"
},
"scanQr": {"en": "Scan Qr", "ar": "اقراء ال QR"}, "scanQr": {"en": "Scan Qr", "ar": "اقراء ال QR"},
"profile": {"en": "Profile", "ar": "ملفي الشخصي"}, "profile": {"en": "Profile", "ar": "ملفي الشخصي"},
"gender": {"en": "Gender", "ar": "الجنس"}, "gender": {"en": "Gender", "ar": "الجنس"},
@ -542,10 +537,6 @@ const Map<String, Map<String, String>> localizedValues = {
"selectSeverity": {"en": "Select Severity", "ar": "حدد الخطورة"}, "selectSeverity": {"en": "Select Severity", "ar": "حدد الخطورة"},
"leaveCreated": {"en": "Leave has been created", "ar": "تم إنشاء الإجازة"}, "leaveCreated": {"en": "Leave has been created", "ar": "تم إنشاء الإجازة"},
"medications": {"en": "Medications", "ar": "الأدوية"}, "medications": {"en": "Medications", "ar": "الأدوية"},
"medication": {"en": "Medication", "ar": "الدواء"},
"createdByName": {"en": "Created By Name", "ar": "الدواء"},
"statusDescription": {"en": "Status Description", "ar": "وصف الحالة"},
"doctorComments": {"en": "Doctor Comments", "ar": "تعليقات الطبيب"},
"procedures": {"en": "Procedures", "ar": "الإجراءات"}, "procedures": {"en": "Procedures", "ar": "الإجراءات"},
"vitalSignEmptyMsg": { "vitalSignEmptyMsg": {
"en": "There is no vital signs for this patient", "en": "There is no vital signs for this patient",
@ -672,12 +663,11 @@ const Map<String, Map<String, String>> localizedValues = {
"progressNoteSOAP": {"en": "Progress Note", "ar": "ملاحظة التقدم"}, "progressNoteSOAP": {"en": "Progress Note", "ar": "ملاحظة التقدم"},
"addProgressNote": {"en": "Add Progress Note", "ar": "أضف ملاحظة التقدم"}, "addProgressNote": {"en": "Add Progress Note", "ar": "أضف ملاحظة التقدم"},
"createdBy": {"en": "Created By :", "ar": "أضيفت عن طريق: "}, "createdBy": {"en": "Created By :", "ar": "أضيفت عن طريق: "},
"riskScore": {"en": "Risk Score :", "ar": "درجة المخاطر"},
"editedBy": {"en": "Edited By :", "ar": "عدلت من : "}, "editedBy": {"en": "Edited By :", "ar": "عدلت من : "},
"currentMedications": {"en": "Current Medications", "ar": "الأدوية الحالية"}, "currentMedications": {"en": "Current Medications", "ar": "الأدوية الحالية"},
"noItem": { "noItem": {
"en": "sorry, there is no items exists in this list", "en": "No items exists in this list",
"ar": "آسف ، لا توجد عناصر موجودة في هذه القائمة" "ar": "لا توجد عناصر في هذه القائمة"
}, },
"postUcafSuccessMsg": { "postUcafSuccessMsg": {
"en": "UCAF request send successfully", "en": "UCAF request send successfully",
@ -718,7 +708,7 @@ const Map<String, Map<String, String>> localizedValues = {
"icd": {"en": "ICD", "ar": "التصنيف الدولي للأمراض"}, "icd": {"en": "ICD", "ar": "التصنيف الدولي للأمراض"},
"days": {"en": "Days", "ar": "أيام"}, "days": {"en": "Days", "ar": "أيام"},
"months": {"en": "Months", "ar": "أشهر"}, "months": {"en": "Months", "ar": "أشهر"},
"years": {"en": "Years", "ar": "سنة"}, "years": {"en": "Years", "ar": "سنوات"},
"hr": {"en": "Hr", "ar": "س"}, "hr": {"en": "Hr", "ar": "س"},
"min": {"en": "Min", "ar": "د"}, "min": {"en": "Min", "ar": "د"},
"appointmentNumber": {"en": "Appointment Number", "ar": "رقم الموعد"}, "appointmentNumber": {"en": "Appointment Number", "ar": "رقم الموعد"},
@ -793,7 +783,7 @@ const Map<String, Map<String, String>> localizedValues = {
}, },
"SpecialResult": {"en": "Special Result", "ar": "نتيجة خاصة"}, "SpecialResult": {"en": "Special Result", "ar": "نتيجة خاصة"},
"noDataAvailable": { "noDataAvailable": {
"en": "Sorry, no data is available", "en": "No data available",
"ar": " لا يوجد بيانات متاحة " "ar": " لا يوجد بيانات متاحة "
}, },
"show-more-btn": {"en": "Flowchart", "ar": "النتائج التراكمية"}, "show-more-btn": {"en": "Flowchart", "ar": "النتائج التراكمية"},
@ -1063,8 +1053,6 @@ const Map<String, Map<String, String>> localizedValues = {
"maritalStatus": {"en": "Marital Status", "ar": "الحالة الزوجية"}, "maritalStatus": {"en": "Marital Status", "ar": "الحالة الزوجية"},
"nursing": {"en": "Nursing", "ar": "تمريض"}, "nursing": {"en": "Nursing", "ar": "تمريض"},
"diabetic": {"en": "Diabetic", "ar": "مرض السكري"}, "diabetic": {"en": "Diabetic", "ar": "مرض السكري"},
"pharmacy": {"en": "Pharmacy", "ar": "الصيدلاني"},
"intervention": {"en": "Intervention", "ar": "التدخل"},
"chart": {"en": "Chart", "ar": "جدول"}, "chart": {"en": "Chart", "ar": "جدول"},
"operationTimeStart": { "operationTimeStart": {
"en": "Operation Time Start :", "en": "Operation Time Start :",
@ -1130,20 +1118,4 @@ const Map<String, Map<String, String>> localizedValues = {
}, },
"planedProcedure": {"en": "Planed Procedure", "ar": "الإجراء المخطط"}, "planedProcedure": {"en": "Planed Procedure", "ar": "الإجراء المخطط"},
"moreDetails": {"en": "More Details", "ar": "المزيد من التفاصيل"}, "moreDetails": {"en": "More Details", "ar": "المزيد من التفاصيل"},
"VTE_Type": {"en": "VTE Type", "ar": "VTE Type"},
"pharmacology": {"en": "Pharmacology", "ar": "علم العقاقير"},
"reasonsThrombo": {"en": "Reasons Thrombo", "ar": "أسباب ثرومبو"},
"youDoNotHaveFavoriteTemplate": {"en": "You Don't Have Favorite Template", "ar": "ليس لديك وصفة طبية مفضلة"},
"pleaseSelectItem": {"en": "please Select Item", "ar": "الرجاء اختيار عنصر"},
"searchFavoriteTemplate": {"en": "search Favorites Template", "ar": "البحث في قالب المفضلة"},
"sorryNoMatch": {"en": "Sorry No Match", "ar": "عذرا لا يوجد تطابق"},
"thousandIsTheMAXForTheStrength": {"en": "1000 Is The MAX For The Strength", "ar": "ألف هو القيمة الأعلى"},
"strengthCanNotBeZero": {"en": "Strength Can't Be Zero", "ar": "القوة لا يمكن أن تكون صفر "},
"old": {"en": "Old", "ar":"القديمه"},
"orderTypeDescription": {"en": "Order Type Description", "ar":"وصف نوع الطلب"},
"doseDetails": {"en": "Dose Details", "ar":"تفاصيل الجرعة"},
"selectCondition": {"en": "Select Condition", "ar":"قم بتحديد الشرط"},
"yourOrderAddedSuccessfully": {"en": "Your Order Added Successfully", "ar":"تم إضافة طلبك بنجاح"},
"youCannotAddOnlySpaces": {"en": "You Can't Add Only Spaces", "ar":""},
"conditionDescription": {"en": "Condition Description", "ar":"لا يمكنك إضافة مسافات فقط"},
}; };

@ -5,15 +5,16 @@ class SizeConfig {
static double _blockWidth = 0; static double _blockWidth = 0;
static double _blockHeight = 0; static double _blockHeight = 0;
static double realScreenWidth; static late double realScreenWidth;
static double realScreenHeight; static late double realScreenHeight;
static double screenWidth; static late double screenWidth;
static double screenHeight; static late double screenHeight;
static double textMultiplier; static late double textMultiplier;
static double imageSizeMultiplier; static late double imageSizeMultiplier;
static double heightMultiplier; static late double heightMultiplier;
static late double widthMultiplier;
static bool isPortrait = true; static bool isPortrait = true;
static double widthMultiplier;
static bool isMobilePortrait = false; static bool isMobilePortrait = false;
static bool isMobile = false; static bool isMobile = false;
static bool isHeightShort = false; static bool isHeightShort = false;
@ -21,10 +22,10 @@ class SizeConfig {
static bool isHeightMiddle = false; static bool isHeightMiddle = false;
static bool isHeightLarge = false; static bool isHeightLarge = false;
static bool isWidthLarge = false; static bool isWidthLarge = false;
void init(BoxConstraints constraints, Orientation orientation) { void init(BoxConstraints constraints, Orientation orientation) {
realScreenHeight = constraints.maxHeight; realScreenHeight = constraints.maxHeight;
realScreenWidth = constraints.maxWidth; realScreenWidth = constraints.maxWidth;
if (constraints.maxWidth <= MAX_SMALL_SCREEN) { if (constraints.maxWidth <= MAX_SMALL_SCREEN) {
isMobile = true; isMobile = true;
} }
@ -47,20 +48,16 @@ class SizeConfig {
if (realScreenWidth < 450) { if (realScreenWidth < 450) {
isMobilePortrait = true; isMobilePortrait = true;
} }
// textMultiplier = _blockHeight;
// imageSizeMultiplier = _blockWidth;
screenHeight = realScreenHeight; screenHeight = realScreenHeight;
screenWidth = realScreenWidth; screenWidth = realScreenWidth;
} else { } else {
isPortrait = false; isPortrait = false;
isMobilePortrait = false; isMobilePortrait = false;
// textMultiplier = _blockWidth;
// imageSizeMultiplier = _blockHeight;
screenHeight = realScreenWidth; screenHeight = realScreenWidth;
screenWidth = realScreenHeight; screenWidth = realScreenHeight;
} }
_blockWidth = screenWidth / 100; _blockWidth = (screenWidth / 100);
_blockHeight = screenHeight / 100; _blockHeight = (screenHeight / 100);
textMultiplier = _blockHeight; textMultiplier = _blockHeight;
imageSizeMultiplier = _blockWidth; imageSizeMultiplier = _blockWidth;
@ -75,9 +72,11 @@ class SizeConfig {
print('widthMultiplier $widthMultiplier'); print('widthMultiplier $widthMultiplier');
print('isPortrait $isPortrait'); print('isPortrait $isPortrait');
print('isMobilePortrait $isMobilePortrait'); print('isMobilePortrait $isMobilePortrait');
} }
static getTextMultiplierBasedOnWidth({double width}) { static getTextMultiplierBasedOnWidth({double? width}) {
// TODO handel LandScape case // TODO handel LandScape case
if (width != null) { if (width != null) {
return width / 100; return width / 100;
@ -85,7 +84,7 @@ class SizeConfig {
return widthMultiplier; return widthMultiplier;
} }
static getWidthMultiplier({double width}) { static getWidthMultiplier({double? width}) {
// TODO handel LandScape case // TODO handel LandScape case
if (width != null) { if (width != null) {
return width / 100; return width / 100;
@ -93,7 +92,7 @@ class SizeConfig {
return widthMultiplier; return widthMultiplier;
} }
static getHeightMultiplier({double height}) { static getHeightMultiplier({double? height}) {
// TODO handel LandScape case // TODO handel LandScape case
if (height != null) { if (height != null) {
return height / 100; return height / 100;

@ -2,5 +2,3 @@ enum PatientType {
IN_PATIENT, IN_PATIENT,
OUT_PATIENT, OUT_PATIENT,
} }
///TODO Elham* Merge the patient type.

@ -1,5 +1,4 @@
enum AuthMethodTypes { SMS, WhatsApp, Fingerprint,FaceID,MoreOptions } enum AuthMethodTypes { SMS, WhatsApp, Fingerprint,FaceID,MoreOptions }
extension SelectedAuthMethodTypesService on AuthMethodTypes { extension SelectedAuthMethodTypesService on AuthMethodTypes {
// ignore: missing_return // ignore: missing_return
int getTypeIdService() { int getTypeIdService() {
@ -19,6 +18,7 @@ extension SelectedAuthMethodTypesService on AuthMethodTypes {
case AuthMethodTypes.MoreOptions: case AuthMethodTypes.MoreOptions:
return 5; return 5;
break; break;
} }
} }
@ -40,6 +40,7 @@ extension SelectedAuthMethodTypesService on AuthMethodTypes {
case 5: case 5:
return AuthMethodTypes.MoreOptions; return AuthMethodTypes.MoreOptions;
break; break;
} }
} }
} }

@ -1,3 +1,6 @@
enum FilterType { Clinic, Hospital } enum FilterType { Clinic, Hospital }
enum OutPatientFilterType { Previous, Today, NextWeek } enum OutPatientFilterType { Previous, Today, NextWeek }

@ -19,6 +19,7 @@ enum MasterKeysService {
MedicationFrequency, MedicationFrequency,
MedicationDoseTime, MedicationDoseTime,
MedicationIndications, MedicationIndications,
AdmissionRequestType, AdmissionRequestType,
DiagnosisSelectionType, DiagnosisSelectionType,
} }

@ -1 +1,2 @@
enum PatientType { inPatient, OutPatient } enum PatientType { inPatient, OutPatient }

@ -1,17 +1,17 @@
class InsuranceApprovalInPatientRequestModel { class InsuranceApprovalInPatientRequestModel {
int patientID; int? patientID;
int patientTypeID; int? patientTypeID;
int eXuldAPPNO; int? eXuldAPPNO;
int projectID; int? projectID;
int languageID; int? languageID;
String stamp; String? stamp;
String iPAdress; String? iPAdress;
double versionID; double? versionID;
int channel; int? channel;
String tokenID; String? tokenID;
String sessionID; String? sessionID;
bool isLoginForDoctorApp; bool? isLoginForDoctorApp;
bool patientOutSA; bool? patientOutSA;
InsuranceApprovalInPatientRequestModel( InsuranceApprovalInPatientRequestModel(
{this.patientID, {this.patientID,

@ -1,25 +0,0 @@
class DoctorErSignAssessmentReqModel {
String setupID;
int signInType;
int loginDoctorID;
int patientID;
DoctorErSignAssessmentReqModel(
{this.setupID, this.signInType, this.loginDoctorID, this.patientID});
DoctorErSignAssessmentReqModel.fromJson(Map<String, dynamic> json) {
setupID = json['SetupID'];
signInType = json['SignInType'];
loginDoctorID = json['LoginDoctorID'];
patientID = json['PatientID'];
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['SetupID'] = this.setupID;
data['SignInType'] = this.signInType;
data['LoginDoctorID'] = this.loginDoctorID;
data['PatientID'] = this.patientID;
return data;
}
}

@ -1,29 +1,29 @@
class CheckActivationCodeModel { class CheckActivationCodeModel {
int patientMobileNumber; int? patientMobileNumber;
String mobileNo; String? mobileNo;
int projectOutSA; int? projectOutSA;
int loginType; int? loginType;
String zipCode; String? zipCode;
bool isRegister; bool? isRegister;
String logInTokenID; String? logInTokenID;
int searchType; int? searchType;
int patientID; int? patientID;
int nationalID; int? nationalID;
int patientIdentificationID; int? patientIdentificationID;
bool forRegisteration; bool? forRegisteration;
String activationCode; String? activationCode;
double versionID; double? versionID;
int channel; int? channel;
int languageID; int? languageID;
String iPAdress; String? iPAdress;
String generalid; String? generalid;
int patientOutSA; int? patientOutSA;
Null sessionID; Null? sessionID;
bool isDentalAllowedBackend; bool? isDentalAllowedBackend;
int deviceTypeID; int ?deviceTypeID;
String dOB; String? dOB;
int isHijri; int? isHijri;
String healthId; String? healthId;
CheckActivationCodeModel( CheckActivationCodeModel(
{this.patientMobileNumber, {this.patientMobileNumber,

@ -1,21 +1,21 @@
class CheckPatientForRegistrationModel { class CheckPatientForRegistrationModel {
int patientIdentificationID; int? patientIdentificationID;
int patientMobileNumber; int? patientMobileNumber;
String zipCode; String? zipCode;
double versionID; double? versionID;
int channel; int? channel;
int languageID; int? languageID;
String iPAdress; String? iPAdress;
String generalid; String? generalid;
int patientOutSA; int? patientOutSA;
Null sessionID; Null sessionID;
bool isDentalAllowedBackend; bool? isDentalAllowedBackend;
int deviceTypeID; int? deviceTypeID;
String tokenID; String? tokenID;
int patientID; int? patientID;
bool isRegister; bool? isRegister;
String dOB; String? dOB;
int isHijri; int? isHijri;
CheckPatientForRegistrationModel( CheckPatientForRegistrationModel(
{this.patientIdentificationID, {this.patientIdentificationID,

@ -1,16 +1,16 @@
class GetPatientInfoRequestModel { class GetPatientInfoRequestModel {
String patientIdentificationID; String? patientIdentificationID;
String dOB; String? dOB;
int isHijri; int? isHijri;
double versionID; double? versionID;
int channel; int? channel;
int languageID; int? languageID;
String iPAdress; String? iPAdress;
String generalid; String? generalid;
int patientOutSA; int? patientOutSA;
Null sessionID; Null sessionID;
bool isDentalAllowedBackend; bool? isDentalAllowedBackend;
int deviceTypeID; int? deviceTypeID;
GetPatientInfoRequestModel( GetPatientInfoRequestModel(
{this.patientIdentificationID, {this.patientIdentificationID,

@ -1,78 +1,78 @@
class GetPatientInfoResponseModel { class GetPatientInfoResponseModel {
dynamic date; dynamic date;
int languageID; int? languageID;
int serviceName; int? serviceName;
dynamic time; dynamic time;
dynamic androidLink; dynamic androidLink;
dynamic authenticationTokenID; dynamic authenticationTokenID;
dynamic data; dynamic data;
bool dataw; bool? dataw;
int dietType; int? dietType;
dynamic errorCode; dynamic errorCode;
dynamic errorEndUserMessage; dynamic errorEndUserMessage;
dynamic errorEndUserMessageN; dynamic errorEndUserMessageN;
dynamic errorMessage; dynamic errorMessage;
int errorType; int? errorType;
int foodCategory; int? foodCategory;
dynamic iOSLink; dynamic iOSLink;
bool isAuthenticated; bool? isAuthenticated;
int mealOrderStatus; int? mealOrderStatus;
int mealType; int? mealType;
int messageStatus; int? messageStatus;
int numberOfResultRecords; int? numberOfResultRecords;
dynamic patientBlodType; dynamic patientBlodType;
dynamic successMsg; dynamic successMsg;
dynamic successMsgN; dynamic successMsgN;
dynamic vidaUpdatedResponse; dynamic vidaUpdatedResponse;
dynamic accessTokenObject; dynamic accessTokenObject;
int age; int? age;
dynamic clientIdentifierId; dynamic clientIdentifierId;
int createdBy; int? createdBy;
String dateOfBirth; String? dateOfBirth;
String firstNameAr; String? firstNameAr;
String firstNameEn; String? firstNameEn;
String gender; String? gender;
dynamic genderAr; dynamic genderAr;
dynamic genderEn; dynamic genderEn;
String healthId; String? healthId;
String idNumber; String? idNumber;
String idType; String? idType;
bool isHijri; bool? isHijri;
int isInstertedOrUpdated; int? isInstertedOrUpdated;
int isNull; int? isNull;
int isPatientExistNHIC; int? isPatientExistNHIC;
bool isRecordLockedByCurrentUser; bool? isRecordLockedByCurrentUser;
String lastNameAr; String? lastNameAr;
String lastNameEn; String? lastNameEn;
dynamic listActiveAccessToken; dynamic listActiveAccessToken;
String maritalStatus; String? maritalStatus;
String maritalStatusCode; String? maritalStatusCode;
String nationalDateOfBirth; String? nationalDateOfBirth;
String nationality; String? nationality;
String nationalityCode; String? nationalityCode;
String occupation; String? occupation;
dynamic pCDTransactionDataResultList; dynamic pCDTransactionDataResultList;
dynamic pCDGetVidaPatientForManualVerificationList; dynamic pCDGetVidaPatientForManualVerificationList;
dynamic pCDNHICHMGPatientDetailsMatchCalulationList; dynamic pCDNHICHMGPatientDetailsMatchCalulationList;
int pCDReturnValue; int? pCDReturnValue;
String patientStatus; String? patientStatus;
String placeofBirth; String? placeofBirth;
dynamic practitionerStatusCode; dynamic practitionerStatusCode;
dynamic practitionerStatusDescAr; dynamic practitionerStatusDescAr;
dynamic practitionerStatusDescEn; dynamic practitionerStatusDescEn;
int rowCount; int? rowCount;
String secondNameAr; String? secondNameAr;
String secondNameEn; String? secondNameEn;
String thirdNameAr; String? thirdNameAr;
String thirdNameEn; String? thirdNameEn;
dynamic yakeenVidaPatientDataStatisticsByPatientIdList; dynamic yakeenVidaPatientDataStatisticsByPatientIdList;
dynamic yakeenVidaPatientDataStatisticsList; dynamic yakeenVidaPatientDataStatisticsList;
dynamic yakeenVidaPatientDataStatisticsPrefferedList; dynamic yakeenVidaPatientDataStatisticsPrefferedList;
dynamic accessToken; dynamic accessToken;
int categoryCode; int? categoryCode;
dynamic categoryNameAr; dynamic categoryNameAr;
dynamic categoryNameEn; dynamic categoryNameEn;
int constraintCode; int? constraintCode;
dynamic constraintNameAr; dynamic constraintNameAr;
dynamic constraintNameEn; dynamic constraintNameEn;
dynamic content; dynamic content;
@ -84,7 +84,7 @@ class GetPatientInfoResponseModel {
dynamic licenseStatusDescEn; dynamic licenseStatusDescEn;
dynamic organizations; dynamic organizations;
dynamic registrationNumber; dynamic registrationNumber;
int specialtyCode; int? specialtyCode;
dynamic specialtyNameAr; dynamic specialtyNameAr;
dynamic specialtyNameEn; dynamic specialtyNameEn;

@ -1,22 +1,22 @@
class PatientRegistrationModel { class PatientRegistrationModel {
Patientobject patientobject; Patientobject? patientobject;
String patientIdentificationID; String? patientIdentificationID;
String patientMobileNumber; String? patientMobileNumber;
String logInTokenID; String? logInTokenID;
double versionID; double? versionID;
int channel; int? channel;
int languageID; int? languageID;
String iPAdress; String? iPAdress;
String generalid; String? generalid;
int patientOutSA; int? patientOutSA;
Null sessionID; Null sessionID;
bool isDentalAllowedBackend; bool? isDentalAllowedBackend;
int deviceTypeID; int? deviceTypeID;
String tokenID; String? tokenID;
String dOB; String? dOB;
int isHijri; int? isHijri;
String healthId; String? healthId;
String zipCode; String? zipCode;
PatientRegistrationModel( PatientRegistrationModel(
{this.patientobject, {this.patientobject,
@ -64,7 +64,7 @@ class PatientRegistrationModel {
Map<String, dynamic> toJson() { Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>(); final Map<String, dynamic> data = new Map<String, dynamic>();
if (this.patientobject != null) { if (this.patientobject != null) {
data['Patientobject'] = this.patientobject.toJson(); data['Patientobject'] = this.patientobject!.toJson();
} }
data['PatientIdentificationID'] = this.patientIdentificationID; data['PatientIdentificationID'] = this.patientIdentificationID;
data['PatientMobileNumber'] = this.patientMobileNumber; data['PatientMobileNumber'] = this.patientMobileNumber;
@ -88,27 +88,27 @@ class PatientRegistrationModel {
} }
class Patientobject { class Patientobject {
bool tempValue; bool? tempValue;
int patientIdentificationType; int? patientIdentificationType;
String patientIdentificationNo; String? patientIdentificationNo;
int mobileNumber; int? mobileNumber;
int patientOutSA; int? patientOutSA;
String firstNameN; String? firstNameN;
String middleNameN; String? middleNameN;
String lastNameN; String? lastNameN;
String firstName; String? firstName;
String middleName; String? middleName;
String lastName; String? lastName;
String strDateofBirth; String? strDateofBirth;
String dateofBirth; String? dateofBirth;
int gender; int? gender;
String nationalityID; String? nationalityID;
String dateofBirthN; String? dateofBirthN;
String emailAddress; String? emailAddress;
String sourceType; String? sourceType;
String preferredLanguage; String? preferredLanguage;
String marital; String? marital;
String eHealthIDField; String? eHealthIDField;
Patientobject( Patientobject(
{this.tempValue, {this.tempValue,

@ -1,28 +1,28 @@
class SendActivationCodeByOTPNotificationTypeForRegistrationModel { class SendActivationCodeByOTPNotificationTypeForRegistrationModel {
int patientMobileNumber; int? patientMobileNumber;
String mobileNo; String? mobileNo;
int projectOutSA; int? projectOutSA;
int loginType; int? loginType;
String zipCode; String? zipCode;
bool isRegister; bool? isRegister;
String logInTokenID; String? logInTokenID;
int searchType; int? searchType;
int patientID; int? patientID;
int nationalID; int? nationalID;
int patientIdentificationID; int? patientIdentificationID;
int oTPSendType; int? oTPSendType;
int languageID; int? languageID;
double versionID; double? versionID;
int channel; int? channel;
String iPAdress; String? iPAdress;
String generalid; String? generalid;
int patientOutSA; int? patientOutSA;
Null sessionID; Null sessionID;
bool isDentalAllowedBackend; bool? isDentalAllowedBackend;
int deviceTypeID; int? deviceTypeID;
String dOB; String? dOB;
int isHijri; int? isHijri;
String healthId; String? healthId;
SendActivationCodeByOTPNotificationTypeForRegistrationModel( SendActivationCodeByOTPNotificationTypeForRegistrationModel(
{this.patientMobileNumber, {this.patientMobileNumber,

@ -1,40 +1,40 @@
import 'package:doctor_app_flutter/utils/date-utils.dart'; import 'package:doctor_app_flutter/util/date-utils.dart';
class Prescriptions { class Prescriptions {
String setupID; String? setupID;
int projectID; int? projectID;
int patientID; int? patientID;
int appointmentNo; int? appointmentNo;
String appointmentDate; String? appointmentDate;
String doctorName; String? doctorName;
String clinicDescription; String? clinicDescription;
String name; String? name;
int episodeID; int? episodeID;
int actualDoctorRate; int? actualDoctorRate;
int admission; int? admission;
int clinicID; int? clinicID;
String companyName; String? companyName;
String despensedStatus; String? despensedStatus;
DateTime dischargeDate; DateTime? dischargeDate;
int dischargeNo; int? dischargeNo;
int doctorID; int? doctorID;
String doctorImageURL; String? doctorImageURL;
int doctorRate; int? doctorRate;
String doctorTitle; String? doctorTitle;
int gender; int? gender;
String genderDescription; String? genderDescription;
bool isActiveDoctorProfile; bool? isActiveDoctorProfile;
bool isDoctorAllowVedioCall; bool? isDoctorAllowVedioCall;
bool isExecludeDoctor; bool? isExecludeDoctor;
bool isInOutPatient; bool? isInOutPatient;
bool isLiveCareAppointment; bool? isLiveCareAppointment;
String isInOutPatientDescription; String? isInOutPatientDescription;
String isInOutPatientDescriptionN; String? isInOutPatientDescriptionN;
bool isInsurancePatient; bool? isInsurancePatient;
String nationalityFlagURL; String? nationalityFlagURL;
int noOfPatientsRate; int? noOfPatientsRate;
String qR; String? qR;
List<String> speciality; List<String?>? speciality;
Prescriptions( Prescriptions(
{this.setupID, {this.setupID,
@ -72,7 +72,7 @@ class Prescriptions {
this.speciality, this.speciality,
this.isLiveCareAppointment}); this.isLiveCareAppointment});
Prescriptions.fromJson(Map<String, dynamic> json) { Prescriptions.fromJson(Map<String?, dynamic> json) {
setupID = json['SetupID']; setupID = json['SetupID'];
projectID = json['ProjectID']; projectID = json['ProjectID'];
patientID = json['PatientID']; patientID = json['PatientID'];
@ -106,11 +106,11 @@ class Prescriptions {
noOfPatientsRate = json['NoOfPatientsRate']; noOfPatientsRate = json['NoOfPatientsRate'];
qR = json['QR']; qR = json['QR'];
isLiveCareAppointment = json['IsLiveCareAppointment']; isLiveCareAppointment = json['IsLiveCareAppointment'];
// speciality = json['Speciality'].cast<String>(); // speciality = json['Speciality'].cast<String ?>();
} }
Map<String, dynamic> toJson() { Map<String?, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>(); final Map<String?, dynamic> data = new Map<String?, dynamic>();
data['SetupID'] = this.setupID; data['SetupID'] = this.setupID;
data['ProjectID'] = this.projectID; data['ProjectID'] = this.projectID;
data['PatientID'] = this.patientID; data['PatientID'] = this.patientID;
@ -150,10 +150,10 @@ class Prescriptions {
} }
class PrescriptionsList { class PrescriptionsList {
String filterName = ""; String? filterName = "";
List<Prescriptions> prescriptionsList = List(); List<Prescriptions> prescriptionsList =[];
PrescriptionsList({this.filterName, Prescriptions prescriptions}) { PrescriptionsList({this.filterName, required Prescriptions prescriptions}) {
prescriptionsList.add(prescriptions); prescriptionsList.add(prescriptions);
} }
} }

@ -1,40 +1,40 @@
class GetMedicationForInPatientModel { class GetMedicationForInPatientModel {
String setupID; String? setupID;
int projectID; int? projectID;
int admissionNo; int? admissionNo;
int patientID; int? patientID;
int orderNo; int? orderNo;
int prescriptionNo; int? prescriptionNo;
int lineItemNo; int? lineItemNo;
String prescriptionDatetime; String? prescriptionDatetime;
int itemID; int? itemID;
int directionID; int? directionID;
int refillID; int? refillID;
String dose; String? dose;
int unitofMeasurement; int? unitofMeasurement;
String startDatetime; String? startDatetime;
String stopDatetime; String? stopDatetime;
int noOfDoses; int? noOfDoses;
int routeId; int? routeId;
String comments; String? comments;
int reviewedPharmacist; int? reviewedPharmacist;
dynamic reviewedPharmacistDatetime; dynamic reviewedPharmacistDatetime;
dynamic discountinueDatetime; dynamic discountinueDatetime;
dynamic rescheduleDatetime; dynamic rescheduleDatetime;
int status; int? status;
String statusDescription; String? statusDescription;
int createdBy; int? createdBy;
String createdOn; String? createdOn;
dynamic editedBy; dynamic editedBy;
dynamic editedOn; dynamic editedOn;
dynamic strength; dynamic strength;
String pHRItemDescription; String? pHRItemDescription;
String pHRItemDescriptionN; String? pHRItemDescriptionN;
String doctorName; String? doctorName;
String uomDescription; String? uomDescription;
String routeDescription; String? routeDescription;
String directionDescription; String? directionDescription;
String refillDescription; String? refillDescription;
GetMedicationForInPatientModel( GetMedicationForInPatientModel(
{this.setupID, {this.setupID,

@ -1,16 +1,16 @@
class GetMedicationForInPatientRequestModel { class GetMedicationForInPatientRequestModel {
bool isDentalAllowedBackend; bool? isDentalAllowedBackend;
double versionID; double? versionID;
int channel; int? channel;
int languageID; int? languageID;
String iPAdress; String? iPAdress;
String generalid; String? generalid;
int deviceTypeID; int? deviceTypeID;
String tokenID; String? tokenID;
int patientID; int? patientID;
int admissionNo; int? admissionNo;
String sessionID; String? sessionID;
int projectID; int? projectID;
GetMedicationForInPatientRequestModel( GetMedicationForInPatientRequestModel(
{this.isDentalAllowedBackend, {this.isDentalAllowedBackend,

@ -1,5 +1,5 @@
class InPatientPrescriptionRequestModel { class InPatientPrescriptionRequestModel {
String vidaAuthTokenID; String? vidaAuthTokenID;
dynamic patientMRN; dynamic patientMRN;
dynamic appNo; dynamic appNo;
dynamic admissionNo; dynamic admissionNo;

@ -1,28 +1,28 @@
class PharmacyPrescriptions { class PharmacyPrescriptions {
String expiryDate; String? expiryDate;
dynamic sellingPrice; dynamic sellingPrice;
int quantity; int?quantity;
int itemID; int?itemID;
int locationID; int?locationID;
int projectID; int?projectID;
String setupID; String ?setupID;
String locationDescription; String ?locationDescription;
Null locationDescriptionN; dynamic locationDescriptionN;
String itemDescription; String ? itemDescription;
Null itemDescriptionN; dynamic itemDescriptionN;
String alias; String ? alias;
int locationTypeID; int ? locationTypeID;
int barcode; int ? barcode;
Null companybarcode; dynamic companybarcode;
int cityID; int ? cityID;
String cityName; String? cityName;
int distanceInKilometers; int ? distanceInKilometers;
String latitude; String? latitude;
int locationType; int ?locationType;
String longitude; String? longitude;
String phoneNumber; String ?phoneNumber;
String projectImageURL; String ? projectImageURL;
Null sortOrder; dynamic sortOrder;
PharmacyPrescriptions( PharmacyPrescriptions(
{this.expiryDate, {this.expiryDate,

@ -1,10 +1,10 @@
class PostPrescriptionReqModel { class PostPrescriptionReqModel {
String vidaAuthTokenID; String ?vidaAuthTokenID;
int clinicID; int? clinicID;
int episodeID; int? episodeID;
int appointmentNo; int? appointmentNo;
int patientMRN; int? patientMRN;
List<PrescriptionRequestModel> prescriptionRequestModel; List<PrescriptionRequestModel> ?prescriptionRequestModel;
PostPrescriptionReqModel( PostPrescriptionReqModel(
{this.vidaAuthTokenID, {this.vidaAuthTokenID,
@ -21,9 +21,9 @@ class PostPrescriptionReqModel {
appointmentNo = json['AppointmentNo']; appointmentNo = json['AppointmentNo'];
patientMRN = json['PatientMRN']; patientMRN = json['PatientMRN'];
if (json['prescriptionRequestModel'] != null) { if (json['prescriptionRequestModel'] != null) {
prescriptionRequestModel = new List<PrescriptionRequestModel>(); prescriptionRequestModel =[];
json['prescriptionRequestModel'].forEach((v) { json['prescriptionRequestModel'].forEach((v) {
prescriptionRequestModel.add(new PrescriptionRequestModel.fromJson(v)); prescriptionRequestModel!.add(new PrescriptionRequestModel.fromJson(v));
}); });
} }
} }
@ -37,25 +37,25 @@ class PostPrescriptionReqModel {
data['PatientMRN'] = this.patientMRN; data['PatientMRN'] = this.patientMRN;
if (this.prescriptionRequestModel != null) { if (this.prescriptionRequestModel != null) {
data['prescriptionRequestModel'] = data['prescriptionRequestModel'] =
this.prescriptionRequestModel.map((v) => v.toJson()).toList(); this.prescriptionRequestModel!.map((v) => v.toJson()).toList();
} }
return data; return data;
} }
} }
class PrescriptionRequestModel { class PrescriptionRequestModel {
int itemId; int ? itemId;
String doseStartDate; String? doseStartDate;
int duration; int ?duration;
double dose; double? dose;
int doseUnitId; int ?doseUnitId;
int route; int ?route;
int frequency; int ?frequency;
int doseTime; int ?doseTime;
bool covered; bool ?covered;
bool approvalRequired; bool ?approvalRequired;
String remarks; String ?remarks;
String icdcode10Id; String ?icdcode10Id;
PrescriptionRequestModel({ PrescriptionRequestModel({
this.itemId, this.itemId,

@ -1,145 +0,0 @@
class PrescriptionEntityModel {
dynamic appointmentNo;
dynamic clinicName;
dynamic createdBy;
dynamic createdOn;
dynamic doctorName;
dynamic doseDailyQuantity;
dynamic doseDailyUnitID;
dynamic doseDetail;
dynamic doseDurationDays;
dynamic doseTimingID;
dynamic episodeID;
dynamic frequencyID;
dynamic icdCode10ID;
dynamic indication;
dynamic isDispensed;
dynamic isMedicineCovered;
dynamic isSIG;
dynamic medicationName;
dynamic medicationPrice;
dynamic medicineCode;
dynamic orderTypeDescription;
dynamic qty;
dynamic quantity;
dynamic remarks;
dynamic routeID;
dynamic startDate;
dynamic status;
dynamic stopDate;
dynamic uom;
dynamic pharmacistRemarks;
dynamic pharmacyInervention;
dynamic refill;
dynamic mediSpanGPICode;
PrescriptionEntityModel(
{this.appointmentNo,
this.clinicName,
this.createdBy,
this.createdOn,
this.doctorName,
this.doseDailyQuantity,
this.doseDailyUnitID,
this.doseDetail,
this.doseDurationDays,
this.doseTimingID,
this.episodeID,
this.frequencyID,
this.icdCode10ID,
this.indication,
this.isDispensed,
this.isMedicineCovered,
this.isSIG,
this.medicationName,
this.medicationPrice,
this.medicineCode,
this.orderTypeDescription,
this.qty,
this.quantity,
this.remarks,
this.routeID,
this.startDate,
this.status,
this.stopDate,
this.uom,
this.pharmacistRemarks,
this.mediSpanGPICode,
this.pharmacyInervention,
this.refill});
PrescriptionEntityModel.fromJson(Map<String, dynamic> json) {
appointmentNo = json['appointmentNo'];
clinicName = json['clinicName'];
createdBy = json['createdBy'];
createdOn = json['createdOn'];
doctorName = json['doctorName'];
doseDailyQuantity = json['doseDailyQuantity'];
doseDailyUnitID = json['doseDailyUnitID'];
doseDetail = json['doseDetail'];
doseDurationDays = json['doseDurationDays'];
doseTimingID = json['doseTimingID'];
episodeID = json['episodeID'];
frequencyID = json['frequencyID'];
icdCode10ID = json['icdCode10ID'];
indication = json['indication'];
isDispensed = json['isDispensed'];
isMedicineCovered = json['isMedicineCovered'];
isSIG = json['isSIG'];
medicationName = json['medicationName'];
medicationPrice = json['medicationPrice'];
medicineCode = json['medicineCode'];
orderTypeDescription = json['orderTypeDescription'];
qty = json['qty'];
quantity = json['quantity'];
remarks = json['remarks'];
routeID = json['routeID'];
startDate = json['startDate'];
status = json['status'];
stopDate = json['stopDate'];
uom = json['uom'];
pharmacistRemarks = json['pharmacistRemarks'];
mediSpanGPICode = json['mediSpanGPICode'];
refill = json['refill'];
pharmacyInervention = json['interventionID'];
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['appointmentNo'] = this.appointmentNo;
data['clinicName'] = this.clinicName;
data['createdBy'] = this.createdBy;
data['createdOn'] = this.createdOn;
data['doctorName'] = this.doctorName;
data['doseDailyQuantity'] = this.doseDailyQuantity;
data['doseDailyUnitID'] = this.doseDailyUnitID;
data['doseDetail'] = this.doseDetail;
data['doseDurationDays'] = this.doseDurationDays;
data['doseTimingID'] = this.doseTimingID;
data['episodeID'] = this.episodeID;
data['frequencyID'] = this.frequencyID;
data['icdCode10ID'] = this.icdCode10ID;
data['indication'] = this.indication;
data['isDispensed'] = this.isDispensed;
data['isMedicineCovered'] = this.isMedicineCovered;
data['isSIG'] = this.isSIG;
data['medicationName'] = this.medicationName;
data['medicationPrice'] = this.medicationPrice;
data['medicineCode'] = this.medicineCode;
data['orderTypeDescription'] = this.orderTypeDescription;
data['qty'] = this.qty;
data['quantity'] = this.quantity;
data['remarks'] = this.remarks;
data['routeID'] = this.routeID;
data['startDate'] = this.startDate;
data['status'] = this.status;
data['stopDate'] = this.stopDate;
data['uom'] = this.uom;
data['pharmacistRemarks'] = this.pharmacistRemarks;
data['mediSpanGPICode'] = this.mediSpanGPICode;
data['refill'] = this.refill;
data['interventionID'] = this.pharmacyInervention;
return data;
}
}

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save