Merge branch 'smallfixes' into 'development'

small fixes in patient profile

See merge request Cloud_Solution/doctor_app_flutter!184
pull/186/head
Elham 5 years ago
commit 06935c8fe4

@ -4,9 +4,8 @@ import 'package:doctor_app_flutter/models/patient/patiant_info_model.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/translations_delegate_base.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.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/profile_image_widget.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:intl/intl.dart';
import './profile_medical_info_widget.dart'; import './profile_medical_info_widget.dart';
/* /*
@ -188,203 +187,218 @@ class PatientProfileWidget extends StatelessWidget {
), ),
]), ]),
), ),
Container( if (patient.admissionNo != null)
margin: EdgeInsets.all(16), Container(
child: Column( margin: EdgeInsets.all(16),
crossAxisAlignment: CrossAxisAlignment.start, child: Column(
children: [ crossAxisAlignment: CrossAxisAlignment.start,
AppText( children: [
TranslationBase.of(context).admissionDetail, AppText(
color: Colors.black, TranslationBase.of(context).admissionDetail,
fontWeight: FontWeight.bold, color: Colors.black,
fontSize: 1.8 * SizeConfig.textMultiplier, fontWeight: FontWeight.bold,
), fontSize: 1.8 * SizeConfig.textMultiplier,
SizedBox(
height: 4,
),
Container(
decoration: BoxDecoration(
color: Colors.white,
shape: BoxShape.rectangle,
borderRadius: BorderRadius.circular(8),
border: Border.fromBorderSide(BorderSide(
color: Color(0xffBBBBBB),
width: 1,
)),
), ),
child: Column( SizedBox(
children: [ height: 4,
Padding( ),
padding: EdgeInsets.all(16), Container(
child: Column( decoration: BoxDecoration(
children: [ color: Colors.white,
Row( shape: BoxShape.rectangle,
children: [ borderRadius: BorderRadius.circular(8),
Container( border: Border.fromBorderSide(BorderSide(
width: 14 * SizeConfig.textMultiplier, color: Color(0xffBBBBBB),
child: AppText( width: 1,
TranslationBase.of(context).dateTime, )),
color: Colors.black, ),
fontWeight: FontWeight.bold, child: Column(
fontSize: 1.6 * SizeConfig.textMultiplier, children: [
), Padding(
), padding: EdgeInsets.all(16),
AppText( child: Column(
"${DateUtils.convertDateFromServerFormat(patient.admissionDate, 'EEEE dd, MMMM yyyy hh:mm a')}", children: [
color: Colors.black, Row(
fontWeight: FontWeight.normal, children: [
fontSize: 1.6 * SizeConfig.textMultiplier, Container(
), width: 14 * SizeConfig.textMultiplier,
], child: AppText(
), TranslationBase.of(context).dateTime,
SizedBox( color: Colors.black,
height: 4, fontWeight: FontWeight.bold,
), fontSize: 1.6 * SizeConfig.textMultiplier,
Row( ),
children: [
Container(
width: 14 * SizeConfig.textMultiplier,
child: AppText(
TranslationBase.of(context).admissionNo,
color: Colors.black,
fontWeight: FontWeight.bold,
fontSize: 1.6 * SizeConfig.textMultiplier,
), ),
), AppText(
AppText( patient.admissionDate != null
patient.admissionNo, ? "${DateUtils
color: Colors.black, .convertDateFromServerFormat(
fontWeight: FontWeight.normal, patient.admissionDate,
fontSize: 1.6 * SizeConfig.textMultiplier, 'EEEE dd, MMMM yyyy hh:mm a')}"
), : "",
],
),
SizedBox(
height: 4,
),
Row(
children: [
Container(
width: 14 * SizeConfig.textMultiplier,
child: AppText(
TranslationBase.of(context).losNo,
color: Colors.black, color: Colors.black,
fontWeight: FontWeight.bold, fontWeight: FontWeight.normal,
fontSize: 1.6 * SizeConfig.textMultiplier, fontSize:
1.6 * SizeConfig.textMultiplier,
), ),
), ],
AppText( ),
DateUtils.differenceBetweenServerDateAndCurrent(patient.admissionDate), SizedBox(
color: Colors.black, height: 4,
fontWeight: FontWeight.normal, ),
fontSize: 1.6 * SizeConfig.textMultiplier, Row(
), children: [
], Container(
), width: 14 * SizeConfig.textMultiplier,
], child: AppText(
), TranslationBase.of(context).admissionNo,
), color: Colors.black,
const Divider(
color: Color(0xffCCCCCC),
height: 5,
thickness: 1,
indent: 0,
endIndent: 0,
),
Container(
height: 10 * SizeConfig.textMultiplier,
child: Row(
children: [
Expanded(
child: Padding(
padding: const EdgeInsets.fromLTRB(16.0, 8.0, 8.0, 8.0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
AppText(
TranslationBase.of(context).area,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
fontSize: 1.6 * SizeConfig.textMultiplier, fontSize: 1.6 * SizeConfig.textMultiplier,
), ),
SizedBox( ),
height: 4, AppText(
), patient.admissionNo != null
AppText( ? patient.admissionNo
patient.clinicDescription, : '',
fontWeight: FontWeight.normal, color: Colors.black,
fontWeight: FontWeight.normal,
fontSize: 1.6 *
SizeConfig.textMultiplier,
),
],
),
SizedBox(
height: 4,
),
Row(
children: [
Container(
width: 14 * SizeConfig.textMultiplier,
child: AppText(
TranslationBase.of(context).losNo,
color: Colors.black,
fontWeight: FontWeight.bold,
fontSize: 1.6 * SizeConfig.textMultiplier, fontSize: 1.6 * SizeConfig.textMultiplier,
), ),
], ),
AppText(
patient.admissionDate != null
? DateUtils
.differenceBetweenServerDateAndCurrent(
patient.admissionDate)
: "",
color: Colors.black,
fontWeight: FontWeight.normal,
fontSize: 1.6 *
SizeConfig.textMultiplier,
),
],
),
],
),
),
const Divider(
color: Color(0xffCCCCCC),
height: 5,
thickness: 1,
indent: 0,
endIndent: 0,
),
Container(
height: 10 * SizeConfig.textMultiplier,
child: Row(
children: [
Expanded(
child: Padding(
padding: const EdgeInsets.fromLTRB(16.0, 8.0, 8.0, 8.0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
AppText(
TranslationBase.of(context).area,
fontWeight: FontWeight.bold,
fontSize: 1.6 * SizeConfig.textMultiplier,
),
SizedBox(
height: 4,
),
AppText(
patient.clinicDescription,
fontWeight: FontWeight.normal,
fontSize: 1.6 * SizeConfig.textMultiplier,
),
],
),
), ),
), ),
), Container(
Container( width: 1,
width: 1, color: Color(0xffCCCCCC),
color: Color(0xffCCCCCC), ),
), Expanded(
Expanded( child: Padding(
child: Padding( padding: const EdgeInsets.fromLTRB(16.0, 8.0, 8.0, 8.0),
padding: const EdgeInsets.fromLTRB(16.0, 8.0, 8.0, 8.0), child: Column(
child: Column( crossAxisAlignment: CrossAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.spaceEvenly,
mainAxisAlignment: MainAxisAlignment.spaceEvenly, children: [
children: [ Expanded(
Expanded( child: Row(
child: Row( crossAxisAlignment: CrossAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start, children: [
children: [ AppText(
AppText( TranslationBase.of(context).room,
TranslationBase.of(context).room, fontWeight: FontWeight.bold,
fontWeight: FontWeight.bold, fontSize: 1.6 * SizeConfig.textMultiplier,
fontSize: 1.6 * SizeConfig.textMultiplier, ),
), SizedBox(
SizedBox( width: 4,
width: 4, ),
), AppText(
AppText( "${patient.nursingStationName}\n${patient.roomId}",
"${patient.nursingStationName}\n${patient.roomId}", fontWeight: FontWeight.normal,
fontWeight: FontWeight.normal, fontSize: 1.4 * SizeConfig.textMultiplier,
fontSize: 1.4 * SizeConfig.textMultiplier, ),
), ],
], ),
), ),
), SizedBox(
SizedBox( height: 4,
height: 4,
),
Expanded(
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
AppText(
TranslationBase.of(context).bed,
fontWeight: FontWeight.bold,
fontSize: 1.6 * SizeConfig.textMultiplier,
),
SizedBox(
width: 4,
),
AppText(
"${patient.bedId}",
fontWeight: FontWeight.normal,
fontSize: 1.6 * SizeConfig.textMultiplier,
),
],
), ),
), Expanded(
], child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
AppText(
TranslationBase.of(context).bed,
fontWeight: FontWeight.bold,
fontSize: 1.6 * SizeConfig.textMultiplier,
),
SizedBox(
width: 4,
),
AppText(
"${patient.bedId}",
fontWeight: FontWeight.normal,
fontSize: 1.6 * SizeConfig.textMultiplier,
),
],
),
),
],
),
), ),
), ),
), ],
], ),
), )
) ],
], ),
), )
) ],
], ),
), ),
),
], ],
), ),
], ],

Loading…
Cancel
Save