finish diabetic

merge-requests/867/head
Elham Rababh 4 years ago
parent dd971ffddb
commit 514e6c81c7

@ -0,0 +1,21 @@
class DiabeticType {
int value;
String nameEn;
String nameAr;
DiabeticType({this.value, this.nameEn, this.nameAr});
DiabeticType.fromJson(Map<String, dynamic> json) {
value = json['value'];
nameEn = json['nameEn'];
nameAr = json['nameAr'];
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['value'] = this.value;
data['nameEn'] = this.nameEn;
data['nameAr'] = this.nameAr;
return data;
}
}

@ -60,6 +60,7 @@ class PatientViewModel extends BaseViewModel {
List<GetDiagnosisForInPatientResponseModel> get diagnosisForInPatientList => List<GetDiagnosisForInPatientResponseModel> get diagnosisForInPatientList =>
_patientService.diagnosisForInPatientList; _patientService.diagnosisForInPatientList;
List<GetDiabeticChartValuesResponseModel> get diabeticChartValuesList => List<GetDiabeticChartValuesResponseModel> get diabeticChartValuesList =>
_patientService.diabeticChartValuesList; _patientService.diabeticChartValuesList;
@ -343,20 +344,29 @@ class PatientViewModel extends BaseViewModel {
} }
} }
Future getDiabeticChartValues(PatiantInformtion patient, int resultType) async { Future getDiabeticChartValues(PatiantInformtion patient, int resultType,
{bool isLocalBusy = false}) async {
await getDoctorProfile(); await getDoctorProfile();
setState(ViewState.Busy); if (isLocalBusy)
setState(ViewState.BusyLocal);
else
setState(ViewState.Busy);
GetDiabeticChartValuesRequestModel requestModel = GetDiabeticChartValuesRequestModel requestModel =
GetDiabeticChartValuesRequestModel( GetDiabeticChartValuesRequestModel(
patientID: patient.patientId, patientID: patient.patientId,
admissionNo: int.parse(patient.admissionNo), admissionNo: int.parse(patient.admissionNo),
patientTypeID: 1, patientTypeID: 1,
patientType: 1, resultType: resultType, setupID: "010266"); patientType: 1,
resultType: resultType,
setupID: "010266");
await _patientService.getDiabeticChartValues(requestModel); await _patientService.getDiabeticChartValues(requestModel);
if (_patientService.hasError) { if (_patientService.hasError) {
error = _patientService.error; error = _patientService.error;
setState(ViewState.ErrorLocal); if (isLocalBusy)
setState(ViewState.ErrorLocal);
else
setState(ViewState.ErrorLocal);
} else { } else {
setState(ViewState.Idle); setState(ViewState.Idle);
} }

@ -1,11 +1,15 @@
import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:doctor_app_flutter/core/enum/viewstate.dart';
import 'package:doctor_app_flutter/core/model/diabetic_chart/DiabeticType.dart';
import 'package:doctor_app_flutter/core/viewModel/patient_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/patient_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/patient/patiant_info_model.dart';
import 'package:doctor_app_flutter/models/patient/vital_sign/patient-vital-sign-history.dart'; import 'package:doctor_app_flutter/models/patient/vital_sign/patient-vital-sign-history.dart';
import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart';
import 'package:doctor_app_flutter/screens/patients/profile/diabetic_chart/line_chart_for_diabetic.dart'; import 'package:doctor_app_flutter/screens/patients/profile/diabetic_chart/line_chart_for_diabetic.dart';
import 'package:doctor_app_flutter/screens/patients/profile/vital_sign/vital_sign_details_blood_pressurewideget.dart'; import 'package:doctor_app_flutter/screens/patients/profile/vital_sign/vital_sign_details_blood_pressurewideget.dart';
import 'package:doctor_app_flutter/util/date-utils.dart'; import 'package:doctor_app_flutter/util/date-utils.dart';
import 'package:doctor_app_flutter/util/helpers.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/charts/app_time_series_chart.dart'; import 'package:doctor_app_flutter/widgets/charts/app_time_series_chart.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-app-bar.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-app-bar.dart';
@ -13,95 +17,192 @@ 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/card_with_bg_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/card_with_bg_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/errors/dr_app_embedded_error.dart'; import 'package:doctor_app_flutter/widgets/shared/errors/dr_app_embedded_error.dart';
import 'package:doctor_app_flutter/widgets/shared/errors/error_message.dart';
import 'package:doctor_app_flutter/widgets/shared/loader/gif_loader_dialog_utils.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'diabetic_details_blood_pressurewideget.dart'; import 'diabetic_details_blood_pressurewideget.dart';
class DiabeticChart extends StatelessWidget { class DiabeticChart extends StatefulWidget {
DiabeticChart({ DiabeticChart({
Key key, Key key,
}) : super(key: key); }) : super(key: key);
@override
_DiabeticChartState createState() => _DiabeticChartState();
}
class _DiabeticChartState extends State<DiabeticChart> {
List<TimeSeriesSales2> timeSeriesData1 = []; List<TimeSeriesSales2> timeSeriesData1 = [];
List<TimeSeriesSales2> timeSeriesData2 = []; List<TimeSeriesSales2> timeSeriesData2 = [];
List<DiabeticType> diabeticType = [
DiabeticType(nameAr: "Urine Glucose", nameEn: "Urine Glucose", value: 1),
DiabeticType(nameAr: "Urine Acet", nameEn: "Urine Acet", value: 2),
DiabeticType(nameAr: "Blood Glucose", nameEn: "Blood Glucose", value: 3),
DiabeticType(nameAr: "Blood Glucose(Glucometer)", nameEn: "Blood Glucose(Glucometer)", value: 4)
];
DiabeticType selectedDiabeticType;
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final routeArgs = ModalRoute.of(context).settings.arguments as Map; final routeArgs = ModalRoute.of(context).settings.arguments as Map;
PatiantInformtion patient = routeArgs['patient']; PatiantInformtion patient = routeArgs['patient'];
ProjectViewModel projectsProvider = Provider.of(context);
return BaseView<PatientViewModel>( return BaseView<PatientViewModel>(
onModelReady: (model) async { onModelReady: (model) async {
await model.getDiabeticChartValues(patient, 3); selectedDiabeticType = diabeticType[2];
await model.getDiabeticChartValues(patient, selectedDiabeticType.value, isLocalBusy: false);
generateData(model); generateData(model);
}, },
builder: (_, model, w) => AppScaffold( builder: (_, model, w) => AppScaffold(
baseViewModel: model, baseViewModel: model,
backgroundColor: Theme.of(context).scaffoldBackgroundColor, backgroundColor: Theme.of(context).scaffoldBackgroundColor,
appBar: PatientProfileAppBar( appBar: PatientProfileAppBar(
patient, patient,
isInpatient: true, isInpatient: true,
), ),
body: SingleChildScrollView( body: SingleChildScrollView(
child: Column(children: [ child: Column(
timeSeriesData1.length != 0 || timeSeriesData2.length != 0 children: [
? Padding( Container(
padding: const EdgeInsets.all(10.0), width: MediaQuery.of(context).size.width * 0.7,
child: Column( child: DropdownButtonHideUnderline(
crossAxisAlignment: CrossAxisAlignment.start, child: DropdownButton(
children: <Widget>[ dropdownColor: Colors.white,
Container( iconEnabledColor: Colors.black,
margin: EdgeInsets.symmetric(horizontal: 8), isExpanded: true,
decoration: BoxDecoration( value: selectedDiabeticType.value,
color: Colors.white, iconSize: 25,
borderRadius: BorderRadius.circular(12)), elevation: 16,
child: LineChartForDiabetic( selectedItemBuilder: (BuildContext context) {
title: "Blood Glucose", return diabeticType
isOX: false, .map((item) {
timeSeries1: timeSeriesData1, return Row(
// timeSeries2: timeSeriesData2, mainAxisSize: MainAxisSize.max,
indexes: timeSeriesData1.length ~/ 5.5, mainAxisAlignment:
), MainAxisAlignment.end,
), children: <Widget>[
Container( Column(
margin: EdgeInsets.symmetric(horizontal: 8, vertical: 16), mainAxisAlignment:
padding: MainAxisAlignment.center,
EdgeInsets.only(top: 16, right: 18.0, left: 16.0), children: [
decoration: BoxDecoration( Container(
color: Colors.white,
borderRadius: BorderRadius.circular(12)), padding: EdgeInsets.all(2),
child: Column( margin: EdgeInsets.all(2),
crossAxisAlignment: CrossAxisAlignment.start, decoration: new BoxDecoration(
children: [ color: Colors.red[800],
AppText( borderRadius:
TranslationBase.of(context).graphDetails, BorderRadius.circular(
fontSize: SizeConfig.textMultiplier * 2.3, 20),
fontWeight: FontWeight.bold, ),
fontFamily: 'Poppins', constraints: BoxConstraints(
), minWidth: 20,
SizedBox( minHeight: 20,
height: 8, ),
), child: Center(
DiabeticDetails( child: AppText(
diabeticDetailsList: model.diabeticChartValuesList, diabeticType
.length
.toString(),
color: Colors.white,
fontSize: projectsProvider
.isArabic
? 10
: 11,
textAlign:
TextAlign.center,
),
)),
],
),
AppText(
selectedDiabeticType.nameEn,
fontSize: 12,
color: Colors.black,
fontWeight: FontWeight.bold,
textAlign: TextAlign.end),
],
);
}).toList();
},
onChanged: (newValue) async {
await onChangeFunc(newValue, model, patient);
setState(() {
});
},
items: diabeticType
.map((item) {
return DropdownMenuItem(
child: AppText(
item.nameEn,
textAlign: TextAlign.left,
),
value: item.value,
);
}).toList(),
)),
),
timeSeriesData1.length != 0 || timeSeriesData2.length != 0
? Padding(
padding: const EdgeInsets.all(10.0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Container(
margin: EdgeInsets.symmetric(horizontal: 8),
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.circular(12)),
child: LineChartForDiabetic(
title: selectedDiabeticType.nameEn,
isOX: false,
timeSeries1: timeSeriesData1,
// timeSeries2: timeSeriesData2,
indexes: timeSeriesData1.length ~/ 5.5,
),
),
Container(
margin: EdgeInsets.symmetric(
horizontal: 8, vertical: 16),
padding: EdgeInsets.only(
top: 16, right: 18.0, left: 16.0),
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.circular(12)),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
AppText(
TranslationBase.of(context).graphDetails,
fontSize: SizeConfig.textMultiplier * 2.3,
fontWeight: FontWeight.bold,
fontFamily: 'Poppins',
),
SizedBox(
height: 8,
),
DiabeticDetails(
diabeticDetailsList:
model.diabeticChartValuesList,
),
],
),
),
],
), ),
], )
), : ErrorMessage(error: TranslationBase.of(context).noItem),
), ],
],
),
)
: Container(
width: double.infinity,
height: MediaQuery.of(context).size.height,
child: Center(
child:
AppText(TranslationBase.of(context).vitalSignDetailEmpty),
),
), ),
],), )),
)
),
); );
} }
@ -130,5 +231,25 @@ class DiabeticChart extends StatelessWidget {
}, },
); );
} }
}
onChangeFunc(newValue, PatientViewModel model, patient) async {
GifLoaderDialogUtils.showMyDialog(context);
setState(() {
selectedDiabeticType = diabeticType[newValue-1];
timeSeriesData1.clear();
timeSeriesData2.clear();
});
await model.getDiabeticChartValues(patient, selectedDiabeticType.value,isLocalBusy:true);
if(model.state == ViewState.ErrorLocal){
Helpers.showErrorToast(model.error);
}
generateData(model);
GifLoaderDialogUtils.hideDialog(context);
} }
} }

Loading…
Cancel
Save