SS-FCSC/uaestats_fe
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Contact us and Notification UAT bug

Browse Source
This commit is contained in:
Kalonkarthik 2025-04-08 15:22:02 +05:30
parent ff79f88853
commit c623b1e1f7
2 changed files with 146 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

162
lib/presentation/routes/drawer_routes/Drawer Items/contactUs.dart
View File

@ -8,6 +8,7 @@ import 'package:uae_stat/infrastructure/services/img_asset_paths/icons/enquiry_a
import 'package:uae_stat/presentation/components/indicators/locale_provider.dart'; import 'package:uae_stat/presentation/components/indicators/locale_provider.dart';
import 'package:uae_stat/presentation/routes/drawer_routes/custom_drawer_routes.dart'; import 'package:uae_stat/presentation/routes/drawer_routes/custom_drawer_routes.dart';
import 'package:flutter_svg/flutter_svg.dart'; import 'package:flutter_svg/flutter_svg.dart';
import 'package:url_launcher/url_launcher.dart';
class Contact extends ConsumerStatefulWidget { class Contact extends ConsumerStatefulWidget {
const Contact({super.key}); const Contact({super.key});
@ -57,43 +58,43 @@ class _ContactState extends ConsumerState<Contact> {
children: [ children: [
buildContactCard( buildContactCard(
context, context,
title: 'DUBAI - EMIRATES TOWER -32ND FLOOR', title: 'DUBAI - EMIRATES TOWER - 32ND FLOOR',
titleAr: 'دبي - أبراج الإمارات - الطابق 32', titleAr: 'دبي - أبراج الإمارات - الطابق 32',
details: [ details: [
{ {
'icon': EnquiryAssetIconPath.building, 'icon': EnquiryAssetIconPath.building,
'text': 'Office : Dubai - Emirates Tower -32nd Floor', 'text': 'Office: Dubai - Emirates Tower - 32nd Floor',
'textAr': 'المقر الرئيسي : دبي - أبراج الإمارات - الطابق 32' 'textAr': 'المقر الرئيسي: دبي - أبراج الإمارات - الطابق 32'
}, },
{ {
'icon': EnquiryAssetIconPath.phone, 'icon': EnquiryAssetIconPath.phone,
'text': 'Tel : 00971 46080000', 'text': 'Tel: 00971 4608 0000',
'textAr': 'الهاتف : 0097146080000' 'textAr': 'الهاتف: 0097146080000'
}, },
{ {
'icon': EnquiryAssetIconPath.fax, 'icon': EnquiryAssetIconPath.fax,
'text': 'Fax : 0097143273535', 'text': 'Fax: 00971 4327 3535',
'textAr': 'فاكس : 0097143273535' 'textAr': 'فاكس: 0097143273535'
}, },
{ {
'icon': EnquiryAssetIconPath.map, 'icon': EnquiryAssetIconPath.map,
'text': 'P.O.Box : 127000 Dubai', 'text': 'P.O.Box: 127000 Dubai',
'textAr': 'ص.ب: : 127000 دبي' 'textAr': 'ص.ب: 127000 دبي'
}, },
{ {
'icon': EnquiryAssetIconPath.at, 'icon': EnquiryAssetIconPath.at,
'text': 'Email Address : info@fcsc.gov.ae', 'text': 'Email Address: info@fcsc.gov.ae',
'textAr': 'البريد الإلكتروني : info@fcsc.gov.ae' 'textAr': 'البريد الإلكتروني: info@fcsc.gov.ae'
}, },
{ {
'icon': EnquiryAssetIconPath.map, 'icon': EnquiryAssetIconPath.map,
'text': 'Latitude : 25.223926', 'text': 'Latitude: 25.223926',
'textAr': 'خط العرض : 25.223926' 'textAr': 'خط العرض: 25.223926'
}, },
{ {
'icon': EnquiryAssetIconPath.map, 'icon': EnquiryAssetIconPath.map,
'text': 'Longitude : 55.350526', 'text': 'Longitude: 55.350526',
'textAr': 'خط الطول : 55.350526' 'textAr': 'خط الطول: 55.350526'
}, },
], ],
), ),
@ -105,38 +106,38 @@ class _ContactState extends ConsumerState<Contact> {
details: [ details: [
{ {
'icon': EnquiryAssetIconPath.building, 'icon': EnquiryAssetIconPath.building,
'text': 'Office : Media Section', 'text': 'Office: Media Section',
'textAr': 'المقر الرئيسي : قسم الاعلام' 'textAr': 'المقر الرئيسي: قسم الاعلام'
}, },
{ {
'icon': EnquiryAssetIconPath.phone, 'icon': EnquiryAssetIconPath.phone,
'text': 'Tel : 00971 46080000', 'text': 'Tel: 00971 4608 0000',
'textAr': 'الهاتف : 0097146080000' 'textAr': 'الهاتف: 0097146080000'
}, },
{ {
'icon': EnquiryAssetIconPath.fax, 'icon': EnquiryAssetIconPath.fax,
'text': 'Fax : 0097143273535', 'text': 'Fax: 00971 4327 3535',
'textAr': 'فاكس : 0097143273535' 'textAr': 'فاكس: 0097143273535'
}, },
{ {
'icon': EnquiryAssetIconPath.map, 'icon': EnquiryAssetIconPath.map,
'text': 'P.O.Box : 127000 Dubai', 'text': 'P.O.Box: 127000 Dubai',
'textAr': 'ص.ب: : 127000 دبي' 'textAr': 'ص.ب: 127000 دبي'
}, },
{ {
'icon': EnquiryAssetIconPath.at, 'icon': EnquiryAssetIconPath.at,
'text': 'Email Address : GCO@fcsc.gov.ae', 'text': 'Email Address: GCO@fcsc.gov.ae',
'textAr': 'البريد الإلكتروني : GCO@fcsc.gov.ae' 'textAr': 'البريد الإلكتروني: GCO@fcsc.gov.ae'
}, },
{ {
'icon': EnquiryAssetIconPath.map, 'icon': EnquiryAssetIconPath.map,
'text': 'Latitude : 25.223926', 'text': 'Latitude: 25.223926',
'textAr': 'خط العرض : 25.223926' 'textAr': 'خط العرض: 25.223926'
}, },
{ {
'icon': EnquiryAssetIconPath.map, 'icon': EnquiryAssetIconPath.map,
'text': 'Longitude : 55.350526', 'text': 'Longitude: 55.350526',
'textAr': 'خط الطول : 55.350526' 'textAr': 'خط الطول: 55.350526'
}, },
], ],
), ),
@ -148,38 +149,38 @@ class _ContactState extends ConsumerState<Contact> {
details: [ details: [
{ {
'icon': EnquiryAssetIconPath.building, 'icon': EnquiryAssetIconPath.building,
'text': 'Office : SDGs', 'text': 'Office: SDGs',
'textAr': 'المقر الرئيسي : أهداف التنمية المستدامة' 'textAr': 'المقر الرئيسي: أهداف التنمية المستدامة'
}, },
{ {
'icon': EnquiryAssetIconPath.phone, 'icon': EnquiryAssetIconPath.phone,
'text': 'Tel : 00971 46080000', 'text': 'Tel: 00971 4608 0000',
'textAr': 'الهاتف : 0097146080000' 'textAr': 'الهاتف: 0097146080000'
}, },
{ {
'icon': EnquiryAssetIconPath.fax, 'icon': EnquiryAssetIconPath.fax,
'text': 'Fax : 0097143273535', 'text': 'Fax: 00971 4327 3535',
'textAr': 'فاكس : 0097143273535' 'textAr': 'فاكس : 0097143273535'
}, },
{ {
'icon': EnquiryAssetIconPath.map, 'icon': EnquiryAssetIconPath.map,
'text': 'P.O.Box : 127000 Dubai', 'text': 'P.O.Box: 127000 Dubai',
'textAr': 'ص.ب: : 127000 دبي' 'textAr': 'ص.ب: 127000 دبي'
}, },
{ {
'icon': EnquiryAssetIconPath.at, 'icon': EnquiryAssetIconPath.at,
'text': 'Email Address : sdgs@fcsc.gov.ae', 'text': 'Email Address: sdgs@fcsc.gov.ae',
'textAr': 'البريد الإلكتروني : sdgs@fcsc.gov.ae' 'textAr': 'البريد الإلكتروني: sdgs@fcsc.gov.ae'
}, },
{ {
'icon': EnquiryAssetIconPath.map, 'icon': EnquiryAssetIconPath.map,
'text': 'Latitude : 25.223926', 'text': 'Latitude: 25.223926',
'textAr': 'خط العرض : 25.223926' 'textAr': 'خط العرض: 25.223926'
}, },
{ {
'icon': EnquiryAssetIconPath.map, 'icon': EnquiryAssetIconPath.map,
'text': 'Longitude : 55.350526', 'text': 'Longitude: 55.350526',
'textAr': 'خط الطول : 55.350526' 'textAr': 'خط الطول: 55.350526'
}, },
], ],
), ),
@ -229,6 +230,34 @@ class _ContactState extends ConsumerState<Contact> {
} }
Widget buildTextRow(String iconName, String text) { Widget buildTextRow(String iconName, String text) {
List<String> values = List.filled(2, '');
String cleanText = '';
if (text.toLowerCase().contains('tel:') || text.toLowerCase().contains('الهاتف:')) {
values = text.split(':');
print ('List of values----- :$values');
print ('value 1 ${values[0]}');
cleanText=values[1].replaceAll(' ', '');
} else if(text.toLowerCase().contains('email address:') || text.toLowerCase().contains('البريد الإلكتروني:')){
values = text.split(':');
cleanText = values[1].replaceAll(' ', '');
} else{
cleanText = text;
}
Future<void> sendEmail(String emailAddress) async {
print ('before email : $emailAddress');
final uri = Uri(
scheme: 'mailto',
path: emailAddress,
);
if (await canLaunchUrl(uri)) {
await launchUrl(uri);
} else {
debugPrint('Could not launch $uri');
}
}
return Padding( return Padding(
padding: const EdgeInsets.symmetric(vertical: 5.0), padding: const EdgeInsets.symmetric(vertical: 5.0),
child: Row( child: Row(
@ -240,7 +269,54 @@ class _ContactState extends ConsumerState<Contact> {
height: 20, height: 20,
), ),
const SizedBox(width: 10), const SizedBox(width: 10),
Expanded( iconName == EnquiryAssetIconPath.phone
? InkWell(
onTap: () async{
print('clean test : $cleanText');
final uri = Uri(scheme: 'tel', path: cleanText);
if (await canLaunchUrl(uri)) {
await launchUrl(uri);
} else {
debugPrint('Could not launch $uri');
}
},
child: RichText(
text: TextSpan(
text: values[0],
style: const TextStyle(fontSize: 14, color: Color(0xFF5F5F5F)),
children: <TextSpan>[
TextSpan(text: ':',),
TextSpan(text: values[1],
style: TextStyle(fontSize: 14, color:Color(0xFF985400))
),
],
),
),
// child: Text(
// text,
// style: const TextStyle(
// fontSize: 14,
// color: Color(0xFF5F5F5F),
// ),
// ),
)
: iconName == EnquiryAssetIconPath.at
? InkWell(
onTap: () => sendEmail(cleanText),
child: RichText(
text: TextSpan(
text: values[0],
style: const TextStyle(fontSize: 14, color: Color(0xFF5F5F5F)),
children: <TextSpan>[
TextSpan(text: ':',),
TextSpan(text: values[1],
style: TextStyle(fontSize: 14, color:Color(0xFF985400))
),
],
),
),
)
:Expanded(
child: Text( child: Text(
text, text,
style: const TextStyle( style: const TextStyle(

30
lib/presentation/routes/drawer_routes/Drawer Items/notification/notification.dart
View File

@ -26,6 +26,7 @@ class _NotificationPageState extends ConsumerState<NotificationPage> {
bool isLoading = true; bool isLoading = true;
List<Map<String, dynamic>> notifications = []; List<Map<String, dynamic>> notifications = [];
List<String> userReadedNotiOrNot = []; List<String> userReadedNotiOrNot = [];
String notificationCount='';
// Current selected tab index // Current selected tab index
int selectedTabIndex = 0; int selectedTabIndex = 0;
@ -48,7 +49,30 @@ class _NotificationPageState extends ConsumerState<NotificationPage> {
super.initState(); super.initState();
locale = ref.read(localeProvider) ?? const Locale('en'); locale = ref.read(localeProvider) ?? const Locale('en');
_userService = UserService(); _userService = UserService();
fetchNotifications(locale?.languageCode ?? 'en'); _initializePage();
}
Future<void> _initializePage() async {
_userService = UserService();
await _fetchUserData();();
await fetchNotifications(locale?.languageCode ?? 'en');
_processNotifications(notifications , userReadedNotiOrNot);
}
void _processNotifications( List<Map<String, dynamic>> notification ,List<String> push ){
print ('inside last function ${notification.length}');
print('inside last function ${push.length}');
int count = 0;
for (var product in notification) {
if (push.contains(product['id'])) {
count++;
}
}
print('count is $count');
if(count>0){
notificationCount='{$count}';}
else{notificationCount='';}
} }
Future<String?> getUserId() async { Future<String?> getUserId() async {
@ -188,8 +212,8 @@ class _NotificationPageState extends ConsumerState<NotificationPage> {
child: BaseScaffold( child: BaseScaffold(
title: Text( title: Text(
context.translate( context.translate(
'Notification', 'Notification $notificationCount',
'إشعار', '$notificationCount إشعار ',
), ),
), ),
body: isLoading body: isLoading