merge-requests/529/head
Sultan Khan 5 years ago
commit 5afb44adfd

@ -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,
@ -160,7 +164,7 @@ class ProcedureCard extends StatelessWidget {
), ),
], ],
), ),
Container( /*Container(
alignment: Alignment.centerRight, alignment: Alignment.centerRight,
child: InkWell( child: InkWell(
onTap: () { onTap: () {
@ -180,22 +184,23 @@ class ProcedureCard extends StatelessWidget {
color: Colors.blue, color: Colors.blue,
), ),
), ),
),*/
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
AppText(
entityList.remarks.toString() ?? '',
fontSize: 12,
), ),
// Row( if (entityList.categoryID == 2 ||
// mainAxisAlignment: MainAxisAlignment.spaceBetween, entityList.categoryID == 4 &&
// children: [ doctorName == entityList.doctorName)
// AppText( InkWell(
// entityList.remarks.toString() ?? '', child: Icon(DoctorApp.edit),
// fontSize: 12, onTap: onTap,
// ), )
// if (entityList.categoryID == 2 || ],
// entityList.categoryID == 4) )
// InkWell(
// 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 &&

@ -32,7 +32,7 @@ class AppText extends StatefulWidget {
AppText( AppText(
this.text, { this.text, {
this.color = Colors.black, this.color = Colors.black,
this.fontWeight = FontWeight.normal, this.fontWeight,
this.variant, this.variant,
this.fontSize, this.fontSize,
this.fontFamily = 'Poppins', this.fontFamily = 'Poppins',

@ -107,7 +107,7 @@ class _AppButtonState extends State<AppButton> {
shape: RoundedRectangleBorder( shape: RoundedRectangleBorder(
side: BorderSide( side: BorderSide(
color: color:
widget.hasBorder ? widget.borderColor : widget.color, widget.hasBorder ? widget.borderColor : widget.color ?? Color(0xFFB8382C),
width: 0.8, width: 0.8,
), ),
borderRadius: BorderRadius.all(Radius.circular(widget.radius))), borderRadius: BorderRadius.all(Radius.circular(widget.radius))),

@ -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