changes for the hospital gesture clicked area and nearest check not showing the hospital dropdown area

merge-update-with-lab-changes
haroon amjad 1 year ago
parent 7ddd932c51
commit cee903dd6b

@ -48,7 +48,7 @@ class ProjectViewModel extends BaseViewModel {
GetAdmissionInfoResponseModel getAdmissionInfoResponseModel = GetAdmissionInfoResponseModel(); GetAdmissionInfoResponseModel getAdmissionInfoResponseModel = GetAdmissionInfoResponseModel();
GetAdmissionRequestInfoResponseModel getAdmissionRequestInfoResponseModel = GetAdmissionRequestInfoResponseModel(); GetAdmissionRequestInfoResponseModel getAdmissionRequestInfoResponseModel = GetAdmissionRequestInfoResponseModel();
bool isIndoorNavigationEnabled = true; bool isIndoorNavigationEnabled = false;
int waitingAppointmentProjectID = 0; int waitingAppointmentProjectID = 0;
DoctorList? waitingAppointmentDoctor; DoctorList? waitingAppointmentDoctor;

@ -1,6 +1,7 @@
import "dart:collection"; import "dart:collection";
import 'package:auto_size_text/auto_size_text.dart'; import 'package:auto_size_text/auto_size_text.dart';
import 'package:diplomaticquarterapp/config/config.dart';
import 'package:diplomaticquarterapp/config/shared_pref_kay.dart'; import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
import 'package:diplomaticquarterapp/config/size_config.dart'; import 'package:diplomaticquarterapp/config/size_config.dart';
import 'package:diplomaticquarterapp/core/model/hospitals/hospitals_model.dart'; import 'package:diplomaticquarterapp/core/model/hospitals/hospitals_model.dart';
@ -95,6 +96,7 @@ class _SearchByClinicState extends State<SearchByClinic> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
AppGlobal.context = context;
return Container( return Container(
child: SingleChildScrollView( child: SingleChildScrollView(
child: Column( child: Column(

@ -89,71 +89,77 @@ class _SearchByHospitalState extends State<SearchByHospital> {
), ),
), ),
mHeight(8), mHeight(8),
Container( InkWell(
width: double.infinity, onTap: () {
decoration: containerRadius(Colors.white, 12), openDropdown(projectDropdownKey);
margin: EdgeInsets.only(left: 20, right: 20), },
padding: EdgeInsets.only(left: 10, right: 10, top: 12, bottom: 12), child: Container(
child: Row( width: double.infinity,
children: [ decoration: containerRadius(Colors.white, 12),
Flexible( margin: EdgeInsets.only(left: 20, right: 20),
child: Column( padding: EdgeInsets.only(left: 10, right: 10, top: 12, bottom: 12),
crossAxisAlignment: CrossAxisAlignment.start, child: Row(
children: [ children: [
Text( Flexible(
TranslationBase.of(context).selectHospital, child: Column(
style: TextStyle( crossAxisAlignment: CrossAxisAlignment.start,
fontSize: 11, children: [
letterSpacing: -0.44, Text(
fontWeight: FontWeight.w600, TranslationBase.of(context).selectHospital,
style: TextStyle(
fontSize: 11,
letterSpacing: -0.44,
fontWeight: FontWeight.w600,
),
), ),
), Container(
Container( height: 18,
height: 18, width: double.infinity,
width: double.infinity, child: DropdownButtonHideUnderline(
child: DropdownButtonHideUnderline( child: DropdownButton<HospitalsModel>(
child: DropdownButton<HospitalsModel>( key: projectDropdownKey,
hint: Text( hint: Text(
TranslationBase.of(context).selectHospital), TranslationBase.of(context).selectHospital),
value: selectedHospital, value: selectedHospital,
iconSize: 0, iconSize: 0,
isExpanded: true, isExpanded: true,
style: TextStyle( style: TextStyle(
fontSize: 14, fontSize: 14,
letterSpacing: -0.56, letterSpacing: -0.56,
color: Colors.black), color: Colors.black),
items: projectsList.map((HospitalsModel item) { items: projectsList.map((HospitalsModel item) {
return DropdownMenuItem<HospitalsModel>( return DropdownMenuItem<HospitalsModel>(
value: item, value: item,
child: AutoSizeText( child: AutoSizeText(
item.name!, item.name!,
maxLines: 1, maxLines: 1,
minFontSize: 10, minFontSize: 10,
style: TextStyle( style: TextStyle(
fontSize: SizeConfig.textMultiplier! * 1.6, fontSize: SizeConfig.textMultiplier! * 1.6,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
letterSpacing: -0.39, letterSpacing: -0.39,
height: 0.8, height: 0.8,
),
), ),
), // Text('${item.name!}'),
// Text('${item.name!}'), );
); }).toList(),
}).toList(), onChanged: (HospitalsModel? newValue) {
onChanged: (HospitalsModel? newValue) { getClinicWrtHospital(newValue);
getClinicWrtHospital(newValue); setState(() {
setState(() { selectedHospital = newValue;
selectedHospital = newValue; });
}); },
}, ),
), ),
), ),
), ],
], ),
), ),
), Icon(Icons.keyboard_arrow_down),
Icon(Icons.keyboard_arrow_down), ],
], )),
)), ),
if (clinicIds?.isNotEmpty == true) ...[ if (clinicIds?.isNotEmpty == true) ...[
mHeight(8), mHeight(8),
InkWell( InkWell(
@ -228,8 +234,23 @@ class _SearchByHospitalState extends State<SearchByHospital> {
void openDropdown(GlobalKey key) { void openDropdown(GlobalKey key) {
GestureDetector? detector; GestureDetector? detector;
detector = searchForGestureDetector(key.currentContext!);
void searchForGestureDetector(BuildContext element) {
element.visitChildElements((element) {
if (element.widget != null && element.widget is GestureDetector) {
detector = element.widget as GestureDetector?;
//return false;
} else {
searchForGestureDetector(element);
}
//return true;
});
}
searchForGestureDetector(key.currentContext!);
assert(detector != null); assert(detector != null);
detector!.onTap!(); detector!.onTap!();
} }

@ -108,10 +108,10 @@ class CalendarUtils {
TZDateTime scheduleDateTimeUTZ = TZDateTime.from(scheduleDateTime!, _currentLocation); TZDateTime scheduleDateTimeUTZ = TZDateTime.from(scheduleDateTime!, _currentLocation);
// print("writableCalendars-name: " + writableCalendars.name); print("writableCalendars-name: " + writableCalendars.name);
// print("writableCalendars-Id: " + writableCalendars.id); print("writableCalendars-Id: " + writableCalendars.id);
// print("writableCalendarsToString: " + writableCalendars.toString()); print("writableCalendarsToString: " + writableCalendars.toString());
// print("writableCalendarsToString: " + writableCalendars!.id!); print("writableCalendarsToString: " + writableCalendars!.id!);
Event event = Event( Event event = Event(
writableCalendars!.id, writableCalendars!.id,
start: scheduleDateTimeUTZ, start: scheduleDateTimeUTZ,
@ -119,11 +119,21 @@ class CalendarUtils {
title: title, title: title,
description: description, description: description,
); );
await deviceCalendarPlugin.createOrUpdateEvent(event).catchError((e) {
print("catchError " + e.toString());
}).whenComplete(() { if(Platform.isAndroid) {
print("whenComplete " + eventId!); Result<bool> result = await deviceCalendarPlugin.hasPermissions();
}); print(result);
await deviceCalendarPlugin.createOrUpdateEvent(event).catchError((e) {
print("catchError " + e.toString());
}).whenComplete(() {
print("whenComplete Calender ID " + eventId!);
});
}
} }
deleteEvent(Calendar _calendar, Event _event) async { deleteEvent(Calendar _calendar, Event _event) async {

Loading…
Cancel
Save