Merge remote-tracking branch 'origin/development-3.3' into update_flutter_3.16.0
# Conflicts: # android/app/build.gradle # android/app/src/main/kotlin/com/hmg/hmgDr/Service/BaseMovingFloatingWidget.kt # android/app/src/main/kotlin/com/hmg/hmgDr/ui/fragment/VideoCallFragment.kt # android/build.gradle # android/gradle/wrapper/gradle-wrapper.properties # ios/Runner.xcodeproj/project.pbxproj # ios/Runner/Info.plist # lib/client/base_app_client.dart # lib/core/model/ER_sign_in/doctor_ER_sign_assessment_req_model.dart # lib/core/model/SOAP/assessment/post_assessment_request_model.dart # lib/core/model/admissionRequest/admission-request.dart # lib/core/model/auth/check_activation_code_for_doctor_app_response_model.dart # lib/core/model/doctor/clinic_model.dart # lib/core/model/hospitals/get_hospitals_request_model.dart # lib/core/model/labs/patient_lab_orders.dart # lib/core/model/patient/get_doctor_by_clinic_id_request.dart # lib/core/model/patient/vital_sign/patient-vital-sign-data.dart # lib/core/model/pharmacy-intervention-model/intervention_medication_history_res_model.dart # lib/core/model/radiology/final_radiology.dart # lib/core/service/AnalyticsService.dart # lib/core/service/VideoCallService.dart # lib/core/service/authentication_service.dart # lib/core/service/hospitals/hospitals_service.dart # lib/core/service/patient_medical_file/ER_signin/ER_signin_service.dart # lib/core/service/patient_medical_file/lab_order/labs_service.dart # lib/core/service/patient_medical_file/radiology/radiology_service.dart # lib/core/service/pending_order_service.dart # lib/core/viewModel/ER_sign_in/ER_sign_in_view_model.dart # lib/core/viewModel/SOAP_view_model.dart # lib/core/viewModel/authentication_view_model.dart # lib/core/viewModel/dashboard_view_model.dart # lib/core/viewModel/doctor_replay_view_model.dart # lib/core/viewModel/patient-ucaf-viewmodel.dart # lib/core/viewModel/procedure_View_model.dart # lib/core/viewModel/radiology_view_model.dart # lib/screens/ER_singin/ER_singin_screen.dart # lib/screens/auth/login_screen.dart # lib/screens/auth/verification_methods_screen.dart # lib/screens/live_care/video_call.dart # lib/screens/medical-file/medical_file_details.dart # lib/screens/medicine/medicine_search_screen.dart # lib/screens/patients/DischargedPatientPage.dart # lib/screens/patients/ECGPage.dart # lib/screens/patients/out_patient/out_patient_screen.dart # lib/screens/patients/profile/admission_request/admission_request_first_screen.dart # lib/screens/patients/profile/diabetic_chart/line_chart_for_diabetic.dart # lib/screens/patients/profile/lab_result/history/line_chart_curved_lab_history.dart # lib/screens/patients/profile/lab_result/laboratory_result/laboratory_result_widget.dart # lib/screens/patients/profile/notes/note/progress_note_screen.dart # lib/screens/patients/profile/notes/note/update_note.dart # lib/screens/patients/profile/operation_report/update_operation_report.dart # lib/screens/patients/profile/profile_screen/patient_profile_screen.dart # lib/screens/patients/profile/profile_screen/profile_gird_for_other.dart # lib/screens/patients/profile/radiology/radiology_details_page.dart # lib/screens/patients/profile/radiology/radiology_home_page.dart # lib/screens/patients/profile/referral/refer_details/referred_patient_detail_in-paint.dart # lib/screens/patients/profile/soap_update/assessment/add_assessment_details.dart # lib/screens/patients/profile/soap_update/assessment/update_assessment_page.dart # lib/screens/patients/profile/soap_update/objective/update_objective_page.dart # lib/screens/patients/profile/soap_update/plan/update_plan_page.dart # lib/screens/patients/profile/soap_update/soap_utils.dart # lib/screens/patients/profile/soap_update/subjective/allergies/add_allergies.dart # lib/screens/patients/profile/soap_update/subjective/allergies/master_key_checkbox_search_allergies_widget.dart # lib/screens/patients/profile/soap_update/subjective/medication/add_medication.dart # lib/screens/patients/profile/soap_update/subjective/update_subjective_page.dart # lib/screens/patients/profile/vital_sign/line_chart_curved.dart # lib/screens/patients/profile/vital_sign/line_chart_curved_blood_pressure.dart # lib/screens/patients/profile/vital_sign/vital_sign_details_screen.dart # lib/screens/patients/profile/vital_sign/vital_sign_item_details_screen.dart # lib/screens/prescription/add_prescription/add_drug/drug_to_drug.dart # lib/screens/prescription/add_prescription/prescription_form_widget.dart # lib/screens/prescription/old_prescriptions_page.dart # lib/screens/prescription/prescription_checkout_screen.dart # lib/screens/procedures/add_procedure_page.dart # lib/screens/procedures/entity_list_checkbox_search_widget.dart # lib/screens/reschedule_leaves/reschedule_leave.dart # lib/utils/translations_delegate_base_utils.dart # lib/utils/utils.dart # lib/widgets/patients/profile/app_bar/patient-profile-app-bar.dart # lib/widgets/patients/profile/app_bar/patient-profile-header-new-design-app-bar.dart # lib/widgets/shared/app_scaffold_widget.dart # lib/widgets/shared/app_texts_widget.dart # lib/widgets/shared/dialogs/dailog-list-select.dart # lib/widgets/shared/dialogs/master_key_dailog.dart # lib/widgets/shared/dialogs/search-drugs-dailog-list.dart # lib/widgets/shared/text_fields/TextFields.dart # lib/widgets/shared/text_fields/html_rich_editor.dart # pubspec.lock # pubspec.yamlupdate_flutter_3.16.0_voipcall
commit
dc802e2bda
@ -1,5 +1,6 @@
|
|||||||
|
#Fri Jun 23 08:50:38 CEST 2017
|
||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
|
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
|
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip
|
||||||
|
|||||||
Binary file not shown.
@ -0,0 +1,4 @@
|
|||||||
|
storePassword=HmGsa123
|
||||||
|
keyPassword=HmGsa123
|
||||||
|
keyAlias=hmgdoctor
|
||||||
|
storeFile=doctor_app_key
|
||||||
@ -1,190 +1,199 @@
|
|||||||
class AdmissionRequest {
|
class AdmissionRequest {
|
||||||
int? patientMRN;
|
int patientMRN;
|
||||||
int? admitToClinic;
|
int admitToClinic;
|
||||||
bool? isPregnant;
|
bool isPregnant;
|
||||||
int? pregnancyWeeks;
|
int pregnancyWeeks;
|
||||||
int? pregnancyType;
|
int pregnancyType;
|
||||||
int? noOfBabies;
|
int noOfBabies;
|
||||||
int? mrpDoctorID;
|
int mrpDoctorID;
|
||||||
String? admissionDate;
|
String admissionDate;
|
||||||
int? expectedDays;
|
int expectedDays;
|
||||||
int? admissionType;
|
int admissionType;
|
||||||
int? admissionLocationID;
|
int admissionLocationID;
|
||||||
int? roomCategoryID;
|
int roomCategoryID;
|
||||||
int? wardID;
|
int wardID;
|
||||||
bool? isSickLeaveRequired;
|
bool isSickLeaveRequired;
|
||||||
String? sickLeaveComments;
|
String sickLeaveComments;
|
||||||
bool? isTransport;
|
bool isTransport;
|
||||||
String? transportComments;
|
String transportComments;
|
||||||
bool? isPhysioAppointmentNeeded;
|
bool isPhysioAppointmentNeeded;
|
||||||
String? physioAppointmentComments;
|
String physioAppointmentComments;
|
||||||
bool? isOPDFollowupAppointmentNeeded;
|
bool isOPDFollowupAppointmentNeeded;
|
||||||
String? opdFollowUpComments;
|
String opdFollowUpComments;
|
||||||
bool? isDietType;
|
bool isDietType;
|
||||||
int? dietType;
|
int dietType;
|
||||||
String? dietRemarks;
|
String dietRemarks;
|
||||||
bool? isPhysicalActivityModification;
|
String diagnosis;
|
||||||
String? physicalActivityModificationComments;
|
bool isPhysicalActivityModification;
|
||||||
int? orStatus;
|
String physicalActivityModificationComments;
|
||||||
String? mainLineOfTreatment;
|
int orStatus;
|
||||||
int? estimatedCost;
|
String mainLineOfTreatment;
|
||||||
String? elementsForImprovement;
|
int estimatedCost;
|
||||||
bool? isPackagePatient;
|
String elementsForImprovement;
|
||||||
String? complications;
|
bool isPackagePatient;
|
||||||
String? otherDepartmentInterventions;
|
String complications;
|
||||||
String? otherProcedures;
|
String otherDepartmentInterventions;
|
||||||
String? pastMedicalHistory;
|
String otherProcedures;
|
||||||
String? pastSurgicalHistory;
|
String pastMedicalHistory;
|
||||||
List<dynamic>? admissionRequestDiagnoses;
|
String pastSurgicalHistory;
|
||||||
List<dynamic>? admissionRequestProcedures;
|
List<dynamic> admissionRequestDiagnoses;
|
||||||
int? appointmentNo;
|
List<dynamic> admissionRequestProcedures;
|
||||||
int? episodeID;
|
int appointmentNo;
|
||||||
int? admissionRequestNo;
|
int episodeID;
|
||||||
|
int admissionRequestNo;
|
||||||
|
|
||||||
AdmissionRequest({
|
AdmissionRequest(
|
||||||
this.patientMRN,
|
{this.patientMRN,
|
||||||
this.admitToClinic,
|
this.admitToClinic,
|
||||||
this.isPregnant,
|
this.isPregnant,
|
||||||
this.pregnancyWeeks,
|
this.pregnancyWeeks = 0,
|
||||||
this.pregnancyType,
|
this.pregnancyType = 0,
|
||||||
this.noOfBabies,
|
this.noOfBabies = 0,
|
||||||
this.mrpDoctorID,
|
this.mrpDoctorID,
|
||||||
this.admissionDate,
|
this.admissionDate,
|
||||||
this.expectedDays,
|
this.expectedDays,
|
||||||
this.admissionType,
|
this.admissionType,
|
||||||
this.admissionLocationID,
|
this.admissionLocationID = 0,
|
||||||
this.roomCategoryID,
|
this.roomCategoryID = 0,
|
||||||
this.wardID,
|
this.wardID,
|
||||||
this.isSickLeaveRequired,
|
this.isSickLeaveRequired,
|
||||||
this.sickLeaveComments,
|
this.sickLeaveComments = "",
|
||||||
this.isTransport,
|
this.isTransport = false,
|
||||||
this.transportComments,
|
this.transportComments = "",
|
||||||
this.isPhysioAppointmentNeeded,
|
this.isPhysioAppointmentNeeded = false,
|
||||||
this.physioAppointmentComments,
|
this.physioAppointmentComments = "",
|
||||||
this.isOPDFollowupAppointmentNeeded,
|
this.isOPDFollowupAppointmentNeeded = false,
|
||||||
this.opdFollowUpComments,
|
this.opdFollowUpComments = "",
|
||||||
this.isDietType,
|
this.isDietType,
|
||||||
this.dietType,
|
this.dietType,
|
||||||
this.dietRemarks,
|
this.dietRemarks,
|
||||||
this.isPhysicalActivityModification,
|
this.diagnosis,
|
||||||
this.physicalActivityModificationComments,
|
this.isPhysicalActivityModification = false,
|
||||||
this.orStatus,
|
this.physicalActivityModificationComments = "",
|
||||||
this.mainLineOfTreatment,
|
this.orStatus = 1,
|
||||||
this.estimatedCost,
|
this.mainLineOfTreatment,
|
||||||
this.elementsForImprovement,
|
this.estimatedCost,
|
||||||
this.isPackagePatient,
|
this.elementsForImprovement,
|
||||||
this.complications,
|
this.isPackagePatient = false,
|
||||||
this.otherDepartmentInterventions,
|
this.complications = "",
|
||||||
this.otherProcedures,
|
this.otherDepartmentInterventions = "",
|
||||||
this.pastMedicalHistory,
|
this.otherProcedures = "",
|
||||||
this.pastSurgicalHistory,
|
this.pastMedicalHistory = "",
|
||||||
this.admissionRequestDiagnoses,
|
this.pastSurgicalHistory = "",
|
||||||
this.admissionRequestProcedures,
|
this.admissionRequestDiagnoses,
|
||||||
this.appointmentNo,
|
this.admissionRequestProcedures,
|
||||||
this.episodeID,
|
this.appointmentNo,
|
||||||
this.admissionRequestNo,
|
this.episodeID,
|
||||||
});
|
this.admissionRequestNo});
|
||||||
|
|
||||||
AdmissionRequest.fromJson(Map<String, dynamic>? json) {
|
AdmissionRequest.fromJson(Map<String, dynamic> json) {
|
||||||
if (json != null) {
|
patientMRN = json['patientMRN'];
|
||||||
patientMRN = json['patientMRN'];
|
admitToClinic = json['admitToClinic'];
|
||||||
admitToClinic = json['admitToClinic'];
|
isPregnant = json['isPregnant'];
|
||||||
isPregnant = json['isPregnant'];
|
pregnancyWeeks = json['pregnancyWeeks'];
|
||||||
pregnancyWeeks = json['pregnancyWeeks'];
|
pregnancyType = json['pregnancyType'];
|
||||||
pregnancyType = json['pregnancyType'];
|
noOfBabies = json['noOfBabies'];
|
||||||
noOfBabies = json['noOfBabies'];
|
mrpDoctorID = json['mrpDoctorID'];
|
||||||
mrpDoctorID = json['mrpDoctorID'];
|
admissionDate = json['admissionDate'];
|
||||||
admissionDate = json['admissionDate'];
|
expectedDays = json['expectedDays'];
|
||||||
expectedDays = json['expectedDays'];
|
admissionType = json['admissionType'];
|
||||||
admissionType = json['admissionType'];
|
admissionLocationID = json['admissionLocationID'];
|
||||||
admissionLocationID = json['admissionLocationID'];
|
roomCategoryID = json['roomCategoryID'];
|
||||||
roomCategoryID = json['roomCategoryID'];
|
wardID = json['wardID'];
|
||||||
wardID = json['wardID'];
|
isSickLeaveRequired = json['isSickLeaveRequired'];
|
||||||
isSickLeaveRequired = json['isSickLeaveRequired'];
|
sickLeaveComments = json['sickLeaveComments'];
|
||||||
sickLeaveComments = json['sickLeaveComments'];
|
isTransport = json['isTransport'];
|
||||||
isTransport = json['isTransport'];
|
transportComments = json['transportComments'];
|
||||||
transportComments = json['transportComments'];
|
isPhysioAppointmentNeeded = json['isPhysioAppointmentNeeded'];
|
||||||
isPhysioAppointmentNeeded = json['isPhysioAppointmentNeeded'];
|
physioAppointmentComments = json['physioAppointmentComments'];
|
||||||
physioAppointmentComments = json['physioAppointmentComments'];
|
isOPDFollowupAppointmentNeeded = json['isOPDFollowupAppointmentNeeded'];
|
||||||
isOPDFollowupAppointmentNeeded = json['isOPDFollowupAppointmentNeeded'];
|
opdFollowUpComments = json['opdFollowUpComments'];
|
||||||
opdFollowUpComments = json['opdFollowUpComments'];
|
isDietType = json['isDietType'];
|
||||||
isDietType = json['isDietType'];
|
dietType = json['dietType'];
|
||||||
dietType = json['dietType'];
|
dietRemarks = json['dietRemarks'];
|
||||||
dietRemarks = json['dietRemarks'];
|
diagnosis = json['diagnosis'];
|
||||||
isPhysicalActivityModification =
|
isPhysicalActivityModification = json['isPhysicalActivityModification'];
|
||||||
json['isPhysicalActivityModification'];
|
physicalActivityModificationComments = json['physicalActivityModificationComments'];
|
||||||
physicalActivityModificationComments =
|
orStatus = json['orStatus'];
|
||||||
json['physicalActivityModificationComments'];
|
mainLineOfTreatment = json['mainLineOfTreatment'];
|
||||||
orStatus = json['orStatus'];
|
estimatedCost = json['estimatedCost'];
|
||||||
mainLineOfTreatment = json['mainLineOfTreatment'];
|
elementsForImprovement = json['elementsForImprovement'];
|
||||||
estimatedCost = json['estimatedCost'];
|
isPackagePatient = json['isPackagePatient'];
|
||||||
elementsForImprovement = json['elementsForImprovement'];
|
complications = json['complications'];
|
||||||
isPackagePatient = json['isPackagePatient'];
|
otherDepartmentInterventions = json['otherDepartmentInterventions'];
|
||||||
complications = json['complications'];
|
otherProcedures = json['otherProcedures'];
|
||||||
otherDepartmentInterventions = json['otherDepartmentInterventions'];
|
pastMedicalHistory = json['pastMedicalHistory'];
|
||||||
otherProcedures = json['otherProcedures'];
|
pastSurgicalHistory = json['pastSurgicalHistory'];
|
||||||
pastMedicalHistory = json['pastMedicalHistory'];
|
if (json['admissionRequestDiagnoses'] != null) {
|
||||||
pastSurgicalHistory = json['pastSurgicalHistory'];
|
admissionRequestDiagnoses = new List<dynamic>();
|
||||||
if (json['admissionRequestDiagnoses'] != null) {
|
json['admissionRequestDiagnoses'].forEach((v) {
|
||||||
admissionRequestDiagnoses = List<dynamic>.from(
|
admissionRequestDiagnoses.add(v);
|
||||||
json['admissionRequestDiagnoses'],
|
// admissionRequestDiagnoses
|
||||||
);
|
// .add(new AdmissionRequestDiagnoses.fromJson(v));
|
||||||
}
|
});
|
||||||
if (json['admissionRequestProcedures'] != null) {
|
|
||||||
admissionRequestProcedures = List<dynamic>.from(
|
|
||||||
json['admissionRequestProcedures'],
|
|
||||||
);
|
|
||||||
}
|
|
||||||
appointmentNo = json['appointmentNo'];
|
|
||||||
episodeID = json['episodeID'];
|
|
||||||
admissionRequestNo = json['admissionRequestNo'];
|
|
||||||
}
|
}
|
||||||
|
if (json['admissionRequestProcedures'] != null) {
|
||||||
|
admissionRequestProcedures = new List<dynamic>();
|
||||||
|
json['admissionRequestProcedures'].forEach((v) {
|
||||||
|
admissionRequestProcedures.add(v);
|
||||||
|
// admissionRequestProcedures
|
||||||
|
// .add(new AdmissionRequestProcedures.fromJson(v));
|
||||||
|
});
|
||||||
|
}
|
||||||
|
appointmentNo = json['appointmentNo'];
|
||||||
|
episodeID = json['episodeID'];
|
||||||
|
admissionRequestNo = json['admissionRequestNo'];
|
||||||
}
|
}
|
||||||
|
|
||||||
Map<String, dynamic> toJson() {
|
Map<String, dynamic> toJson() {
|
||||||
final Map<String, dynamic> data = {};
|
final Map<String, dynamic> data = new Map<String, dynamic>();
|
||||||
data['patientMRN'] = patientMRN;
|
data['patientMRN'] = this.patientMRN;
|
||||||
data['admitToClinic'] = admitToClinic;
|
data['admitToClinic'] = this.admitToClinic;
|
||||||
data['isPregnant'] = isPregnant;
|
data['isPregnant'] = this.isPregnant;
|
||||||
data['pregnancyWeeks'] = pregnancyWeeks;
|
data['pregnancyWeeks'] = this.pregnancyWeeks;
|
||||||
data['pregnancyType'] = pregnancyType;
|
data['pregnancyType'] = this.pregnancyType;
|
||||||
data['noOfBabies'] = noOfBabies;
|
data['noOfBabies'] = this.noOfBabies;
|
||||||
data['mrpDoctorID'] = mrpDoctorID;
|
data['mrpDoctorID'] = this.mrpDoctorID;
|
||||||
data['admissionDate'] = admissionDate;
|
data['admissionDate'] = this.admissionDate;
|
||||||
data['expectedDays'] = expectedDays;
|
data['expectedDays'] = this.expectedDays;
|
||||||
data['admissionType'] = admissionType;
|
data['admissionType'] = this.admissionType;
|
||||||
data['admissionLocationID'] = admissionLocationID;
|
data['admissionLocationID'] = this.admissionLocationID;
|
||||||
data['roomCategoryID'] = roomCategoryID;
|
data['roomCategoryID'] = this.roomCategoryID;
|
||||||
data['wardID'] = wardID;
|
data['wardID'] = this.wardID;
|
||||||
data['isSickLeaveRequired'] = isSickLeaveRequired;
|
data['isSickLeaveRequired'] = this.isSickLeaveRequired;
|
||||||
data['sickLeaveComments'] = sickLeaveComments;
|
data['sickLeaveComments'] = this.sickLeaveComments;
|
||||||
data['isTransport'] = isTransport;
|
data['isTransport'] = this.isTransport;
|
||||||
data['transportComments'] = transportComments;
|
data['transportComments'] = this.transportComments;
|
||||||
data['isPhysioAppointmentNeeded'] = isPhysioAppointmentNeeded;
|
data['isPhysioAppointmentNeeded'] = this.isPhysioAppointmentNeeded;
|
||||||
data['physioAppointmentComments'] = physioAppointmentComments;
|
data['physioAppointmentComments'] = this.physioAppointmentComments;
|
||||||
data['isOPDFollowupAppointmentNeeded'] = isOPDFollowupAppointmentNeeded;
|
data['isOPDFollowupAppointmentNeeded'] = this.isOPDFollowupAppointmentNeeded;
|
||||||
data['opdFollowUpComments'] = opdFollowUpComments;
|
data['opdFollowUpComments'] = this.opdFollowUpComments;
|
||||||
data['isDietType'] = isDietType;
|
data['isDietType'] = this.isDietType;
|
||||||
data['dietType'] = dietType;
|
data['dietType'] = this.dietType;
|
||||||
data['dietRemarks'] = dietRemarks;
|
data['dietRemarks'] = this.dietRemarks;
|
||||||
data['isPhysicalActivityModification'] = isPhysicalActivityModification;
|
data['diagnosis'] = this.diagnosis;
|
||||||
data['physicalActivityModificationComments'] =
|
data['isPhysicalActivityModification'] = this.isPhysicalActivityModification;
|
||||||
physicalActivityModificationComments;
|
data['physicalActivityModificationComments'] = this.physicalActivityModificationComments;
|
||||||
data['orStatus'] = orStatus;
|
data['orStatus'] = this.orStatus;
|
||||||
data['mainLineOfTreatment'] = mainLineOfTreatment;
|
data['mainLineOfTreatment'] = this.mainLineOfTreatment;
|
||||||
data['estimatedCost'] = estimatedCost;
|
data['estimatedCost'] = this.estimatedCost;
|
||||||
data['elementsForImprovement'] = elementsForImprovement;
|
data['elementsForImprovement'] = this.elementsForImprovement;
|
||||||
data['isPackagePatient'] = isPackagePatient;
|
data['isPackagePatient'] = this.isPackagePatient;
|
||||||
data['complications'] = complications;
|
data['complications'] = this.complications;
|
||||||
data['otherDepartmentInterventions'] = otherDepartmentInterventions;
|
data['otherDepartmentInterventions'] = this.otherDepartmentInterventions;
|
||||||
data['otherProcedures'] = otherProcedures;
|
data['otherProcedures'] = this.otherProcedures;
|
||||||
data['pastMedicalHistory'] = pastMedicalHistory;
|
data['pastMedicalHistory'] = this.pastMedicalHistory;
|
||||||
data['pastSurgicalHistory'] = pastSurgicalHistory;
|
data['pastSurgicalHistory'] = this.pastSurgicalHistory;
|
||||||
data['admissionRequestDiagnoses'] = admissionRequestDiagnoses;
|
if (this.admissionRequestDiagnoses != null) {
|
||||||
data['admissionRequestProcedures'] = admissionRequestProcedures;
|
data['admissionRequestDiagnoses'] = this.admissionRequestDiagnoses;
|
||||||
data['appointmentNo'] = appointmentNo;
|
// this.admissionRequestDiagnoses.map((v) => v.toJson()).toList();
|
||||||
data['episodeID'] = episodeID;
|
}
|
||||||
data['admissionRequestNo'] = admissionRequestNo;
|
if (this.admissionRequestProcedures != null) {
|
||||||
|
data['admissionRequestProcedures'] = this.admissionRequestProcedures.map((v) => v.toJson()).toList();
|
||||||
|
}
|
||||||
|
data['appointmentNo'] = this.appointmentNo;
|
||||||
|
data['episodeID'] = this.episodeID;
|
||||||
|
data['admissionRequestNo'] = this.admissionRequestNo;
|
||||||
return data;
|
return data;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -0,0 +1,80 @@
|
|||||||
|
import 'dart:convert';
|
||||||
|
List<DoctorSchedule> doctorScheduleFromJson(String str) => List<DoctorSchedule>.from(json.decode(str).map((x) => DoctorSchedule.fromJson(x)));
|
||||||
|
|
||||||
|
String doctorScheduleToJson(List<DoctorSchedule> data) => json.encode(List<dynamic>.from(data.map((x) => x.toJson())));
|
||||||
|
|
||||||
|
class DoctorSchedule {
|
||||||
|
int scheduledid;
|
||||||
|
int status;
|
||||||
|
String clinicname;
|
||||||
|
int clinicid;
|
||||||
|
List<Scheduleforuser> scheduleforuser;
|
||||||
|
|
||||||
|
DoctorSchedule({
|
||||||
|
this.scheduledid,
|
||||||
|
this.status,
|
||||||
|
this.clinicname,
|
||||||
|
this.clinicid,
|
||||||
|
this.scheduleforuser,
|
||||||
|
});
|
||||||
|
|
||||||
|
factory DoctorSchedule.fromJson(Map<String, dynamic> json) => DoctorSchedule(
|
||||||
|
scheduledid: json["scheduledid"],
|
||||||
|
status: json["status"],
|
||||||
|
clinicname: json["clinicname"],
|
||||||
|
clinicid: json["clinicid"],
|
||||||
|
scheduleforuser: List<Scheduleforuser>.from(json["scheduleforuser"].map((x) => Scheduleforuser.fromJson(x))),
|
||||||
|
);
|
||||||
|
|
||||||
|
Map<String, dynamic> toJson() => {
|
||||||
|
"scheduledid": scheduledid,
|
||||||
|
"status": status,
|
||||||
|
"clinicname": clinicname,
|
||||||
|
"clinicid": clinicid,
|
||||||
|
"scheduleforuser": List<dynamic>.from(scheduleforuser.map((x) => x.toJson())),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
class Scheduleforuser {
|
||||||
|
DateTime days;
|
||||||
|
int duration;
|
||||||
|
List<Shiftforuser> shiftforuser;
|
||||||
|
|
||||||
|
Scheduleforuser({
|
||||||
|
this.days,
|
||||||
|
this.duration,
|
||||||
|
this.shiftforuser,
|
||||||
|
});
|
||||||
|
|
||||||
|
factory Scheduleforuser.fromJson(Map<String, dynamic> json) => Scheduleforuser(
|
||||||
|
days: DateTime.parse(json["days"]),
|
||||||
|
duration: json["duration"],
|
||||||
|
shiftforuser: List<Shiftforuser>.from(json["shiftforuser"].map((x) => Shiftforuser.fromJson(x))),
|
||||||
|
);
|
||||||
|
|
||||||
|
Map<String, dynamic> toJson() => {
|
||||||
|
"days": days.toIso8601String(),
|
||||||
|
"duration": duration,
|
||||||
|
"shiftforuser": List<dynamic>.from(shiftforuser.map((x) => x.toJson())),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
class Shiftforuser {
|
||||||
|
int fromtime;
|
||||||
|
int totime;
|
||||||
|
|
||||||
|
Shiftforuser({
|
||||||
|
this.fromtime,
|
||||||
|
this.totime,
|
||||||
|
});
|
||||||
|
|
||||||
|
factory Shiftforuser.fromJson(Map<String, dynamic> json) => Shiftforuser(
|
||||||
|
fromtime: json["fromtime"],
|
||||||
|
totime: json["totime"],
|
||||||
|
);
|
||||||
|
|
||||||
|
Map<String, dynamic> toJson() => {
|
||||||
|
"fromtime": fromtime,
|
||||||
|
"totime": totime,
|
||||||
|
};
|
||||||
|
}
|
||||||
@ -0,0 +1,15 @@
|
|||||||
|
class VidaPlusProjectListModel {
|
||||||
|
int projectID;
|
||||||
|
|
||||||
|
VidaPlusProjectListModel({this.projectID});
|
||||||
|
|
||||||
|
VidaPlusProjectListModel.fromJson(Map<String, dynamic> json) {
|
||||||
|
projectID = json['ProjectID'];
|
||||||
|
}
|
||||||
|
|
||||||
|
Map<String, dynamic> toJson() {
|
||||||
|
final Map<String, dynamic> data = new Map<String, dynamic>();
|
||||||
|
data['ProjectID'] = this.projectID;
|
||||||
|
return data;
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -1,23 +1,46 @@
|
|||||||
import 'package:doctor_app_flutter/config/config.dart';
|
import 'package:doctor_app_flutter/config/config.dart';
|
||||||
import 'package:doctor_app_flutter/core/model/ER_sign_in/doctor_ER_sign_assessment_req_model.dart';
|
import 'package:doctor_app_flutter/core/model/ER_sign_in/doctor_ER_sign_assessment_req_model.dart';
|
||||||
|
import 'package:doctor_app_flutter/core/model/Prescriptions/Prescriptions.dart';
|
||||||
|
import 'package:doctor_app_flutter/core/model/Prescriptions/get_medication_for_inpatient_model.dart';
|
||||||
|
import 'package:doctor_app_flutter/core/model/Prescriptions/get_medication_for_inpatient_request_model.dart';
|
||||||
|
import 'package:doctor_app_flutter/core/model/Prescriptions/perscription_pharmacy.dart';
|
||||||
|
import 'package:doctor_app_flutter/core/model/Prescriptions/post_prescrition_req_model.dart';
|
||||||
|
import 'package:doctor_app_flutter/core/model/Prescriptions/prescription_entity_model.dart';
|
||||||
|
import 'package:doctor_app_flutter/core/model/Prescriptions/prescription_in_patient.dart';
|
||||||
|
import 'package:doctor_app_flutter/core/model/Prescriptions/prescription_model.dart';
|
||||||
|
import 'package:doctor_app_flutter/core/model/Prescriptions/prescription_report.dart';
|
||||||
|
import 'package:doctor_app_flutter/core/model/Prescriptions/prescription_report_enh.dart';
|
||||||
|
import 'package:doctor_app_flutter/core/model/Prescriptions/prescription_req_model.dart';
|
||||||
|
import 'package:doctor_app_flutter/core/model/Prescriptions/prescriptions_order.dart';
|
||||||
|
import 'package:doctor_app_flutter/core/model/Prescriptions/request_get_list_pharmacy_for_prescriptions.dart';
|
||||||
|
import 'package:doctor_app_flutter/core/model/Prescriptions/request_prescription_report.dart';
|
||||||
|
import 'package:doctor_app_flutter/core/model/Prescriptions/request_prescription_report_enh.dart';
|
||||||
|
import 'package:doctor_app_flutter/core/model/SOAP/Allergy/get_allergies_res_model.dart';
|
||||||
|
import 'package:doctor_app_flutter/core/model/SOAP/Assessment/get_assessment_res_model.dart';
|
||||||
|
import 'package:doctor_app_flutter/core/model/calculate_box_request_model.dart';
|
||||||
|
import 'package:doctor_app_flutter/core/model/search_drug/get_medication_response_model.dart';
|
||||||
|
import 'package:doctor_app_flutter/core/model/search_drug/item_by_medicine_request_model.dart';
|
||||||
|
import 'package:doctor_app_flutter/core/model/search_drug/search_drug_model.dart';
|
||||||
|
import 'package:doctor_app_flutter/core/model/search_drug/search_drug_request_model.dart';
|
||||||
import 'package:doctor_app_flutter/core/service/base/lookup-service.dart';
|
import 'package:doctor_app_flutter/core/service/base/lookup-service.dart';
|
||||||
|
import 'package:doctor_app_flutter/core/model/SOAP/Assessment/get_assessment_req_model.dart';
|
||||||
|
import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart';
|
||||||
|
import 'package:doctor_app_flutter/core/model/patient/vital_sign/patient-vital-sign-data.dart';
|
||||||
|
import 'package:doctor_app_flutter/utils/date-utils.dart';
|
||||||
|
import 'package:flutter/cupertino.dart';
|
||||||
|
|
||||||
class ERSignInService extends LookupService {
|
class ERSignInService extends LookupService {
|
||||||
|
|
||||||
|
|
||||||
Future signInERPatient({DoctorErSignAssessmentReqModel? doctorErSignAssessmentReqModel}) async {
|
Future signInERPatient({DoctorErSignAssessmentReqModel doctorErSignAssessmentReqModel}) async {
|
||||||
|
|
||||||
|
|
||||||
hasError = false;
|
hasError = false;
|
||||||
|
|
||||||
await baseAppClient.post(DOCTOR_ER_SIGN_ASSESSMENT,
|
await baseAppClient.post(DOCTOR_ER_SIGN_ASSESSMENT,
|
||||||
onSuccess: (dynamic response, int statusCode) {
|
onSuccess: (dynamic response, int statusCode) {
|
||||||
|
|
||||||
}, onFailure: (String error, int statusCode) {
|
}, onFailure: (String error, int statusCode) {
|
||||||
hasError = true;
|
hasError = true;
|
||||||
super.error = error;
|
super.error = error;
|
||||||
}, body: doctorErSignAssessmentReqModel!.toJson());
|
}, body: doctorErSignAssessmentReqModel.toJson());
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -0,0 +1,465 @@
|
|||||||
|
import 'package:doctor_app_flutter/core/service/home/dasboard_service.dart';
|
||||||
|
import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart';
|
||||||
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:flutter_datetime_picker/flutter_datetime_picker.dart';
|
||||||
|
import 'package:intl/intl.dart';
|
||||||
|
import 'package:provider/provider.dart';
|
||||||
|
import 'package:flutter_svg/flutter_svg.dart';
|
||||||
|
import '../../core/viewModel/project_view_model.dart';
|
||||||
|
import '../../core/viewModel/schedule_view_model.dart';
|
||||||
|
import '../../icons_app/doctor_app_icons.dart';
|
||||||
|
import '../../utils/date-utils.dart';
|
||||||
|
import '../../utils/dr_app_toast_msg.dart';
|
||||||
|
import '../../utils/translations_delegate_base_utils.dart';
|
||||||
|
import '../../widgets/shared/app_scaffold_widget.dart';
|
||||||
|
import '../../widgets/shared/errors/error_message.dart';
|
||||||
|
import '../base/base_view.dart';
|
||||||
|
import '../patients/register_patient/CustomEditableText.dart';
|
||||||
|
|
||||||
|
class DoctorSchedulePage extends StatefulWidget {
|
||||||
|
@override
|
||||||
|
_DoctorSchedulePageState createState() => _DoctorSchedulePageState();
|
||||||
|
}
|
||||||
|
|
||||||
|
class _DoctorSchedulePageState extends State<DoctorSchedulePage> {
|
||||||
|
DashboardService service;
|
||||||
|
PageController _pageController = PageController();
|
||||||
|
double currentPage = 0;
|
||||||
|
int selectedindex = 0;
|
||||||
|
List weeks = [];
|
||||||
|
// List<DoctorScheduleResponse> doctorScheduleResponse = [];
|
||||||
|
int weekMS = 604800 * 1000;
|
||||||
|
// DoctorList? doctorList;
|
||||||
|
List<String> freeSlots = [];
|
||||||
|
bool isPageChange = false;
|
||||||
|
String fromDate = DateFormat('yyyy-MM-dd').format(DateTime.now());
|
||||||
|
String toDate =
|
||||||
|
DateFormat('yyyy-MM-dd').format(DateTime.now().add(Duration(days: 30)));
|
||||||
|
// AppSharedPreferences sharedPref = AppSharedPreferences();
|
||||||
|
|
||||||
|
@override
|
||||||
|
void initState() {
|
||||||
|
// this.doctorList = widget.doctorList;
|
||||||
|
|
||||||
|
super.initState();
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
ProjectViewModel projectViewModel = Provider.of(context);
|
||||||
|
return BaseView<ScheduleViewModel>(
|
||||||
|
onModelReady: (model) => model.getDoctorRota(fromDate, toDate),
|
||||||
|
builder: (_, model, widget2) {
|
||||||
|
return AppScaffold(
|
||||||
|
appBarTitle: TranslationBase.of(context).doctorSchedule,
|
||||||
|
isShowAppBar: true,
|
||||||
|
baseViewModel: model,
|
||||||
|
isHomeIcon: false,
|
||||||
|
isLoading: true,
|
||||||
|
actionButton: IconButton(
|
||||||
|
icon: Icon(DoctorApp.search_1),
|
||||||
|
color: Colors.black, //Colors.black,
|
||||||
|
onPressed: () => searchSchedule(model),
|
||||||
|
),
|
||||||
|
body: SizedBox(
|
||||||
|
height: MediaQuery.of(context).size.height,
|
||||||
|
child: Stack(
|
||||||
|
children: [
|
||||||
|
Column(
|
||||||
|
children: [
|
||||||
|
Padding(
|
||||||
|
padding: EdgeInsets.only(left: 20),
|
||||||
|
child: Row(
|
||||||
|
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||||
|
children: [
|
||||||
|
Text(
|
||||||
|
TranslationBase.of(context).dateFrom +
|
||||||
|
" " +
|
||||||
|
DateFormat("dd-MMM").format(
|
||||||
|
DateFormat('yyyy-MM-dd')
|
||||||
|
.parse(fromDate)) +
|
||||||
|
" " +
|
||||||
|
TranslationBase.of(context).to +
|
||||||
|
" " +
|
||||||
|
DateFormat("dd-MMM").format(
|
||||||
|
DateFormat('yyyy-MM-dd')
|
||||||
|
.parse(toDate)),
|
||||||
|
style: TextStyle(fontWeight: FontWeight.w600),
|
||||||
|
),
|
||||||
|
Row(
|
||||||
|
children: [
|
||||||
|
IconButton(
|
||||||
|
onPressed: () {
|
||||||
|
|
||||||
|
model.getDoctorRota(fromDate, toDate,);
|
||||||
|
},
|
||||||
|
icon: SvgPicture.asset(
|
||||||
|
'assets/images/svgs/prev.svg',
|
||||||
|
height: 25,
|
||||||
|
width: 10)),
|
||||||
|
IconButton(
|
||||||
|
onPressed: () {},
|
||||||
|
icon: SvgPicture.asset(
|
||||||
|
'assets/images/svgs/next.svg',
|
||||||
|
height: 25,
|
||||||
|
width: 10))
|
||||||
|
],
|
||||||
|
),
|
||||||
|
],
|
||||||
|
)),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
model.getDoctorRotation.length ==0 ? Center(
|
||||||
|
child: ErrorMessage(
|
||||||
|
error: TranslationBase.of(context).noDataAvailable,
|
||||||
|
)) :
|
||||||
|
Container(
|
||||||
|
margin: EdgeInsets.only(top: 45),
|
||||||
|
child: PageView.builder(
|
||||||
|
controller: _pageController,
|
||||||
|
itemCount: model.getDoctorRotation.length,
|
||||||
|
onPageChanged: (index) {
|
||||||
|
setState(() {
|
||||||
|
isPageChange = true;
|
||||||
|
this.currentPage = index.toDouble();
|
||||||
|
});
|
||||||
|
},
|
||||||
|
itemBuilder: (context, index) {
|
||||||
|
return Container(
|
||||||
|
child: ListView.builder(
|
||||||
|
itemCount: model.getDoctorRotation[index]
|
||||||
|
.scheduleforuser.length,
|
||||||
|
itemBuilder: (context, index2) => InkWell(
|
||||||
|
onTap: () {
|
||||||
|
// final weekDay = weeks[index][index2]['DayName'];
|
||||||
|
},
|
||||||
|
child: Row(
|
||||||
|
children: [
|
||||||
|
Expanded(
|
||||||
|
flex: 1,
|
||||||
|
child: Padding(
|
||||||
|
padding:
|
||||||
|
projectViewModel.isArabic
|
||||||
|
? EdgeInsets.only(
|
||||||
|
right: 17)
|
||||||
|
: EdgeInsets.only(
|
||||||
|
left: 17),
|
||||||
|
child: Row(children: [
|
||||||
|
Column(
|
||||||
|
children: [
|
||||||
|
Text(DateFormat('EEEE')
|
||||||
|
.format(model
|
||||||
|
.getDoctorRotation[
|
||||||
|
index]
|
||||||
|
.scheduleforuser[
|
||||||
|
index2]
|
||||||
|
.days)
|
||||||
|
|
||||||
|
// fontSize: 13,
|
||||||
|
// fontWeight: projectViewModel.isArabic ? FontWeight.w600 : FontWeight.w500,
|
||||||
|
),
|
||||||
|
Text(getDayMonths(model
|
||||||
|
.getDoctorRotation[
|
||||||
|
index]
|
||||||
|
.scheduleforuser[
|
||||||
|
index2]
|
||||||
|
.days))
|
||||||
|
|
||||||
|
// fontWeight: FontWeight.bold,
|
||||||
|
// fontSize: 18,
|
||||||
|
],
|
||||||
|
)
|
||||||
|
])),
|
||||||
|
),
|
||||||
|
Expanded(
|
||||||
|
flex: 3,
|
||||||
|
child: ClipRRect(
|
||||||
|
borderRadius:
|
||||||
|
const BorderRadius.all(
|
||||||
|
Radius.circular(
|
||||||
|
20.0)),
|
||||||
|
child: Container(
|
||||||
|
padding: EdgeInsets.only(
|
||||||
|
left: 10,
|
||||||
|
right: 10,
|
||||||
|
top: 15,
|
||||||
|
bottom: 20),
|
||||||
|
margin: EdgeInsets.only(
|
||||||
|
left: 20,
|
||||||
|
right: 20,
|
||||||
|
top: 7,
|
||||||
|
bottom: 7),
|
||||||
|
decoration: BoxDecoration(
|
||||||
|
boxShadow: [
|
||||||
|
model
|
||||||
|
.getDoctorRotation[
|
||||||
|
index]
|
||||||
|
.scheduleforuser[
|
||||||
|
index2]
|
||||||
|
.days
|
||||||
|
.toString()
|
||||||
|
.substring(
|
||||||
|
0,
|
||||||
|
10) ==
|
||||||
|
DateTime.now()
|
||||||
|
.toString()
|
||||||
|
.substring(
|
||||||
|
0, 10)
|
||||||
|
? BoxShadow(
|
||||||
|
color: Colors
|
||||||
|
.green,
|
||||||
|
offset: Offset(
|
||||||
|
projectViewModel.isArabic
|
||||||
|
? 5
|
||||||
|
: -5,
|
||||||
|
0))
|
||||||
|
: BoxShadow(
|
||||||
|
color: Colors
|
||||||
|
.grey[
|
||||||
|
100],
|
||||||
|
blurRadius:
|
||||||
|
5,
|
||||||
|
spreadRadius:
|
||||||
|
4,
|
||||||
|
offset:
|
||||||
|
Offset(
|
||||||
|
0,
|
||||||
|
10),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
borderRadius:
|
||||||
|
const BorderRadius.all(
|
||||||
|
Radius.circular(
|
||||||
|
10.0)),
|
||||||
|
color: Colors.white),
|
||||||
|
child: Column(
|
||||||
|
crossAxisAlignment:
|
||||||
|
CrossAxisAlignment
|
||||||
|
.start,
|
||||||
|
children: [
|
||||||
|
model
|
||||||
|
.getDoctorRotation[
|
||||||
|
index]
|
||||||
|
.scheduleforuser[
|
||||||
|
index2]
|
||||||
|
.days
|
||||||
|
.toString()
|
||||||
|
.substring(
|
||||||
|
0,
|
||||||
|
10) ==
|
||||||
|
DateTime.now()
|
||||||
|
.toString()
|
||||||
|
.substring(
|
||||||
|
0,
|
||||||
|
10)
|
||||||
|
? Text(
|
||||||
|
TranslationBase.of(
|
||||||
|
context)
|
||||||
|
.today,
|
||||||
|
style:
|
||||||
|
TextStyle(
|
||||||
|
color: Colors
|
||||||
|
.green,
|
||||||
|
fontWeight:
|
||||||
|
FontWeight
|
||||||
|
.w600,
|
||||||
|
fontSize:
|
||||||
|
12,
|
||||||
|
))
|
||||||
|
: SizedBox(),
|
||||||
|
// : SizedBox(),
|
||||||
|
Row(
|
||||||
|
children: [
|
||||||
|
Expanded(
|
||||||
|
child: Text(
|
||||||
|
model
|
||||||
|
.getDoctorRotation[
|
||||||
|
index]
|
||||||
|
.clinicname,
|
||||||
|
style:
|
||||||
|
TextStyle(
|
||||||
|
fontWeight:
|
||||||
|
FontWeight
|
||||||
|
.w600,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
// Icon(Icons.arrow_forward, size: 16.0),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
Container(
|
||||||
|
height: 45,
|
||||||
|
child: ListView
|
||||||
|
.builder(
|
||||||
|
itemCount: model
|
||||||
|
.getDoctorRotation[
|
||||||
|
index]
|
||||||
|
.scheduleforuser[
|
||||||
|
index2]
|
||||||
|
.shiftforuser
|
||||||
|
.length,
|
||||||
|
itemBuilder: (context,
|
||||||
|
index3) =>
|
||||||
|
Row(children: [
|
||||||
|
Text(model.getDoctorRotation[index].scheduleforuser[index2].shiftforuser[index3].fromtime.toString()),
|
||||||
|
Text(" To "),
|
||||||
|
Text(model.getDoctorRotation[index].scheduleforuser[index2].shiftforuser[index3].totime.toString())
|
||||||
|
])))
|
||||||
|
|
||||||
|
// ],)
|
||||||
|
]))),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
))));
|
||||||
|
},
|
||||||
|
)),
|
||||||
|
// PageViewIndicator(
|
||||||
|
// isActive: true,
|
||||||
|
// currentPage: this.currentPage,
|
||||||
|
// length: weeks.length,
|
||||||
|
// )
|
||||||
|
],
|
||||||
|
)),
|
||||||
|
);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
searchSchedule(model) {
|
||||||
|
showDialog(
|
||||||
|
context: context,
|
||||||
|
builder: (BuildContext context) {
|
||||||
|
return StatefulBuilder(
|
||||||
|
builder:(context, setState) {
|
||||||
|
return
|
||||||
|
AlertDialog(
|
||||||
|
title: Column(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
Text(
|
||||||
|
TranslationBase.of(context).search,
|
||||||
|
style: TextStyle(fontSize: 22),
|
||||||
|
),
|
||||||
|
Text(
|
||||||
|
TranslationBase.of(context).searchFindSchedule,
|
||||||
|
style: TextStyle(fontSize: 16),
|
||||||
|
)
|
||||||
|
],
|
||||||
|
),
|
||||||
|
content: Container(
|
||||||
|
height: 150,
|
||||||
|
child: Column(children: [
|
||||||
|
InkWell(
|
||||||
|
onTap: () {
|
||||||
|
DatePicker.showDatePicker(
|
||||||
|
context,
|
||||||
|
showTitleActions: true,
|
||||||
|
minTime: DateTime(DateTime.now().year - 1, 1, 1),
|
||||||
|
maxTime: DateTime.now().add(Duration(days:365)),
|
||||||
|
onConfirm: (date) {
|
||||||
|
setState(() {
|
||||||
|
fromDate = DateFormat('yyyy-MM-dd').format(date);
|
||||||
|
});
|
||||||
|
},
|
||||||
|
);
|
||||||
|
},
|
||||||
|
child: Container(
|
||||||
|
padding:
|
||||||
|
EdgeInsets.only(top: 5, left: 12, right: 12, bottom: 5),
|
||||||
|
width: double.infinity,
|
||||||
|
height: 55,
|
||||||
|
decoration: BoxDecoration(
|
||||||
|
borderRadius: BorderRadius.circular(12),
|
||||||
|
color: Colors.white,
|
||||||
|
boxShadow: [
|
||||||
|
BoxShadow(
|
||||||
|
blurRadius: .26,
|
||||||
|
spreadRadius: 1 * 1.5,
|
||||||
|
color: Colors.black.withOpacity(.05))
|
||||||
|
]),
|
||||||
|
child: Column(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
Text(
|
||||||
|
TranslationBase.of(context).dateFrom,
|
||||||
|
style: TextStyle(fontSize: 12),
|
||||||
|
),
|
||||||
|
Row(
|
||||||
|
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||||
|
children: [
|
||||||
|
Text(fromDate),
|
||||||
|
Icon(Icons.calendar_month_outlined)
|
||||||
|
])
|
||||||
|
],
|
||||||
|
))),
|
||||||
|
SizedBox(height: 20,),
|
||||||
|
InkWell(
|
||||||
|
onTap: () {
|
||||||
|
DatePicker.showDatePicker(
|
||||||
|
context,
|
||||||
|
showTitleActions: true,
|
||||||
|
minTime: DateTime(DateTime.now().year - 1, 1, 1),
|
||||||
|
maxTime: DateTime.now().add(Duration(days:365)),
|
||||||
|
onConfirm: (date) {
|
||||||
|
setState(() {
|
||||||
|
toDate = DateFormat('yyyy-MM-dd').format(date);
|
||||||
|
});
|
||||||
|
},
|
||||||
|
);
|
||||||
|
},
|
||||||
|
child: Container(
|
||||||
|
padding:
|
||||||
|
EdgeInsets.only(top: 5, left: 12, right: 12, bottom: 5),
|
||||||
|
width: double.infinity,
|
||||||
|
height: 55,
|
||||||
|
decoration: BoxDecoration(
|
||||||
|
borderRadius: BorderRadius.circular(12),
|
||||||
|
color: Colors.white,
|
||||||
|
boxShadow: [
|
||||||
|
BoxShadow(
|
||||||
|
blurRadius: .26,
|
||||||
|
spreadRadius: 1 * 1.5,
|
||||||
|
color: Colors.black.withOpacity(.05))
|
||||||
|
]),
|
||||||
|
child: Column(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
Text(
|
||||||
|
TranslationBase.of(context).toDate,
|
||||||
|
style: TextStyle(fontSize: 12),
|
||||||
|
),
|
||||||
|
Row(
|
||||||
|
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||||
|
children: [
|
||||||
|
Text(toDate),
|
||||||
|
Icon(Icons.calendar_month_outlined)
|
||||||
|
])
|
||||||
|
],
|
||||||
|
)))
|
||||||
|
]),
|
||||||
|
),
|
||||||
|
actions: [
|
||||||
|
AppButton(
|
||||||
|
title:TranslationBase.of(context).search,
|
||||||
|
onPressed: () {
|
||||||
|
setState((){
|
||||||
|
model.getDoctorRota(fromDate, toDate);
|
||||||
|
Navigator.pop(context);
|
||||||
|
});
|
||||||
|
},
|
||||||
|
)
|
||||||
|
],
|
||||||
|
);
|
||||||
|
;
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
String getDayMonths(DateTime dateTime) {
|
||||||
|
String dateFormat =
|
||||||
|
'${dateTime.day} ${AppDateUtils.getMonth(dateTime.month).toString().substring(0, 3)}';
|
||||||
|
return dateFormat;
|
||||||
|
}
|
||||||
|
}
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue