Merge branch 'sultan' into 'development'

dashboard issue

See merge request Cloud_Solution/doctor_app_flutter!326
merge-requests/327/merge
Mohammad Aljammal 5 years ago
commit 63a68b81f1

@ -738,4 +738,5 @@ const Map<String, Map<String, String>> localizedValues = {
'en': "A Sick leave is on Hold status for this patient", 'en': "A Sick leave is on Hold status for this patient",
'ar': "الإجازة المرضية في حالة الانتظار لهذا المريض" 'ar': "الإجازة المرضية في حالة الانتظار لهذا المريض"
}, },
'no-clinic': {'en': "No Clinic", 'ar': "لا عيادة"}
}; };

@ -62,7 +62,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
bool isExpanded = false; bool isExpanded = false;
String isInpatient = ""; String isInpatient = "";
var clinicName = []; var clinicName = [];
var clinicId = 1; var clinicId;
void didChangeDependencies() async { void didChangeDependencies() async {
super.didChangeDependencies(); super.didChangeDependencies();
if (_isInit) { if (_isInit) {
@ -144,43 +144,50 @@ class _DashboardScreenState extends State<DashboardScreen> {
Container( Container(
width: MediaQuery.of(context).size.width * .6, width: MediaQuery.of(context).size.width * .6,
// height: 100, // height: 100,
child: DropdownButtonHideUnderline( child: projectsProvider.doctorClinicsList.length > 0
child: DropdownButton( ? DropdownButtonHideUnderline(
dropdownColor: Colors.white, child: DropdownButton(
iconEnabledColor: Colors.white, dropdownColor: Colors.white,
isExpanded: true, iconEnabledColor: Colors.white,
value: clinicId, isExpanded: true,
iconSize: 25, value: clinicId == null
elevation: 16, ? projectsProvider
selectedItemBuilder: (BuildContext context) { .doctorClinicsList[0].clinicID
return projectsProvider.doctorClinicsList : clinicId,
.map((item) { iconSize: 25,
return Row( elevation: 16,
mainAxisSize: MainAxisSize.max, selectedItemBuilder: (BuildContext context) {
children: <Widget>[ return projectsProvider.doctorClinicsList
AppText( .map((item) {
item.clinicName, return Row(
fontSize: SizeConfig.textMultiplier * 2.1, mainAxisSize: MainAxisSize.max,
color: Colors.white, children: <Widget>[
), AppText(
], item.clinicName,
); fontSize:
}).toList(); SizeConfig.textMultiplier * 2.1,
}, color: Colors.white,
onChanged: (newValue) { ),
clinicId = newValue; ],
changeClinic(newValue, context); );
}, }).toList();
items: projectsProvider.doctorClinicsList.map((item) { },
return DropdownMenuItem( onChanged: (newValue) {
child: Text( clinicId = newValue;
item.clinicName, changeClinic(newValue, context);
textAlign: TextAlign.end, },
), items: projectsProvider.doctorClinicsList
value: item.clinicID, .map((item) {
); return DropdownMenuItem(
}).toList(), child: Text(
)), item.clinicName,
textAlign: TextAlign.end,
),
value: item.clinicID,
);
}).toList(),
))
: AppText(TranslationBase.of(context).noClinic),
), ),
), ),
// InkWell( // InkWell(

@ -1118,9 +1118,11 @@ class TranslationBase {
String get admissionRequestSuccessMsg => String get admissionRequestSuccessMsg =>
localizedValues['admissionRequestSuccessMsg'][locale.languageCode]; localizedValues['admissionRequestSuccessMsg'][locale.languageCode];
String get infoStatus => localizedValues['infoStatus'][locale.languageCode]; String get infoStatus => localizedValues['infoStatus'][locale.languageCode];
String get doctorResponse => localizedValues['doctorResponse'][locale.languageCode]; String get doctorResponse =>
String get sickleaveonhold => localizedValues['doctorResponse'][locale.languageCode];
String get sickleaveonhold =>
localizedValues['sickleaveonhold'][locale.languageCode]; localizedValues['sickleaveonhold'][locale.languageCode];
String get noClinic => localizedValues['no-clinic'][locale.languageCode];
} }
class TranslationBaseDelegate extends LocalizationsDelegate<TranslationBase> { class TranslationBaseDelegate extends LocalizationsDelegate<TranslationBase> {

Loading…
Cancel
Save