Merge branch 'fix-issues' into 'development'

bugs fix

See merge request Cloud_Solution/doctor_app_flutter!282
merge-requests/283/head
Mohammad Aljammal 5 years ago
commit cb767e4d4c

@ -34,6 +34,10 @@ class _MedicalFilePageState extends State<MedicalFilePage> {
child: SingleChildScrollView( child: SingleChildScrollView(
child: Container( child: Container(
child: Column( child: Column(
// mainAxisAlignment: model.medicalFileList.length != 0 &&
// model.medicalFileList != null
// ? MainAxisAlignment.start
// : MainAxisAlignment.center,
children: [ children: [
PatientPageHeaderWidget(patient), PatientPageHeaderWidget(patient),
Divider( Divider(

@ -5,6 +5,7 @@ import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/shared/Text.dart'; import 'package:doctor_app_flutter/widgets/shared/Text.dart';
import 'package:doctor_app_flutter/widgets/shared/TextFields.dart'; import 'package:doctor_app_flutter/widgets/shared/TextFields.dart';
import 'package:doctor_app_flutter/widgets/shared/app_buttons_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_buttons_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/divider_with_spaces_around.dart'; import 'package:doctor_app_flutter/widgets/shared/divider_with_spaces_around.dart';
import 'package:doctor_app_flutter/widgets/shared/network_base_view.dart'; import 'package:doctor_app_flutter/widgets/shared/network_base_view.dart';
import 'package:eva_icons_flutter/eva_icons_flutter.dart'; import 'package:eva_icons_flutter/eva_icons_flutter.dart';
@ -71,43 +72,53 @@ class _EntityListCheckboxSearchWidgetState
SizedBox( SizedBox(
height: 15, height: 15,
), ),
Column( items.length != 0
children: items.map((historyInfo) { ? Column(
return Column( children: items.map((historyInfo) {
children: [ return Column(
Row( children: [
children: [ Row(
Checkbox( children: [
value: widget Checkbox(
.isEntityListSelected(historyInfo), value: widget.isEntityListSelected(
activeColor: Colors.red[800], historyInfo),
onChanged: (bool newValue) { activeColor: Colors.red[800],
setState(() { onChanged: (bool newValue) {
if (widget.isEntityListSelected( setState(() {
historyInfo)) { if (widget.isEntityListSelected(
widget.removeHistory(historyInfo); historyInfo)) {
} else { widget
widget.addHistory(historyInfo); .removeHistory(historyInfo);
} } else {
}); widget.addHistory(historyInfo);
}), }
Expanded( });
child: Padding( }),
padding: const EdgeInsets.symmetric( Expanded(
horizontal: 10, vertical: 0), child: Padding(
child: Texts(historyInfo.procedureName, padding: const EdgeInsets.symmetric(
variant: "bodyText", horizontal: 10, vertical: 0),
bold: true, child: Texts(
color: Colors.black), historyInfo.procedureName,
variant: "bodyText",
bold: true,
color: Colors.black),
),
),
],
), ),
), DividerWithSpacesAround(),
], ],
);
}).toList(),
)
: Center(
child: Container(
child: AppText(
"There's no procedures for this category",
color: Color(0xFFB9382C)),
), ),
DividerWithSpacesAround(), )
],
);
}).toList(),
),
], ],
), ),
)), )),

@ -438,11 +438,10 @@ class _ProcedureScreenState extends State<ProcedureScreen> {
0.10, 0.10,
child: child:
AppText( AppText(
model model.procedureList[0].entityList[index].remarks !=
.procedureList[0] null
.entityList[index] ? model.procedureList[0].entityList[index].remarks.toString()
.remarks : "",
.toString(),
fontSize: fontSize:
11.5, 11.5,
), ),

Loading…
Cancel
Save