fix last issue

merge-requests/847/head
Elham Rababh 5 years ago
parent 9a5eff8c8b
commit 87b70ff905

@ -55,7 +55,7 @@ class _AddPatientSickLeaveScreenState extends State<AddPatientSickLeaveScreen> {
AddSickLeaveRequest addSickLeave = AddSickLeaveRequest(); AddSickLeaveRequest addSickLeave = AddSickLeaveRequest();
bool isFormSubmitted = false; bool isFormSubmitted = false;
FocusNode focusNode;
void _presentDatePicker() { void _presentDatePicker() {
showDatePicker( showDatePicker(
context: context, context: context,
@ -76,6 +76,7 @@ class _AddPatientSickLeaveScreenState extends State<AddPatientSickLeaveScreen> {
@override @override
void initState() { void initState() {
focusNode = new FocusNode();
super.initState(); super.initState();
} }
@ -143,6 +144,7 @@ class _AddPatientSickLeaveScreenState extends State<AddPatientSickLeaveScreen> {
AppTextFieldCustom( AppTextFieldCustom(
height: Helpers.getTextFieldHeight(), height: Helpers.getTextFieldHeight(),
onClick: () { onClick: () {
Helpers.hideKeyboard(context);
_presentDatePicker(); _presentDatePicker();
}, },
hintText: TranslationBase.of(context) hintText: TranslationBase.of(context)
@ -208,11 +210,13 @@ class _AddPatientSickLeaveScreenState extends State<AddPatientSickLeaveScreen> {
SizedBox( SizedBox(
width: 10, width: 10,
), ),
AppText( Expanded(
model.sickLeaveStatistics.recommendedSickLeaveDays, child: AppText(
textAlign: TextAlign.start, model.sickLeaveStatistics.recommendedSickLeaveDays,
fontSize: 12, textAlign: TextAlign.start,
color: IN_PROGRESS_COLOR, fontSize: 12,
color: IN_PROGRESS_COLOR,
),
), ),
], ],
) )

@ -100,173 +100,171 @@ class PatientSickLeaveScreen extends StatelessWidget {
? Expanded( ? Expanded(
child: FractionallySizedBox( child: FractionallySizedBox(
widthFactor: 0.95, widthFactor: 0.95,
child: Expanded( child: ListView.builder(
child: ListView.builder( scrollDirection: Axis.vertical,
scrollDirection: Axis.vertical, shrinkWrap: true,
shrinkWrap: true, itemCount: model.getAllSIckLeavePatient.length,
itemCount: model.getAllSIckLeavePatient.length, itemBuilder: (BuildContext ctxt, int index) {
itemBuilder: (BuildContext ctxt, int index) { SickLeavePatientModel item =
SickLeavePatientModel item = model.getAllSIckLeavePatient[index];
model.getAllSIckLeavePatient[index]; return Column(
return Column( children: [
children: [ CardWithBgWidget(
CardWithBgWidget( padding: 0,
padding: 0, marginLeft: 10,
marginLeft: 10, marginSymmetric: 10,
marginSymmetric: 10, hasBorder: false,
hasBorder: false, bgColor: Colors.black,
bgColor: Colors.black, widget: Container(
widget: Container( color: Colors.white,
color: Colors.white, padding: EdgeInsets.all(20),
padding: EdgeInsets.all(20), child: InkWell(
child: InkWell( child: Column(
child: Column( children: [
children: [ Row(
Row( crossAxisAlignment:
crossAxisAlignment: CrossAxisAlignment.start,
CrossAxisAlignment.start, mainAxisAlignment:
mainAxisAlignment: MainAxisAlignment.start,
MainAxisAlignment.start,
children: [
Expanded(
// width: MediaQuery.of(context).size.width*0.51,
child: AppText(
Helpers.capitalize(
item.doctorName ?? ""),
fontSize: 18,
color: Color(0xff2e303a),
fontWeight: FontWeight.w700,
fontFamily: 'Poppins',
textOverflow:
TextOverflow.ellipsis,
),
),
]),
SizedBox(
height: 10,
),
Row(
children: [ children: [
ClipRRect( Expanded(
borderRadius: // width: MediaQuery.of(context).size.width*0.51,
BorderRadius.circular(50.0), child: AppText(
child: CachedNetworkImage( Helpers.capitalize(
imageUrl: item item.doctorName ?? ""),
.doctorImageURL ?? fontSize: 18,
"https://hmgwebservices.com/Images/MobileImages/DUBAI/unkown.png", color: Color(0xff2e303a),
height: 30, fontWeight: FontWeight.w700,
width: 30, fontFamily: 'Poppins',
errorWidget: textOverflow:
(context, url, error) => TextOverflow.ellipsis,
AppText(
'No Image',
fontSize: 10,
),
), ),
), ),
SizedBox( ]),
width: 10, SizedBox(
height: 10,
),
Row(
children: [
ClipRRect(
borderRadius:
BorderRadius.circular(50.0),
child: CachedNetworkImage(
imageUrl: item
.doctorImageURL ??
"https://hmgwebservices.com/Images/MobileImages/DUBAI/unkown.png",
height: 30,
width: 30,
errorWidget:
(context, url, error) =>
AppText(
'No Image',
fontSize: 10,
),
), ),
Column( ),
children: [ SizedBox(
CustomRow( width: 10,
label: TranslationBase.of( ),
context) Column(
.daysSickleave + children: [
": ", CustomRow(
labelSize: SizeConfig label: TranslationBase.of(
.getTextMultiplierBasedOnWidth() * context)
3.3, .daysSickleave +
valueSize: SizeConfig ": ",
.getTextMultiplierBasedOnWidth() * labelSize: SizeConfig
4, .getTextMultiplierBasedOnWidth() *
value: (item.sickLeaveDays 3.3,
.toString() != valueSize: SizeConfig
null && .getTextMultiplierBasedOnWidth() *
item.sickLeaveDays 4,
.toString() != value: (item.sickLeaveDays
"null") .toString() !=
? item.sickLeaveDays null &&
.toString() item.sickLeaveDays
: item.noOfDays .toString() !=
.toString(), "null")
), ? item.sickLeaveDays
CustomRow( .toString()
label: TranslationBase.of( : item.noOfDays
context) .toString(),
.startDate + ),
' ' ?? CustomRow(
"", label: TranslationBase.of(
labelSize: SizeConfig context)
.getTextMultiplierBasedOnWidth() * .startDate +
3.3, ' ' ??
valueSize: SizeConfig "",
.getTextMultiplierBasedOnWidth() * labelSize: SizeConfig
4, .getTextMultiplierBasedOnWidth() *
value: AppDateUtils 3.3,
.getDayMonthYearDateFormatted( valueSize: SizeConfig
item.startDate.contains( .getTextMultiplierBasedOnWidth() *
"/Date(") 4,
? AppDateUtils value: AppDateUtils
.convertStringToDate( .getDayMonthYearDateFormatted(
item item.startDate.contains(
.startDate) "/Date(")
: DateTime.parse( ? AppDateUtils
item.startDate), .convertStringToDate(
), item
.startDate)
: DateTime.parse(
item.startDate),
), ),
CustomRow( ),
label: TranslationBase.of( CustomRow(
context) label: TranslationBase.of(
.endDate + context)
' ' ?? .endDate +
"", ' ' ??
labelSize: SizeConfig "",
.getTextMultiplierBasedOnWidth() * labelSize: SizeConfig
3.3, .getTextMultiplierBasedOnWidth() *
valueSize: SizeConfig 3.3,
.getTextMultiplierBasedOnWidth() * valueSize: SizeConfig
4, .getTextMultiplierBasedOnWidth() *
value: AppDateUtils 4,
.getDayMonthYearDateFormatted( value: AppDateUtils
item.startDate.contains( .getDayMonthYearDateFormatted(
"/Date(") item.startDate.contains(
? AppDateUtils "/Date(")
.convertStringToDate( ? AppDateUtils
item.endDate ?? .convertStringToDate(
"") item.endDate ??
.add( "")
Duration( .add(
days: item Duration(
.noOfDays ?? days: item
item.sickLeaveDays), .noOfDays ??
) item.sickLeaveDays),
: DateTime.parse( )
item.startDate ?? : DateTime.parse(
"") item.startDate ??
.add( "")
Duration( .add(
days: Duration(
item.noOfDays ?? days:
""), item.noOfDays ??
), ""),
), ),
), ),
], ),
crossAxisAlignment: ],
CrossAxisAlignment.start, crossAxisAlignment:
), CrossAxisAlignment.start,
], ),
), ],
], ),
), ],
), ),
), ),
), ),
], ),
); ],
}), );
), }),
), ),
) )
: patient.patientStatusType != 43 : patient.patientStatusType != 43

Loading…
Cancel
Save