Merge branch 'sultan' into 'development'

Sultan

See merge request Cloud_Solution/doctor_app_flutter!535
merge-requests/536/merge
Mohammad Aljammal 5 years ago
commit 8bafcf02d0

@ -21,6 +21,7 @@ import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/dr_app_circular_progress_Indeicator.dart'; import 'package:doctor_app_flutter/widgets/shared/dr_app_circular_progress_Indeicator.dart';
import 'package:doctor_app_flutter/widgets/shared/errors/dr_app_embedded_error.dart'; import 'package:doctor_app_flutter/widgets/shared/errors/dr_app_embedded_error.dart';
import 'package:doctor_app_flutter/widgets/shared/loader/gif_loader_dialog_utils.dart'; import 'package:doctor_app_flutter/widgets/shared/loader/gif_loader_dialog_utils.dart';
import 'package:doctor_app_flutter/widgets/shared/text_fields/app_text_form_field.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:hexcolor/hexcolor.dart'; import 'package:hexcolor/hexcolor.dart';
import 'package:intl/intl.dart'; import 'package:intl/intl.dart';
@ -394,20 +395,51 @@ class _PatientsScreenState extends State<PatientsScreen> {
children: [ children: [
Column(children: <Widget>[ Column(children: <Widget>[
SizedBox(height: 18.5), SizedBox(height: 18.5),
Container( Container(
width: SizeConfig.screenWidth * 0.9, decoration: BoxDecoration(
height: SizeConfig.screenHeight * 0.08, borderRadius:
child: TextField( BorderRadius.all(Radius.circular(6.0)),
controller: _controller, border: Border.all(
onChanged: (String str) { width: 1.0,
this.searchData(str); color: HexColor("#CCCCCC"),
}, ),
decoration: buildInputDecoration( color: Colors.white),
context, child: Column(
TranslationBase.of(context) crossAxisAlignment:
.searchPatientName), CrossAxisAlignment.start,
), children: [
), Padding(
padding: EdgeInsets.only(
left: 10, top: 10),
child: AppText(
TranslationBase.of(context)
.selectYourProject,
fontWeight: FontWeight.w600,
)),
AppTextFormField(
// focusNode: focusProject,
controller: _controller,
borderColor: Colors.white,
suffixIcon: Icons.arrow_drop_down,
onTap: () {},
)
])),
// Container(
// width: SizeConfig.screenWidth * 0.9,
// height: SizeConfig.screenHeight * 0.08,
// child: TextField(
// controller: _controller,
// onChanged: (String str) {
// this.searchData(str);
// },
// decoration: buildInputDecoration(
// context,
// TranslationBase.of(context)
// .searchPatientName),
// ),
// ),
SizedBox( SizedBox(
height: 10.0, height: 10.0,
), ),
@ -484,21 +516,65 @@ class _PatientsScreenState extends State<PatientsScreen> {
: Column( : Column(
children: <Widget>[ children: <Widget>[
SizedBox(height: 18.5), SizedBox(height: 18.5),
Container( Container(
width: SizeConfig.screenWidth * 0.9, width: SizeConfig.screenWidth * 0.9,
height: height: 75,
SizeConfig.screenHeight * 0.08, decoration: BoxDecoration(
child: TextField( borderRadius: BorderRadius.all(
controller: _controller, Radius.circular(6.0)),
onChanged: (String str) { border: Border.all(
this.searchData(str); width: 1.0,
}, color: HexColor("#CCCCCC"),
decoration: buildInputDecoration( ),
context, color: Colors.white),
TranslationBase.of(context) child: Column(
.searchPatientName), crossAxisAlignment:
), CrossAxisAlignment.start,
), children: [
Padding(
padding: EdgeInsets.only(
left: 10, top: 10),
child: AppText(
TranslationBase.of(
context)
.searchPatientName,
fontWeight:
FontWeight.bold,
)),
AppTextFormField(
// focusNode: focusProject,
controller: _controller,
borderColor: Colors.white,
prefix: IconButton(
icon: Icon(
DoctorApp.filter_1,
color: Colors.black,
),
iconSize: 20,
padding:
EdgeInsets.only(
bottom: 30),
),
onChanged: (String str) {
this.searchData(str);
}),
])),
// Container(
// width: SizeConfig.screenWidth * 0.9,
// height:
// SizeConfig.screenHeight * 0.08,
// child: TextField(
// controller: _controller,
// onChanged: (String str) {
// this.searchData(str);
// },
// decoration: buildInputDecoration(
// context,
// TranslationBase.of(context)
// .searchPatientName),
// ),
// ),
SizedBox( SizedBox(
height: 10.0, height: 10.0,
), ),
@ -696,28 +772,6 @@ class _PatientsScreenState extends State<PatientsScreen> {
}); });
} }
InputDecoration buildInputDecoration(BuildContext context, hint) {
return InputDecoration(
suffixIcon: IconButton(
icon: Icon(DoctorApp.search_patient),
color: Colors.grey,
onPressed: () {},
iconSize: 30,
),
filled: true,
fillColor: Colors.white,
hintText: hint,
hintStyle: TextStyle(fontSize: 1.66 * SizeConfig.textMultiplier),
enabledBorder: OutlineInputBorder(
borderRadius: BorderRadius.all(Radius.circular(10.0)),
borderSide: BorderSide(color: HexColor('#CCCCCC')),
),
focusedBorder: OutlineInputBorder(
borderRadius: BorderRadius.all(Radius.circular(10.0)),
borderSide: BorderSide(color: Colors.grey), //),
));
}
Widget _locationBar(BuildContext _context, model) { Widget _locationBar(BuildContext _context, model) {
return Container( return Container(
height: MediaQuery.of(context).size.height * 0.0619, height: MediaQuery.of(context).size.height * 0.0619,

@ -213,8 +213,8 @@ class PatientCard extends StatelessWidget {
), ),
), ),
), ),
if (SERVICES_PATIANT2[int.parse(patientType)] == if (SERVICES_PATIANT2[int.parse(patientType)] !=
"List_MyOutPatient") "List_InPatient")
Container( Container(
child: RichText( child: RichText(
text: new TextSpan( text: new TextSpan(

Loading…
Cancel
Save