Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into favorite_procedure_templates

 Conflicts:
	lib/screens/procedures/add-favourite-procedure.dart
merge-requests/704/head
Mohammad Aljammal 5 years ago
commit 2b6736ed6a

@ -52,7 +52,9 @@ class BaseAppClient {
if (body['EditedBy'] == '') { if (body['EditedBy'] == '') {
body.remove("EditedBy"); body.remove("EditedBy");
} }
body['TokenID'] = token ?? ''; if(body['TokenID'] == null){
body['TokenID'] = token ?? '';
}
// body['TokenID'] = "@dm!n" ?? ''; // body['TokenID'] = "@dm!n" ?? '';
String lang = await sharedPref.getString(APP_Language); String lang = await sharedPref.getString(APP_Language);
if (lang != null && lang == 'ar') if (lang != null && lang == 'ar')

@ -210,6 +210,8 @@ const PATIENT_MEDICAL_REPORT_VERIFIED = "Services/Patients.svc/REST/DAPP_Verifie
const GET_PROCEDURE_TEMPLETE = 'Services/Doctors.svc/REST/DAPP_ProcedureTemplateGet'; const GET_PROCEDURE_TEMPLETE = 'Services/Doctors.svc/REST/DAPP_ProcedureTemplateGet';
const GET_TEMPLETE_LIST = 'Services/Doctors.svc/REST/DAPP_TemplateGet';
const GET_PROCEDURE_TEMPLETE_DETAILS = "Services/Doctors.svc/REST/DAPP_ProcedureTemplateDetailsGet"; const GET_PROCEDURE_TEMPLETE_DETAILS = "Services/Doctors.svc/REST/DAPP_ProcedureTemplateDetailsGet";
const GET_PENDING_PATIENT_ER_FOR_DOCTOR_APP = 'Services/DoctorApplication.svc/REST/GetPendingPatientERForDoctorApp'; const GET_PENDING_PATIENT_ER_FOR_DOCTOR_APP = 'Services/DoctorApplication.svc/REST/GetPendingPatientERForDoctorApp';

@ -105,11 +105,12 @@ class ProcedureTempleteDetailsModel {
} }
} }
class ProcedureTempleteDetailsModelList { class ProcedureTempleteDetailsModelList {
List<ProcedureTempleteDetailsModel> procedureTemplate; List<ProcedureTempleteDetailsModel> procedureTemplate = List();
String templateName; String templateName;
int templateId;
ProcedureTempleteDetailsModelList( ProcedureTempleteDetailsModelList(
{this.templateName, ProcedureTempleteDetailsModel template}) { {this.templateName, this.templateId, ProcedureTempleteDetailsModel template}) {
procedureTemplate.add(template); procedureTemplate.add(template);
} }
} }

@ -23,8 +23,9 @@ class ProcedureService extends BaseService {
List<Procedures> procedureslist = List(); List<Procedures> procedureslist = List();
List<dynamic> categoryList = []; List<dynamic> categoryList = [];
List<ProcedureTempleteModel> _templateList = List(); // List<ProcedureTempleteModel> _templateList = List();
List<ProcedureTempleteModel> get templateList => _templateList; // List<ProcedureTempleteModel> get templateList => _templateList;
List<ProcedureTempleteDetailsModel> templateList = List();
List<ProcedureTempleteDetailsModel> _templateDetailsList = List(); List<ProcedureTempleteDetailsModel> _templateDetailsList = List();
List<ProcedureTempleteDetailsModel> get templateDetailsList => List<ProcedureTempleteDetailsModel> get templateDetailsList =>
@ -63,22 +64,31 @@ class ProcedureService extends BaseService {
); );
Future getProcedureTemplate( Future getProcedureTemplate(
{int doctorId, int projectId, int clinicId}) async { {int doctorId, int projectId, int clinicId, String categoryID}) async {
_procedureTempleteRequestModel = ProcedureTempleteRequestModel( _procedureTempleteRequestModel = ProcedureTempleteRequestModel(
tokenID: "@dm!n", tokenID: "@dm!n",
patientID: 0, patientID: 0,
searchType: 1, searchType: 1,
editedBy: 208195,
); );
hasError = false; hasError = false;
//insuranceApprovalInPatient.clear();
await baseAppClient.post(GET_PROCEDURE_TEMPLETE, await baseAppClient.post(GET_TEMPLETE_LIST/*GET_PROCEDURE_TEMPLETE*/,
onSuccess: (dynamic response, int statusCode) { onSuccess: (dynamic response, int statusCode) {
//prescriptionsList.clear(); templateList.clear();
response['HIS_ProcedureTemplateList'].forEach((template) { response['DAPP_TemplateGetList'].forEach((template) {
_templateList.add(ProcedureTempleteModel.fromJson(template)); ProcedureTempleteDetailsModel templateElement = ProcedureTempleteDetailsModel.fromJson(template);
if(categoryID != null){
if(categoryID == templateElement.categoryID){
templateList.add(templateElement);
}
} else {
templateList.add(templateElement);
}
}); });
// response['HIS_ProcedureTemplateList'].forEach((template) {
// _templateList.add(ProcedureTempleteModel.fromJson(template));
// });
}, onFailure: (String error, int statusCode) { }, onFailure: (String error, int statusCode) {
hasError = true; hasError = true;
super.error = error; super.error = error;

@ -27,17 +27,22 @@ class ProcedureViewModel extends BaseViewModel {
FilterType filterType = FilterType.Clinic; FilterType filterType = FilterType.Clinic;
bool hasError = false; bool hasError = false;
ProcedureService _procedureService = locator<ProcedureService>(); ProcedureService _procedureService = locator<ProcedureService>();
List<GetOrderedProcedureModel> get procedureList => List<GetOrderedProcedureModel> get procedureList =>
_procedureService.procedureList; _procedureService.procedureList;
List<ProcedureValadteModel> get valadteProcedureList => List<ProcedureValadteModel> get valadteProcedureList =>
_procedureService.valadteProcedureList; _procedureService.valadteProcedureList;
List<CategoriseProcedureModel> get categoriesList => List<CategoriseProcedureModel> get categoriesList =>
_procedureService.categoriesList; _procedureService.categoriesList;
List<dynamic> get categoryList => _procedureService.categoryList; List<dynamic> get categoryList => _procedureService.categoryList;
RadiologyService _radiologyService = locator<RadiologyService>(); RadiologyService _radiologyService = locator<RadiologyService>();
LabsService _labsService = locator<LabsService>(); LabsService _labsService = locator<LabsService>();
List<FinalRadiologyList> _finalRadiologyListClinic = List(); List<FinalRadiologyList> _finalRadiologyListClinic = List();
List<FinalRadiologyList> _finalRadiologyListHospital = List(); List<FinalRadiologyList> _finalRadiologyListHospital = List();
List<FinalRadiologyList> get finalRadiologyList => List<FinalRadiologyList> get finalRadiologyList =>
filterType == FilterType.Clinic filterType == FilterType.Clinic
? _finalRadiologyListClinic ? _finalRadiologyListClinic
@ -51,8 +56,11 @@ class ProcedureViewModel extends BaseViewModel {
List<LabOrderResult> get labOrdersResultsList => List<LabOrderResult> get labOrdersResultsList =>
_labsService.labOrdersResultsList; _labsService.labOrdersResultsList;
List<ProcedureTempleteModel> get procedureTemplate =>
List<ProcedureTempleteDetailsModel> get procedureTemplate =>
_procedureService.templateList; _procedureService.templateList;
List<ProcedureTempleteDetailsModelList> templateList = List();
List<ProcedureTempleteDetailsModel> get procedureTemplateDetails => List<ProcedureTempleteDetailsModel> get procedureTemplateDetails =>
_procedureService.templateDetailsList; _procedureService.templateDetailsList;
@ -101,19 +109,43 @@ class ProcedureViewModel extends BaseViewModel {
setState(ViewState.Idle); setState(ViewState.Idle);
} }
Future getProcedureTemplate() async { Future getProcedureTemplate({String categoryID}) async {
hasError = false; hasError = false;
//_insuranceCardService.clearInsuranceCard(); //_insuranceCardService.clearInsuranceCard();
setState(ViewState.Busy); setState(ViewState.Busy);
await _procedureService.getProcedureTemplate(); await _procedureService.getProcedureTemplate(categoryID: categoryID);
if (_procedureService.hasError) { if (_procedureService.hasError) {
error = _procedureService.error; error = _procedureService.error;
setState(ViewState.ErrorLocal); setState(ViewState.ErrorLocal);
} else } else {
setTemplateListDependOnId();
setState(ViewState.Idle); setState(ViewState.Idle);
}
}
setTemplateListDependOnId() {
procedureTemplate.forEach((element) {
List<ProcedureTempleteDetailsModelList> templateListData = templateList
.where((elementTemplate) =>
elementTemplate.templateId == element.templateID)
.toList();
if (templateListData.length != 0) {
templateList[templateList.indexOf(templateListData[0])]
.procedureTemplate
.add(element);
} else {
templateList.add(ProcedureTempleteDetailsModelList(
templateName: element.templateName,
templateId: element.templateID,
template: element));
}
});
print(templateList.length.toString());
} }
int tempId = 0; int tempId = 0;
Future getProcedureTemplateDetails({int templateId}) async { Future getProcedureTemplateDetails({int templateId}) async {
tempId = templateId; tempId = templateId;
hasError = false; hasError = false;

@ -47,9 +47,10 @@ class _AddFavouriteProcedureState extends State<AddFavouriteProcedure> {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return BaseView<ProcedureViewModel>( return BaseView<ProcedureViewModel>(
onModelReady: (model) async { onModelReady: (model) async {
if (model.procedureTemplate.length == 0) { // TODO mosa_change
// if (model.procedureTemplate.length == 0) {
model.getProcedureTemplate(); model.getProcedureTemplate();
} // }
}, },
builder: (BuildContext context, ProcedureViewModel model, Widget child) => builder: (BuildContext context, ProcedureViewModel model, Widget child) =>
AppScaffold( AppScaffold(
@ -66,7 +67,7 @@ class _AddFavouriteProcedureState extends State<AddFavouriteProcedure> {
baseViewModel: model, baseViewModel: model,
child: EntityListCheckboxSearchFavProceduresWidget( child: EntityListCheckboxSearchFavProceduresWidget(
model: widget.model, model: widget.model,
masterList: widget.model.procedureTemplate, // masterList: widget.model.procedureTemplate,
//TODO change it to the new model //TODO change it to the new model
removeFavProcedure: (item) { removeFavProcedure: (item) {
setState(() { setState(() {

Loading…
Cancel
Save