merge-requests/390/head
Sikander Saleem 3 years ago
parent acd3855c77
commit 970887b0c5

@ -127,11 +127,14 @@ const INSERT_ER_INERT_PRES_ORDER =
/// ER RRT
const GET_ALL_RC_TRANSPORTATION = 'rc/api/Transportation/getalltransportation';
const GET_ALL_TRANSPORTATIONS_RC = 'rc/api/Transportation/getalltransportation';
const GET_ALL_RRT_QUESTIONS =
'Services/Patients.svc/REST/PatientER_RRT_GetAllQuestions';
const GET_RRT_SERVICE_PRICE =
'Services/Patients.svc/REST/PatientE_RealRRT_GetServicePrice';
const INSERT_TRANSPORTATION_ORDER_RC = "rc/api/Transportation/add";
///FindUs
const GET_FINDUS_REQUEST = 'Services/Lists.svc/REST/Get_HMG_Locations';

@ -85,7 +85,7 @@ class DoctorView extends StatelessWidget {
children: <Widget>[
RatingBar.readOnly(
initialRating: this.doctor.actualDoctorRate.toDouble(),
size: 15.0,
size: 16.0,
filledColor: Color(0XFFD02127),
emptyColor: Color(0XFFD02127),
isHalfAllowed: true,

@ -359,7 +359,8 @@ class _MyAppointmentsState extends State<MyAppointments> with SingleTickerProvid
isLiveCareAppointment: _appointmentResult.isLiveCareAppointment,
date: DateUtil.convertStringToDate(_appointmentResult.appointmentDate),
isSortByClinic: _isSortByClinic,
appoTime: _appointmentResult.startTime.substring(0, 5),
rating: _appointmentResult.actualDoctorRate + 0.0,
appointmentTime: _appointmentResult.startTime.substring(0, 5),
//projectViewModel.isArabic ? DateUtil.getMonthDayYearDateFormattedAr(labOrder.orderDate) : DateUtil.getMonthDayYearDateFormatted(labOrder.orderDate),
);
},

@ -45,22 +45,23 @@ class _WelcomeLogin extends State<WelcomeLogin> {
alignment: Alignment.centerLeft,
child: SvgPicture.asset(
"assets/images/new/hmg_icon.svg",
height: 35,
width: 35,
height: 62,
width: 62,
),
),
SizedBox(height: 16),
SizedBox(height: 24),
Text(
TranslationBase.of(context).welcome,
style: TextStyle(fontSize: 24, fontWeight: FontWeight.w700, color: Color(0xff2B353E), letterSpacing: -1.44, height: 23 / 24),
),
SizedBox(height: 16),
Text(
TranslationBase.of(context).welcomeText,
style: TextStyle(fontSize: 14, fontWeight: FontWeight.w600, color: Color(0xff2B353E), letterSpacing: -0.56, height: 21 / 14),
style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, color: Color(0xff2B353E), letterSpacing: -0.64, height: 23 / 16),
),
Text(
TranslationBase.of(context).welcomeText2,
style: TextStyle(fontSize: 14, fontWeight: FontWeight.w600, color: Color(0xff2B353E), letterSpacing: -0.56, height: 21 / 14),
style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, color: Color(0xff2B353E), letterSpacing: -0.64, height: 23 / 16),
),
SizedBox(
height: 14,

@ -24,7 +24,7 @@ class _MyAdmissionsPageState extends State<MyAdmissionsPage> {
date:DateTime.now(),// 'Feb 14, 2020',
profileUrl:
'https://scontent.famm4-1.fna.fbcdn.net/v/t31.0-8/30425660_1862582094040824_7851633779570222226_o.jpg?_nc_cat=101&_nc_sid=09cbfe&_nc_eui2=AeF3TI6D2_tFS5QoQsqyaCKd2zBfzh74hOzbMF_OHviE7PQdLHRwmBoIOiKyWmK9MskOshPjkU73a5EdQMA3dqnV&_nc_ohc=1feou2fDCuIAX_Ra9qB&_nc_ht=scontent.famm4-1.fna&oh=709d34d1c284de1d0aa08ed37b0ac09a&oe=5F3C5ACB',
rat: 3.8,
rating: 3.8,
subName: 'Jammal',
),
DoctorCard(
@ -32,7 +32,7 @@ class _MyAdmissionsPageState extends State<MyAdmissionsPage> {
date: DateTime.now(),//'Feb 14, 2020',
profileUrl:
'https://scontent.famm4-1.fna.fbcdn.net/v/t31.0-8/30425660_1862582094040824_7851633779570222226_o.jpg?_nc_cat=101&_nc_sid=09cbfe&_nc_eui2=AeF3TI6D2_tFS5QoQsqyaCKd2zBfzh74hOzbMF_OHviE7PQdLHRwmBoIOiKyWmK9MskOshPjkU73a5EdQMA3dqnV&_nc_ohc=1feou2fDCuIAX_Ra9qB&_nc_ht=scontent.famm4-1.fna&oh=709d34d1c284de1d0aa08ed37b0ac09a&oe=5F3C5ACB',
rat: 3.8,
rating: 3.8,
subName: 'Jammal',
),
],
@ -49,7 +49,7 @@ class _MyAdmissionsPageState extends State<MyAdmissionsPage> {
date: DateTime.now(),//'Feb 14, 2020',
profileUrl:
'https://scontent.famm4-1.fna.fbcdn.net/v/t31.0-8/30425660_1862582094040824_7851633779570222226_o.jpg?_nc_cat=101&_nc_sid=09cbfe&_nc_eui2=AeF3TI6D2_tFS5QoQsqyaCKd2zBfzh74hOzbMF_OHviE7PQdLHRwmBoIOiKyWmK9MskOshPjkU73a5EdQMA3dqnV&_nc_ohc=1feou2fDCuIAX_Ra9qB&_nc_ht=scontent.famm4-1.fna&oh=709d34d1c284de1d0aa08ed37b0ac09a&oe=5F3C5ACB',
rat: 4.8,
rating: 4.8,
subName: 'Jammal',
),
),

@ -48,7 +48,7 @@ class _PatientSickLeavePageState extends State<PatientSickLeavePage> {
name: model.sickLeaveList[index].doctorName,
date: model.sickLeaveList[index].appointmentDate,
profileUrl: model.sickLeaveList[index].doctorImageURL,
rat: model.sickLeaveList[index].actualDoctorRate.toDouble(),
rating: model.sickLeaveList[index].actualDoctorRate.toDouble(),
subName: model.sickLeaveList[index].projectName,
isInOutPatient: model.sickLeaveList[index].isInOutPatient,
onEmailTap: () {

@ -70,7 +70,7 @@ class PrescriptionsPage extends StatelessWidget {
),
name: prescriptions.doctorName,
profileUrl: prescriptions.doctorImageURL,
rat: prescriptions.actualDoctorRate.toDouble(),
rating: prescriptions.actualDoctorRate.toDouble(),
subName: prescriptions.name,
isInOutPatient: prescriptions.isInOutPatient,
isLiveCareAppointment: prescriptions.isLiveCareAppointment,

@ -9,11 +9,12 @@ import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:diplomaticquarterapp/extensions/string_extensions.dart';
import 'package:provider/provider.dart';
import 'package:rating_bar/rating_bar.dart';
class DoctorCard extends StatelessWidget {
final String name;
final String subName;
final double rat;
final double rating;
final DateTime date;
final String profileUrl;
final String billNo;
@ -22,10 +23,23 @@ class DoctorCard extends StatelessWidget {
final bool isInOutPatient;
final bool isLiveCareAppointment;
final bool isSortByClinic;
final String appoTime;
final String appointmentTime;
final bool isParentAppointment;
DoctorCard(
{this.name, this.subName, this.rat, this.date, this.profileUrl, this.isSortByClinic = true, this.billNo, this.onTap, this.onEmailTap, this.isInOutPatient, this.isLiveCareAppointment = false, this.appoTime});
{this.name,
this.subName,
this.rating,
this.date,
this.profileUrl,
this.isSortByClinic = true,
this.billNo,
this.onTap,
this.onEmailTap,
this.isInOutPatient,
this.isLiveCareAppointment = false,
this.appointmentTime,
this.isParentAppointment = false});
@override
Widget build(BuildContext context) {
@ -108,7 +122,7 @@ class DoctorCard extends StatelessWidget {
),
Text(
// DateUtil.formatDateToTime(date),
appoTime,
appointmentTime,
style: TextStyle(fontSize: 14, fontWeight: FontWeight.w600, color: Color(0xff575757), letterSpacing: -0.48, height: 18 / 12),
),
],
@ -132,8 +146,24 @@ class DoctorCard extends StatelessWidget {
mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[
myRichText(isSortByClinic ? TranslationBase.of(context).hospital : TranslationBase.of(context).clinic + ":", subName),
myRichText(TranslationBase.of(context).invoiceNo, billNo ?? ""),
//if (rat != null) StarRating(totalAverage: rat, forceStars: true),
if (rating == null) myRichText(TranslationBase.of(context).invoiceNo, billNo ?? ""),
if (rating != null)
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
mainAxisSize: MainAxisSize.max,
children: <Widget>[
RatingBar.readOnly(
initialRating: rating,
size: 16.0,
filledColor: Color(0XFFD02127),
emptyColor: Color(0XFFD02127),
isHalfAllowed: true,
halfFilledIcon: Icons.star_half,
filledIcon: Icons.star,
emptyIcon: Icons.star_border,
),
],
),
],
),
),

@ -83,7 +83,7 @@ class _AppExpandableNotifier extends State<AppExpandableNotifier> {
if (_mainTitle.isNotEmpty)
Text(
_mainTitle,
style: TextStyle(fontSize: 20, fontWeight: FontWeight.w600, color: Color(0xff2E303A), letterSpacing: -0.72, height: 23 / 12),
style: TextStyle(fontSize: 20, fontWeight: FontWeight.w600, color: Color(0xff2E303A), letterSpacing: -0.72, height: 1),
),
// Text(
// _subTitle,

Loading…
Cancel
Save