Merge branch 'Amjad_search' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into ibrahim-merge

 Conflicts:
	lib/config/config.dart
merge-requests/111/head
Mohammad ALjammal 6 years ago
commit edd25ff437

@ -238,7 +238,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
valueFontColor: Colors.black, valueFontColor: Colors.black,
titleFontColor: Colors.black, titleFontColor: Colors.black,
iconColor: Colors.black, iconColor: Colors.black,
titleFontSize: 16, titleFontSize: 14,
), ),
onTap: () { onTap: () {
Navigator.of(context).pushNamed(PATIENT_SEARCH); Navigator.of(context).pushNamed(PATIENT_SEARCH);
@ -268,7 +268,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
valueFontColor: Colors.black, valueFontColor: Colors.black,
titleFontColor: Colors.black, titleFontColor: Colors.black,
iconColor: Colors.black, iconColor: Colors.black,
titleFontSize: 16, titleFontSize: 14,
), ),
), ),
), ),

@ -20,7 +20,7 @@ DrAppSharedPreferances sharedPref = new DrAppSharedPreferances();
/* /*
*@author: ibrahim albitar *@author: ibrahim albitar
*@Date:15/5/2020 *@Date:15/5/2020
*@param: *@param: '
*@return: *@return:
*@desc: *@desc:
*/ */
@ -182,7 +182,7 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
if (strExist) { if (strExist) {
filteredNotesList = null; filteredNotesList = null;
filteredNotesList = notesList filteredNotesList = patientsProv.patientProgressNoteList
.where((note) => .where((note) =>
note["DoctorName"].toString().contains(str.toUpperCase())) note["DoctorName"].toString().contains(str.toUpperCase()))
.toList(); .toList();

@ -50,7 +50,7 @@ class _DynamicElementsState extends State<DynamicElements> {
AppTextFormField( AppTextFormField(
textInputType: TextInputType.number, textInputType: TextInputType.number,
hintText: 'From', hintText: 'From',
controller: _fromDateController, //_fromDateController, controller: _fromDateController,
inputFormatter: ONLY_DATE, inputFormatter: ONLY_DATE,
onTap: () { onTap: () {
@ -83,7 +83,7 @@ class _DynamicElementsState extends State<DynamicElements> {
AppTextFormField( AppTextFormField(
textInputType: TextInputType.number, textInputType: TextInputType.number,
hintText: 'TO', hintText: 'TO',
controller: _fromDateController, //_toDateController, controller: _toDateController,
onTap: () { onTap: () {
_presentDatePicker('_selectedToDate'); _presentDatePicker('_selectedToDate');
}, },

Loading…
Cancel
Save