Merge branch 'soap-objective-feature-re-design' into 'development'

cahnges on UCaf

See merge request Cloud_Solution/doctor_app_flutter!460
merge-requests/461/merge
Mohammad Aljammal 5 years ago
commit 9839ef4a00

@ -1,6 +1,7 @@
import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/config/config.dart';
import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:doctor_app_flutter/core/viewModel/patient-ucaf-viewmodel.dart'; import 'package:doctor_app_flutter/core/viewModel/patient-ucaf-viewmodel.dart';
import 'package:doctor_app_flutter/icons_app/doctor_app_icons.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/patients/profile/UCAF/page-stepper-widget.dart'; import 'package:doctor_app_flutter/screens/patients/profile/UCAF/page-stepper-widget.dart';
@ -145,8 +146,8 @@ class _UCAFInputScreenState extends State<UCAFInputScreen> {
), ),
AppTextFieldCustom( AppTextFieldCustom(
height: screenSize.height * 0.075, height: screenSize.height * 0.075,
hintText: hintText: TranslationBase.of(context)
TranslationBase.of(context).durationOfIllness, .durationOfIllness,
dropDownText: "3", dropDownText: "3",
inputType: TextInputType.number, inputType: TextInputType.number,
inputFormatters: [ inputFormatters: [
@ -163,6 +164,14 @@ class _UCAFInputScreenState extends State<UCAFInputScreen> {
children: [ children: [
Row( Row(
children: [ children: [
Icon(
DoctorApp.warning,
size: 20,
color: Color(0xFFCC9B14),
),
SizedBox(
width: 4,
),
AppText( AppText(
"BP (H/L)", "BP (H/L)",
fontSize: fontSize:
@ -246,7 +255,8 @@ class _UCAFInputScreenState extends State<UCAFInputScreen> {
height: 16, height: 16,
), ),
AppText( AppText(
TranslationBase.of(context).chiefComplaintsAndSymptoms, TranslationBase.of(context)
.chiefComplaintsAndSymptoms,
fontFamily: 'Poppins', fontFamily: 'Poppins',
fontSize: SizeConfig.textMultiplier * 2.1, fontSize: SizeConfig.textMultiplier * 2.1,
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
@ -265,7 +275,8 @@ class _UCAFInputScreenState extends State<UCAFInputScreen> {
height: 8, height: 8,
), ),
AppTextFieldCustom( AppTextFieldCustom(
hintText: TranslationBase.of(context).instruction, hintText:
TranslationBase.of(context).instruction,
dropDownText: helpers.parseHtmlString(model dropDownText: helpers.parseHtmlString(model
.patientChiefComplaintList[0] .patientChiefComplaintList[0]
.chiefComplaint), .chiefComplaint),
@ -288,7 +299,7 @@ class _UCAFInputScreenState extends State<UCAFInputScreen> {
(index) => CheckboxListTile( (index) => CheckboxListTile(
title: AppText( title: AppText(
conditionsData[index]['name'], conditionsData[index]['name'],
fontWeight: FontWeight.bold, fontWeight: FontWeight.normal,
fontSize: fontSize:
SizeConfig.textMultiplier * 2.1, SizeConfig.textMultiplier * 2.1,
), ),
@ -307,115 +318,77 @@ class _UCAFInputScreenState extends State<UCAFInputScreen> {
SizedBox( SizedBox(
height: 8, height: 8,
), ),
Container( AppTextFieldCustom(
height: screenSize.height * 0.070, height: screenSize.height * 0.075,
child: TextField( hintText: TranslationBase.of(context).other,
decoration: dropDownText: "None",
Helpers.textFieldSelectorDecoration( enabled: false,
TranslationBase.of(context).other, ),
null,
false),
enabled: true,
controller: _otherController,
keyboardType: TextInputType.text,
)),
SizedBox( SizedBox(
height: 8, height: 8,
), ),
Container( AppTextFieldCustom(
height: screenSize.height * 0.070, height: screenSize.height * 0.075,
child: TextField( hintText: TranslationBase.of(context).how,
decoration: dropDownText: "None",
Helpers.textFieldSelectorDecoration( enabled: false,
TranslationBase.of(context).how, ),
null,
false),
enabled: true,
controller: _howController,
keyboardType: TextInputType.text,
)),
SizedBox( SizedBox(
height: 8, height: 8,
), ),
Row( Row(
children: [ children: [
Expanded( Expanded(
child: Container( child: AppTextFieldCustom(
height: screenSize.height * 0.070, height: screenSize.height * 0.075,
child: TextField( hintText:
decoration: Helpers TranslationBase.of(context).when,
.textFieldSelectorDecoration( dropDownText: "None",
TranslationBase.of(context) enabled: false,
.when, ),
null,
false),
enabled: true,
controller: _whenController,
keyboardType: TextInputType.text,
)),
), ),
SizedBox( SizedBox(
width: 4, width: 4,
), ),
Expanded( Expanded(
child: Container( child: AppTextFieldCustom(
height: screenSize.height * 0.070, height: screenSize.height * 0.075,
child: TextField( hintText:
decoration: Helpers TranslationBase.of(context).where,
.textFieldSelectorDecoration( dropDownText: "None",
TranslationBase.of(context) enabled: false,
.where, ),
null,
false),
enabled: true,
controller: _whereController,
keyboardType: TextInputType.text,
)),
), ),
], ],
), ),
SizedBox( SizedBox(
height: 8, height: 8,
), ),
Container( AppTextFieldCustom(
child: TextField( height: screenSize.height * 0.1,
decoration: hintText: TranslationBase.of(context).specifyPossibleLineManagement,
Helpers.textFieldSelectorDecoration( dropDownText: "None",
TranslationBase.of(context) enabled: false,
.specifyPossibleLineManagement,
null,
false),
enabled: true,
controller: _managementsLineController,
keyboardType: TextInputType.text,
minLines: 4, minLines: 4,
maxLines: 6, maxLines: 6,
)), ),
SizedBox( SizedBox(
height: 16, height: 26,
), ),
AppText( AppText(
TranslationBase.of(context).significantSigns, TranslationBase.of(context).significantSigns,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
fontSize: SizeConfig.textMultiplier * 2.0, fontSize: SizeConfig.textMultiplier * 2.1,
), ),
SizedBox( SizedBox(
height: 8, height: 8,
), ),
Container( AppTextFieldCustom(
child: TextField( height: screenSize.height * 0.1,
decoration: hintText: TranslationBase.of(context).backAbdomen,
Helpers.textFieldSelectorDecoration( dropDownText: "BackLNeck",
TranslationBase.of(context) enabled: false,
.backAbdomen, ),
null,
false),
enabled: true,
controller: _signsController,
keyboardType: TextInputType.multiline,
minLines: null,
maxLines: null,
)),
], ],
), ),
), ),

@ -51,7 +51,7 @@ class VitalSignItem extends StatelessWidget {
"$lastVal", "$lastVal",
fontFamily: 'Poppins', fontFamily: 'Poppins',
fontSize: SizeConfig.textMultiplier * 1.4, fontSize: SizeConfig.textMultiplier * 1.4,
fontWeight: FontWeight.w800, fontWeight: FontWeight.bold,
margin: 0, margin: 0,
), ),
Expanded( Expanded(
@ -88,7 +88,7 @@ class VitalSignItem extends StatelessWidget {
"$des", "$des",
fontFamily: 'Poppins', fontFamily: 'Poppins',
fontSize: SizeConfig.textMultiplier * 1.3, fontSize: SizeConfig.textMultiplier * 1.3,
fontWeight: FontWeight.w600, fontWeight: FontWeight.bold,
), ),
), ),
), ),

@ -68,7 +68,7 @@ class _AppTextFieldCustomState extends State<AppTextFieldCustom> {
widget.hintText, widget.hintText,
fontFamily: 'Poppins', fontFamily: 'Poppins',
fontSize: SizeConfig.textMultiplier * 1.4, fontSize: SizeConfig.textMultiplier * 1.4,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w700,
), ),
widget.dropDownText == null widget.dropDownText == null
? TextField( ? TextField(

Loading…
Cancel
Save