hot fixing

merge-requests/237/head
Mohammad Aljammal 5 years ago
parent deb5b81cb3
commit eb5a3a59ff

@ -124,11 +124,13 @@ class _MedicalFilePageState extends State<MedicalFilePage> {
'Doctor : '.toUpperCase(), 'Doctor : '.toUpperCase(),
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
), ),
AppText( Expanded(
child: AppText(
model.medicalFileList[0].entityList[0] model.medicalFileList[0].entityList[0]
.timelines[index].doctorName, .timelines[index].doctorName,
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
), ),
),
], ],
), ),
Row( Row(

@ -466,13 +466,6 @@ class _PatientsScreenState extends State<PatientsScreen> {
height: height:
10.0, 10.0,
), ),
Padding(
padding: EdgeInsets.symmetric(
vertical:
5.5,
horizontal:
22.5),
child:
AppText( AppText(
item.firstName + item.firstName +
" " + " " +
@ -484,7 +477,6 @@ class _PatientsScreenState extends State<PatientsScreen> {
backGroundcolor: backGroundcolor:
Colors.white, Colors.white,
), ),
),
], ],
), ),
Row( Row(

@ -696,7 +696,7 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
selectDate(BuildContext context, PrescriptionViewModel model) async { selectDate(BuildContext context, PrescriptionViewModel model) async {
DateTime selectedDate; DateTime selectedDate;
selectedDate = DateTime.now().add(Duration(hours: 10)); selectedDate = DateTime.now().add(Duration(hours: 15));
final DateTime picked = await showDatePicker( final DateTime picked = await showDatePicker(
context: context, context: context,
initialDate: selectedDate, initialDate: selectedDate,

@ -94,7 +94,7 @@ class PatientProfileWidget extends StatelessWidget {
color: Color(0xffCCCCCC), color: Color(0xffCCCCCC),
), ),
Container( Container(
height: 10 * SizeConfig.textMultiplier, height: 11 * SizeConfig.textMultiplier,
child: Row( child: Row(
children: [ children: [
Expanded( Expanded(
@ -232,7 +232,8 @@ class PatientProfileWidget extends StatelessWidget {
SizeConfig.textMultiplier, SizeConfig.textMultiplier,
), ),
), ),
AppText( Expanded(
child: AppText(
patient.admissionDate != null patient.admissionDate != null
? "${DateUtils.convertDateFromServerFormat(patient.admissionDate, 'EEEE dd, MMMM yyyy hh:mm a')}" ? "${DateUtils.convertDateFromServerFormat(patient.admissionDate, 'EEEE dd, MMMM yyyy hh:mm a')}"
: "", : "",
@ -241,6 +242,7 @@ class PatientProfileWidget extends StatelessWidget {
fontSize: fontSize:
1.6 * SizeConfig.textMultiplier, 1.6 * SizeConfig.textMultiplier,
), ),
),
], ],
), ),
SizedBox( SizedBox(
@ -374,7 +376,8 @@ class PatientProfileWidget extends StatelessWidget {
SizedBox( SizedBox(
width: 4, width: 4,
), ),
AppText( Expanded(
child: AppText(
"${patient.nursingStationName}\n${patient.roomId}", "${patient.nursingStationName}\n${patient.roomId}",
fontWeight: fontWeight:
FontWeight.normal, FontWeight.normal,
@ -382,6 +385,7 @@ class PatientProfileWidget extends StatelessWidget {
SizeConfig SizeConfig
.textMultiplier, .textMultiplier,
), ),
),
], ],
), ),
), ),

@ -505,6 +505,8 @@ class _AddExaminationDailogState extends State<AddExaminationDailog> {
baseViewModel: model, baseViewModel: model,
child: MasterKeyCheckboxSearchWidget( child: MasterKeyCheckboxSearchWidget(
model: model, model: model,
hintSearchText: 'Search Examination',
buttonName: 'Add Examination',
masterList: model.physicalExaminationList, masterList: model.physicalExaminationList,
removeHistory: (history){ removeHistory: (history){
setState(() { setState(() {

Loading…
Cancel
Save