fixed A & E

lib/models/general_models/enums_model.dart

@@ -2,6 +2,7 @@ class EnumsModel {
   int id;
   int enumTypeId;
   String enumValueStr;
+  String enumValueStrN;
   String enumValueStrDes;
   int enumValue;
   bool isActive;
@@ -10,6 +11,7 @@ class EnumsModel {
     required this.id,
     required this.enumTypeId,
     required this.enumValueStr,
+    required this.enumValueStrN,
     required this.enumValueStrDes,
     required this.enumValue,
     required this.isActive,
@@ -19,6 +21,7 @@ class EnumsModel {
         id: json["id"],
         enumTypeId: json["enumTypeID"],
         enumValueStr: json["enumValueStr"],
+        enumValueStrN: json["enumValueStrN"],
         enumValueStrDes: json["enumValueStrDes"] ?? json["enumValueStr"],
         enumValue: json["enumValue"],
         isActive: json["isActive"],
@@ -26,6 +29,7 @@ class EnumsModel {
 
   @override
   String toString() {
-    return 'EnumsModel{id: $id, enumTypeId: $enumTypeId, enumValueStr: $enumValueStr,enumValueStrDes: $enumValueStrDes, enumValue: $enumValue, isActive: $isActive}';
+    return 'EnumsModel{id: $id, enumTypeId: $enumTypeId, enumValueStr: $enumValueStr,enumValueStrDes: $enumValueStrDes, enumValue: $enumValue, isActive: $isActive,'
+        'enumValueStrN: $enumValueStrN}';
   }
 }

lib/models/general_models/widgets_models.dart

@@ -1,10 +1,12 @@
 class FilterListModel {
   String title;
+  String? titleN;
   String iconUrl;
   int id;
   bool isSelected;
 
-  FilterListModel({required this.id, required this.isSelected, this.iconUrl = "", required this.title});
+  FilterListModel(
+      {required this.id, required this.isSelected, this.iconUrl = "", required this.title,  this.titleN});
 }
 
 class SelectionModel {

lib/models/setting_utils_models/faqs_model.dart

@@ -6,8 +6,11 @@ class FAQsModel {
   bool? isActive;
   int? channel;
   bool? isCollapsed;
+  String? questionN;
+  String? answerN;
 
-  FAQsModel({this.id, this.question, this.answer, this.sequenceNo, this.isActive, this.channel, this.isCollapsed});
+  FAQsModel({this.id, this.question, this.answer, this.sequenceNo, this.isActive, this.channel, this.isCollapsed,
+    this.questionN, this.answerN, });
 
   FAQsModel.fromJson(Map<String, dynamic> json) {
     id = json['id'];
@@ -17,6 +20,8 @@ class FAQsModel {
     isActive = json['isActive'];
     channel = json['channel'];
     isCollapsed = false;
+    questionN = json['questionN'];
+    answerN = json['answerN'];
   }
 
   Map<String, dynamic> toJson() {
@@ -27,6 +32,8 @@ class FAQsModel {
     data['sequenceNo'] = sequenceNo;
     data['isActive'] = isActive;
     data['channel'] = channel;
+    data['questionN'] = questionN;
+    data['answerN'] = answerN;
     return data;
   }
 }

lib/repositories/appointment_repo.dart

@@ -304,6 +304,8 @@ class AppointmentRepoImp implements AppointmentRepo {
       queryParameters: params,
       ApiConsts.customersAppointmentGetByFilters,
     );
+    print("genericRespModel.data .......");
+    print(genericRespModel.data);
     List<AppointmentListModel> appointmentList = List.generate(genericRespModel.data.length, (index) => AppointmentListModel.fromJson(genericRespModel.data[index]));
     return appointmentList;
   }

lib/views/setting_options/setting_options_faqs.dart

@@ -14,6 +14,8 @@ import 'package:mc_common_app/widgets/extensions/extensions_widget.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:provider/provider.dart';
 
+import '../../classes/app_state.dart';
+
 class SettingOptionsFAQs extends StatefulWidget {
   const SettingOptionsFAQs({super.key});
 
@@ -45,6 +47,7 @@ class _SettingOptionsFAQsState extends State<SettingOptionsFAQs> {
         ),
         body: Consumer(
           builder: (BuildContext context, SettingOptionsVM settingsOptionsVM, Widget? child) {
+            bool isArabic = AppState().isArabic(context);
             return Container(
               color: MyColors.backgroundColor,
               width: double.infinity,
@@ -70,7 +73,7 @@ class _SettingOptionsFAQsState extends State<SettingOptionsFAQs> {
                                   return ExpansionTile(
                                     tilePadding: EdgeInsets.zero,
                                     shape: const Border(),
-                                    title: (faqModel.question ?? "").toText(fontSize: 16).paddingOnly(left: 8, right: 8),
+                                    title: (isArabic ? faqModel.questionN ?? "" : faqModel.question ?? "").toText(fontSize: 16).paddingOnly(left: 8, right: 8),
                                     onExpansionChanged: (value) {
                                       setState(() {
                                         settingsOptionsVM.faqsList[index].isCollapsed = value;
@@ -86,7 +89,7 @@ class _SettingOptionsFAQsState extends State<SettingOptionsFAQs> {
                                         crossAxisAlignment: CrossAxisAlignment.start,
                                         children: [
                                           5.height,
-                                          (faqModel.answer ?? "").toText(color: MyColors.lightTextColor, fontSize: 14, fontWeight: MyFonts.Medium),
+                                          (isArabic ? faqModel.answerN ?? "" : faqModel.answer ?? "").toText(color: MyColors.lightTextColor, fontSize: 14, fontWeight: MyFonts.Medium),
                                           10.height,
                                         ],
                                       ).paddingOnly(left: 8, right: 8)

lib/widgets/common_widgets/filters_list.dart

@@ -7,6 +7,8 @@ import 'package:mc_common_app/models/general_models/widgets_models.dart';
 import 'package:mc_common_app/theme/colors.dart';
 import 'package:mc_common_app/widgets/extensions/extensions_widget.dart';
 
+import '../../classes/app_state.dart';
+
 class FiltersList extends StatelessWidget {
   final List<FilterListModel> filterList;
   final Function(int, int) onFilterTapped;
@@ -25,6 +27,7 @@ class FiltersList extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    final isArabic = AppState().isArabic(context);
     return SizedBox(
       height: 37,
       width: double.infinity,
@@ -65,7 +68,12 @@ class FiltersList extends StatelessWidget {
                       ],
                     ],
                     // Text displayed in the chip
-                    filterList[index].title.tr().toText(
+                    (isArabic
+                    ? (filterList[index].titleN ?? filterList[index].title)
+                    : filterList[index].title)
+                    .tr()
+                    .toText(
+                    // filterList[index].title.tr().toText(
                           fontSize: 13,
                           letterSpacing: -0.14,
                           color: filterList[index].isSelected ? MyColors.white : null,