From f8371f71a1bfbdd4229fd7daa2ab9defc9a0e341 Mon Sep 17 00:00:00 2001 From: Elham Rababh Date: Mon, 24 Jan 2022 13:49:43 +0200 Subject: [PATCH] fix intervention_medication --- .../profile/intervention_medication_service.dart | 12 +++++------- .../profile/intervention_medication_view_model.dart | 11 ++++++----- .../accept_or_reject_req_model.dart | 0 .../accept_or_reject_res_model.dart | 0 .../intervention_medication_history_req_model.dart | 0 .../intervention_medication_history_res_model.dart | 0 .../new_medication_req_model.dart | 0 .../new_medication_res_model.dart | 0 .../intervention_medication_history_screen.dart | 2 +- 9 files changed, 12 insertions(+), 13 deletions(-) rename lib/{screens/patients/profile => models}/pharmacy-intervention-model/accept_or_reject_req_model.dart (100%) rename lib/{screens/patients/profile => models}/pharmacy-intervention-model/accept_or_reject_res_model.dart (100%) rename lib/{screens/patients/profile => models}/pharmacy-intervention-model/intervention_medication_history_req_model.dart (100%) rename lib/{screens/patients/profile => models}/pharmacy-intervention-model/intervention_medication_history_res_model.dart (100%) rename lib/{screens/patients/profile => models}/pharmacy-intervention-model/new_medication_req_model.dart (100%) rename lib/{screens/patients/profile => models}/pharmacy-intervention-model/new_medication_res_model.dart (100%) diff --git a/lib/core/service/patient/profile/intervention_medication_service.dart b/lib/core/service/patient/profile/intervention_medication_service.dart index eab0fcab..26cf197e 100644 --- a/lib/core/service/patient/profile/intervention_medication_service.dart +++ b/lib/core/service/patient/profile/intervention_medication_service.dart @@ -1,12 +1,10 @@ import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/core/service/base/base_service.dart'; -import '../../../../screens/patients/profile/pharmacy-intervention-model/accept_or_reject_req_model.dart'; -import '../../../../screens/patients/profile/pharmacy-intervention-model/intervention_medication_history_req_model.dart'; -import '../../../../screens/patients/profile/pharmacy-intervention-model/intervention_medication_history_res_model.dart'; -import '../../../../screens/patients/profile/pharmacy-intervention-model/new_medication_req_model.dart'; -import '../../../../screens/patients/profile/pharmacy-intervention-model/new_medication_res_model.dart'; - - +import 'package:doctor_app_flutter/models/pharmacy-intervention-model/accept_or_reject_req_model.dart'; +import 'package:doctor_app_flutter/models/pharmacy-intervention-model/intervention_medication_history_req_model.dart'; +import 'package:doctor_app_flutter/models/pharmacy-intervention-model/intervention_medication_history_res_model.dart'; +import 'package:doctor_app_flutter/models/pharmacy-intervention-model/new_medication_req_model.dart'; +import 'package:doctor_app_flutter/models/pharmacy-intervention-model/new_medication_res_model.dart'; class InterventionMedicationService extends BaseService { List _allInterventionList = []; diff --git a/lib/core/viewModel/profile/intervention_medication_view_model.dart b/lib/core/viewModel/profile/intervention_medication_view_model.dart index 9c456a2a..99a7edbe 100644 --- a/lib/core/viewModel/profile/intervention_medication_view_model.dart +++ b/lib/core/viewModel/profile/intervention_medication_view_model.dart @@ -2,12 +2,13 @@ import 'package:doctor_app_flutter/core/enum/viewstate.dart'; import 'package:doctor_app_flutter/core/viewModel/base_view_model.dart'; import 'package:doctor_app_flutter/locator.dart'; import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; +import 'package:doctor_app_flutter/models/pharmacy-intervention-model/accept_or_reject_req_model.dart'; +import 'package:doctor_app_flutter/models/pharmacy-intervention-model/intervention_medication_history_req_model.dart'; +import 'package:doctor_app_flutter/models/pharmacy-intervention-model/intervention_medication_history_res_model.dart'; +import 'package:doctor_app_flutter/models/pharmacy-intervention-model/new_medication_req_model.dart'; +import 'package:doctor_app_flutter/models/pharmacy-intervention-model/new_medication_res_model.dart'; import '../../../models/dashboard/get_special_clinical_care_mapping_List_Respose_Model.dart'; -import '../../../screens/patients/profile/pharmacy-intervention-model/accept_or_reject_req_model.dart'; -import '../../../screens/patients/profile/pharmacy-intervention-model/intervention_medication_history_req_model.dart'; -import '../../../screens/patients/profile/pharmacy-intervention-model/intervention_medication_history_res_model.dart'; -import '../../../screens/patients/profile/pharmacy-intervention-model/new_medication_req_model.dart'; -import '../../../screens/patients/profile/pharmacy-intervention-model/new_medication_res_model.dart'; + import '../../../util/date-utils.dart'; import '../../service/patient/profile/intervention_medication_service.dart'; import '../../service/special_clinics/special_clinic_service.dart'; diff --git a/lib/screens/patients/profile/pharmacy-intervention-model/accept_or_reject_req_model.dart b/lib/models/pharmacy-intervention-model/accept_or_reject_req_model.dart similarity index 100% rename from lib/screens/patients/profile/pharmacy-intervention-model/accept_or_reject_req_model.dart rename to lib/models/pharmacy-intervention-model/accept_or_reject_req_model.dart diff --git a/lib/screens/patients/profile/pharmacy-intervention-model/accept_or_reject_res_model.dart b/lib/models/pharmacy-intervention-model/accept_or_reject_res_model.dart similarity index 100% rename from lib/screens/patients/profile/pharmacy-intervention-model/accept_or_reject_res_model.dart rename to lib/models/pharmacy-intervention-model/accept_or_reject_res_model.dart diff --git a/lib/screens/patients/profile/pharmacy-intervention-model/intervention_medication_history_req_model.dart b/lib/models/pharmacy-intervention-model/intervention_medication_history_req_model.dart similarity index 100% rename from lib/screens/patients/profile/pharmacy-intervention-model/intervention_medication_history_req_model.dart rename to lib/models/pharmacy-intervention-model/intervention_medication_history_req_model.dart diff --git a/lib/screens/patients/profile/pharmacy-intervention-model/intervention_medication_history_res_model.dart b/lib/models/pharmacy-intervention-model/intervention_medication_history_res_model.dart similarity index 100% rename from lib/screens/patients/profile/pharmacy-intervention-model/intervention_medication_history_res_model.dart rename to lib/models/pharmacy-intervention-model/intervention_medication_history_res_model.dart diff --git a/lib/screens/patients/profile/pharmacy-intervention-model/new_medication_req_model.dart b/lib/models/pharmacy-intervention-model/new_medication_req_model.dart similarity index 100% rename from lib/screens/patients/profile/pharmacy-intervention-model/new_medication_req_model.dart rename to lib/models/pharmacy-intervention-model/new_medication_req_model.dart diff --git a/lib/screens/patients/profile/pharmacy-intervention-model/new_medication_res_model.dart b/lib/models/pharmacy-intervention-model/new_medication_res_model.dart similarity index 100% rename from lib/screens/patients/profile/pharmacy-intervention-model/new_medication_res_model.dart rename to lib/models/pharmacy-intervention-model/new_medication_res_model.dart diff --git a/lib/screens/patients/profile/pharmacy-intervention/intervention_medication_history_screen.dart b/lib/screens/patients/profile/pharmacy-intervention/intervention_medication_history_screen.dart index ce1e69f0..77b76539 100644 --- a/lib/screens/patients/profile/pharmacy-intervention/intervention_medication_history_screen.dart +++ b/lib/screens/patients/profile/pharmacy-intervention/intervention_medication_history_screen.dart @@ -2,8 +2,8 @@ import 'package:doctor_app_flutter/core/enum/viewstate.dart'; import 'package:doctor_app_flutter/core/viewModel/authentication_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; +import 'package:doctor_app_flutter/models/pharmacy-intervention-model/new_medication_res_model.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart'; -import 'package:doctor_app_flutter/screens/patients/profile/pharmacy-intervention-model/new_medication_res_model.dart'; import 'package:doctor_app_flutter/util/date-utils.dart'; import 'package:doctor_app_flutter/util/dr_app_shared_pref.dart'; import 'package:doctor_app_flutter/util/dr_app_toast_msg.dart';