Merge branches 'development' and 'radilology' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into radilology

merge-requests/530/head
Elham Rababah 5 years ago
commit f4ce9eb004

@ -13,6 +13,7 @@ import 'package:doctor_app_flutter/models/doctor/profile_req_Model.dart';
import 'package:doctor_app_flutter/models/patient/patient_model.dart'; import 'package:doctor_app_flutter/models/patient/patient_model.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/medicine/search_medicine_patient_screen.dart'; import 'package:doctor_app_flutter/screens/medicine/search_medicine_patient_screen.dart';
import 'package:doctor_app_flutter/screens/patients/patient_search_screen.dart';
import 'package:doctor_app_flutter/screens/patients/profile/referral/patient_referral_screen.dart'; import 'package:doctor_app_flutter/screens/patients/profile/referral/patient_referral_screen.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/dr_app_shared_pref.dart'; import 'package:doctor_app_flutter/util/dr_app_shared_pref.dart';
@ -61,30 +62,11 @@ class _HomeScreenState extends State<HomeScreen> {
var _isInit = true; var _isInit = true;
DoctorProfileModel profile; DoctorProfileModel profile;
bool isExpanded = false; bool isExpanded = false;
String isInpatient = ""; bool isInpatient = false;
var clinicName = []; var clinicName = [];
int sliderActiveIndex = 0; int sliderActiveIndex = 0;
var clinicId; var clinicId;
var _patientSearchFormValues = PatientModel( var _patientSearchFormValues;
FirstName: "0",
MiddleName: "0",
LastName: "0",
PatientMobileNumber: "0",
PatientIdentificationID: "0",
PatientID: 0,
From: DateUtils.convertDateToFormat(DateTime.now(), 'yyyy-MM-dd')
.toString(),
To: DateUtils.convertDateToFormat(DateTime.now(), 'yyyy-MM-dd')
.toString(),
LanguageID: 2,
stamp: "2020-03-02T13:56:39.170Z",
IPAdress: "11.11.11.11",
VersionID: 1.2,
Channel: 9,
TokenID: "2Fi7HoIHB0eDyekVa6tCJg==",
SessionID: "5G0yXn0Jnq",
IsLoginForDoctorApp: true,
PatientOutSA: false);
void didChangeDependencies() async { void didChangeDependencies() async {
super.didChangeDependencies(); super.didChangeDependencies();
@ -338,17 +320,7 @@ class _HomeScreenState extends State<HomeScreen> {
], ],
), ),
new Container( new Container(
height: MediaQuery.of(context) height: 130,
.orientation ==
Orientation.portrait
? MediaQuery.of(context)
.size
.height *
0.15
: MediaQuery.of(context)
.size
.height *
0.20,
child: new ListView( child: new ListView(
scrollDirection: scrollDirection:
Axis.horizontal, Axis.horizontal,
@ -381,17 +353,7 @@ class _HomeScreenState extends State<HomeScreen> {
], ],
), ),
new Container( new Container(
height: MediaQuery.of(context) height: 130,
.orientation ==
Orientation.portrait
? MediaQuery.of(context)
.size
.height *
0.15
: MediaQuery.of(context)
.size
.height *
0.20,
child: new ListView( child: new ListView(
scrollDirection: Axis scrollDirection: Axis
.horizontal, .horizontal,
@ -427,17 +389,7 @@ class _HomeScreenState extends State<HomeScreen> {
], ],
), ),
new Container( new Container(
height: MediaQuery.of(context) height: 130,
.orientation ==
Orientation.portrait
? MediaQuery.of(context)
.size
.height *
0.15
: MediaQuery.of(context)
.size
.height *
0.20,
child: new ListView( child: new ListView(
scrollDirection: Axis scrollDirection: Axis
.horizontal, .horizontal,
@ -573,6 +525,7 @@ class _HomeScreenState extends State<HomeScreen> {
), ),
hasBorder: false, hasBorder: false,
onTap: () { onTap: () {
getRequestHeader(false);
Navigator.of(context) Navigator.of(context)
.pushNamed(PATIENTS, arguments: { .pushNamed(PATIENTS, arguments: {
"patientSearchForm": "patientSearchForm":
@ -622,6 +575,46 @@ class _HomeScreenState extends State<HomeScreen> {
SizedBox( SizedBox(
height: 10, height: 10,
), ),
Row(
children: [
HomePageCard(
color: Colors.black,
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Padding(
padding: EdgeInsets.only(
top: 10, left: 10, right: 0),
child: Icon(
DoctorApp.search,
size: 32,
color: Colors.white,
)),
Container(
padding: EdgeInsets.all(10),
child: AppText(
TranslationBase.of(context).inPatient,
color: Colors.white,
textAlign: TextAlign.start,
fontSize: 13,
))
],
),
hasBorder: false,
onTap: () {
getRequestHeader(true);
Navigator.of(context)
.pushNamed(PATIENTS, arguments: {
"patientSearchForm":
_patientSearchFormValues,
"selectedType": "1",
"arrivalType": "1"
});
},
)
],
),
SizedBox( SizedBox(
height: 20, height: 20,
), ),
@ -832,4 +825,31 @@ class _HomeScreenState extends State<HomeScreen> {
])), ])),
]; ];
} }
getRequestHeader(isInpatient) {
_patientSearchFormValues = PatientModel(
FirstName: "0",
MiddleName: "0",
LastName: "0",
PatientMobileNumber: "0",
PatientIdentificationID: "0",
PatientID: 0,
From: isInpatient == true
? '0'
: DateUtils.convertDateToFormat(DateTime.now(), 'yyyy-MM-dd')
.toString(),
To: isInpatient == true
? '0'
: DateUtils.convertDateToFormat(DateTime.now(), 'yyyy-MM-dd')
.toString(),
LanguageID: 2,
stamp: "2020-03-02T13:56:39.170Z",
IPAdress: "11.11.11.11",
VersionID: 1.2,
Channel: 9,
TokenID: "2Fi7HoIHB0eDyekVa6tCJg==",
SessionID: "5G0yXn0Jnq",
IsLoginForDoctorApp: true,
PatientOutSA: false);
}
} }

@ -593,6 +593,7 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
children: <Widget>[ children: <Widget>[
AppButton( AppButton(
title: TranslationBase.of(context).search, title: TranslationBase.of(context).search,
color: Colors.red[800],
onPressed: () { onPressed: () {
_validateInputs(); _validateInputs();
}, },

@ -44,6 +44,10 @@ class VitalSignDetailsScreen extends StatelessWidget {
appBarTitle: TranslationBase.of(context).vitalSign, appBarTitle: TranslationBase.of(context).vitalSign,
body: mode.patientVitalSignsHistory.length > 0 body: mode.patientVitalSignsHistory.length > 0
? Column( ? Column(
children: [
Expanded(
child: Container(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Container( Container(
@ -70,7 +74,7 @@ class VitalSignDetailsScreen extends StatelessWidget {
height: MediaQuery.of(context).size.height * 0.23, height: MediaQuery.of(context).size.height * 0.23,
width: double.infinity, width: double.infinity,
padding: EdgeInsets.all(12.0), padding: EdgeInsets.all(12.0),
margin: EdgeInsets.symmetric(horizontal: 16.0), margin: EdgeInsets.symmetric(horizontal: 16.0, vertical: 8.0),
decoration: BoxDecoration( decoration: BoxDecoration(
shape: BoxShape.rectangle, shape: BoxShape.rectangle,
color: Colors.white, color: Colors.white,
@ -274,13 +278,13 @@ class VitalSignDetailsScreen extends StatelessWidget {
), ),
Expanded( Expanded(
child: Container( child: Container(
margin: EdgeInsets.symmetric(horizontal: 8.0), margin: EdgeInsets.symmetric(horizontal: 16.0, vertical: 4),
child: GridView.count( child: GridView.count(
shrinkWrap: true, shrinkWrap: true,
physics: NeverScrollableScrollPhysics(), physics: NeverScrollableScrollPhysics(),
crossAxisSpacing: 4, crossAxisSpacing: 6,
mainAxisSpacing: 4, mainAxisSpacing: 6,
childAspectRatio: 1 / 1.0, childAspectRatio: 1.0 / 1.0,
crossAxisCount: 3, crossAxisCount: 3,
children: [ children: [
InkWell( InkWell(
@ -443,6 +447,10 @@ class VitalSignDetailsScreen extends StatelessWidget {
), ),
), ),
], ],
),
),
),
],
) )
: Center( : Center(
child: Column( child: Column(

@ -55,14 +55,18 @@ class VitalSignItem extends StatelessWidget {
margin: 0, margin: 0,
), ),
Expanded( Expanded(
child: AppText( child: Column(
children: [
AppText(
"$unit", "$unit",
fontFamily: 'Poppins', fontFamily: 'Poppins',
fontSize: SizeConfig.textMultiplier * 1.2, fontSize: SizeConfig.textMultiplier * 1.2,
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
color: HexColor('#B8382C'), color: Color(0xFFB8382C),
margin: 0, margin: 0,
), ),
],
),
), ),
], ],
), ),

@ -1,6 +1,9 @@
//import 'package:doctor_app_flutter/client/base_app_client.dart';
import 'package:doctor_app_flutter/config/shared_pref_kay.dart';
import 'package:doctor_app_flutter/core/model/procedure/get_ordered_procedure_model.dart'; import 'package:doctor_app_flutter/core/model/procedure/get_ordered_procedure_model.dart';
import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart';
import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart'; import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart';
import 'package:doctor_app_flutter/models/doctor/doctor_profile_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/screens/patients/profile/lab_result/FlowChartPage.dart'; import 'package:doctor_app_flutter/screens/patients/profile/lab_result/FlowChartPage.dart';
import 'package:doctor_app_flutter/util/date-utils.dart'; import 'package:doctor_app_flutter/util/date-utils.dart';
@ -17,20 +20,21 @@ class ProcedureCard extends StatelessWidget {
final String categoryName; final String categoryName;
final int categoryID; final int categoryID;
final PatiantInformtion patient; final PatiantInformtion patient;
final String doctorName;
const ProcedureCard( const ProcedureCard({
{Key key, Key key,
this.onTap, this.onTap,
this.entityList, this.entityList,
this.categoryID, this.categoryID,
this.categoryName, this.categoryName,
this.patient, this.patient,
}) this.doctorName,
: super(key: key); }) : super(key: key);
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
ProjectViewModel projectViewModel = Provider.of(context); ProjectViewModel projectViewModel = Provider.of(context);
return Container( return Container(
width: double.maxFinite, width: double.maxFinite,
height: MediaQuery.of(context).size.height * .22, height: MediaQuery.of(context).size.height * .22,
@ -181,21 +185,22 @@ class ProcedureCard extends StatelessWidget {
), ),
), ),
),*/ ),*/
// Row( Row(
// mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
// children: [ children: [
// AppText( AppText(
// entityList.remarks.toString() ?? '', entityList.remarks.toString() ?? '',
// fontSize: 12, fontSize: 12,
// ), ),
// if (entityList.categoryID == 2 || if (entityList.categoryID == 2 ||
// entityList.categoryID == 4) entityList.categoryID == 4 &&
// InkWell( doctorName == entityList.doctorName)
// child: Icon(DoctorApp.edit), InkWell(
// onTap: onTap, child: Icon(DoctorApp.edit),
// ) onTap: onTap,
// ], )
// ) ],
)
], ],
), ),
//onTap: onTap, //onTap: onTap,

@ -67,7 +67,7 @@ class _ProcedureListWidgetState extends State<ProcedureListWidget> {
NetworkBaseView( NetworkBaseView(
baseViewModel: widget.model, baseViewModel: widget.model,
child: Container( child: Container(
height: MediaQuery.of(context).size.height * 0.55, height: MediaQuery.of(context).size.height * 0.75,
child: Center( child: Center(
child: Container( child: Container(
margin: EdgeInsets.only(top: 15), margin: EdgeInsets.only(top: 15),

@ -1,30 +1,35 @@
import 'package:doctor_app_flutter/client/base_app_client.dart'; //import 'package:doctor_app_flutter/client/base_app_client.dart';
import 'package:doctor_app_flutter/config/shared_pref_kay.dart';
import 'package:doctor_app_flutter/core/enum/viewstate.dart'; import 'package:doctor_app_flutter/core/enum/viewstate.dart';
import 'package:doctor_app_flutter/core/viewModel/procedure_View_model.dart'; import 'package:doctor_app_flutter/core/viewModel/procedure_View_model.dart';
import 'package:doctor_app_flutter/models/doctor/doctor_profile_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/screens/base/base_view.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart';
import 'package:doctor_app_flutter/screens/procedures/add-procedure-form.dart'; import 'package:doctor_app_flutter/screens/procedures/add-procedure-form.dart';
import 'package:doctor_app_flutter/screens/procedures/update-procedure.dart'; import 'package:doctor_app_flutter/screens/procedures/update-procedure.dart';
import 'package:doctor_app_flutter/util/helpers.dart'; import 'package:doctor_app_flutter/util/helpers.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/patient-page-header-widget.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design.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/app_scaffold_widget.dart'; 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/network_base_view.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'ProcedureCard.dart'; import 'ProcedureCard.dart';
class ProcedureScreen extends StatelessWidget { class ProcedureScreen extends StatelessWidget {
String doctorNameP;
void initState() async {
Map profile = await sharedPref.getObj(DOCTOR_PROFILE);
DoctorProfileModel doctorProfile = DoctorProfileModel.fromJson(profile);
doctorNameP = doctorProfile.doctorName;
}
@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'];
String patientType = routeArgs['patientType']; String patientType = routeArgs['patientType'];
String arrivalType = routeArgs['arrivalType']; String arrivalType = routeArgs['arrivalType'];
return BaseView<ProcedureViewModel>( return BaseView<ProcedureViewModel>(
onModelReady: (model) => onModelReady: (model) =>
model.getProcedure(mrn: patient.patientId, patientType: patientType), model.getProcedure(mrn: patient.patientId, patientType: patientType),
@ -174,6 +179,7 @@ class ProcedureScreen extends StatelessWidget {
// 'You Cant Update This Procedure'); // 'You Cant Update This Procedure');
}, },
patient: patient, patient: patient,
doctorName: doctorNameP,
), ),
), ),
if (model.procedureList.length != 0 && if (model.procedureList.length != 0 &&

@ -22,7 +22,7 @@ class GetActivityButton extends StatelessWidget {
Padding( Padding(
padding: EdgeInsets.all(10), padding: EdgeInsets.all(10),
child: AppText(value.value.toString(), child: AppText(value.value.toString(),
fontSize: 28, fontWeight: FontWeight.bold)), fontSize: 32, fontWeight: FontWeight.bold)),
Expanded( Expanded(
child: AppText( child: AppText(
value.kPIParameter, value.kPIParameter,

@ -136,6 +136,7 @@ class PatientCard extends StatelessWidget {
: "", : "",
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
fontSize: 14, fontSize: 14,
textOverflow: TextOverflow.ellipsis,
), ),
patientInfo.nationality != null || patientInfo.nationality != null ||
patientInfo.nationalityId != null patientInfo.nationalityId != null
@ -143,7 +144,9 @@ class PatientCard extends StatelessWidget {
borderRadius: borderRadius:
BorderRadius.circular(20.0), BorderRadius.circular(20.0),
child: Image.network( child: Image.network(
patientInfo.nationalityFlagURL, patientInfo.nationalityFlagURL != null
? patientInfo.nationalityFlagURL
: '',
height: 25, height: 25,
width: 30, width: 30,
errorBuilder: (BuildContext context, errorBuilder: (BuildContext context,

@ -608,7 +608,7 @@ packages:
name: meta name: meta
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.3.0-nullsafety.3" version: "1.3.0-nullsafety.4"
mime: mime:
dependency: transitive dependency: transitive
description: description:
@ -900,7 +900,7 @@ packages:
name: stack_trace name: stack_trace
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.10.0-nullsafety.1" version: "1.10.0-nullsafety.2"
sticky_headers: sticky_headers:
dependency: "direct main" dependency: "direct main"
description: description:
@ -1091,5 +1091,5 @@ packages:
source: hosted source: hosted
version: "2.2.1" version: "2.2.1"
sdks: sdks:
dart: ">=2.10.0 <2.11.0" dart: ">=2.10.0 <=2.11.0-213.1.beta"
flutter: ">=1.22.0 <2.0.0" flutter: ">=1.22.0 <2.0.0"

Loading…
Cancel
Save