fix flutter 2

merge-requests/910/head
Elham Rababh 4 years ago
parent 8df3cf8a33
commit 7af43f5f1d

@ -309,7 +309,7 @@
"${BUILT_PRODUCTS_DIR}/shared_preferences_ios/shared_preferences_ios.framework", "${BUILT_PRODUCTS_DIR}/shared_preferences_ios/shared_preferences_ios.framework",
"${BUILT_PRODUCTS_DIR}/speech_to_text/speech_to_text.framework", "${BUILT_PRODUCTS_DIR}/speech_to_text/speech_to_text.framework",
"${BUILT_PRODUCTS_DIR}/sqflite/sqflite.framework", "${BUILT_PRODUCTS_DIR}/sqflite/sqflite.framework",
"${BUILT_PRODUCTS_DIR}/url_launcher/url_launcher.framework", "${BUILT_PRODUCTS_DIR}/url_launcher_ios/url_launcher_ios.framework",
"${BUILT_PRODUCTS_DIR}/video_player/video_player.framework", "${BUILT_PRODUCTS_DIR}/video_player/video_player.framework",
"${BUILT_PRODUCTS_DIR}/wakelock/wakelock.framework", "${BUILT_PRODUCTS_DIR}/wakelock/wakelock.framework",
"${BUILT_PRODUCTS_DIR}/webview_flutter_wkwebview/webview_flutter_wkwebview.framework", "${BUILT_PRODUCTS_DIR}/webview_flutter_wkwebview/webview_flutter_wkwebview.framework",
@ -350,7 +350,7 @@
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/shared_preferences_ios.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/shared_preferences_ios.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/speech_to_text.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/speech_to_text.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/sqflite.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/sqflite.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/url_launcher.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/url_launcher_ios.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/video_player.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/video_player.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/wakelock.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/wakelock.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/webview_flutter_wkwebview.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/webview_flutter_wkwebview.framework",

@ -10,7 +10,7 @@ class HomePatientCard extends StatelessWidget {
final Color backgroundIconColor; final Color backgroundIconColor;
final String text; final String text;
final Color textColor; final Color textColor;
final GestureTapCallback onTap; final VoidCallback onTap;
final double iconSize; final double iconSize;
HomePatientCard({ HomePatientCard({

@ -74,7 +74,7 @@ class _HomeScreenState extends State<HomeScreen> {
}, },
builder: (_, model, w) => AppScaffold( builder: (_, model, w) => AppScaffold(
baseViewModel: model, baseViewModel: model,
isShowAppBar: true, isShowAppBar: false,
appBar: HomeScreenHeader( appBar: HomeScreenHeader(
model: model, model: model,
onOpenDrawer: () { onOpenDrawer: () {
@ -393,7 +393,7 @@ class _HomeScreenState extends State<HomeScreen> {
context, context,
FadePage( FadePage(
page: InPatientScreen( page: InPatientScreen(
specialClinic: model.getSpecialClinic(clinicId ?? projectsProvider!.doctorClinicsList[0]!.clinicID!)!, specialClinic: model.getSpecialClinic(clinicId ?? projectsProvider!.doctorClinicsList[0]!.clinicID!),
), ),
), ),
); );

@ -11,15 +11,15 @@ import 'package:provider/provider.dart';
class InPatientHeader extends StatelessWidget with PreferredSizeWidget { class InPatientHeader extends StatelessWidget with PreferredSizeWidget {
InPatientHeader( InPatientHeader(
{required this.model, {required this.model,
required this.specialClinic, this.specialClinic,
this.activeTab, this.activeTab,
this.selectedMapId, this.selectedMapId,
this.onChangeFunc}) this.onChangeFunc})
: super(); : super();
final PatientSearchViewModel model; final PatientSearchViewModel model;
final GetSpecialClinicalCareListResponseModel specialClinic; final GetSpecialClinicalCareListResponseModel? specialClinic;
final activeTab; final activeTab;
final selectedMapId; final selectedMapId;
final onChangeFunc; final onChangeFunc;
@override @override

@ -20,12 +20,12 @@ import '../DischargedPatientPage.dart';
import 'in_patient_list_page.dart'; import 'in_patient_list_page.dart';
class InPatientScreen extends StatefulWidget { class InPatientScreen extends StatefulWidget {
GetSpecialClinicalCareListResponseModel specialClinic; GetSpecialClinicalCareListResponseModel? specialClinic;
bool isAllClinic = true; bool isAllClinic = true;
bool showBottomSheet = false; bool showBottomSheet = false;
late String selectedClinicName; String ?selectedClinicName;
InPatientScreen({Key? key, required this.specialClinic}); InPatientScreen({Key? key, this.specialClinic});
@override @override
_InPatientScreenState createState() => _InPatientScreenState(); _InPatientScreenState createState() => _InPatientScreenState();
@ -35,7 +35,7 @@ class _InPatientScreenState extends State<InPatientScreen>
with SingleTickerProviderStateMixin { with SingleTickerProviderStateMixin {
late TabController _tabController; late TabController _tabController;
int _activeTab = 0; int _activeTab = 0;
late int selectedMapId; int ? selectedMapId;
@override @override
void initState() { void initState() {
@ -69,7 +69,7 @@ class _InPatientScreenState extends State<InPatientScreen>
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;
} }
@ -160,14 +160,14 @@ class _InPatientScreenState extends State<InPatientScreen>
patientSearchViewModel: model, patientSearchViewModel: model,
isAllClinic: widget.isAllClinic, isAllClinic: widget.isAllClinic,
showBottomSheet: widget.showBottomSheet, showBottomSheet: widget.showBottomSheet,
selectedClinicName: widget.selectedClinicName, selectedClinicName: widget.selectedClinicName??'',
onChangeValue: onChangeState), onChangeValue: onChangeState),
InPatientListPage( InPatientListPage(
isMyInPatient: true, isMyInPatient: true,
patientSearchViewModel: model, patientSearchViewModel: model,
isAllClinic: widget.isAllClinic, isAllClinic: widget.isAllClinic,
showBottomSheet: widget.showBottomSheet, showBottomSheet: widget.showBottomSheet,
selectedClinicName: widget.selectedClinicName, selectedClinicName: widget.selectedClinicName??"",
onChangeValue: onChangeState), onChangeValue: onChangeState),
DischargedPatient(), DischargedPatient(),
], ],

@ -21,8 +21,7 @@ class AppTextFieldCustomSearch extends StatelessWidget {
}); });
final TextEditingController? searchController; final TextEditingController? searchController;
final Function(String)? onChangeFun;
final Function? onChangeFun;
final Function(String)? onFieldSubmitted; final Function(String)? onFieldSubmitted;
final Widget ?positionedChild; final Widget ?positionedChild;
@ -54,7 +53,7 @@ class AppTextFieldCustomSearch extends StatelessWidget {
onPressed: () {}, onPressed: () {},
), ),
controller: searchController, controller: searchController,
onChanged: onChangeFun!(), onChanged: (value)=>onChangeFun,
onFieldSubmitted: ()=>onFieldSubmitted, onFieldSubmitted: ()=>onFieldSubmitted,
validationError: validationError), validationError: validationError),
if (positionedChild != null) if (positionedChild != null)

Loading…
Cancel
Save