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

match the design as xd

Browse Source
merge-requests/847/head
Elham Rababh 3 years ago
parent f05455fddf
commit 8a0e94c854
3 changed files with 67 additions and 34 deletions
Show Stats Download Patch File Download Diff File

4
lib/config/localized_values.dart
Unescape Escape View File

@ -243,7 +243,7 @@ const Map<String, Map<String, String>> localizedValues = {
},
"no-sickleve": {"en": "No sick leave available", "ar": "لا توجد إجازة مرضية"},
"applynow": {"en": "Apply Now", "ar": "التقدم بطلب الآن"},
"add-sickleave": {"en": "ADD SICK LEAVE", "ar": "أضف إجازة مرضية"},
"add-sickleave": {"en": "Add Sick Leave", "ar": "أضف إجازة مرضية"},
"add": {"en": "Add", "ar": "أضف"},
"approved": {"en": "Approved", "ar": "موافق"},
"extended": {"en": "Extended", "ar": "تمديد"},
@ -251,7 +251,7 @@ const Map<String, Map<String, String>> localizedValues = {
"leave-start-date": {"en": "Leave start date", "ar": "تاريخ بدء المغادرة"},
"days-sick-leave": {"en": "Leave Days: ", "ar": "أيام الإجازة "},
"extend": {"en": "Extend", "ar": "تمديد"},
"extend-sickleave": {"en": "EXTEND SICK LEAVE", "ar": "قم بتمديد الإجازة المرضية"},
"extend-sickleave": {"en": "Extend Sick Leave", "ar": "قم بتمديد الإجازة المرضية"},
"chiefComplaintLength": {
"en": "Chief Complaint length should be greater than 25",
"ar": "يجب أن يكون طول شكوى الرئيسية أكبر من 25"

51
lib/screens/sick-leave/add-sickleave.dart
Unescape Escape View File

@ -23,6 +23,7 @@ import 'package:doctor_app_flutter/widgets/shared/errors/error_message.dart';
import 'package:doctor_app_flutter/widgets/shared/rounded_container_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/user-guid/CusomRow.dart';
import 'package:doctor_app_flutter/widgets/transitions/fade_page.dart';
import 'package:doctor_app_flutter/widgets/transitions/slide_up_page.dart';
import 'package:flutter/material.dart';
import 'package:hexcolor/hexcolor.dart';
import 'package:provider/provider.dart';
@ -51,8 +52,7 @@ class AddSickLeavScreen extends StatelessWidget {
patient,
isInpatient: isInpatient,
),
body: Column(
children: [
body: Column(children: [
patient.patientStatusType == 43
? Column(
crossAxisAlignment: CrossAxisAlignment.start,
@ -153,14 +153,17 @@ class AddSickLeavScreen extends StatelessWidget {
),
),
]),
SizedBox(height: 10,),
SizedBox(
height: 10,
),
Row(
children: [
ClipRRect(
borderRadius:
BorderRadius.circular(50.0),
child: CachedNetworkImage(
imageUrl: item.doctorImageURL ??
imageUrl: item
.doctorImageURL ??
"https://hmgwebservices.com/Images/MobileImages/DUBAI/unkown.png",
height: 30,
width: 30,
@ -182,8 +185,12 @@ class AddSickLeavScreen extends StatelessWidget {
context)
.daysSickleave +
": ",
labelSize: SizeConfig.getTextMultiplierBasedOnWidth() * 3.3,
valueSize: SizeConfig.getTextMultiplierBasedOnWidth() * 4,
labelSize: SizeConfig
.getTextMultiplierBasedOnWidth() *
3.3,
valueSize: SizeConfig
.getTextMultiplierBasedOnWidth() *
4,
value: (item.sickLeaveDays
.toString() !=
null &&
@ -201,15 +208,20 @@ class AddSickLeavScreen extends StatelessWidget {
.startDate +
' ' ??
"",
labelSize: SizeConfig.getTextMultiplierBasedOnWidth() * 3.3,
valueSize: SizeConfig.getTextMultiplierBasedOnWidth() * 4,
labelSize: SizeConfig
.getTextMultiplierBasedOnWidth() *
3.3,
valueSize: SizeConfig
.getTextMultiplierBasedOnWidth() *
4,
value: AppDateUtils
.getDayMonthYearDateFormatted(
item.startDate
.contains("/Date(")
item.startDate.contains(
"/Date(")
? AppDateUtils
.convertStringToDate(
item.startDate)
item
.startDate)
: DateTime.parse(
item.startDate),
),
@ -220,12 +232,16 @@ class AddSickLeavScreen extends StatelessWidget {
.endDate +
' ' ??
"",
labelSize: SizeConfig.getTextMultiplierBasedOnWidth() * 3.3,
valueSize: SizeConfig.getTextMultiplierBasedOnWidth() * 4,
labelSize: SizeConfig
.getTextMultiplierBasedOnWidth() *
3.3,
valueSize: SizeConfig
.getTextMultiplierBasedOnWidth() *
4,
value: AppDateUtils
.getDayMonthYearDateFormatted(
item.startDate
.contains("/Date(")
item.startDate.contains(
"/Date(")
? AppDateUtils
.convertStringToDate(
item.endDate ??
@ -281,8 +297,9 @@ class AddSickLeavScreen extends StatelessWidget {
{GetAllSickLeaveResponse extendedData}) {
Navigator.push(
context,
FadePage(
page: SickLeaveScreen(
SlideUpPageRoute(
fullscreenDialog: true,
widget: SickLeaveScreen(
appointmentNo: isExtend == true
? extendedData.appointmentNo
: patient.appointmentNo,

36
lib/screens/sick-leave/sick_leave.dart
Unescape Escape View File

@ -4,11 +4,12 @@ import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:doctor_app_flutter/core/enum/viewstate.dart';
import 'package:doctor_app_flutter/core/viewModel/patient_view_model.dart';
import 'package:doctor_app_flutter/core/viewModel/sick_leave_view_model.dart';
import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart';
import 'package:doctor_app_flutter/models/sickleave/add_sickleave_request.dart';
import 'package:doctor_app_flutter/models/sickleave/get_all_sickleave_response.dart';
import 'package:doctor_app_flutter/routes.dart';
import 'package:doctor_app_flutter/screens/base/base_view.dart';
import 'package:doctor_app_flutter/screens/sick-leave/add-sickleave.dart';
import 'package:doctor_app_flutter/screens/patients/profile/soap_update/shared_soap_widgets/bottom_sheet_title.dart';
import 'package:doctor_app_flutter/util/dr_app_shared_pref.dart';
import 'package:doctor_app_flutter/util/dr_app_toast_msg.dart';
import 'package:doctor_app_flutter/util/helpers.dart';
@ -18,7 +19,6 @@ import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/loader/gif_loader_dialog_utils.dart';
import 'package:doctor_app_flutter/widgets/shared/text_fields/app-textfield-custom.dart';
import 'package:doctor_app_flutter/widgets/shared/text_fields/app_text_form_field.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
@ -101,9 +101,9 @@ class _SickLeaveScreenState extends State<SickLeaveScreen> {
},
child: AppScaffold(
baseViewModel: model2,
appBarTitle: widget.isExtended == true
appBar: BottomSheetTitle(title: widget.isExtended == true
? TranslationBase.of(context).extendSickLeave
: TranslationBase.of(context).addSickLeave,
: TranslationBase.of(context).addSickLeave,),
isShowAppBar: true,
body: Center(
child: Container(
@ -190,7 +190,7 @@ class _SickLeaveScreenState extends State<SickLeaveScreen> {
AppTextFieldCustom(
height: Helpers.getTextFieldHeight(),
hintText:
TranslationBase.of(context).clinicName,
TranslationBase.of(context).clinic,
enabled: false,
maxLines: 1,
minLines: 1,
@ -209,12 +209,29 @@ class _SickLeaveScreenState extends State<SickLeaveScreen> {
model2.sickLeaveStatistics[
'recommendedSickLeaveDays'] !=
null
? AppText(
? Row(
crossAxisAlignment:
CrossAxisAlignment.center,
children: [
SizedBox(
width: 10,
),
Icon(
DoctorApp.warning,
size: 20,
color: IN_PROGRESS_COLOR,
),
SizedBox(
width: 10,
),
AppText(
model2.sickLeaveStatistics[
'recommendedSickLeaveDays'],
fontWeight: FontWeight.bold,
textAlign: TextAlign.start,
fontSize: 15,
fontSize: 12,
color: IN_PROGRESS_COLOR,
),
],
)
: SizedBox(
height: 10,
@ -225,7 +242,7 @@ class _SickLeaveScreenState extends State<SickLeaveScreen> {
AppTextFieldCustom(
height: Helpers.getTextFieldHeight(),
hintText:
TranslationBase.of(context).doctorName,
TranslationBase.of(context).doctor,
enabled: false,
maxLines: 1,
minLines: 1,
@ -316,7 +333,6 @@ class _SickLeaveScreenState extends State<SickLeaveScreen> {
submitForm(SickLeaveViewModel model2) async {
{
if (widget.isExtended) {
GifLoaderDialogUtils.showMyDialog(context);
await model2.extendSickLeave(widget.extendedData);
if (model2.state == ViewState.ErrorLocal) {

Write Preview
Loading…
Cancel
Save