Merge branch 'elham' into 'master'

vital_sign_details

See merge request Cloud_Solution/doctor_app_flutter!52
merge-requests/53/merge
Elham 6 years ago
commit 8d3aa791df

@ -25,6 +25,7 @@ class HttpInterceptor extends InterceptorContract {
Future<RequestData> interceptRequest({RequestData data}) async { Future<RequestData> interceptRequest({RequestData data}) async {
print('RequestData ${data.body}'); print('RequestData ${data.body}');
print('RequestData ${data.url}');
try { try {
data.headers["Content-Type"] = "application/json"; data.headers["Content-Type"] = "application/json";
data.headers["Accept"] = "application/json"; data.headers["Accept"] = "application/json";

@ -1,3 +1,11 @@
/*
*@author: Elham Rababah
*@Date:6/5/2020
*@param:
*@return:LabOrdersReqModel
*@desc: LabOrdersReqModel class
*/
class LabOrdersReqModel { class LabOrdersReqModel {
int patientID; int patientID;
int patientTypeID; int patientTypeID;

@ -1,3 +1,10 @@
/*
*@author: Elham Rababah
*@Date:6/5/2020
*@param:
*@return:LabOrdersResModel
*@desc: LabOrdersResModel class
*/
class LabOrdersResModel { class LabOrdersResModel {
String setupID; String setupID;
int projectID; int projectID;

@ -1,3 +1,10 @@
/*
*@author: Elham Rababah
*@Date:6/5/2020
*@param:
*@return:PrescriptionReqModel
*@desc: PrescriptionReqModel class
*/
class PrescriptionReqModel { class PrescriptionReqModel {
int patientID; int patientID;
int setupID; int setupID;

@ -1,3 +1,10 @@
/*
*@author: Elham Rababah
*@Date:6/5/2020
*@param:
*@return:PrescriptionResModel
*@desc: PrescriptionResModel class
*/
class PrescriptionResModel { class PrescriptionResModel {
String setupID; String setupID;
int projectID; int projectID;

@ -1,3 +1,10 @@
/*
*@author: Elham Rababah
*@Date:6/5/2020
*@param:
*@return:RadiologyReqModel
*@desc: RadiologyReqModel class
*/
class RadiologyReqModel { class RadiologyReqModel {
int patientID; int patientID;
int projectID; int projectID;

@ -1,3 +1,10 @@
/*
*@author: Elham Rababah
*@Date:6/5/2020
*@param:
*@return:RadiologyResModel
*@desc: RadiologyResModel class
*/
class RadiologyResModel { class RadiologyResModel {
String setupID; String setupID;
int projectID; int projectID;

@ -1,3 +1,10 @@
/*
*@author: Elham Rababah
*@Date:6/5/2020
*@param:
*@return:VitalSignResModel
*@desc: VitalSignResModel class
*/
class VitalSignResModel { class VitalSignResModel {
var transNo; var transNo;
var projectID; var projectID;

@ -44,7 +44,7 @@ class PatientsProvider with ChangeNotifier {
// var srvicePatiant = ["GetMyOutPatient", "GetMyInPatient", "GtMyDischargePatient","GtMyReferredPatient","GtMyDischargeReferralPatient","GtMyTomorrowPatient","GtMyReferralPatient"]; // var srvicePatiant = ["GetMyOutPatient", "GetMyInPatient", "GtMyDischargePatient","GtMyReferredPatient","GtMyDischargeReferralPatient","GtMyTomorrowPatient","GtMyReferralPatient"];
// print("a=SERVICES_PATIANT[patientType]========='=======a"); // print("a=SERVICES_PATIANT[patientType]========='=======a");
int val = int.parse(patientType); int val = int.parse(patientType);
final url ="https://uat.hmgwebservices.com/Services/DoctorApplication.svc/REST/"+ SERVICES_PATIANT[val];///"https://uat.hmgwebservices.com/Services/Doctors.svc/REST/"; final url =BASE_URL+"DoctorApplication.svc/REST/"+ SERVICES_PATIANT[val];///"https://uat.hmgwebservices.com/Services/Doctors.svc/REST/";
//BASE_URL + 'DoctorApplication.svc/REST/' + SERVICES_PATIANT[val]; //BASE_URL + 'DoctorApplication.svc/REST/' + SERVICES_PATIANT[val];
// print("a===========$url=======a"); // print("a===========$url=======a");

@ -16,6 +16,7 @@ import './screens/patients/profile/lab_result/lab_orders_screen.dart';
import './screens/patients/profile/patient_profile_screen.dart'; import './screens/patients/profile/patient_profile_screen.dart';
import './screens/patients/profile/prescriptions/prescriptions_screen.dart'; import './screens/patients/profile/prescriptions/prescriptions_screen.dart';
import './screens/patients/profile/radiology/radiology_screen.dart'; import './screens/patients/profile/radiology/radiology_screen.dart';
import './screens/patients/profile/vital_sign/vital_sign_details_screen.dart';
import './screens/patients/profile/vital_sign/vital_sign_screen.dart'; import './screens/patients/profile/vital_sign/vital_sign_screen.dart';
import './screens/profile_screen.dart'; import './screens/profile_screen.dart';
import './screens/settings/settings_screen.dart'; import './screens/settings/settings_screen.dart';
@ -40,10 +41,12 @@ const String PHARMACIES_LIST = 'medicine/pharmacies-list';
const String MESSAGES = 'messages'; const String MESSAGES = 'messages';
const String SERVICES = 'services'; const String SERVICES = 'services';
const String SETTINGS = 'settings'; const String SETTINGS = 'settings';
const String VITAL_SIGN = 'vital-sign'; const String VITAL_SIGN = 'patients/vital-sign';
const String LAB_ORDERS = 'lab_orders'; const String LAB_ORDERS = 'patients/lab_orders';
const String PRESCRIPTIONS = 'Prescription'; const String PRESCRIPTIONS = 'patients/prescription';
const String RADIOLOGY = 'Radiology'; const String RADIOLOGY = 'patients/radiology';
const String VITAL_SIGN_DETAILS = 'patients/vital-sign-details';
var routes = { var routes = {
@ -68,5 +71,7 @@ var routes = {
SERVICES: (_) => ServicesScreen(), SERVICES: (_) => ServicesScreen(),
LAB_ORDERS:(_)=>LabOrdersScreen(), LAB_ORDERS:(_)=>LabOrdersScreen(),
PRESCRIPTIONS:(_)=>PrescriptionScreen(), PRESCRIPTIONS:(_)=>PrescriptionScreen(),
RADIOLOGY:(_)=>RadiologyScreen() RADIOLOGY:(_)=>RadiologyScreen(),
VITAL_SIGN_DETAILS:(_)=>VitalSignDetailsScreen(),
}; };

@ -77,7 +77,6 @@ class _PatientsScreenState extends State<PatientsScreen> {
if (_isInit) { if (_isInit) {
PatientsProvider patientsProv = Provider.of<PatientsProvider>(context); PatientsProvider patientsProv = Provider.of<PatientsProvider>(context);
patientsProv.getPatientList(patient, patientType).then((res) { patientsProv.getPatientList(patient, patientType).then((res) {
print('List_MyInPatient${(res['List_MyInPatient'])}');
setState(() { setState(() {
int val2 = int.parse(patientType); int val2 = int.parse(patientType);
litems = res[SERVICES_PATIANT2[val2]]; litems = res[SERVICES_PATIANT2[val2]];

@ -108,9 +108,11 @@ class _LabOrdersScreenState extends State<LabOrdersScreen> {
children: <Widget>[ children: <Widget>[
Row( Row(
children: <Widget>[ children: <Widget>[
ProfileImageWidget(url:patientsProv ProfileImageWidget(
.patientLabResultOrdersList[index] url: patientsProv
.doctorImageURL), .patientLabResultOrdersList[
index]
.doctorImageURL),
Expanded( Expanded(
child: Padding( child: Padding(
padding: const EdgeInsets.fromLTRB( padding: const EdgeInsets.fromLTRB(
@ -123,15 +125,18 @@ class _LabOrdersScreenState extends State<LabOrdersScreen> {
'${patientsProv.patientLabResultOrdersList[index].doctorName}', '${patientsProv.patientLabResultOrdersList[index].doctorName}',
fontSize: 2.5 * fontSize: 2.5 *
SizeConfig.textMultiplier, SizeConfig.textMultiplier,
fontWeight: FontWeight.bold,
), ),
SizedBox( SizedBox(
height: 8, height: 8,
), ),
AppText( AppText(
' ${patientsProv.patientLabResultOrdersList[index].clinicName}', ' ${patientsProv.patientLabResultOrdersList[index].clinicName}',
fontSize: 2.5 * fontSize: 2 *
SizeConfig SizeConfig.textMultiplier,
.textMultiplier), color: Theme.of(context)
.primaryColor,
),
SizedBox( SizedBox(
height: 8, height: 8,
), ),

@ -55,8 +55,7 @@ class _PrescriptionScreenState extends State<PrescriptionScreen> {
tokenID: token, tokenID: token,
patientTypeID: patient.patientType, patientTypeID: patient.patientType,
languageID: 2, languageID: 2,
setupID: 0 setupID: 0);
);
patientsProv.getPatientPrescriptions(prescriptionReqModel.toJson()); patientsProv.getPatientPrescriptions(prescriptionReqModel.toJson());
} }
@ -99,7 +98,8 @@ class _PrescriptionScreenState extends State<PrescriptionScreen> {
SizeConfig.realScreenWidth * 0.05, SizeConfig.realScreenWidth * 0.05,
0), 0),
child: ListView.builder( child: ListView.builder(
itemCount: patientsProv.patientPrescriptionsList.length, itemCount:
patientsProv.patientPrescriptionsList.length,
itemBuilder: (BuildContext ctxt, int index) { itemBuilder: (BuildContext ctxt, int index) {
return InkWell( return InkWell(
child: CardWithBgWidget( child: CardWithBgWidget(
@ -108,9 +108,10 @@ class _PrescriptionScreenState extends State<PrescriptionScreen> {
children: <Widget>[ children: <Widget>[
Row( Row(
children: <Widget>[ children: <Widget>[
ProfileImageWidget(url:patientsProv ProfileImageWidget(
.patientPrescriptionsList[index] url: patientsProv
.doctorImageURL), .patientPrescriptionsList[index]
.doctorImageURL),
Expanded( Expanded(
child: Padding( child: Padding(
padding: const EdgeInsets.fromLTRB( padding: const EdgeInsets.fromLTRB(
@ -123,15 +124,18 @@ class _PrescriptionScreenState extends State<PrescriptionScreen> {
'${patientsProv.patientPrescriptionsList[index].doctorName}', '${patientsProv.patientPrescriptionsList[index].doctorName}',
fontSize: 2.5 * fontSize: 2.5 *
SizeConfig.textMultiplier, SizeConfig.textMultiplier,
fontWeight: FontWeight.bold,
), ),
SizedBox( SizedBox(
height: 8, height: 8,
), ),
AppText( AppText(
' ${patientsProv.patientPrescriptionsList[index].clinicDescription}', ' ${patientsProv.patientPrescriptionsList[index].clinicDescription}',
fontSize: 2.5 * fontSize: 2 *
SizeConfig SizeConfig
.textMultiplier), .textMultiplier,
color: Theme.of(context)
.primaryColor),
SizedBox( SizedBox(
height: 8, height: 8,
), ),

@ -123,23 +123,27 @@ class _RadiologyScreenState extends State<RadiologyScreen> {
'${patientsProv.patientRadiologyList[index].doctorName}', '${patientsProv.patientRadiologyList[index].doctorName}',
fontSize: 2.5 * fontSize: 2.5 *
SizeConfig.textMultiplier, SizeConfig.textMultiplier,
fontWeight: FontWeight.bold
), ),
SizedBox( SizedBox(
height: 8, height: 8,
), ),
AppText( AppText(
'Invoice No:${patientsProv.patientRadiologyList[index].invoiceNo}', 'Invoice No:${patientsProv.patientRadiologyList[index].invoiceNo}',
fontSize: 2.5 * fontSize: 2 *
SizeConfig.textMultiplier, SizeConfig.textMultiplier,
), ),
SizedBox( SizedBox(
height: 8, height: 8,
), ),
AppText( AppText(
' ${patientsProv.patientRadiologyList[index].clinicName}', ' ${patientsProv.patientRadiologyList[index].clinicName}',
fontSize: 2.5 * fontSize: 2 *
SizeConfig SizeConfig.textMultiplier,
.textMultiplier), color: Theme.of(context)
.primaryColor,
),
SizedBox( SizedBox(
height: 8, height: 8,
), ),

@ -0,0 +1,70 @@
import 'package:flutter/material.dart';
import '../../../../config/size_config.dart';
import '../../../../models/patient/vital_sign_res_model.dart';
import '../../../../widgets/patients/profile/profile_medical_info_widget.dart';
import '../../../../widgets/shared/app_scaffold_widget.dart';
import '../../../../widgets/shared/rounded_container_widget.dart';
class VitalSignDetailsScreen extends StatelessWidget {
// VitalSignDetailsScreen({Key key, this.vitalSing}) : super(key: key);
VitalSignResModel vitalSing;
String url = "assets/images/";
final double contWidth = SizeConfig.realScreenWidth * 0.70;
@override
Widget build(BuildContext context) {
final routeArgs = ModalRoute.of(context).settings.arguments as Map;
vitalSing = routeArgs['vitalSing'];
return AppScaffold(
appBarTitle: "vital Sing ",
body: RoundedContainer(
height: SizeConfig.realScreenHeight *0.7,
child: CustomScrollView(
primary: false,
slivers: <Widget>[
SliverPadding(
padding: const EdgeInsets.all(10),
sliver: SliverGrid.count(
childAspectRatio: 0.7,
crossAxisSpacing: 10,
mainAxisSpacing: 0,
crossAxisCount: 3,
children: <Widget>[
CircleAvatarWidget(
des: 'Body Measurements',
url: url + 'heartbeat.png',
), CircleAvatarWidget(
des: 'Temperature',
url: url + 'heartbeat.png',
),
CircleAvatarWidget(
des: 'Pulse',
url: url + 'heartbeat.png',
),
CircleAvatarWidget(
des: 'Respiration',
url: url + 'heartbeat.png',
),
CircleAvatarWidget(
des: 'Blood Pressure',
url: url + 'heartbeat.png',
),
CircleAvatarWidget(
des: 'Oxygenation',
url: url + 'heartbeat.png',
), CircleAvatarWidget(
des: 'Pain Scale',
url: url + 'heartbeat.png',
),
],
),
),
],
),
// height: 500,
));
}
}

@ -1,3 +1,4 @@
import 'package:doctor_app_flutter/routes.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
@ -109,9 +110,10 @@ class _VitalSignScreenState extends State<VitalSignScreen> {
children: <Widget>[ children: <Widget>[
Row( Row(
children: <Widget>[ children: <Widget>[
ProfileImageWidget(url:patientsProv ProfileImageWidget(
.patientVitalSignList[index] url: patientsProv
.doctorImageURL), .patientVitalSignList[index]
.doctorImageURL),
Expanded( Expanded(
child: Padding( child: Padding(
padding: const EdgeInsets.fromLTRB( padding: const EdgeInsets.fromLTRB(
@ -124,15 +126,18 @@ class _VitalSignScreenState extends State<VitalSignScreen> {
'${patientsProv.patientVitalSignList[index].doctorName}', '${patientsProv.patientVitalSignList[index].doctorName}',
fontSize: 2.5 * fontSize: 2.5 *
SizeConfig.textMultiplier, SizeConfig.textMultiplier,
fontWeight: FontWeight.bold,
), ),
SizedBox( SizedBox(
height: 8, height: 8,
), ),
AppText( AppText(
' ${patientsProv.patientVitalSignList[index].clinicName}', ' ${patientsProv.patientVitalSignList[index].clinicName}',
fontSize: 2.5 * fontSize: 2 *
SizeConfig SizeConfig.textMultiplier,
.textMultiplier), color: Theme.of(context)
.primaryColor,
),
SizedBox( SizedBox(
height: 8, height: 8,
), ),
@ -145,7 +150,9 @@ class _VitalSignScreenState extends State<VitalSignScreen> {
], ],
), ),
), ),
onTap: () {}, onTap: () {
Navigator.of(context).pushNamed(VITAL_SIGN_DETAILS,arguments: {'vitalSing':patientsProv.patientVitalSignList[index]});
},
); );
}), }),
), ),

@ -15,37 +15,6 @@ import './profile_status_info_widget.dart';
*@desc: Patient Profile Widget *@desc: Patient Profile Widget
*/ */
class PatientProfileWidget extends StatelessWidget { class PatientProfileWidget extends StatelessWidget {
// Map patient = {
// "ProjectID": 15,
// "ClinicID": null,
// "DoctorID": 70907,
// "PatientID": 3315674,
// "DoctorName": "MOQBIL ABDULLAH AL HODAITHY",
// "DoctorNameN": null,
// "FirstName": "WALEED",
// "MiddleName": "ALI",
// "LastName": "AL-YAZIDI",
// "FirstNameN": null,
// "MiddleNameN": null,
// "LastNameN": null,
// "Gender": 1,
// "DateofBirth": "/Date(534286800000+0300)/",
// "NationalityID": null,
// "MobileNumber": "0500014559",
// "EmailAddress": "unknown@unknown.com",
// "PatientIdentificationNo": "1063236754",
// "NationalityName": "Saudi",
// "NationalityNameN": null,
// "PatientStatusType": null,
// "PatientType": 1,
// "AppointmentDate": "/Date(1587848400000+0300)/",
// "StartTime": "13:00:00",
// "Age": "34 Yr",
// "ClinicDescription": "INTERNAL MEDICINE CLINIC",
// "GenderDescription": "Male",
// "AdmissionDate": "/Date(1587848400000+0300)/",
// "AdmissionNo": "2020008652"
// };
PatiantInformtion patient; PatiantInformtion patient;

@ -79,7 +79,7 @@ class ProfileMedicalInfoWidget extends StatelessWidget {
), ),
InkWell( InkWell(
//RADIOLOGY //RADIOLOGY
onTap: () { onTap: () {
navigator(context, RADIOLOGY); navigator(context, RADIOLOGY);
}, },
child: CircleAvatarWidget( child: CircleAvatarWidget(
@ -123,26 +123,34 @@ class CircleAvatarWidget extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Column( return Container(
children: <Widget>[ child: Column(
Container( children: <Widget>[
height: height, Container(
width: width, height: height,
decoration: new BoxDecoration( width: width,
// color: Colors.green, // border color // width: 50,
shape: BoxShape.circle, // height: 50,
border: Border.all(color: Hexcolor('#B7831A'), width: 1.5)), decoration: new BoxDecoration(
child: CircleAvatar( // color: Colors.green, // border color
radius: SizeConfig.imageSizeMultiplier * 12, shape: BoxShape.circle,
child: Image.asset(url), border: Border.all(color: Hexcolor('#B7831A'), width: 1.5)),
backgroundColor: Colors.transparent, child: CircleAvatar(
radius: SizeConfig.imageSizeMultiplier * 12,
child: Image.asset(url),
backgroundColor: Colors.transparent,
),
), ),
), SizedBox(
SizedBox( height: 10,
height: 10, ),
), AppText(
AppText(des) des,
], fontSize: 2 * SizeConfig.textMultiplier,
textAlign: TextAlign.center,
)
],
),
); );
} }
} }

@ -2,7 +2,6 @@ import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
// OWNER : Ibrahim albitar // OWNER : Ibrahim albitar
// DATE : 12-04-2020 // DATE : 12-04-2020
// DESCRIPTION : Customization for Texts in app // DESCRIPTION : Customization for Texts in app
@ -19,6 +18,7 @@ class AppText extends StatefulWidget {
final double marginBottom; final double marginBottom;
final double marginLeft; final double marginLeft;
final bool visibility; final bool visibility;
final TextAlign textAlign;
AppText(this.data, AppText(this.data,
{this.color = Colors.black, {this.color = Colors.black,
@ -30,7 +30,8 @@ class AppText extends StatefulWidget {
this.marginRight = 0, this.marginRight = 0,
this.marginBottom = 0, this.marginBottom = 0,
this.marginLeft = 0, this.marginLeft = 0,
this.visibility = true}); this.visibility = true,
this.textAlign});
@override @override
_AppTextState createState() => _AppTextState(); _AppTextState createState() => _AppTextState();
@ -39,18 +40,19 @@ class AppText extends StatefulWidget {
class _AppTextState extends State<AppText> { class _AppTextState extends State<AppText> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Visibility( return Visibility(
visible: widget.visibility, visible: widget.visibility,
child: Container( child: Container(
margin: widget.margin != null ? EdgeInsets.all(widget.margin) : EdgeInsets.only( margin: widget.margin != null
top: widget.marginTop, ? EdgeInsets.all(widget.margin)
right: widget.marginRight, : EdgeInsets.only(
bottom: widget.marginBottom, top: widget.marginTop,
left: widget.marginLeft right: widget.marginRight,
), bottom: widget.marginBottom,
left: widget.marginLeft),
child: Text( child: Text(
widget.data, widget.data,
textAlign: widget.textAlign,
style: TextStyle( style: TextStyle(
color: widget.color, color: widget.color,
fontWeight: widget.fontWeight, fontWeight: widget.fontWeight,

Loading…
Cancel
Save