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 5 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,14 +53,13 @@ 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
: DropdownButtonHideUnderline(
child: DropdownButton( child: DropdownButton(
dropdownColor: Colors.white, dropdownColor: Colors.white,
iconEnabledColor: Colors.black, iconEnabledColor: Colors.black,
isExpanded: true, isExpanded: true,
value: selectedMapId == null value: selectedMapId??model.specialClinicalCareMappingList[0].nursingStationID,
? TranslationBase.of(context).all
: selectedMapId,
iconSize: 25, iconSize: 25,
elevation: 16, elevation: 16,
selectedItemBuilder: (BuildContext context) { selectedItemBuilder: (BuildContext context) {
@ -84,17 +84,19 @@ class InPatientHeader extends StatelessWidget with PreferredSizeWidget {
), ),
child: Center( child: Center(
child: AppText( child: AppText(
model.specialClinicalCareMappingList.length model.specialClinicalCareMappingList
.length
.toString(), .toString(),
color: Colors.white, color: Colors.white,
fontSize: fontSize: projectsProvider.isArabic
projectsProvider.isArabic ? 10 : 11, ? 10
: 11,
textAlign: TextAlign.center, textAlign: TextAlign.center,
), ),
)), )),
], ],
), ),
AppText(item.description, AppText(selectedMapId == null?TranslationBase.of(context).all:item.description,
fontSize: 12, fontSize: 12,
color: Colors.black, color: Colors.black,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,

@ -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