Merge branch 'special_clinic_fixes' into 'development'

fix special clinic issue

See merge request Cloud_Solution/doctor_app_flutter!858
merge-requests/859/head
Mohammad Aljammal 4 years ago
commit 6003df7f63

@ -5,6 +5,7 @@ import 'package:doctor_app_flutter/models/dashboard/get_special_clinical_care_Li
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:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:font_awesome_flutter/font_awesome_flutter.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
class InPatientHeader extends StatelessWidget with PreferredSizeWidget { class InPatientHeader extends StatelessWidget with PreferredSizeWidget {
@ -52,70 +53,71 @@ class InPatientHeader extends StatelessWidget with PreferredSizeWidget {
activeTab != 2) activeTab != 2)
Container( Container(
width: MediaQuery.of(context).size.width * .3, width: MediaQuery.of(context).size.width * .3,
child: DropdownButtonHideUnderline( child
child: DropdownButton( : DropdownButtonHideUnderline(
dropdownColor: Colors.white, child: DropdownButton(
iconEnabledColor: Colors.black, dropdownColor: Colors.white,
isExpanded: true, iconEnabledColor: Colors.black,
value: selectedMapId == null isExpanded: true,
? TranslationBase.of(context).all value: selectedMapId??model.specialClinicalCareMappingList[0].nursingStationID,
: selectedMapId, iconSize: 25,
iconSize: 25, elevation: 16,
elevation: 16, selectedItemBuilder: (BuildContext context) {
selectedItemBuilder: (BuildContext context) { return model.specialClinicalCareMappingList.map((item) {
return model.specialClinicalCareMappingList.map((item) { return Row(
return Row( mainAxisSize: MainAxisSize.max,
mainAxisSize: MainAxisSize.max, mainAxisAlignment: MainAxisAlignment.end,
mainAxisAlignment: MainAxisAlignment.end, children: <Widget>[
children: <Widget>[ Column(
Column( mainAxisAlignment: MainAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.center, children: [
children: [ Container(
Container( padding: EdgeInsets.all(2),
padding: EdgeInsets.all(2), margin: EdgeInsets.all(2),
margin: EdgeInsets.all(2), decoration: new BoxDecoration(
decoration: new BoxDecoration( color: Colors.red[800],
color: Colors.red[800], borderRadius: BorderRadius.circular(20),
borderRadius: BorderRadius.circular(20), ),
), constraints: BoxConstraints(
constraints: BoxConstraints( minWidth: 20,
minWidth: 20, minHeight: 20,
minHeight: 20, ),
), child: Center(
child: Center( child: AppText(
child: AppText( model.specialClinicalCareMappingList
model.specialClinicalCareMappingList.length .length
.toString(), .toString(),
color: Colors.white, color: Colors.white,
fontSize: fontSize: projectsProvider.isArabic
projectsProvider.isArabic ? 10 : 11, ? 10
textAlign: TextAlign.center, : 11,
), textAlign: TextAlign.center,
)), ),
], )),
), ],
AppText(item.description, ),
fontSize: 12, AppText(selectedMapId == null?TranslationBase.of(context).all:item.description,
color: Colors.black, fontSize: 12,
fontWeight: FontWeight.bold, color: Colors.black,
textAlign: TextAlign.end), fontWeight: FontWeight.bold,
], textAlign: TextAlign.end),
); ],
}).toList(); );
}, }).toList();
onChanged: (newValue) async { },
onChangeFunc(newValue); onChanged: (newValue) async {
}, onChangeFunc(newValue);
items: model.specialClinicalCareMappingList.map((item) { },
return DropdownMenuItem( items: model.specialClinicalCareMappingList.map((item) {
child: AppText( return DropdownMenuItem(
item.description, child: AppText(
textAlign: TextAlign.left, item.description,
), textAlign: TextAlign.left,
value: item.nursingStationID, ),
); value: item.nursingStationID,
}).toList(), );
)), }).toList(),
)),
), ),
]), ]),
), ),

@ -67,12 +67,12 @@ class _InPatientScreenState extends State<InPatientScreen>
return BaseView<PatientSearchViewModel>( return BaseView<PatientSearchViewModel>(
onModelReady: (model) async { onModelReady: (model) async {
model.clearPatientList(); model.clearPatientList();
// if (widget.specialClinic != null) { if (widget.specialClinic != null) {
// await model await model
// .getSpecialClinicalCareMappingList(widget.specialClinic.clinicID); .getSpecialClinicalCareMappingList(widget.specialClinic.clinicID);
// requestModel.nursingStationID = // requestModel.nursingStationID =
// model.specialClinicalCareMappingList[0].nursingStationID; // model.specialClinicalCareMappingList[0].nursingStationID;
// } }
requestModel.clinicID = 0; requestModel.clinicID = 0;
await model.getInPatientList(requestModel); await model.getInPatientList(requestModel);
}, },

Loading…
Cancel
Save