Feedback status implemented

pull/188/head
haroon amjad 2 months ago
parent e1788f1187
commit 4b710523e8

@ -0,0 +1,4 @@
<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect width="40" height="40" rx="8" fill="#EFEFF0"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M25.312 9.93059C23.9686 9.74998 22.2479 9.74999 20.0572 9.75H19.9428C17.7521 9.74999 16.0314 9.74998 14.688 9.93059C13.3114 10.1157 12.2191 10.5027 11.3609 11.3609C10.5027 12.2191 10.1157 13.3114 9.93059 14.688C9.74998 16.0314 9.74999 17.7521 9.75 19.9428V20.0572C9.74999 22.2479 9.74998 23.9686 9.93059 25.312C10.1157 26.6886 10.5027 27.7809 11.3609 28.6391C12.2191 29.4973 13.3114 29.8843 14.688 30.0694C16.0314 30.25 17.7521 30.25 19.9428 30.25H19.9428H20.0572H20.0572C22.2479 30.25 23.9686 30.25 25.312 30.0694C26.6886 29.8843 27.7809 29.4973 28.6391 28.6391C29.4973 27.7809 29.8843 26.6886 30.0694 25.312C30.25 23.9686 30.25 22.2479 30.25 20.0572V20.0572V19.9428V19.9428C30.25 17.7521 30.25 16.0314 30.0694 14.688C29.8843 13.3114 29.4973 12.2191 28.6391 11.3609C27.7809 10.5027 26.6886 10.1157 25.312 9.93059ZM20.75 16C20.75 15.5858 20.4142 15.25 20 15.25C19.5858 15.25 19.25 15.5858 19.25 16L19.25 24C19.25 24.4142 19.5858 24.75 20 24.75C20.4142 24.75 20.75 24.4142 20.75 24L20.75 16ZM17.75 18C17.75 17.5858 17.4142 17.25 17 17.25C16.5858 17.25 16.25 17.5858 16.25 18L16.25 22C16.25 22.4142 16.5858 22.75 17 22.75C17.4142 22.75 17.75 22.4142 17.75 22L17.75 18ZM23.75 18C23.75 17.5858 23.4142 17.25 23 17.25C22.5858 17.25 22.25 17.5858 22.25 18L22.25 22C22.25 22.4142 22.5858 22.75 23 22.75C23.4142 22.75 23.75 22.4142 23.75 22L23.75 18ZM14.75 19C14.75 18.5858 14.4142 18.25 14 18.25C13.5858 18.25 13.25 18.5858 13.25 19L13.25 21C13.25 21.4142 13.5858 21.75 14 21.75C14.4142 21.75 14.75 21.4142 14.75 21V19ZM26.75 19C26.75 18.5858 26.4142 18.25 26 18.25C25.5858 18.25 25.25 18.5858 25.25 19L25.25 21C25.25 21.4142 25.5858 21.75 26 21.75C26.4142 21.75 26.75 21.4142 26.75 21V19Z" fill="#2E3039"/>
</svg>

After

Width:  |  Height:  |  Size: 1.9 KiB

@ -0,0 +1,4 @@
<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect width="40" height="40" rx="8" fill="#EFEFF0"/>
<path d="M13.3173 9.28657C13.8839 9.40369 14.3352 9.78443 14.6156 10.2875L15.5088 11.8899C15.8379 12.4801 16.1147 12.9768 16.2955 13.4086C16.4873 13.8666 16.6013 14.3182 16.5492 14.8176C16.4971 15.317 16.2925 15.7354 16.0103 16.144C15.7443 16.5292 15.3709 16.958 14.9272 17.4677L13.6142 18.9759C13.3789 19.2461 13.2612 19.3812 13.2505 19.5501C13.2397 19.719 13.3362 19.8633 13.529 20.1518C15.1726 22.6109 17.3877 24.8268 19.8488 26.4718C20.1374 26.6647 20.2816 26.7611 20.4505 26.7503C20.6194 26.7396 20.7546 26.6219 21.0248 26.3866L22.5331 25.0736C23.0427 24.6299 23.4716 24.2565 23.8568 23.9905C24.2653 23.7083 24.6838 23.5036 25.1831 23.4516C25.6825 23.3995 26.1342 23.5134 26.5922 23.7052C27.0239 23.886 27.5206 24.1629 28.1107 24.4918L29.7133 25.3851C30.2163 25.6655 30.5971 26.1168 30.7142 26.6835C30.8325 27.2561 30.658 27.8316 30.2724 28.3047C28.8735 30.021 26.6322 31.1139 24.281 30.6396C22.8358 30.348 21.4098 29.8623 19.6851 28.8732C16.2197 26.8858 13.1126 23.777 11.1276 20.3157C10.1384 18.591 9.65272 17.165 9.36118 15.7197C8.88688 13.3685 9.97971 11.1272 11.6961 9.72833C12.1691 9.34279 12.7447 9.16822 13.3173 9.28657Z" fill="#2E3039"/>
</svg>

After

Width:  |  Height:  |  Size: 1.3 KiB

@ -0,0 +1,4 @@
<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect width="40" height="40" rx="8" fill="#EFEFF0"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M18.072 11H16.928C15.3393 11 14.0461 10.9999 13.0263 11.1371C11.9623 11.2801 11.0474 11.5887 10.318 12.318C9.58869 13.0474 9.28011 13.9623 9.13706 15.0263C8.99995 16.0461 8.99997 17.3393 9 18.9279V21.072C8.99997 22.6607 8.99995 23.9539 9.13706 24.9737C9.28011 26.0377 9.58869 26.9527 10.318 27.682C11.0474 28.4113 11.9623 28.7199 13.0263 28.8629C14.0462 29.0001 15.3393 29 16.928 29H18.072C19.6607 29 20.9538 29.0001 21.9737 28.8629C23.0377 28.7199 23.9527 28.4113 24.682 27.682C25.3875 26.9764 25.6993 26.0972 25.8484 25.0773C26.3063 25.4374 26.7206 25.7408 27.0944 25.9666C27.7947 26.3896 28.6822 26.7439 29.5929 26.2925C30.4895 25.848 30.7673 24.9371 30.8829 24.1198C30.9991 23.2982 30.9991 22.1926 30.999 20.8645V19.1382C30.9991 17.8101 30.9991 16.7045 30.8829 15.8828C30.7673 15.0655 30.4895 14.1546 29.5929 13.7102C28.6822 13.2587 27.7947 13.613 27.0944 14.0361C26.7207 14.2619 26.3066 14.5651 25.8488 14.925C25.6998 13.9042 25.3881 13.0241 24.682 12.318C23.9527 11.5887 23.0377 11.2801 21.9737 11.1371C20.9539 10.9999 19.6607 11 18.072 11ZM25.9943 17.3825C26 17.8628 26 18.3777 26 18.928V21.072C26 21.6233 26 22.1391 25.9943 22.6201C26.9515 23.4089 27.6126 23.943 28.1285 24.2547C28.3999 24.4186 28.5637 24.4778 28.6531 24.4955C28.6728 24.4994 28.6863 24.5007 28.6942 24.5012C28.6982 24.5014 28.7027 24.5013 28.7027 24.5013L28.7047 24.5005C28.7064 24.4997 28.7078 24.4988 28.7087 24.4982C28.7101 24.4972 28.7108 24.4966 28.7108 24.4966C28.7136 24.4936 28.7286 24.4774 28.7499 24.4358C28.7977 24.3422 28.8567 24.1641 28.9026 23.8397C28.9966 23.1754 28.999 22.2135 28.999 20.7832V19.2194C28.999 17.7892 28.9966 16.8273 28.9026 16.1629C28.8567 15.8385 28.7977 15.6604 28.7499 15.5669C28.7286 15.5252 28.714 15.5095 28.7112 15.5065C28.7112 15.5065 28.709 15.5043 28.7047 15.5021L28.7032 15.5014C28.7032 15.5014 28.6982 15.5013 28.6942 15.5015C28.6863 15.5019 28.6728 15.5032 28.6531 15.5071C28.5637 15.5248 28.3999 15.584 28.1285 15.748C27.6126 16.0597 26.9515 16.5938 25.9943 17.3825ZM18 16C18 15.4477 18.4477 15 19 15L21 15C21.5523 15 22 15.4477 22 16C22 16.5523 21.5523 17 21 17L19 17C18.4477 17 18 16.5523 18 16Z" fill="#2E3039"/>
</svg>

After

Width:  |  Height:  |  Size: 2.3 KiB

@ -945,6 +945,7 @@
"offline": "غير متصل",
"videoCall": "مكالمة فيديو",
"liveVideoCallWithHMGDoctors": "مكالمة فيديو مباشرة مع أطباء مجموعة الحبيب الطبية",
"liveAudioCallWithHMGDoctors": "مكالمة صوتية مباشرة مع أطباء مجموعة الحبيب الطبية",
"audioCall": "مكالمة صوتية",
"phoneCall": "مكالمة هاتفية",
"livePhoneCallWithHMGDoctors": "مكالمة هاتفية مباشرة مع أطباء مجموعة الحبيب الطبية",

@ -937,6 +937,7 @@
"offline": "Offline",
"videoCall": "Video Call",
"liveVideoCallWithHMGDoctors": "Live Video Call with HMG Doctors",
"liveAudioCallWithHMGDoctors": "Live Audio Call with HMG Doctors",
"audioCall": "Audio Call",
"phoneCall": "Phone Call",
"livePhoneCallWithHMGDoctors": "Live Phone Call with HMG Doctors",

@ -197,6 +197,10 @@ class ApiClientImp implements ApiClient {
// body['PatientTypeID'] = 1;
// body['PatientOutSA'] = 0;
// body['SessionID'] = "45786230487560q";
body['IdentificationNo'] = "2235558844";
body['MobileNo'] = "966533147722";
body['PatientID'] = 809289;
}
if(!url.contains("/paymentApi")) {

@ -4,7 +4,7 @@ import 'package:hmg_patient_app_new/core/enums.dart';
class ApiConsts {
static const maxSmallScreen = 660;
static AppEnvironmentTypeEnum appEnvironmentType = AppEnvironmentTypeEnum.uat;
static AppEnvironmentTypeEnum appEnvironmentType = AppEnvironmentTypeEnum.preProd;
// static String baseUrl = 'https://uat.hmgwebservices.com/'; // HIS API URL UAT
@ -229,8 +229,8 @@ class ApiConsts {
static String getAiOverViewLabOrder = "Services/Patients.svc/REST/HMGAI_Lab_Analyzer_API";
// ************ static values for Api ****************
// static final double appVersionID = 19.7;
static final double appVersionID = 50.7;
static final double appVersionID = 19.7;
// static final double appVersionID = 50.7;
static final int appChannelId = 3;
static final String appIpAddress = "10.20.10.20";
static final String appGeneralId = "Cs2020@2016\$2958";

@ -295,6 +295,10 @@ class AppAssets {
static const String bulb = '$svgBasePath/bulb.svg';
static const String switchBtn = '$svgBasePath/switch.svg';
static const String livecare_video = '$svgBasePath/livecare_video.svg';
static const String livecare_audio = '$svgBasePath/livecare_audio.svg';
static const String livecare_phone = '$svgBasePath/livecare_phone.svg';
//Health Trackers
static const String bloodPressureIcon = '$svgBasePath/blood_pressure_icon.svg';
static const String bloodSugarOnlyIcon = '$svgBasePath/blood_sugar_only_icon.svg';

@ -990,6 +990,12 @@ class Utils {
return isAllowed;
}
static bool containsArabic(String text) {
// Using Unicode range for Arabic characters
final RegExp arabicRegex = RegExp(r'[\u0600-\u06FF\u0750-\u077F\u08A0-\u08FF\uFB50-\uFDFF\uFE70-\uFEFF]');
return arabicRegex.hasMatch(text);
}
static String toEnglishNumbers(String input) {
const english = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9'];
const arabic = ['٠', '١', '٢', '٣', '٤', '٥', '٦', '٧', '٨', '٩'];

@ -192,6 +192,7 @@ extension EmailValidator on String {
int? maxlines,
double? letterSpacing = 0,
double? height,
String? fontFamily,
TextOverflow? textOverflow,
}) =>
Text(
@ -206,7 +207,7 @@ extension EmailValidator on String {
height: height,
fontWeight: weight ?? (isBold ? FontWeight.bold : FontWeight.normal),
decoration: isUnderLine ? TextDecoration.underline : null,
fontFamily: isEnglishOnly ? "Poppins" : getIt.get<AppState>().getLanguageCode() == "ar" ? 'GESSTwo' : 'Poppins',
fontFamily: fontFamily ?? (isEnglishOnly ? "Poppins" : getIt.get<AppState>().getLanguageCode() == "ar" ? 'GESSTwo' : 'Poppins'),
decorationColor: color ?? AppColors.blackColor),
);
@ -231,12 +232,13 @@ extension EmailValidator on String {
TextAlign? textAlign,
FontWeight? weight,
TextOverflow? textOverflow,
String? fontFamily,
double? letterSpacing = -0.4,
Color decorationColor = AppColors.errorColor}) =>
Text(
this,
maxLines: maxlines,
textAlign: isCenter ? TextAlign.center : null,
textAlign: isCenter ? textAlign ?? TextAlign.center : null,
// locale: Locale('en', 'US'),
style: TextStyle(
color: color ?? AppColors.blackColor,
@ -246,7 +248,7 @@ extension EmailValidator on String {
overflow: textOverflow,
fontWeight: weight ?? (isBold ? FontWeight.bold : FontWeight.normal),
decoration: isUnderLine ? TextDecoration.underline : null,
fontFamily: isEnglishOnly ? "Poppins" : getIt.get<AppState>().getLanguageCode() == "ar" ? 'GESSTwo' : 'Poppins',
fontFamily: fontFamily ?? (isEnglishOnly ? "Poppins" : getIt.get<AppState>().getLanguageCode() == "ar" ? 'GESSTwo' : 'Poppins'),
decorationColor: decorationColor),
);

@ -256,6 +256,7 @@ class ContactUsViewModel extends ChangeNotifier {
}
} else if (apiResponse.messageStatus == 1) {
cocItemsList = apiResponse.data!;
cocItemsList.sort((a, b) => a.date!.compareTo(b.date!));
isCOCItemsListLoading = false;
notifyListeners();
if (onSuccess != null) {

@ -941,6 +941,7 @@ abstract class LocaleKeys {
static const offline = 'offline';
static const videoCall = 'videoCall';
static const liveVideoCallWithHMGDoctors = 'liveVideoCallWithHMGDoctors';
static const liveAudioCallWithHMGDoctors = 'liveAudioCallWithHMGDoctors';
static const audioCall = 'audioCall';
static const phoneCall = 'phoneCall';
static const livePhoneCallWithHMGDoctors = 'livePhoneCallWithHMGDoctors';

@ -110,7 +110,7 @@ class ImmediateLiveCarePaymentDetails extends StatelessWidget {
children: [
Row(
children: [
Utils.buildSvgWithAssets(icon: AppAssets.livecare_clinic_icon, width: 32.h, height: 32.h, fit: BoxFit.contain),
Utils.buildSvgWithAssets(icon: getLiveCareTypeIcon(immediateLiveCareVM.liveCareSelectedCallType), width: 32.h, height: 32.h, fit: BoxFit.contain),
SizedBox(width: 8.h),
getLiveCareType(context, immediateLiveCareVM.liveCareSelectedCallType).toText16(isBold: true),
],
@ -429,6 +429,19 @@ class ImmediateLiveCarePaymentDetails extends StatelessWidget {
// // }
// }
String getLiveCareTypeIcon(int callType) {
switch (callType) {
case 1:
return AppAssets.livecare_video;
case 2:
return AppAssets.livecare_audio;
case 3:
return AppAssets.livecare_phone;
default:
return AppAssets.livecare_video;
}
}
String getLiveCareType(BuildContext context, int callType) {
switch (callType) {
case 1:

@ -22,7 +22,7 @@ class SelectLiveCareCallType extends StatelessWidget {
return Column(
children: [
checkInOptionCard(
AppAssets.checkin_location_icon,
AppAssets.livecare_video,
LocaleKeys.videoCall.tr(context: context),
LocaleKeys.liveVideoCallWithHMGDoctors.tr(context: context),
).onPress(() {
@ -31,16 +31,16 @@ class SelectLiveCareCallType extends StatelessWidget {
}),
SizedBox(height: 16.h),
checkInOptionCard(
AppAssets.checkin_location_icon,
AppAssets.livecare_audio,
LocaleKeys.audioCall.tr(context: context),
LocaleKeys.liveVideoCallWithHMGDoctors.tr(context: context),
LocaleKeys.liveAudioCallWithHMGDoctors.tr(context: context),
).onPress(() {
Navigator.of(context).pop();
immediateLiveCareViewModel.setLiveCareSelectedCallType(2);
}),
SizedBox(height: 16.h),
checkInOptionCard(
AppAssets.checkin_location_icon,
AppAssets.livecare_phone,
LocaleKeys.phoneCall.tr(context: context),
LocaleKeys.livePhoneCallWithHMGDoctors.tr(context: context),
).onPress(() {

@ -26,6 +26,7 @@ import 'package:hmg_patient_app_new/widgets/input_widget.dart';
import 'package:hmg_patient_app_new/widgets/loader/bottomsheet_loader.dart';
import 'package:hmg_patient_app_new/widgets/routes/custom_page_route.dart';
import 'package:provider/provider.dart';
import 'dart:ui' as ui;
class FeedbackPage extends StatelessWidget {
FeedbackPage({super.key});
@ -36,10 +37,13 @@ class FeedbackPage extends StatelessWidget {
final TextEditingController subjectTextController = TextEditingController();
final TextEditingController messageTextController = TextEditingController();
late AppState appState;
@override
Widget build(BuildContext context) {
contactUsViewModel = Provider.of<ContactUsViewModel>(context, listen: false);
medicalFileViewModel = Provider.of<MedicalFileViewModel>(context, listen: false);
appState = getIt.get<AppState>();
return Scaffold(
backgroundColor: AppColors.bgScaffoldColor,
body: Consumer<ContactUsViewModel>(builder: (context, contactUsVM, child) {
@ -425,13 +429,57 @@ class FeedbackPage extends StatelessWidget {
duration: Duration(milliseconds: 300),
curve: Curves.easeInOut,
child: Container(
height: 200.h,
width: 300.w,
padding: EdgeInsets.all(16.h),
decoration: RoundedRectangleBorder().toSmoothCornerDecoration(
color: AppColors.whiteColor,
borderRadius: 20.h,
hasShadow: true,
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
AppCustomChipWidget(
labelText: appState.isArabic() ? contactUsViewModel.cocItemsList[index].statusAr : contactUsViewModel.cocItemsList[index].status,
// backgroundColor: AppColors.warningColorYellow,
backgroundColor: (contactUsViewModel.cocItemsList[index].statusId == 7 || contactUsViewModel.cocItemsList[index].statusId == 8)
? AppColors.primaryRedColor
: (contactUsViewModel.cocItemsList[index].statusId == 10 ||
contactUsViewModel.cocItemsList[index].statusId == 6 ||
contactUsViewModel.cocItemsList[index].statusId == 9)
? AppColors.successColor
: AppColors.warningColorYellow,
textColor: AppColors.whiteColor,
),
SizedBox(height: 8.h),
"${LocaleKeys.requestID.tr(context: context)} ${contactUsViewModel.cocItemsList[index].itemID}".toText16(weight: FontWeight.bold),
SizedBox(height: 8.h),
Wrap(
direction: Axis.horizontal,
spacing: 4.h,
runSpacing: 4.h,
children: [
AppCustomChipWidget(
labelText: contactUsViewModel.cocItemsList[index].date!.split(" ")[0],
icon: AppAssets.calendarGrey,
labelPadding: EdgeInsetsDirectional.only(start: -4.w, end: 6.w),
),
AppCustomChipWidget(
labelText: contactUsViewModel.cocItemsList[index].formType,
icon: AppAssets.ask_doctor_icon,
labelPadding: EdgeInsetsDirectional.only(start: -4.w, end: 6.w),
),
],
),
SizedBox(height: 8.h),
"${contactUsViewModel.cocItemsList[index].cOCTitle}"
.toText16(weight: FontWeight.bold, fontFamily: Utils.isArabicText(contactUsViewModel.cocItemsList[index].cOCTitle ?? "") ? "GESSTwo" : "Poppins"),
SizedBox(height: 8.h),
"${contactUsViewModel.cocItemsList[index].detail}".toText14(
weight: FontWeight.w500,
color: AppColors.textColorLight,
fontFamily: Utils.isArabicText(contactUsViewModel.cocItemsList[index].detail ?? "") ? "GESSTwo" : "Poppins"),
],
),
).paddingOnly(bottom: 16.h),
),
),

Loading…
Cancel
Save