fixes and updates

pull/254/head
Sultan khan 11 hours ago
parent 42e710c61f
commit 94993fa6fb

@ -62,7 +62,8 @@ class _SelectClinicPageState extends State<SelectClinicPage> {
scheduleMicrotask(() {
bookAppointmentsViewModel.getClinics();
});
name = (widget.calculatorType!.name.toLowerCase() =="bmi"? widget.calculatorType!.name.toUpperCase(): widget.calculatorType!.name.toCamelCase)??"";
name = (widget.calculatorType?.name.toLowerCase() =="bmi"? widget.calculatorType?.name.toUpperCase(): widget.calculatorType?.name.toCamelCase)??"";
super.initState();
}

@ -32,7 +32,7 @@ class WeatherWidget extends StatelessWidget {
}
String _formatDateTime(DateTime dateTime) {
final formatter = DateFormat('MMMM dd, yyyy - EEEE, HH:mm');
final formatter = DateFormat('MMMM dd, yyyy - EEEE, HH:mm', 'en_US');
return formatter.format(dateTime);
}

@ -7,11 +7,13 @@ import 'package:hmg_patient_app_new/extensions/string_extensions.dart';
import 'package:hmg_patient_app_new/extensions/widget_extensions.dart';
import 'package:hmg_patient_app_new/features/prescriptions/prescriptions_view_model.dart';
import 'package:hmg_patient_app_new/generated/locale_keys.g.dart';
import 'package:hmg_patient_app_new/presentation/prescriptions/prescription_delivery_orders_list_page.dart';
import 'package:hmg_patient_app_new/theme/colors.dart';
import 'package:hmg_patient_app_new/widgets/appbar/collapsing_list_view.dart';
import 'package:hmg_patient_app_new/widgets/buttons/custom_button.dart';
import 'package:hmg_patient_app_new/widgets/common_bottom_sheet.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';
class PrescriptionDeliveryOrderSummaryPage extends StatelessWidget {
@ -130,6 +132,12 @@ class PrescriptionDeliveryOrderSummaryPage extends StatelessWidget {
child: Utils.getSuccessWidget(loadingText: LocaleKeys.requestSubmittedSuccessfully.tr(context: context)),
callBackFunc: () {
Navigator.of(context).pop();
prescriptionsViewModel.getPrescriptionOrdersList();
Navigator.of(context).push(
CustomPageRoute(
page: PrescriptionDeliveryOrdersListPage(),
),
);
},
title: "",
isCloseButtonVisible: true,

@ -42,6 +42,58 @@ class WeatherDetailsPage extends StatelessWidget {
}
}
/// Get color based on category label
Color _getColorFromCategory(String? categoryLabel) {
if (categoryLabel == null) return AppColors.successColor;
final category = categoryLabel.toLowerCase().trim();
// Green: Low, Beneficial
if (category.contains('low') || category.contains('beneficial')) {
return AppColors.successColor;
}
// Yellow: Fair
else if (category.contains('fair')) {
return AppColors.warningColorYellow;
}
// Red: Very High, At High Risk
else if (category.contains('very high') || category.contains('at high risk')) {
return AppColors.errorColor;
}
// Orange: Risk, High (but not "very high" or "at high risk")
else if (category.contains('risk') || category.contains('high')) {
return AppColors.warningColor;
}
return AppColors.successColor; // Default to green
}
/// Get background color based on category label
Color _getBackgroundFromCategory(String? categoryLabel) {
if (categoryLabel == null) return AppColors.successLightColor.withValues(alpha: 0.1);
final category = categoryLabel.toLowerCase().trim();
// Green: Low, Beneficial
if (category.contains('low') || category.contains('beneficial')) {
return AppColors.successLightColor.withValues(alpha: 0.1);
}
// Yellow: Fair
else if (category.contains('fair')) {
return AppColors.warningColorYellow.withValues(alpha: 0.1);
}
// Red: Very High, At High Risk
else if (category.contains('very high') || category.contains('at high risk')) {
return AppColors.errorLightColor.withValues(alpha: 0.1);
}
// Orange: Risk, High (but not "very high" or "at high risk")
else if (category.contains('risk') || category.contains('high')) {
return AppColors.warningLightColor.withValues(alpha: 0.1);
}
return AppColors.successLightColor.withValues(alpha: 0.1); // Default to green
}
IconData _getIconFromCategory(String? category) {
if (category == null) return Icons.wb_sunny_outlined;
@ -84,8 +136,8 @@ class WeatherDetailsPage extends StatelessWidget {
return _buildCategoryCard(
description: cityInfo.name ?? '',
categoryLabel: cityInfo.category ?? '',
color: _getColorFromColorName(cityInfo.colorName),
backgroundColor: _getBackgroundColorFromColorName(cityInfo.colorName),
color: _getColorFromCategory(cityInfo.category),
backgroundColor: _getBackgroundFromCategory(cityInfo.category),
icon: _getIconFromCategory(cityInfo.category),
);
}),
@ -173,7 +225,7 @@ class WeatherDetailsPage extends StatelessWidget {
),
child: categoryLabel.toText12(
color: color,
fontWeight: FontWeight.w600,
isBold: true,
maxLine: 1
),
),

Loading…
Cancel
Save