Haroon6138
/
doctor_app_flutter
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge branch 'design-updates' into 'development'

Browse Source 
in-patient && out-patient

See merge request Cloud_Solution/doctor_app_flutter!173
pull/178/head
Elham 4 years ago
parent d57eeb0a01 911921e0b8
commit 09e97d74c0
3 changed files with 464 additions and 404 deletions
Show Stats Download Patch File Download Diff File

328
lib/screens/patients/patient_search_screen.dart
Unescape Escape View File

@ -140,7 +140,9 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
Padding( Padding(
padding: const EdgeInsets.only(top: 12.0), padding: const EdgeInsets.only(top: 12.0),
child: AppText( child: AppText(
TranslationBase.of(context).searchPatientImageCaptionTitle.toUpperCase(), TranslationBase.of(context)
.searchPatientImageCaptionTitle
.toUpperCase(),
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
fontSize: SizeConfig.heightMultiplier * 2.5, fontSize: SizeConfig.heightMultiplier * 2.5,
), ),
@ -155,7 +157,6 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
) )
], ],
), ),
Container( Container(
padding: EdgeInsets.all(15), padding: EdgeInsets.all(15),
width: SizeConfig.screenWidth * 1, width: SizeConfig.screenWidth * 1,
@ -177,10 +178,9 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
style: BorderStyle.solid, style: BorderStyle.solid,
color: Hexcolor("#CCCCCC")), color: Hexcolor("#CCCCCC")),
borderRadius: borderRadius:
BorderRadius.all(Radius.circular(6.0)), BorderRadius.all(Radius.circular(6.0)),
), ),
), ),
width: double.infinity, width: double.infinity,
child: Padding( child: Padding(
padding: EdgeInsets.only( padding: EdgeInsets.only(
@ -195,54 +195,53 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
// add Expanded to have your dropdown button fill remaining space // add Expanded to have your dropdown button fill remaining space
child: DropdownButtonHideUnderline( child: DropdownButtonHideUnderline(
child: DropdownButton( child: DropdownButton(
isExpanded: true, isExpanded: true,
value: _selectedType, value: _selectedType,
iconSize: 25, iconSize: 25,
elevation: 16, elevation: 16,
selectedItemBuilder: selectedItemBuilder:
(BuildContext context) { (BuildContext context) {
return PATIENT_TYPE.map((item) { return PATIENT_TYPE.map((item) {
return Row( return Row(
mainAxisSize: MainAxisSize.max, mainAxisSize: MainAxisSize.max,
children: <Widget>[ children: <Widget>[
!projectsProvider.isArabic !projectsProvider.isArabic
? AppText( ? AppText(
item['text'], item['text'],
fontSize: SizeConfig fontSize: SizeConfig
.textMultiplier * .textMultiplier *
2.1, 2.1,
) )
: AppText( : AppText(
item['text_ar'], item['text_ar'],
fontSize: SizeConfig fontSize: SizeConfig
.textMultiplier * .textMultiplier *
2.1, 2.1,
), ),
], ],
); );
}).toList(); }).toList();
}, },
onChanged: (String newValue) => onChanged: (String newValue) => {
{ setState(() {
setState(() { _selectedType = newValue;
_selectedType = newValue; selectedPatientType =
selectedPatientType = int.parse(_selectedType);
int.parse(_selectedType); })
}) },
}, items: PATIENT_TYPE.map((item) {
items: PATIENT_TYPE.map((item) { !projectsProvider.isArabic
!projectsProvider.isArabic ? itemText = item['text']
? itemText = item['text'] : itemText = item['text_ar'];
: itemText = item['text_ar']; return DropdownMenuItem(
return DropdownMenuItem( child: Text(
child: Text( itemText,
itemText, textAlign: TextAlign.end,
textAlign: TextAlign.end, ),
), value: item['val'],
value: item['val'], );
); }).toList(),
}).toList(), )),
)),
), ),
], ],
), ),
@ -253,30 +252,23 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
), ),
Container( Container(
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.all( borderRadius:
Radius.circular(6.0)), BorderRadius.all(Radius.circular(6.0)),
border: Border.all( border: Border.all(
width: 1.0, color: Hexcolor("#CCCCCC")) width: 1.0, color: Hexcolor("#CCCCCC"))),
),
padding: EdgeInsets.only(top: 5), padding: EdgeInsets.only(top: 5),
child: AppTextFormField( child: AppTextFormField(
labelText:
labelText: TranslationBase TranslationBase.of(context).firstName,
.of(context)
.firstName,
borderColor: Colors.white, borderColor: Colors.white,
onSaved: (value) { onSaved: (value) {
value == null value == null
? _patientSearchFormValues.setFirstName = ? _patientSearchFormValues.setFirstName =
"0" "0"
: _patientSearchFormValues.setFirstName = : _patientSearchFormValues.setFirstName =
value; value;
if (value if (value.toString().trim().isEmpty) {
.toString()
.trim()
.isEmpty) {
_patientSearchFormValues.setFirstName = "0"; _patientSearchFormValues.setFirstName = "0";
} }
}, },
@ -290,29 +282,24 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
), ),
Container( Container(
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.all( borderRadius:
Radius.circular(6.0)), BorderRadius.all(Radius.circular(6.0)),
border: Border.all( border: Border.all(
width: 1.0, color: Hexcolor("#CCCCCC")) width: 1.0, color: Hexcolor("#CCCCCC"))),
),
padding: EdgeInsets.only(top: 5), padding: EdgeInsets.only(top: 5),
child: AppTextFormField( child: AppTextFormField(
labelText: TranslationBase labelText:
.of(context) TranslationBase.of(context).middleName,
.middleName,
borderColor: Colors.white, borderColor: Colors.white,
onSaved: (value) { onSaved: (value) {
value == null value == null
? _patientSearchFormValues.setMiddleName = ? _patientSearchFormValues.setMiddleName =
"0" "0"
: _patientSearchFormValues.setMiddleName = : _patientSearchFormValues.setMiddleName =
value; value;
if (value if (value.toString().trim().isEmpty) {
.toString()
.trim()
.isEmpty) {
_patientSearchFormValues.setMiddleName = _patientSearchFormValues.setMiddleName =
"0"; "0";
} }
}, },
// validator: (value) { // validator: (value) {
@ -325,27 +312,21 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
), ),
Container( Container(
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.all( borderRadius:
Radius.circular(6.0)), BorderRadius.all(Radius.circular(6.0)),
border: Border.all( border: Border.all(
width: 1.0, color: Hexcolor("#CCCCCC")) width: 1.0, color: Hexcolor("#CCCCCC"))),
),
padding: EdgeInsets.only(top: 5), padding: EdgeInsets.only(top: 5),
child: AppTextFormField( child: AppTextFormField(
labelText: TranslationBase labelText: TranslationBase.of(context).lastName,
.of(context)
.lastName,
borderColor: Colors.white, borderColor: Colors.white,
onSaved: (value) { onSaved: (value) {
value == null value == null
? ? _patientSearchFormValues.setLastName =
_patientSearchFormValues.setLastName = "0" "0"
: _patientSearchFormValues.setLastName = : _patientSearchFormValues.setLastName =
value; value;
if (value if (value.toString().trim().isEmpty) {
.toString()
.trim()
.isEmpty) {
_patientSearchFormValues.setLastName = "0"; _patientSearchFormValues.setLastName = "0";
} }
}, },
@ -356,30 +337,25 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
), ),
Container( Container(
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.all( borderRadius:
Radius.circular(6.0)), BorderRadius.all(Radius.circular(6.0)),
border: Border.all( border: Border.all(
width: 1.0, color: Hexcolor("#CCCCCC")) width: 1.0, color: Hexcolor("#CCCCCC"))),
),
padding: EdgeInsets.only(top: 5), padding: EdgeInsets.only(top: 5),
child: AppTextFormField( child: AppTextFormField(
labelText: TranslationBase labelText:
.of(context) TranslationBase.of(context).phoneNumber,
.phoneNumber,
borderColor: Colors.white, borderColor: Colors.white,
textInputType: TextInputType.number, textInputType: TextInputType.number,
inputFormatter: ONLY_NUMBERS, inputFormatter: ONLY_NUMBERS,
onSaved: (value) { onSaved: (value) {
value == null value == null
? _patientSearchFormValues ? _patientSearchFormValues
.setPatientMobileNumber = "0" .setPatientMobileNumber = "0"
: _patientSearchFormValues : _patientSearchFormValues
.setPatientMobileNumber = value; .setPatientMobileNumber = value;
if (value if (value.toString().trim().isEmpty) {
.toString()
.trim()
.isEmpty) {
_patientSearchFormValues _patientSearchFormValues
.setPatientMobileNumber = "0"; .setPatientMobileNumber = "0";
} }
@ -391,29 +367,24 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
), ),
Container( Container(
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.all( borderRadius:
Radius.circular(6.0)), BorderRadius.all(Radius.circular(6.0)),
border: Border.all( border: Border.all(
width: 1.0, color: Hexcolor("#CCCCCC")) width: 1.0, color: Hexcolor("#CCCCCC"))),
),
padding: EdgeInsets.only(top: 5), padding: EdgeInsets.only(top: 5),
child: AppTextFormField( child: AppTextFormField(
labelText: TranslationBase labelText:
.of(context) TranslationBase.of(context).patientID,
.patientID,
borderColor: Colors.white, borderColor: Colors.white,
textInputType: TextInputType.number, textInputType: TextInputType.number,
inputFormatter: ONLY_NUMBERS, inputFormatter: ONLY_NUMBERS,
onSaved: (value) { onSaved: (value) {
value == null value == null
? ? _patientSearchFormValues.setPatientID =
_patientSearchFormValues.setPatientID = 0 0
: _patientSearchFormValues.setPatientID = : _patientSearchFormValues.setPatientID =
int.parse(value); int.parse(value);
if (value if (value.toString().trim().isEmpty) {
.toString()
.trim()
.isEmpty) {
_patientSearchFormValues.setPatientID = 0; _patientSearchFormValues.setPatientID = 0;
} }
}), }),
@ -423,16 +394,14 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
), ),
Container( Container(
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.all( borderRadius:
Radius.circular(6.0)), BorderRadius.all(Radius.circular(6.0)),
border: Border.all( border: Border.all(
width: 1.0, color: Hexcolor("#CCCCCC")) width: 1.0, color: Hexcolor("#CCCCCC"))),
),
padding: EdgeInsets.only(top: 5), padding: EdgeInsets.only(top: 5),
child: AppTextFormField( child: AppTextFormField(
labelText: TranslationBase labelText:
.of(context) TranslationBase.of(context).patientFile,
.patientFile,
borderColor: Colors.white, borderColor: Colors.white,
textInputType: TextInputType.number, textInputType: TextInputType.number,
inputFormatter: ONLY_NUMBERS, inputFormatter: ONLY_NUMBERS,
@ -442,8 +411,8 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
(!(_selectedType == '2' || _selectedType == '4')) (!(_selectedType == '2' || _selectedType == '4'))
? DynamicElements(_patientSearchFormValues) ? DynamicElements(_patientSearchFormValues)
: SizedBox( : SizedBox(
height: 0, height: 0,
), ),
SizedBox( SizedBox(
height: 10, height: 10,
), ),
@ -456,7 +425,7 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
style: BorderStyle.solid, style: BorderStyle.solid,
color: Hexcolor("#CCCCCC")), color: Hexcolor("#CCCCCC")),
borderRadius: borderRadius:
BorderRadius.all(Radius.circular(6.0)), BorderRadius.all(Radius.circular(6.0)),
), ),
), ),
width: double.infinity, width: double.infinity,
@ -473,29 +442,29 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
// add Expanded to have your dropdown button fill remaining space // add Expanded to have your dropdown button fill remaining space
child: DropdownButtonHideUnderline( child: DropdownButtonHideUnderline(
child: DropdownButton( child: DropdownButton(
isExpanded: true, isExpanded: true,
value: _selectedLocation, value: _selectedLocation,
iconSize: 25, iconSize: 25,
elevation: 16, elevation: 16,
selectedItemBuilder: selectedItemBuilder:
(BuildContext context) { (BuildContext context) {
return LOCATIONS.map((item) { return LOCATIONS.map((item) {
return Row( return Row(
mainAxisSize: MainAxisSize.max, mainAxisSize: MainAxisSize.max,
children: <Widget>[ children: <Widget>[
!projectsProvider.isArabic !projectsProvider.isArabic
? AppText( ? AppText(
item['text'], item['text'],
fontSize: SizeConfig fontSize: SizeConfig
.textMultiplier * .textMultiplier *
2.1, 2.1,
) )
: AppText( : AppText(
item['text-ar'], item['text-ar'],
fontSize: SizeConfig fontSize: SizeConfig
.textMultiplier * .textMultiplier *
2.1, 2.1,
) )
], ],
); );
}).toList(); }).toList();
@ -517,7 +486,7 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
value: item['val'], value: item['val'],
); );
}).toList(), }).toList(),
)), )),
), ),
], ],
), ),
@ -530,30 +499,29 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Container( Container(
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.all( borderRadius: BorderRadius.all(
Radius.circular(6.0)), Radius.circular(6.0)),
border: Border.all( border: Border.all(
width: 1.0, width: 1.0,
color: Hexcolor("#CCCCCC")) color: Hexcolor("#CCCCCC"))),
), height: 25,
height: 25, width: 25,
width: 25, child: Checkbox(
child: Checkbox( value: true,
value: true, checkColor: Hexcolor("#2A930A"),
checkColor: Hexcolor("#2A930A"), activeColor: Colors.white,
activeColor: Colors.white, onChanged: (bool newValue) {}),
onChanged: (bool newValue) {}), ),
), SizedBox(
SizedBox(width: 12,), width: 12,
AppText( ),
TranslationBase AppText(
.of(context) TranslationBase.of(context)
.onlyArrivedPatient, .onlyArrivedPatient,
fontSize: SizeConfig.textMultiplier * fontSize: SizeConfig.textMultiplier * 2),
2), ])),
])),
SizedBox( SizedBox(
height: 10, height: 10,
), ),

532
lib/screens/patients/patients_screen.dart
Unescape Escape View File

@ -352,6 +352,7 @@ class _PatientsScreenState extends State<PatientsScreen> {
SizedBox(height: 10.0), SizedBox(height: 10.0),
Container( Container(
width: SizeConfig.screenWidth * 0.9, width: SizeConfig.screenWidth * 0.9,
height: SizeConfig.screenHeight * 0.05,
child: TextField( child: TextField(
controller: _controller, controller: _controller,
onChanged: (String str) { onChanged: (String str) {
@ -366,8 +367,11 @@ class _PatientsScreenState extends State<PatientsScreen> {
SizedBox( SizedBox(
height: 10.0, height: 10.0,
), ),
Divider(
thickness: 1,
color: Colors.grey,
),
Container( Container(
decoration: BoxDecoration( decoration: BoxDecoration(
color: Color(0Xffffffff), color: Color(0Xffffffff),
borderRadius: borderRadius:
@ -376,227 +380,318 @@ class _PatientsScreenState extends State<PatientsScreen> {
EdgeInsets.fromLTRB(15, 0, 15, 0), EdgeInsets.fromLTRB(15, 0, 15, 0),
child: (responseModelList.length > 0) child: (responseModelList.length > 0)
? Column( ? Column(
// mainAxisAlignment: MainAxisAlignment.center, // mainAxisAlignment: MainAxisAlignment.center,
children: responseModelList children: responseModelList.map(
.map((PatiantInformtion item) { (PatiantInformtion item) {
return Container( return Container(
decoration: myBoxDecoration(), decoration:
child: InkWell( myBoxDecoration(),
child: Row( child: InkWell(
children: <Widget>[ child: Row(
Column(
mainAxisAlignment:
MainAxisAlignment
.start,
children: <Widget>[
Container(
decoration:
BoxDecoration(
gradient: LinearGradient(
begin:
Alignment(
-1,
-1),
end:
Alignment(
1, 1),
colors: [
Colors.grey[
100],
Colors.grey[
200],
]),
boxShadow: [
BoxShadow(
color: Color
.fromRGBO(
0,
0,
0,
0.08),
offset:
Offset(
0.0,
5.0),
blurRadius:
16.0)
],
borderRadius: BorderRadius
.all(Radius
.circular(
50.0)),
),
width: 80,
height: 80,
child: Icon(
item
.genderDescription ==
"Male"
? DoctorApp
.male
: DoctorApp
.female_icon,
size: 80,
)),
],
),
SizedBox(
width: 10,
),
Expanded(
child: Column(
crossAxisAlignment:
CrossAxisAlignment
.start,
children: <Widget>[ children: <Widget>[
SizedBox( Column(
height: 15,
),
AppText(
item.firstName +
" " +
item.lastName,
fontSize: 2.0 *
SizeConfig
.textMultiplier,
fontWeight:
FontWeight.bold,
backGroundcolor:
Colors.white,
),
SizedBox(
height: 8,
),
AppText(
TranslationBase
.of(
context)
.fileNo +
item.patientId
.toString(),
fontSize: 2.0 *
SizeConfig
.textMultiplier,
fontWeight:
FontWeight.bold,
backGroundcolor:
Colors.white,
),
AppText(
TranslationBase
.of(
context)
.age +
item.age
.toString(),
fontSize: 2.0 *
SizeConfig
.textMultiplier,
fontWeight:
FontWeight.bold,
backGroundcolor:
Colors.white,
),
SizedBox(
height: 8,
),
SERVICES_PATIANT2[
int.parse(
patientType)] ==
"List_MyOutPatient"
? Row(
mainAxisAlignment: mainAxisAlignment:
MainAxisAlignment MainAxisAlignment
.spaceBetween, .start,
children: < children: <Widget>[
Widget>[
Container( Container(
height: decoration:
20, BoxDecoration(
width: 80, gradient: LinearGradient(
decoration: begin: Alignment(
BoxDecoration( -1,
borderRadius: -1),
BorderRadius end: Alignment(
.circular( 1,
50), 1),
color: Hexcolor( colors: [
"#20A169"), Colors
), .grey[100],
child: Colors
AppText( .grey[200],
item ]),
.startTime, boxShadow: [
color: Colors BoxShadow(
.white, color: Color.fromRGBO(
fontSize: 0,
2 * SizeConfig 0,
.textMultiplier, 0,
textAlign: 0.08),
TextAlign offset: Offset(
.center, 0.0,
fontWeight: 5.0),
FontWeight blurRadius:
.bold, 16.0)
), ],
), borderRadius:
SizedBox( BorderRadius.all(
width: 60, Radius.circular(50.0)),
), ),
Container( width: 70,
child: height: 70,
AppText( child: Icon(
convertDateFormat2( item.genderDescription ==
item "Male"
.appointmentDate ? DoctorApp
.toString()), .male
fontSize: : DoctorApp
2.0 * .female_icon,
SizeConfig size: 80,
.textMultiplier, )),
fontWeight:
FontWeight
.bold,
),
)
], ],
)
: AppText(
item
.nationalityName ??
item
.nationalityNameN,
fontSize: 2.5 *
SizeConfig
.textMultiplier,
), ),
SizedBox( SizedBox(
height: 15, width: 10,
),
Expanded(
child: Column(
children: [
Column(
children: [
Padding(
padding: EdgeInsets
.only(
top: 10.5),
child:
AppText(
item.firstName +
" " +
item.lastName,
fontSize:
2.0 *
SizeConfig.textMultiplier,
fontWeight:
FontWeight.bold,
backGroundcolor:
Colors.white,
textAlign:
TextAlign.left,
),
),
],
),
Row(
mainAxisAlignment:
MainAxisAlignment
.spaceEvenly,
children: [
Column(
crossAxisAlignment:
CrossAxisAlignment
.start,
children: <
Widget>[
SizedBox(
height:
15,
),
SizedBox(
height:
0,
),
SizedBox(
height:
3.5,
),
Wrap(
children: [
AppText(
TranslationBase.of(context).fileNo,
fontSize: 1.8 * SizeConfig.textMultiplier,
fontWeight: FontWeight.bold,
backGroundcolor: Colors.white,
),
AppText(
item.patientId.toString(),
fontSize: 1.8 * SizeConfig.textMultiplier,
fontWeight: FontWeight.w300,
backGroundcolor: Colors.white,
),
],
),
SizedBox(
height:
2.5,
),
AppText(
'NATIONALITY: ' +
item.nationalityName.toString(),
fontSize:
1.8 * SizeConfig.textMultiplier,
fontWeight:
FontWeight.bold,
backGroundcolor:
Colors.white,
),
SizedBox(
height:
8,
),
SERVICES_PATIANT2[int.parse(patientType)] ==
"List_MyOutPatient"
? Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: <Widget>[
Container(
height: 15,
width: 60,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(25),
color: Hexcolor("#20A169"),
),
child: AppText(
item.startTime,
color: Colors.white,
fontSize: 1.5 * SizeConfig.textMultiplier,
textAlign: TextAlign.center,
fontWeight: FontWeight.bold,
),
),
SizedBox(
width: 3.5,
),
Container(
child: AppText(
convertDateFormat2(item.appointmentDate.toString()),
fontSize: 1.5 * SizeConfig.textMultiplier,
fontWeight: FontWeight.bold,
),
),
SizedBox(
height: 25.5,
)
],
)
: SizedBox(
height: 15,
),
],
),
Column(
crossAxisAlignment:
CrossAxisAlignment
.start,
// mainAxisAlignment:
// MainAxisAlignment
// .spaceBetween,
children: <
Widget>[
SizedBox(
height:
20.5,
),
SizedBox(
height:
0,
),
Wrap(
children: [
AppText(
TranslationBase.of(context).age,
fontSize: 1.8 * SizeConfig.textMultiplier,
fontWeight: FontWeight.bold,
backGroundcolor: Colors.white,
),
AppText(
item.age.toString(),
fontSize: 1.8 * SizeConfig.textMultiplier,
fontWeight: FontWeight.w300,
backGroundcolor: Colors.white,
),
],
),
SizedBox(
height:
2.5,
),
Wrap(
children: [
AppText(
TranslationBase.of(context).gender,
fontSize: 1.8 * SizeConfig.textMultiplier,
fontWeight: FontWeight.bold,
backGroundcolor: Colors.white,
),
AppText(
item.gender.toString() == '1' ? 'Male' : 'Female',
fontSize: 1.8 * SizeConfig.textMultiplier,
fontWeight: FontWeight.w300,
backGroundcolor: Colors.white,
),
],
),
SizedBox(
height:
8,
),
SERVICES_PATIANT2[int.parse(patientType)] ==
"List_MyOutPatient"
? Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: <Widget>[
Container(
height: 15,
width: 60,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(25),
color: Hexcolor("#20A169"),
),
child: AppText(
item.startTime,
color: Colors.white,
fontSize: 1.5 * SizeConfig.textMultiplier,
textAlign: TextAlign.center,
fontWeight: FontWeight.bold,
),
),
SizedBox(
width: 3.5,
),
Container(
child: AppText(
convertDateFormat2(item.appointmentDate.toString()),
fontSize: 1.5 * SizeConfig.textMultiplier,
fontWeight: FontWeight.bold,
),
),
SizedBox(
height: 25.5,
),
],
)
: SizedBox(
height: 15,
),
],
),
],
),
],
),
), ),
// Divider(color: Colors.grey)
], ],
), ),
onTap: () {
Navigator.of(context)
.pushNamed(
PATIENTS_PROFILE,
arguments: {
"patient": item
});
},
), ),
// Divider(color: Colors.grey) );
], }).toList(),
), )
onTap: () {
Navigator.of(context)
.pushNamed(
PATIENTS_PROFILE,
arguments: {
"patient": item
});
},
),
);
}).toList(),
)
: Center( : Center(
child: DrAppEmbeddedError( child: DrAppEmbeddedError(
error: TranslationBase error: TranslationBase.of(
.of(context) context)
.youDontHaveAnyPatient), .youDontHaveAnyPatient),
), ),
), ),
], ],
), ),
@ -609,17 +704,17 @@ class _PatientsScreenState extends State<PatientsScreen> {
InputDecoration buildInputDecoration(BuildContext context, hint) { InputDecoration buildInputDecoration(BuildContext context, hint) {
return InputDecoration( return InputDecoration(
prefixIcon: Icon(Icons.search, color: Colors.red), prefixIcon: Icon(Icons.search, color: Colors.grey),
filled: true, filled: true,
fillColor: Colors.white, fillColor: Colors.white,
hintText: hint, hintText: hint,
hintStyle: TextStyle(fontSize: 2 * SizeConfig.textMultiplier), hintStyle: TextStyle(fontSize: 1.66 * SizeConfig.textMultiplier),
enabledBorder: OutlineInputBorder( enabledBorder: OutlineInputBorder(
borderRadius: BorderRadius.all(Radius.circular(20)), borderRadius: BorderRadius.all(Radius.circular(10.0)),
borderSide: BorderSide(color: Hexcolor('#CCCCCC')), borderSide: BorderSide(color: Hexcolor('#CCCCCC')),
), ),
focusedBorder: OutlineInputBorder( focusedBorder: OutlineInputBorder(
borderRadius: BorderRadius.all(Radius.circular(50.0)), borderRadius: BorderRadius.all(Radius.circular(10.0)),
borderSide: BorderSide(color: Colors.grey), //), borderSide: BorderSide(color: Colors.grey), //),
)); ));
} }
@ -627,10 +722,7 @@ class _PatientsScreenState extends State<PatientsScreen> {
Widget _locationBar(BuildContext _context) { Widget _locationBar(BuildContext _context) {
return Expanded( return Expanded(
child: Container( child: Container(
height: MediaQuery height: MediaQuery.of(context).size.height * 0.065,
.of(context)
.size
.height * 0.065,
width: SizeConfig.screenWidth * 0.95, width: SizeConfig.screenWidth * 0.95,
decoration: BoxDecoration( decoration: BoxDecoration(
color: Color(0Xffffffff), borderRadius: BorderRadius.circular(20)), color: Color(0Xffffffff), borderRadius: BorderRadius.circular(20)),
@ -647,7 +739,7 @@ class _PatientsScreenState extends State<PatientsScreen> {
height: 40, height: 40,
width: 90, width: 90,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(50), borderRadius: BorderRadius.circular(3.0),
color: _isActive ? Hexcolor("#B8382B") : Colors.white, color: _isActive ? Hexcolor("#B8382B") : Colors.white,
), ),
child: Center( child: Center(

8
pubspec.lock
Unescape Escape View File

@ -405,7 +405,7 @@ packages:
name: js name: js
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.6.1+1" version: "0.6.3-nullsafety.1"
json_annotation: json_annotation:
dependency: transitive dependency: transitive
description: description:
@ -447,7 +447,7 @@ packages:
name: meta name: meta
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.3.0-nullsafety.3" version: "1.3.0-nullsafety.4"
mime: mime:
dependency: transitive dependency: transitive
description: description:
@ -662,7 +662,7 @@ packages:
name: stack_trace name: stack_trace
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.10.0-nullsafety.1" version: "1.10.0-nullsafety.2"
stream_channel: stream_channel:
dependency: transitive dependency: transitive
description: description:
@ -769,5 +769,5 @@ packages:
source: hosted source: hosted
version: "2.2.1" version: "2.2.1"
sdks: sdks:
dart: ">=2.10.0-110 <2.11.0" dart: ">=2.10.0-110 <=2.11.0-213.1.beta"
flutter: ">=1.12.13+hotfix.5 <2.0.0" flutter: ">=1.12.13+hotfix.5 <2.0.0"

Write Preview
Loading…
Cancel
Save