Merge branch 'add_out_patient_filter' into 'development'

hot fix

See merge request Cloud_Solution/doctor_app_flutter!630
merge-requests/631/merge
Mohammad Aljammal 5 years ago
commit 866f6cc8ea

@ -91,6 +91,7 @@ class PatientSearchViewModel extends BaseViewModel {
bool isSearchWithKeyInfo}) async { bool isSearchWithKeyInfo}) async {
String dateTo; String dateTo;
String dateFrom; String dateFrom;
// TODO Fix this in Arabic
if (item == 'Previous') { if (item == 'Previous') {
selectedFromDate = DateTime( selectedFromDate = DateTime(
DateTime.now().year, DateTime.now().month - 1, DateTime.now().day); DateTime.now().year, DateTime.now().month - 1, DateTime.now().day);

@ -1,6 +1,7 @@
import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:doctor_app_flutter/core/enum/filter_type.dart'; import 'package:doctor_app_flutter/core/enum/filter_type.dart';
import 'package:doctor_app_flutter/core/enum/patient_type.dart'; import 'package:doctor_app_flutter/core/enum/patient_type.dart';
import 'package:doctor_app_flutter/core/enum/viewstate.dart';
import 'package:doctor_app_flutter/core/model/PatientSearchRequestModel.dart'; import 'package:doctor_app_flutter/core/model/PatientSearchRequestModel.dart';
import 'package:doctor_app_flutter/core/viewModel/PatientSearchViewModel.dart'; import 'package:doctor_app_flutter/core/viewModel/PatientSearchViewModel.dart';
import 'package:doctor_app_flutter/core/viewModel/auth_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/auth_view_model.dart';
@ -164,7 +165,7 @@ class _OutPatientsScreenState extends State<OutPatientsScreen> {
color: _isActive ? Colors.white : Color(0xFF2B353E), color: _isActive ? Colors.white : Color(0xFF2B353E),
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
), ),
_isActive&&_activeLocation!=0 ?Container( _isActive&&_activeLocation!=0&&model.state == ViewState.Idle ?Container(
padding: EdgeInsets.all(2), padding: EdgeInsets.all(2),
margin: EdgeInsets.symmetric(horizontal: 5), margin: EdgeInsets.symmetric(horizontal: 5),
decoration: decoration:

@ -37,7 +37,7 @@ class AppTextFieldCustom extends StatefulWidget {
this.suffixIcon, this.suffixIcon,
this.dropDownColor, this.dropDownColor,
this.enabled = true, this.enabled = true,
this.inputType = TextInputType.text, this.inputType,
this.minLines = 1, this.minLines = 1,
this.maxLines = 1, this.maxLines = 1,
this.inputFormatters, this.inputFormatters,
@ -106,7 +106,7 @@ class _AppTextFieldCustomState extends State<AppTextFieldCustom> {
color: Color(0xFF575757), color: Color(0xFF575757),
), ),
controller: widget.controller, controller: widget.controller,
keyboardType: widget.inputType, keyboardType: widget.inputType?? (widget.maxLines == 1 ? TextInputType.text : TextInputType.multiline),
enabled: widget.enabled, enabled: widget.enabled,
minLines: widget.minLines, minLines: widget.minLines,
maxLines: widget.maxLines, maxLines: widget.maxLines,

Loading…
Cancel
Save