Haroon6138
/
PatientApp-KKUMC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes

Browse Source
dq_and_master
Haroon Amjad 4 years ago
parent 965c97d262
commit 3308aa47e1
9 changed files with 78 additions and 37 deletions
Show Stats Download Patch File Download Diff File

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

@ -1162,6 +1162,10 @@ const Map localizedValues = {
"en": "Please rate the clinic",
"ar": "يرجى تقييم العيادة"
},
"rate": {
"en": "Rate",
"ar": "تقييم"
},
"fetch-data": {
"en": "Fetch Data",
"ar": "تحديث الان"
@ -1173,5 +1177,25 @@ const Map localizedValues = {
"update-email": {
"en": "Update Email",
"ar": "تحديث البريد الالكتروني"
}
},
"booked-success": {
"en": "The appointment has been successfully booked.",
"ar": "لقد تم حجز الموعد بنجاح"
},
"appo-reminder-select-option-30": {
"en": "Before 30 Mins",
"ar": "قبل 30 دقيقة"
},
"appo-reminder-select-option-60": {
"en": "Before 1 Hour",
"ar": "قبل ساعة واحدة"
},
"appo-reminder-select-option-90": {
"en": "Before 1 Hour and 30 mins",
"ar": "قبل ساعة و 30 دقيقة"
},
"appo-reminder-select-option-120": {
"en": "Before 2 Hours",
"ar": "قبل ساعتين"
},
};

2
lib/pages/BookAppointment/BookConfirm.dart
Unescape Escape View File

@ -423,7 +423,7 @@ class _BookConfirmState extends State<BookConfirm> {
context)
.then((res) {
if (res['MessageStatus'] == 1) {
AppToast.showSuccessToast(message: "Appointment Booked Successfully");
AppToast.showSuccessToast(message: TranslationBase.of(context).bookedSuccess);
print(res['AppointmentNo']);
Future.delayed(new Duration(milliseconds: 500), () {

2
lib/pages/BookAppointment/components/DocAvailableAppointments.dart
Unescape Escape View File

@ -178,7 +178,7 @@ class _DocAvailableAppointmentsState extends State<DocAvailableAppointments>
holidayStyle: TextStyle().copyWith(color: Colors.blue[800]),
),
daysOfWeekStyle: DaysOfWeekStyle(
weekendStyle: TextStyle().copyWith(color: Colors.blue[600]),
weekendStyle: TextStyle().copyWith(color: Colors.black),
),
headerStyle: HeaderStyle(
centerHeaderTitle: true,

5
lib/pages/MyAppointments/AppointmentDetails.dart
Unescape Escape View File

@ -37,13 +37,16 @@ class _AppointmentDetailsState extends State<AppointmentDetails>
@override
void initState() {
_tabController = new TabController(length: 2, vsync: this);
AppointmentDetails.showFooterButton = false;
super.initState();
}
@override
void dispose() {
super.dispose();
_tabController.dispose();
AppointmentDetails.showFooterButton = false;
}
@override
@ -162,7 +165,7 @@ class _AppointmentDetailsState extends State<AppointmentDetails>
),
Container(
alignment: Alignment.center,
child: Text(widget.appo.startTime),
child: Text(widget.appo.startTime.substring(0, 5)),
),
Container(
margin: EdgeInsets.only(top: 10.0),

21
lib/pages/MyAppointments/widgets/custom_radio.dart
Unescape Escape View File

@ -1,6 +1,7 @@
import 'package:diplomaticquarterapp/pages/MyAppointments/models/AskDocRequestTypeModel.dart';
import 'package:diplomaticquarterapp/pages/MyAppointments/widgets/askDocDialog.dart';
import 'package:diplomaticquarterapp/pages/MyAppointments/widgets/reminder_dialog.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:flutter/material.dart';
class CustomRadio extends StatefulWidget {
@ -21,17 +22,23 @@ class CustomRadioState extends State<CustomRadio> {
void initState() {
super.initState();
WidgetsBinding.instance.addPostFrameCallback((_) {
if (widget.requestData != null) {
widget.requestData.forEach((element) {
sampleData.add(
new RadioModel(false, element.description, element.parameterCode));
sampleData.add(new RadioModel(
false, element.description, element.parameterCode));
});
} else {
sampleData.add(new RadioModel(false, "Before 30 Mins", 30));
sampleData.add(new RadioModel(false, 'Before 1 Hour', 60));
sampleData.add(new RadioModel(false, 'Before 2 Hours', 120));
sampleData.add(new RadioModel(false, 'Before 4 Hours', 240));
sampleData.add(new RadioModel(
false, TranslationBase.of(context).appoReminder30, 30));
sampleData.add(new RadioModel(
false, TranslationBase.of(context).appoReminder60, 60));
sampleData.add(new RadioModel(
false, TranslationBase.of(context).appoReminder90, 90));
sampleData.add(new RadioModel(
false, TranslationBase.of(context).appoReminder120, 120));
}
});
}
@override
@ -96,7 +103,7 @@ class RadioItem extends StatelessWidget {
),
),
new Container(
margin: new EdgeInsets.only(left: 15.0),
margin: new EdgeInsets.only(left: 15.0, right: 15.0),
child: new Text(_item.text, style: TextStyle(fontSize: 16.0)),
),
],

15
lib/pages/MyAppointments/widgets/reminder_dialog.dart
Unescape Escape View File

@ -27,19 +27,18 @@ class _ReminderDialogState extends State<ReminderDialog> {
shape:
RoundedRectangleBorder(borderRadius: BorderRadius.circular(12.0)),
child: Container(
height: MediaQuery.of(context).size.height * 0.57,
// height: MediaQuery.of(context).size.height * 0.57,
width: 450.0,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.max,
mainAxisSize: MainAxisSize.min,
children: <Widget>[
Container(
margin: EdgeInsets.all(20.0),
child: Text(TranslationBase.of(context).setReminder,
style: TextStyle(
fontSize: 20.0,
fontWeight: FontWeight.bold,
fontFamily: "Open-Sans-Bold")),
fontWeight: FontWeight.bold)),
),
Container(
transform: Matrix4.translationValues(0.0, -30.0, 0.0),
@ -61,13 +60,12 @@ class _ReminderDialogState extends State<ReminderDialog> {
child: Text(TranslationBase.of(context).confirm,
style: TextStyle(
color: Colors.white,
fontWeight: FontWeight.bold,
fontFamily: 'Open-Sans-Bold')),
fontWeight: FontWeight.bold)),
),
),
Container(
width: MediaQuery.of(context).size.width,
margin: EdgeInsets.only(left: 100.0, top: 20.0, right: 100.0),
margin: EdgeInsets.only(left: 100.0, top: 20.0, right: 100.0, bottom: 20.0),
child: OutlineButton(
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(10.0)),
@ -81,8 +79,7 @@ class _ReminderDialogState extends State<ReminderDialog> {
child: Text(TranslationBase.of(context).cancel_nocaps,
style: TextStyle(
color: Colors.red,
fontWeight: FontWeight.bold,
fontFamily: 'Open-Sans-Bold')),
fontWeight: FontWeight.bold)),
),
),
]),

14
lib/pages/ToDoList/ToDo.dart
Unescape Escape View File

@ -1,6 +1,7 @@
import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
import 'package:diplomaticquarterapp/core/model/ImagesInfo.dart';
import 'package:diplomaticquarterapp/core/service/AuthenticatedUserObject.dart';
import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
import 'package:diplomaticquarterapp/locator.dart';
import 'package:diplomaticquarterapp/models/Appointments/AppoimentAllHistoryResultList.dart';
import 'package:diplomaticquarterapp/models/Appointments/PatientShareResposne.dart';
@ -69,6 +70,7 @@ class _ToDoState extends State<ToDo> {
@override
Widget build(BuildContext context) {
toDoProvider = Provider.of<ToDoCountProviderModel>(context);
ProjectViewModel projectViewModel = Provider.of(context);
return AppScaffold(
appBarTitle: TranslationBase.of(context).todoList,
imagesInfo: imagesInfo,
@ -109,11 +111,15 @@ class _ToDoState extends State<ToDo> {
height: 20.0),
Container(
margin:
EdgeInsets.only(left: 5.0, right: 20.0),
EdgeInsets.only(left: 10.0, right: 10.0),
child: Text(
getDate(widget
DateUtil.getWeekDayMonthDayYearDateFormatted(
DateUtil.convertStringToDate(widget
.appoList[index].appointmentDate),
style: TextStyle(fontSize: 11.0)),
projectViewModel.isArabic
? "ar"
: "en") + " " + widget.appoList[index].startTime.substring(0, 5),
style: TextStyle(fontSize: 10.0)),
),
widget.appoList[index].isLiveCareAppointment
? SvgPicture.asset(
@ -141,7 +147,7 @@ class _ToDoState extends State<ToDo> {
: "-",
overflow: TextOverflow.clip,
maxLines: 2,
style: TextStyle(fontSize: 11.0)),
style: TextStyle(fontSize: 10.0)),
),
],
),

4
lib/pages/rateAppointment/rate_appointment_doctor.dart
Unescape Escape View File

@ -40,7 +40,7 @@ class _RateAppointmentDoctorState extends State<RateAppointmentDoctor> {
headline6:
TextStyle(color: Colors.white, fontWeight: FontWeight.bold),
),
title: Text('Rate'),
title: Text(TranslationBase.of(context).rate),
leading: Builder(
builder: (BuildContext context) {
return IconButton(
@ -94,7 +94,7 @@ class _RateAppointmentDoctorState extends State<RateAppointmentDoctor> {
height: 22,
),
Texts(
model.appointmentDetails.doctorName,
TranslationBase.of(context).dr + " " + model.appointmentDetails.doctorName,
bold: true,
),
SizedBox(

14
lib/uitl/translations_delegate_base.dart
Unescape Escape View File

@ -1009,20 +1009,24 @@ class TranslationBase {
String get selectHospitalDec => localizedValues['select-hospital'][locale.languageCode];
String get start => localizedValues['start'][locale.languageCode];
String get infoChat => localizedValues['info-chat'][locale.languageCode];
String get noRecords => localizedValues['empty'][locale.languageCode];
String get lastVisit => localizedValues['last-visit'][locale.languageCode];
String get tapTitle => localizedValues['tap-title'][locale.languageCode];
String get later => localizedValues['later'][locale.languageCode];
String get lastAppointment => localizedValues['last-appointment'][locale.languageCode];
String get rateClinic => localizedValues['rate-clinic'][locale.languageCode];
String get fetchData => localizedValues['fetch-data'][locale.languageCode];
String get sendConfEmail => localizedValues['send-email'][locale.languageCode];
String get updateEmail => localizedValues['update-email'][locale.languageCode];
String get rate => localizedValues['rate'][locale.languageCode];
String get bookedSuccess => localizedValues['booked-success'][locale.languageCode];
String get appoReminder30 => localizedValues['appo-reminder-select-option-30'][locale.languageCode];
String get appoReminder60 => localizedValues['appo-reminder-select-option-60'][locale.languageCode];
String get appoReminder90 => localizedValues['appo-reminder-select-option-90'][locale.languageCode];
String get appoReminder120 => localizedValues['appo-reminder-select-option-120'][locale.languageCode];
}
class TranslationBaseDelegate extends LocalizationsDelegate<TranslationBase> {

Write Preview
Loading…
Cancel
Save