Skip to content

GitLab

Commit dc88a3f9 authored by Sai Srinivas's avatar Sai Srinivas
Browse files

gen erp 08-10

parent d2c9404a
Hide whitespace changes
Inline Side-by-side
lib/Notifiers/splashVersionNotifier.dart
View file @ dc88a3f9
import 'dart:io'; import 'dart:io';
import 'dart:math';
import 'package:flutter/foundation.dart'; import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:generp/Models/VersionsResponse.dart'; import 'package:generp/Models/VersionsResponse.dart';
import 'package:generp/Notifiers/HomeScreenNotifier.dart';
import 'package:generp/Notifiers/loginNotifier.dart'; import 'package:generp/Notifiers/loginNotifier.dart';
import 'package:generp/Utils/SharedpreferencesService.dart'; import 'package:generp/Utils/SharedpreferencesService.dart';
import 'package:generp/screens/HomeScreen.dart'; import 'package:generp/screens/HomeScreen.dart';
...@@ -55,7 +54,7 @@ class SplashVersionNotifier extends ChangeNotifier { ...@@ -55,7 +54,7 @@ class SplashVersionNotifier extends ChangeNotifier {
if (data != null) { if (data != null) {
if (kDebugMode) { if (kDebugMode) {
print("Current Build: $currentBuild"); print("Current Build: $currentBuild");
print("Server Response: $data"); print("Server Response: ${data.latestVersionCode}");
} }
if (Platform.isAndroid && if (Platform.isAndroid &&
currentBuild < (data.latestVersionCode ?? 0)) { currentBuild < (data.latestVersionCode ?? 0)) {
......
lib/main.dart
View file @ dc88a3f9
import 'dart:convert';
import 'dart:io'; import 'dart:io';
import 'package:firebase_core/firebase_core.dart'; import 'package:firebase_core/firebase_core.dart';
...@@ -10,56 +11,138 @@ import 'package:flutter_local_notifications/flutter_local_notifications.dart'; ...@@ -10,56 +11,138 @@ import 'package:flutter_local_notifications/flutter_local_notifications.dart';
import 'package:flutter_ringtone_player/flutter_ringtone_player.dart'; import 'package:flutter_ringtone_player/flutter_ringtone_player.dart';
import 'package:generp/Models/hrmModels/leaveApplicationLIstResponse.dart'; import 'package:generp/Models/hrmModels/leaveApplicationLIstResponse.dart';
import 'package:generp/Utils/app_colors.dart'; import 'package:generp/Utils/app_colors.dart';
import 'package:generp/screens/AttendanceScreen.dart';
import 'package:generp/screens/crm/LeadDetailsByMode.dart';
import 'package:generp/screens/crm/ProspectListByMode.dart';
import 'package:generp/screens/crm/crmDashboard.dart';
import 'package:generp/screens/hrm/Attendancelist.dart';
import 'package:generp/screens/hrm/OrganizationStructureScreen.dart';
import 'package:generp/screens/hrm/TourExpensesListScreen.dart';
import 'Notifiers/hrmProvider/advanceProvider.dart';
import 'screens/notifierExports.dart'; import 'screens/notifierExports.dart';
import 'package:generp/Utils/SharedpreferencesService.dart'; import 'package:generp/Utils/SharedpreferencesService.dart';
import 'package:generp/screens/splash.dart'; import 'package:generp/screens/splash.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'Utils/commonWidgets.dart'; import 'Utils/commonWidgets.dart';
// Navigator Key for global navigation
final GlobalKey<NavigatorState> navigatorKey = GlobalKey<NavigatorState>();
// Notification Channel
const AndroidNotificationChannel channel = AndroidNotificationChannel( const AndroidNotificationChannel channel = AndroidNotificationChannel(
'generp_channel', // id 'generp_channel',
'generp_channel_name', 'generp_channel_name',
importance: Importance.max, importance: Importance.max,
playSound: false, playSound: true,
); );
final FlutterLocalNotificationsPlugin flutterLocalNotificationsPlugin = final FlutterLocalNotificationsPlugin flutterLocalNotificationsPlugin =
FlutterLocalNotificationsPlugin(); FlutterLocalNotificationsPlugin();
Future<void> _firebaseMessagingBackgroundHandler(RemoteMessage message) async { Future<void> _firebaseMessagingBackgroundHandler(RemoteMessage message) async {
await Firebase.initializeApp(); await Firebase.initializeApp();
String type = message.data['type'] ?? ''; debugPrint("📩 Background notification received: ${message.data}");
}
if (type == 'offline_reminder') { void handleNotificationTap(Map<String, dynamic> data) {
FlutterRingtonePlayer().play( debugPrint("👉 Handling notification tap: $data");
// fromAsset: "assets/offline_reminder.mp3",
ios: IosSounds.glass, // Specify the iOS sound try {
); String type = data['type'] ?? '';
} else if (type == 'normal') { String? rollId = data['RoleID'] ?? data['rollId'];
FlutterRingtonePlayer().play( String? notificationId = data['notification_id'] ?? data['notificationId'];
// fromAsset: "assets/notification_sound.mp3", String? url = data['url'];
ios: IosSounds.glass, // Specify the iOS sound String? mode = data['Parameter'];
); debugPrint("👉 Handling notification tap: $mode");
} else if (type == 'web_erp_notification') {
FlutterRingtonePlayer().play( if (type.toLowerCase() == "app") {
// fromAsset: "assets/notification_sound.mp3", // 🔥 Navigation based on RoleID
ios: IosSounds.glass, // Specify the iOS sound switch (rollId) {
); case "1":
} else { navigatorKey.currentState?.pushNamed('/crm_lead_list');
FlutterRingtonePlayer().play( break;
// fromAsset: "assets/notification_sound.mp3", case "4":
// will be the sound on Android navigatorKey.currentState?.pushNamed('/crm_prospect_list');
ios: IosSounds.glass, // will be the sound on iOS break;
); case "5":
} navigatorKey.currentState?.pushNamed(
if (kDebugMode) { '/crm_prospect_details',
print('A Background message just showed up: ${message.messageId}'); arguments: {"id": notificationId},
);
break;
case "6":
navigatorKey.currentState?.pushNamed(
'/crm_lead_details',
arguments: {"id": notificationId},
);
break;
case "7":
navigatorKey.currentState?.pushNamed('/dashboard');
break;
case "8":
navigatorKey.currentState?.pushNamed('/crm_new_customer_new_lead_register');
break;
case "10":
navigatorKey.currentState?.pushNamed('/crm_prospect_list_team');
break;
case "11":
navigatorKey.currentState?.pushNamed('/crm_prospect_list_admin');
break;
case "15":
navigatorKey.currentState?.pushNamed('/finance_list_employee');
break;
case "16":
navigatorKey.currentState?.pushNamed('/finance_list_admin');
break;
case "17":
navigatorKey.currentState?.pushNamed('/dispatch_list_executive');
break;
case "312":
navigatorKey.currentState?.pushNamed('/tour_bill_list');
break;
case "601":
navigatorKey.currentState?.pushNamed('/manual_attendance_request_list');
break;
default:
navigatorKey.currentState?.pushNamed('/home'); // fallback
}
} else if (type.toLowerCase() == "web" && url != null && url.isNotEmpty) {
// Open in WebView or browser
navigatorKey.currentState?.pushNamed(
'/webview',
arguments: {"url": url},
);
} else {
// fallback
navigatorKey.currentState?.pushNamed('/home');
}
} catch (e) {
debugPrint("❌ Error handling notification tap: $e");
} }
} }
// FlutterLocalNotificationsPlugin cannot auto-detect foreground taps
void showInAppNotification(BuildContext context, Map<String, dynamic> data) {
final snackBar = SnackBar(
content: Text(data['type'] ?? "New Notification"),
action: SnackBarAction(
label: 'Open',
onPressed: () {
debugPrint("👉 Foreground notification tapped: $data");
handleNotificationTap(data);
},
),
);
ScaffoldMessenger.of(context).showSnackBar(snackBar);
}
void main() async { void main() async {
WidgetsFlutterBinding.ensureInitialized(); WidgetsFlutterBinding.ensureInitialized();
// Firebase init
if (Platform.isAndroid) { if (Platform.isAndroid) {
await Firebase.initializeApp( await Firebase.initializeApp(
options: FirebaseOptions( options: FirebaseOptions(
...@@ -72,60 +155,147 @@ void main() async { ...@@ -72,60 +155,147 @@ void main() async {
} else if (Platform.isIOS) { } else if (Platform.isIOS) {
await Firebase.initializeApp(); await Firebase.initializeApp();
} }
if (kDebugMode) {
if (Firebase.apps.isNotEmpty) { // 🔔 Local Notification Init
print("Firebase is initialized"); const AndroidInitializationSettings initSettingsAndroid =
} else { AndroidInitializationSettings('@mipmap/ic_launcher');
print("Firebase is not initialized");
const DarwinInitializationSettings initSettingsIOS = DarwinInitializationSettings();
const InitializationSettings initializationSettings = InitializationSettings(
android: initSettingsAndroid,
iOS: initSettingsIOS,
);
flutterLocalNotificationsPlugin.initialize(
initializationSettings,
onDidReceiveNotificationResponse: (NotificationResponse notificationResponse) async {
if (notificationResponse.payload != null) {
handleNotificationTap(jsonDecode(notificationResponse.payload!));
debugPrint("📩 Notification clicked: $notificationResponse");
}
} }
} );
// Firebase Messaging
FirebaseMessaging.onBackgroundMessage(_firebaseMessagingBackgroundHandler);
FirebaseMessaging messaging = FirebaseMessaging.instance; FirebaseMessaging messaging = FirebaseMessaging.instance;
await messaging.requestPermission(alert: true, badge: true, sound: true);
NotificationSettings settings = await messaging.requestPermission( // Foreground notification
alert: true,
announcement: true,
badge: true,
carPlay: false,
criticalAlert: false,
provisional: false,
sound: false,
);
FirebaseMessaging.onMessage.listen((RemoteMessage message) { FirebaseMessaging.onMessage.listen((RemoteMessage message) {
RemoteNotification? notification = message.notification; final notification = message.notification;
AndroidNotification? android = message.notification?.android; final android = message.notification?.android;
print("msg");
String type = message.data['type'] ?? ''; debugPrint("😊 Foreground msg received: ${message.data}");
if (type == 'offline_reminder') {
FlutterRingtonePlayer().play( if (notification != null && android != null) {
fromAsset: "assets/offline_reminder.mp3", // flutterLocalNotificationsPlugin.show(
ios: IosSounds.glass, // Specify the iOS sound // notification.hashCode,
); // notification.title,
} else if (type == 'normal') { // notification.body,
FlutterRingtonePlayer().play( // NotificationDetails(
fromAsset: "assets/notification_sound.mp3", // android: AndroidNotificationDetails(
ios: IosSounds.glass, // Specify the iOS sound // channel.id,
); // channel.name,
} else if (type == 'web_erp_notification') { // importance: Importance.max,
FlutterRingtonePlayer().play( // priority: Priority.high,
fromAsset: "assets/notification_sound.mp3", // icon: '@mipmap/ic_launcher',
ios: IosSounds.glass, // Specify the iOS sound // ),
); // ),
} else { // payload: jsonEncode({
FlutterRingtonePlayer().play( // "type": message.data['type'],
fromAsset: // "rollId": message.data['RoleID'],
"assets/notification_sound.mp3", // will be the sound on Android // "notificationId": message.data['notification_id'],
ios: IosSounds.glass, // will be the sound on iOS // }),
// );
}
// ⚡ Foreground tap alternative:
// Show an in-app banner or SnackBar with a tap action
final context = navigatorKey.currentContext;
if (context != null) {
// Add haptic feedback
HapticFeedback.mediumImpact();
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Row(
children: [
SizedBox(
child: Image.asset(
"assets/images/ic_splash.jpg",
height: 30,
width: 30,
),
),
SizedBox(width: 8),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: [
Text(
notification?.title ?? "New Notification",
style: TextStyle(
fontSize: 14,
color: AppColors.app_blue,
fontFamily: "JakartaMedium",
),
),
if (notification?.body != null) SizedBox(height: 2),
if (notification?.body != null)
Text(
notification!.body!,
style: TextStyle(
fontSize: 12,
color: AppColors.semi_black,
fontFamily: "JakartaMedium",
),
),
],
),
),
],
),
action: SnackBarAction(
label: "Open",
textColor: AppColors.app_blue,
onPressed: () {
// Add haptic feedback for button press
HapticFeedback.lightImpact();
debugPrint("👉 Foreground notification tapped: ${message.data}");
// Use the same payload structure as local notifications
handleNotificationTap({
"type": message.data['type'],
"rollId": message.data['RoleID'],
"notificationId": message.data['notification_id'],
});
},
),
backgroundColor: AppColors.white,
behavior: SnackBarBehavior.floating,
elevation: 6,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(8),
),
margin: const EdgeInsets.all(16),
duration: const Duration(seconds: 4),
),
); );
} }
}); });
FirebaseMessaging.onBackgroundMessage(_firebaseMessagingBackgroundHandler);
await flutterLocalNotificationsPlugin await flutterLocalNotificationsPlugin
.resolvePlatformSpecificImplementation< .resolvePlatformSpecificImplementation<
AndroidFlutterLocalNotificationsPlugin AndroidFlutterLocalNotificationsPlugin>()
>()
?.createNotificationChannel(channel); ?.createNotificationChannel(channel);
await FirebaseMessaging.instance.setForegroundNotificationPresentationOptions( await FirebaseMessaging.instance.setForegroundNotificationPresentationOptions(
...@@ -134,13 +304,27 @@ void main() async { ...@@ -134,13 +304,27 @@ void main() async {
sound: true, sound: true,
); );
await FirebaseMessaging.instance.getToken().then((value) { FirebaseMessaging.onMessageOpenedApp.listen((RemoteMessage message) {
String? token = value; String type = message.data['type'] ?? '';
String redirectUrl = message.data['redirect_url'] ?? '';
handleNotificationTap(message.data);
// Navigator.push(
// context,
// MaterialPageRoute(builder: (context) => Dashboard()),
// );
if (kDebugMode) { if (kDebugMode) {
// print("fbstoken:{$token}"); print('A new onMessageOpenedApp event was published!');
} }
});
SharedpreferencesService().saveString("fbstoken", token!); // Save FCM Token
await FirebaseMessaging.instance.getToken().then((value) {
if (value != null) {
SharedpreferencesService().saveString("fbstoken", value);
debugPrint("🔑 FCM Token: $value");
}
}); });
runApp(const MyApp()); runApp(const MyApp());
...@@ -153,19 +337,19 @@ class MyApp extends StatelessWidget { ...@@ -153,19 +337,19 @@ class MyApp extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
// SystemChrome.setApplicationSwitcherDescription(ApplicationSwitcherDescription()); // SystemChrome.setApplicationSwitcherDescription(ApplicationSwitcherDescription());
SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge); // SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
FirebaseMessaging.onMessageOpenedApp.listen((RemoteMessage message) { // FirebaseMessaging.onMessageOpenedApp.listen((RemoteMessage message) {
String type = message.data['type'] ?? ''; // String type = message.data['type'] ?? '';
String redirectUrl = message.data['redirect_url'] ?? ''; // String redirectUrl = message.data['redirect_url'] ?? '';
//
// Navigator.push( // // Navigator.push(
// context, // // context,
// MaterialPageRoute(builder: (context) => Dashboard()), // // MaterialPageRoute(builder: (context) => Dashboard()),
// ); // // );
if (kDebugMode) { // if (kDebugMode) {
print('A new onMessageOpenedApp event was published!'); // print('A new onMessageOpenedApp event was published!');
} // }
}); // });
return MultiProvider( return MultiProvider(
providers: [ providers: [
ChangeNotifierProvider(create: (_) => SplashVersionNotifier()), ChangeNotifierProvider(create: (_) => SplashVersionNotifier()),
...@@ -226,9 +410,7 @@ class MyApp extends StatelessWidget { ...@@ -226,9 +410,7 @@ class MyApp extends StatelessWidget {
ChangeNotifierProvider(create: (_) => Dispatchorderprovider()), ChangeNotifierProvider(create: (_) => Dispatchorderprovider()),
ChangeNotifierProvider(create: (_) => followUpUpdateProvider()), ChangeNotifierProvider(create: (_) => followUpUpdateProvider()),
ChangeNotifierProvider(create: (_) => Appointmentcalendarprovider()), ChangeNotifierProvider(create: (_) => Appointmentcalendarprovider()),
ChangeNotifierProvider( ChangeNotifierProvider(create: (_) => Addnewleadsandprospectsprovider()),
create: (_) => Addnewleadsandprospectsprovider(),
),
ChangeNotifierProvider(create: (_) => HrmAccessiblePagesProvider()), ChangeNotifierProvider(create: (_) => HrmAccessiblePagesProvider()),
ChangeNotifierProvider(create: (_) => Attendancelistprovider()), ChangeNotifierProvider(create: (_) => Attendancelistprovider()),
ChangeNotifierProvider(create: (_) => AttendanceDetailsProvider()), ChangeNotifierProvider(create: (_) => AttendanceDetailsProvider()),
...@@ -237,12 +419,36 @@ class MyApp extends StatelessWidget { ...@@ -237,12 +419,36 @@ class MyApp extends StatelessWidget {
ChangeNotifierProvider(create: (_) => RewardListProvider()), ChangeNotifierProvider(create: (_) => RewardListProvider()),
ChangeNotifierProvider(create: (_) => LeaveApplicationListProvider()), ChangeNotifierProvider(create: (_) => LeaveApplicationListProvider()),
ChangeNotifierProvider(create: (_) => Orgprovider()), ChangeNotifierProvider(create: (_) => Orgprovider()),
ChangeNotifierProvider(create: (_) => AdvanceListProvider()),
ChangeNotifierProvider(create: (_) => CasualLeaveHistoryProvider()),
], ],
child: Builder( child: Builder(
builder: (BuildContext context) { builder: (BuildContext context) {
return MaterialApp( return MaterialApp(
navigatorKey: navigatorKey,
routes: {
'/home': (context) => const AttendanceScreen(),
'/chat': (context) => AttendanceScreen(),
'/product_details': (context) => AttendanceScreen(),
'/order_details': (context) => AttendanceScreen(),
'/crm_lead_list': (context) => LeadDetailsByMode(mode: "", pageTitleName: "Lead Details", leadId: ""),
'/crm_prospect_list': (context) => ProspectListByMode(),
'/crm_prospect_details': (context) => AttendanceScreen(),
'/crm_lead_details': (context) => AttendanceScreen(),
'/dashboard': (context) => CrmdashboardScreen(),
'/crm_new_customer_new_lead_register': (context) => AttendanceScreen(),
'/crm_prospect_list_team': (context) => AttendanceScreen(),
'/crm_prospect_list_admin': (context) => AttendanceScreen(),
'/finance_list_employee': (context) => AttendanceScreen(),
'/finance_list_admin': (context) => AttendanceScreen(),
'/dispatch_list_executive': (context) => AttendanceScreen(),
'/tour_bill_list': (context) => TourExpensesListScreen(),
'/manual_attendance_request_list': (context) => AttendanceListScreen(mode: "",),
},
scrollBehavior: const MaterialScrollBehavior().copyWith( scrollBehavior: const MaterialScrollBehavior().copyWith(
dragDevices: {PointerDeviceKind.touch, PointerDeviceKind.mouse}, dragDevices: {PointerDeviceKind.touch,PointerDeviceKind.mouse},
), ),
navigatorObservers: [MyNavigatorObserver()], navigatorObservers: [MyNavigatorObserver()],
...@@ -261,6 +467,7 @@ class MyApp extends StatelessWidget { ...@@ -261,6 +467,7 @@ class MyApp extends StatelessWidget {
highlightColor: Colors.transparent, highlightColor: Colors.transparent,
hoverColor: Colors.transparent, hoverColor: Colors.transparent,
scaffoldBackgroundColor: Colors.white, scaffoldBackgroundColor: Colors.white,
dialogBackgroundColor: Colors.white,
cardColor: Colors.white, cardColor: Colors.white,
shadowColor: Colors.white54, shadowColor: Colors.white54,
searchBarTheme: const SearchBarThemeData(), searchBarTheme: const SearchBarThemeData(),
...@@ -304,8 +511,8 @@ class MyApp extends StatelessWidget { ...@@ -304,8 +511,8 @@ class MyApp extends StatelessWidget {
dragHandleSize: Size(60.0, 6.0), dragHandleSize: Size(60.0, 6.0),
), ),
colorScheme: const ColorScheme.light( colorScheme: const ColorScheme.light(
surface: Colors.white, background: Colors.white,
).copyWith(surface: Colors.white), ).copyWith(background: Colors.white),
scrollbarTheme: ScrollbarThemeData( scrollbarTheme: ScrollbarThemeData(
minThumbLength: 20, minThumbLength: 20,
interactive: true, interactive: true,
...@@ -316,8 +523,10 @@ class MyApp extends StatelessWidget { ...@@ -316,8 +523,10 @@ class MyApp extends StatelessWidget {
), ),
), ),
checkboxTheme: CheckboxThemeData( checkboxTheme: CheckboxThemeData(
side: BorderSide(width: 0.5), side: BorderSide(width: 0.5),
checkColor: WidgetStatePropertyAll(AppColors.white), checkColor: WidgetStatePropertyAll(AppColors.white),
), ),
useMaterial3: true, useMaterial3: true,
// inputDecorationTheme: InputDecorationTheme( // inputDecorationTheme: InputDecorationTheme(
......
lib/screens/HomeScreen.dart
View file @ dc88a3f9
...@@ -1779,12 +1779,12 @@ class _MyHomePageState extends State<MyHomePage> { ...@@ -1779,12 +1779,12 @@ class _MyHomePageState extends State<MyHomePage> {
} }
Future<void> _showProfileBottomSheet(BuildContext context) { Future<void> _showProfileBottomSheet(BuildContext context) {
final profileNotifier = Provider.of<ProfileNotifer>(context, listen: false); // final profileNotifier = Provider.of<ProfileNotifer>(context, listen: false);
profileNotifier.fetchJobDescription( // profileNotifier.fetchJobDescription(
Provider.of<HomescreenNotifier>(context, listen: false), // Provider.of<HomescreenNotifier>(context, listen: false),
context, // context,
); // );
return showModalBottomSheet( return showModalBottomSheet(
useSafeArea: true, useSafeArea: true,
isDismissible: true, isDismissible: true,
...@@ -1975,18 +1975,7 @@ class _MyHomePageState extends State<MyHomePage> { ...@@ -1975,18 +1975,7 @@ class _MyHomePageState extends State<MyHomePage> {
AppColors.semi_black, AppColors.semi_black,
), ),
), ),
if (profileNotifier if (index == 2) // only for Designation
.response
?.jobDescription
?.jobDescription !=
null &&
profileNotifier
.response!
.jobDescription!
.jobDescription !=
"")
if (index ==
2) // only for Designation
InkWell( InkWell(
onTap: onTap:
index == 2 index == 2
......
lib/screens/crm/LeadDetailsByMode.dart
View file @ dc88a3f9
...@@ -797,7 +797,7 @@ class _LeadDetailsByModeState extends State<LeadDetailsByMode> { ...@@ -797,7 +797,7 @@ class _LeadDetailsByModeState extends State<LeadDetailsByMode> {
if (productsNotEmpty) ...[ if (productsNotEmpty) ...[
SizedBox( SizedBox(
width: double.infinity, width: double.infinity,
height: 130, height: 150,
child: ListView.builder( child: ListView.builder(
physics: AlwaysScrollableScrollPhysics(), physics: AlwaysScrollableScrollPhysics(),
shrinkWrap: true, shrinkWrap: true,
...@@ -872,7 +872,7 @@ class _LeadDetailsByModeState extends State<LeadDetailsByMode> { ...@@ -872,7 +872,7 @@ class _LeadDetailsByModeState extends State<LeadDetailsByMode> {
); );
}, },
child: Container( child: Container(
height: 130, height: 140,
width: width:
MediaQuery.of(context).size.width * MediaQuery.of(context).size.width *
0.9, 0.9,
...@@ -966,7 +966,7 @@ class _LeadDetailsByModeState extends State<LeadDetailsByMode> { ...@@ -966,7 +966,7 @@ class _LeadDetailsByModeState extends State<LeadDetailsByMode> {
AppColors.grey_semi, AppColors.grey_semi,
), ),
), ),
SizedBox(height: 5), SizedBox(height: 3),
DottedLine( DottedLine(
dashGapLength: 4, dashGapLength: 4,
dashGapColor: dashGapColor:
...@@ -988,6 +988,24 @@ class _LeadDetailsByModeState extends State<LeadDetailsByMode> { ...@@ -988,6 +988,24 @@ class _LeadDetailsByModeState extends State<LeadDetailsByMode> {
.semi_black, .semi_black,
), ),
), ),
SizedBox(height: 5),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Expanded(
child: Text(
provider.leadProducts[lp].remarks ?? "",
style: TextStyle(
fontFamily: "JakartaMedium",
fontSize: 14,
color: AppColors.semi_black,
),
maxLines: 1,
overflow: TextOverflow.ellipsis,
),
),
],
)
], ],
), ),
), ),
...@@ -3458,6 +3476,34 @@ class _LeadDetailsByModeState extends State<LeadDetailsByMode> { ...@@ -3458,6 +3476,34 @@ class _LeadDetailsByModeState extends State<LeadDetailsByMode> {
), ),
], ],
), ),
const SizedBox(height: 10),
TextWidget(context, "Remarks"),
Container(
margin: EdgeInsets.only(bottom: 6),
decoration: BoxDecoration(
color: AppColors.text_field_color,
borderRadius: BorderRadius.circular(14),
),
child: TextFormField(
controller: editProvider.addEditRemarkController,
maxLines: 3,
enabled: true,
style: TextStyle(
color: Colors.black,
fontSize: 14,
),
decoration: InputDecoration(
hintText: "Enter remark",
hintStyle: TextStyle(
color: Colors.grey.shade500,
fontSize: 14,
),
border: InputBorder.none,
contentPadding: EdgeInsets.symmetric(
horizontal: 12, vertical: 12),
),
),
),
// IconButton( // IconButton(
// icon: const Icon(Icons.delete), // icon: const Icon(Icons.delete),
// onPressed: editProvider.editProductPriceControllers.length > 1 // onPressed: editProvider.editProductPriceControllers.length > 1
...@@ -3476,8 +3522,8 @@ class _LeadDetailsByModeState extends State<LeadDetailsByMode> { ...@@ -3476,8 +3522,8 @@ class _LeadDetailsByModeState extends State<LeadDetailsByMode> {
provider.leadDetails.id!, provider.leadDetails.id!,
type, type,
leadProductId, leadProductId,
editProvider editProvider.selectedAddEditProductId,
.selectedAddEditProductId, editProvider.addEditRemarkController
); );
}, },
child: Container( child: Container(
......
lib/screens/crm/LeadListByMode.dart
View file @ dc88a3f9
...@@ -267,24 +267,22 @@ class _LeadlistbymodeState extends State<Leadlistbymode> { ...@@ -267,24 +267,22 @@ class _LeadlistbymodeState extends State<Leadlistbymode> {
), ),
), ),
SizedBox(width: 10), SizedBox(width: 10),
Expanded( Expanded(
flex: 1, flex: 1,
child: InkResponse( child: InkResponse(
onTap: () { onTap: () {
HapticFeedback.selectionClick(); HapticFeedback.selectionClick();
launch( _showContactOptions(context, crmLists[index].mob1);
'tel://${crmLists[index].mob1}', },
); child: SizedBox(
}, height: 35,
child: SizedBox( width: 35,
height: 35, child: SvgPicture.asset(
width: 35, "assets/svg/crm/lead_list_call_ic.svg",
child: SvgPicture.asset( ),
"assets/svg/crm/lead_list_call_ic.svg", ),
), ),
), ),
),
),
], ],
), ),
], ],
...@@ -930,6 +928,91 @@ class _LeadlistbymodeState extends State<Leadlistbymode> { ...@@ -930,6 +928,91 @@ class _LeadlistbymodeState extends State<Leadlistbymode> {
}, },
); );
} }
void _showContactOptions(BuildContext context, String? phoneNumber) {
if (phoneNumber == null || phoneNumber.isEmpty) {
ScaffoldMessenger.of(context).showSnackBar(
const SnackBar(content: Text("No phone number available")),
);
return;
}
showModalBottomSheet(
context: context,
shape: const RoundedRectangleBorder(
borderRadius: BorderRadius.vertical(top: Radius.circular(20)),
),
backgroundColor: Colors.white,
builder: (BuildContext context) {
return Padding(
padding: const EdgeInsets.symmetric(vertical: 16, horizontal: 20),
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
Container(
width: 40,
height: 4,
decoration: BoxDecoration(
color: Colors.grey.shade400,
borderRadius: BorderRadius.circular(10),
),
),
const SizedBox(height: 16),
const Text(
"Contact Options",
style: TextStyle(
fontSize: 18,
fontWeight: FontWeight.w600,
fontFamily: "JakartaMedium",
color: Colors.black
),
),
const SizedBox(height: 20),
// --- Call Option ---
ListTile(
leading: const Icon(Icons.phone, color: Colors.green),
title: const Text("Call", style: TextStyle(
fontSize: 16,
fontFamily: "JakartaMedium",
)
),
onTap: () async {
Navigator.pop(context);
final uri = Uri.parse("tel:$phoneNumber");
await launchUrl(uri, mode: LaunchMode.externalApplication);
},
),
// --- WhatsApp Option ---
ListTile(
leading: const Icon(Icons.chat, color: Colors.teal),
title: const Text("WhatsApp", style: TextStyle(
fontSize: 16,
fontFamily: "JakartaMedium",
)
),
onTap: () async {
Navigator.pop(context);
final message = Uri.encodeComponent("Hello, I’d like to connect with you.");
final whatsappUri = Uri.parse("https://wa.me/$phoneNumber?text=$message");
if (await canLaunchUrl(whatsappUri)) {
await launchUrl(whatsappUri, mode: LaunchMode.externalApplication);
} else {
ScaffoldMessenger.of(context).showSnackBar(
const SnackBar(content: Text("WhatsApp not installed or invalid number")),
);
}
},
),
],
),
);
},
);
}
bool _isFilterSelected(Leadlistprovider provider, int index) { bool _isFilterSelected(Leadlistprovider provider, int index) {
switch (index) { switch (index) {
......
lib/screens/crm/ProspectDetailsByMode.dart
View file @ dc88a3f9
...@@ -3375,43 +3375,43 @@ class ProspectDetailsByModeState extends State<ProspectDetailsByMode> { ...@@ -3375,43 +3375,43 @@ class ProspectDetailsByModeState extends State<ProspectDetailsByMode> {
children: [ children: [
Expanded( Expanded(
child: DropdownButton2<String>( child: DropdownButton2<String>(
hint: Text( isExpanded: true,
"Select Status", hint: const Row(
style: TextStyle(fontSize: 14), children: [
Expanded(
child: Text(
'Select Lead Status',
style: TextStyle(fontSize: 14),
overflow: TextOverflow.ellipsis,
),
),
],
), ),
items: items:
addleadProvider.statusList <String>['All', 'Cold', 'Hot', 'Warm']
.map( .map(
(slist) => (value) => DropdownMenuItem<String>(
DropdownMenuItem<String>( value: value,
value: slist, child: Text(
child: Text( value ?? '',
slist, style: const TextStyle(
style: TextStyle( fontSize: 14,
fontSize: 14, ),
), overflow: TextOverflow.ellipsis,
), ),
), ),
) )
.toList(), .toList(),
value: addleadProvider.selectedStatus, value: addleadProvider.selectedStatus,
onChanged: (String? value) { onChanged: (String? newValue) {
if (value != null) { setState(() {
if (addleadProvider addleadProvider.selectedStatus = newValue!;
.statusList });
.isNotEmpty) {
addleadProvider.selectedStatus =
value;
}
}
}, },
isExpanded: true,
buttonStyleData: ddtheme.buttonStyleData, buttonStyleData: ddtheme.buttonStyleData,
iconStyleData: ddtheme.iconStyleData, iconStyleData: ddtheme.iconStyleData,
menuItemStyleData: menuItemStyleData: ddtheme.menuItemStyleData,
ddtheme.menuItemStyleData, dropdownStyleData: ddtheme.dropdownStyleData,
dropdownStyleData:
ddtheme.dropdownStyleData,
), ),
), ),
], ],
...@@ -3421,6 +3421,34 @@ class ProspectDetailsByModeState extends State<ProspectDetailsByMode> { ...@@ -3421,6 +3421,34 @@ class ProspectDetailsByModeState extends State<ProspectDetailsByMode> {
errorWidget(context, addleadProvider.statusError), errorWidget(context, addleadProvider.statusError),
], ],
TextWidget(context, "Remarks"),
Container(
margin: EdgeInsets.only(bottom: 6),
decoration: BoxDecoration(
color: AppColors.text_field_color,
borderRadius: BorderRadius.circular(14),
),
child: TextFormField(
controller: addleadProvider.addLeadProductRemarksController,
maxLines: 3,
enabled: true,
style: TextStyle(
color: Colors.black,
fontSize: 14,
),
decoration: InputDecoration(
hintText: "Enter remark",
hintStyle: TextStyle(
color: Colors.grey.shade500,
fontSize: 14,
),
border: InputBorder.none,
contentPadding: EdgeInsets.symmetric(
horizontal: 12, vertical: 12),
),
),
),
InkResponse( InkResponse(
onTap: onTap:
addleadProvider.submitLoading addleadProvider.submitLoading
......
lib/screens/crm/addLeadProductScreen.dart
View file @ dc88a3f9
...@@ -29,7 +29,6 @@ class _AddleadproductscreenState extends State<Addleadproductscreen> { ...@@ -29,7 +29,6 @@ class _AddleadproductscreenState extends State<Addleadproductscreen> {
@override @override
void initState() { void initState() {
// TODO: implement initState
super.initState(); super.initState();
_connectivity.initialise(); _connectivity.initialise();
_connectivity.myStream.listen((source) { _connectivity.myStream.listen((source) {
...@@ -47,17 +46,15 @@ class _AddleadproductscreenState extends State<Addleadproductscreen> { ...@@ -47,17 +46,15 @@ class _AddleadproductscreenState extends State<Addleadproductscreen> {
provider.addProductPriceController.clear(); provider.addProductPriceController.clear();
provider.addQuantityController.clear(); provider.addQuantityController.clear();
provider.addTotalAmountController.clear(); provider.addTotalAmountController.clear();
provider.remarkController.clear(); // Clear remarks too
} else { } else {
provider.prefillProductForEdit(widget.editIndex!); provider.prefillProductForEdit(widget.editIndex!);
} }
// provider.addEditInitializeForm(context);
}); });
} }
@override @override
void dispose() { void dispose() {
// TODO: implement dispose
super.dispose(); super.dispose();
_connectivity.disposeStream(); _connectivity.disposeStream();
} }
...@@ -77,15 +74,15 @@ class _AddleadproductscreenState extends State<Addleadproductscreen> { ...@@ -77,15 +74,15 @@ class _AddleadproductscreenState extends State<Addleadproductscreen> {
} }
return (connection == "Online") return (connection == "Online")
? Platform.isAndroid ? Platform.isAndroid
? WillPopScope( ? WillPopScope(
onWillPop: () => onBackPressed(context), onWillPop: () => onBackPressed(context),
child: SafeArea( child: SafeArea(
top: false, top: false,
bottom: true, bottom: true,
child: _scaffold(context), child: _scaffold(context),
), ),
) )
: _scaffold(context) : _scaffold(context)
: NoNetwork(context); : NoNetwork(context);
} }
...@@ -94,7 +91,6 @@ class _AddleadproductscreenState extends State<Addleadproductscreen> { ...@@ -94,7 +91,6 @@ class _AddleadproductscreenState extends State<Addleadproductscreen> {
builder: (context, provider, child) { builder: (context, provider, child) {
return Scaffold( return Scaffold(
resizeToAvoidBottomInset: true, resizeToAvoidBottomInset: true,
appBar: appbarNew(context, "Generate Quotation", 0xFFFFFFFF), appBar: appbarNew(context, "Generate Quotation", 0xFFFFFFFF),
backgroundColor: AppColors.scaffold_bg_color, backgroundColor: AppColors.scaffold_bg_color,
body: SingleChildScrollView( body: SingleChildScrollView(
...@@ -109,7 +105,6 @@ class _AddleadproductscreenState extends State<Addleadproductscreen> { ...@@ -109,7 +105,6 @@ class _AddleadproductscreenState extends State<Addleadproductscreen> {
horizontal: 10, horizontal: 10,
vertical: 10, vertical: 10,
), ),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.white, color: Colors.white,
borderRadius: BorderRadius.circular(20), borderRadius: BorderRadius.circular(20),
...@@ -129,67 +124,55 @@ class _AddleadproductscreenState extends State<Addleadproductscreen> { ...@@ -129,67 +124,55 @@ class _AddleadproductscreenState extends State<Addleadproductscreen> {
style: TextStyle(fontSize: 14), style: TextStyle(fontSize: 14),
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
), ),
items: items: provider.productsList
provider.productsList .map(
.map( (ord) => DropdownMenuItem<Products>(
(ord) => DropdownMenuItem<Products>( value: ord,
value: ord, child: Text(
child: Text( "${ord.name}",
"${ord.name}", style: const TextStyle(
style: const TextStyle( fontSize: 14,
fontSize: 14, ),
), overflow: TextOverflow.ellipsis,
overflow: TextOverflow.ellipsis, ),
), ),
), )
) .toList(),
.toList(), value: provider.selectedProducts != null
// provider.selectedOrderIds[index] != null? ? provider.productsList.firstWhere(
// provider (element) =>
// .orderList element.id ==
// .firstWhere( provider.selectedProductsId,
// (product) => )
// product : null,
// .orderId ==
// provider
// .selectedOrderIds[index],
// )
value:
provider.selectedProducts != null
? provider.productsList.firstWhere(
(element) =>
element.id ==
provider.selectedProductsId,
)
: null,
onChanged: (Products? value) { onChanged: (Products? value) {
if (value != null) { if (value != null) {
provider.selectedProducts = value; provider.selectedProducts = value;
provider.selectedProductsId = value.id!; provider.selectedProductsId = value.id!;
provider.selectedProductsValue = value.name; provider.selectedProductsValue = value.name;
provider.selectedProductsRemark = value.remarks;
provider.crmSelectedProductDetailsApiFunction(
context,
value.id.toString(),
);
} }
provider.crmSelectedProductDetailsApiFunction(
context,
value!.id.toString(),
);
}, },
dropdownSearchData: DropdownSearchData( dropdownSearchData: DropdownSearchData(
searchInnerWidgetHeight: 50, searchInnerWidgetHeight: 50,
searchController: searchController:
provider.productSearchController, provider.productSearchController,
searchInnerWidget: Padding( searchInnerWidget: Padding(
padding: const EdgeInsets.all(8), padding: const EdgeInsets.all(8),
child: TextFormField( child: TextFormField(
controller: controller:
provider.productSearchController, provider.productSearchController,
decoration: InputDecoration( decoration: InputDecoration(
isDense: true, isDense: true,
contentPadding: contentPadding:
const EdgeInsets.symmetric( const EdgeInsets.symmetric(
horizontal: 10, horizontal: 10,
vertical: 8, vertical: 8,
), ),
hintText: 'Search Product...', hintText: 'Search Product...',
border: OutlineInputBorder( border: OutlineInputBorder(
borderRadius: BorderRadius.circular( borderRadius: BorderRadius.circular(
...@@ -201,10 +184,10 @@ class _AddleadproductscreenState extends State<Addleadproductscreen> { ...@@ -201,10 +184,10 @@ class _AddleadproductscreenState extends State<Addleadproductscreen> {
), ),
searchMatchFn: (item, searchValue) { searchMatchFn: (item, searchValue) {
return item.value?.name return item.value?.name
?.toLowerCase() ?.toLowerCase()
.contains( .contains(
searchValue.toLowerCase(), searchValue.toLowerCase(),
) ?? ) ??
false; false;
}, },
), ),
...@@ -222,7 +205,6 @@ class _AddleadproductscreenState extends State<Addleadproductscreen> { ...@@ -222,7 +205,6 @@ class _AddleadproductscreenState extends State<Addleadproductscreen> {
], ],
), ),
), ),
const SizedBox(height: 10), const SizedBox(height: 10),
textControllerWidget( textControllerWidget(
context, context,
...@@ -255,7 +237,7 @@ class _AddleadproductscreenState extends State<Addleadproductscreen> { ...@@ -255,7 +237,7 @@ class _AddleadproductscreenState extends State<Addleadproductscreen> {
provider.addTotalAmountController, provider.addTotalAmountController,
"Amount", "Amount",
"Total Amount", "Total Amount",
(_) {}, (_) {},
TextInputType.number, TextInputType.number,
true, true,
FilteringTextInputFormatter.digitsOnly, FilteringTextInputFormatter.digitsOnly,
...@@ -263,54 +245,133 @@ class _AddleadproductscreenState extends State<Addleadproductscreen> { ...@@ -263,54 +245,133 @@ class _AddleadproductscreenState extends State<Addleadproductscreen> {
), ),
], ],
), ),
TextWidget(context, "Remarks"),
// IconButton( Container(
// icon: const Icon(Icons.delete), margin: EdgeInsets.only(bottom: 6),
// onPressed: provider.editProductPriceControllers.length > 1 decoration: BoxDecoration(
// ? () => provider.editRemoveRow(j) color: AppColors.text_field_color,
// : null, borderRadius: BorderRadius.circular(14),
// ), ),
child: TextFormField(
controller: provider.remarkController,
maxLines: 3,
enabled: true,
style: TextStyle(
color: Colors.black,
fontSize: 14,
),
decoration: InputDecoration(
hintText: "Enter remark",
hintStyle: TextStyle(
color: Colors.grey.shade500,
fontSize: 14,
),
border: InputBorder.none,
contentPadding: EdgeInsets.symmetric(
horizontal: 12, vertical: 12),
),
),
)
], ],
), ),
), ),
], ],
), ),
), ),
floatingActionButtonLocation: floatingActionButtonLocation:
FloatingActionButtonLocation.centerFloat, FloatingActionButtonLocation.centerFloat,
floatingActionButton: InkWell( floatingActionButton: InkWell(
onTap: () { onTap: () {
HapticFeedback.selectionClick(); HapticFeedback.selectionClick();
if (provider.selectedProducts != null) {
final productData = { // Validate required fields
"product_id": provider.selectedProductsId!, if (provider.selectedProducts == null) {
"price": provider.addProductPriceController.text, ScaffoldMessenger.of(context).showSnackBar(
"qty": provider.addQuantityController.text, SnackBar(
"net_price": provider.addTotalAmountController.text, content: Text("Please select a product"),
}; backgroundColor: Colors.red,
if (widget.editIndex != null) { duration: Duration(seconds: 2),
provider.updateProduct(widget.editIndex!, productData); ),
} else { );
provider.addProduct(productData); return;
} }
print(provider.getJsonEncodedProducts());
Navigator.pop(context, provider.getJsonEncodedProducts()); if (provider.addProductPriceController.text.isEmpty) {
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text("Please enter product price"),
backgroundColor: Colors.red,
duration: Duration(seconds: 2),
),
);
return;
} }
if (provider.addQuantityController.text.isEmpty) {
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text("Please enter quantity"),
backgroundColor: Colors.red,
duration: Duration(seconds: 2),
),
);
return;
}
// Prepare product data - FIX: Use .text for remarks
final productData = {
"product_id": provider.selectedProductsId!,
"price": provider.addProductPriceController.text,
"qty": provider.addQuantityController.text,
"net_price": provider.addTotalAmountController.text,
"remarks": provider.remarkController.text, // FIXED: Use .text
};
if (widget.editIndex != null) {
provider.updateProduct(widget.editIndex!, productData);
print("Product updated at index ${widget.editIndex}");
} else {
provider.addProduct(productData);
print("New product added");
}
print("Product data: ${provider.getJsonEncodedProducts()}");
// Show success message
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text(widget.editIndex != null
? "Product updated successfully!"
: "Product added successfully!"),
backgroundColor: Colors.green,
duration: Duration(seconds: 2),
),
);
// Close screen after a short delay to show the success message
Future.delayed(Duration(milliseconds: 1500), () {
if (mounted) {
Navigator.pop(context, true); // Return true to indicate success
}
});
}, },
child: Container( child: Container(
alignment: Alignment.center, alignment: Alignment.center,
height: 45, height: 45,
decoration: BoxDecoration( decoration: BoxDecoration(
color: AppColors.app_blue, //1487C9 color: AppColors.app_blue,
borderRadius: BorderRadius.circular(14.0), borderRadius: BorderRadius.circular(14.0),
), ),
margin: EdgeInsets.symmetric(horizontal: 10), margin: EdgeInsets.symmetric(horizontal: 10),
child: Center( child: Center(
child: Text( child: Text(
"Submit", widget.editIndex != null ? "Update Product" : "Add Product",
textAlign: TextAlign.center, textAlign: TextAlign.center,
style: TextStyle(color: Colors.white), style: TextStyle(
color: Colors.white,
fontSize: 16,
fontWeight: FontWeight.w600,
),
), ),
), ),
), ),
...@@ -319,4 +380,18 @@ class _AddleadproductscreenState extends State<Addleadproductscreen> { ...@@ -319,4 +380,18 @@ class _AddleadproductscreenState extends State<Addleadproductscreen> {
}, },
); );
} }
}
Widget TextWidget(context, text) {
return Padding(
padding: const EdgeInsets.only(bottom: 5.0, top: 8.0),
child: Text(
text,
style: TextStyle(
fontSize: 14,
fontWeight: FontWeight.w500,
color: AppColors.semi_black,
),
),
);
}
}
\ No newline at end of file
lib/screens/crm/addLeadsProspectsScreen.dart
View file @ dc88a3f9
...@@ -299,27 +299,28 @@ class _AddleadsprospectsscreenState extends State<Addleadsprospectsscreen> { ...@@ -299,27 +299,28 @@ class _AddleadsprospectsscreenState extends State<Addleadsprospectsscreen> {
), ),
errorWidget(context, provider.companynameError), errorWidget(context, provider.companynameError),
textControllerWidget( textControllerWidget(
context, context,
provider.contactPersonNameController, provider.contactPersonNameController,
"Contact Person Name", "Contact Person Name",
"Enter Name", "Enter Name",
provider.onChangeContactPersonName, (value) => provider.onChangeContactPersonName(context, value),
TextInputType.name, TextInputType.name,
false, false,
null, null,
focusNodes[1], focusNodes[1],
focusNodes[2], focusNodes[2],
TextInputAction.next, TextInputAction.next,
), ),
errorWidget(context, provider.nameError),
errorWidget(context, provider.nameError),
textControllerWidget( textControllerWidget(
context, context,
provider.mobileController, provider.mobileController,
"Mobile Number", "Mobile Number",
"Enter Mobile Number", "Enter Mobile Number",
provider.onChangemobile, (value) => provider.onChangemobile(context, value),
TextInputType.phone, TextInputType.phone,
false, false,
FilteringTextInputFormatter.digitsOnly, FilteringTextInputFormatter.digitsOnly,
...@@ -931,40 +932,36 @@ class _AddleadsprospectsscreenState extends State<Addleadsprospectsscreen> { ...@@ -931,40 +932,36 @@ class _AddleadsprospectsscreenState extends State<Addleadsprospectsscreen> {
scrollDirection: Axis.horizontal, scrollDirection: Axis.horizontal,
itemCount: provider.productRows.length, itemCount: provider.productRows.length,
itemBuilder: (context, index) { itemBuilder: (context, index) {
final product = final product = provider.productRows[index];
provider.productRows[index]; final productName = provider.productsList
final productName = .firstWhere(
provider.productsList (p) => p.id == product['product_id'],
.firstWhere( orElse: () => Products(
(p) => id: '',
p.id == name: 'Unknown',
product['product_id'], ),
orElse: )
() => Products( .name;
id: '',
name: 'Unknown',
),
)
.name;
final prodPrice = product['price'] ?? '-'; final prodPrice = product['price'] ?? '-';
final prodQty = product['qty'] ?? '-'; final prodQty = product['qty'] ?? '-';
final totalPrice = final totalPrice = product['net_price'] ?? '-';
product['net_price'] ?? '-';
// FIX: Get the text from TextEditingController, not the controller itself
final remark = product['remarks'] is TextEditingController
? (product['remarks'] as TextEditingController).text
: product['remarks']?.toString() ?? '';
return InkResponse( return InkResponse(
onTap: () async { onTap: () async {
var res = await Navigator.push( var res = await Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: builder: (context) => Addleadproductscreen(
(context) => type: "Edit",
Addleadproductscreen( editIndex: index,
type: "Edit", ),
editIndex: index,
),
settings: RouteSettings( settings: RouteSettings(
name: name: 'Generatequotationaddeditproduct',
'Generatequotationaddeditproduct',
), ),
), ),
); );
...@@ -973,21 +970,10 @@ class _AddleadsprospectsscreenState extends State<Addleadsprospectsscreen> { ...@@ -973,21 +970,10 @@ class _AddleadsprospectsscreenState extends State<Addleadsprospectsscreen> {
} }
}, },
child: Container( child: Container(
width: width: MediaQuery.of(context).size.width * 0.8,
MediaQuery.of(
context,
).size.width *
0.8,
margin: EdgeInsets.only( margin: EdgeInsets.only(
left: index == 0 ? 10 : 5, left: index == 0 ? 10 : 5,
right: right: index == provider.productRows.length - 1 ? 10 : 5,
index ==
provider
.productRows
.length -
1
? 10
: 5,
bottom: 5, bottom: 5,
), ),
padding: EdgeInsets.symmetric( padding: EdgeInsets.symmetric(
...@@ -996,15 +982,11 @@ class _AddleadsprospectsscreenState extends State<Addleadsprospectsscreen> { ...@@ -996,15 +982,11 @@ class _AddleadsprospectsscreenState extends State<Addleadsprospectsscreen> {
), ),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Color(0xFFE6F6FF), color: Color(0xFFE6F6FF),
borderRadius: BorderRadius.circular( borderRadius: BorderRadius.circular(14),
14,
),
), ),
child: Row( child: Row(
mainAxisAlignment: mainAxisAlignment: MainAxisAlignment.start,
MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
crossAxisAlignment:
CrossAxisAlignment.start,
children: [ children: [
Expanded( Expanded(
flex: 1, flex: 1,
...@@ -1016,10 +998,8 @@ class _AddleadsprospectsscreenState extends State<Addleadsprospectsscreen> { ...@@ -1016,10 +998,8 @@ class _AddleadsprospectsscreenState extends State<Addleadsprospectsscreen> {
Expanded( Expanded(
flex: 6, flex: 6,
child: Column( child: Column(
crossAxisAlignment: crossAxisAlignment: CrossAxisAlignment.start,
CrossAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
mainAxisAlignment:
MainAxisAlignment.start,
children: [ children: [
Row( Row(
children: [ children: [
...@@ -1028,32 +1008,23 @@ class _AddleadsprospectsscreenState extends State<Addleadsprospectsscreen> { ...@@ -1028,32 +1008,23 @@ class _AddleadsprospectsscreenState extends State<Addleadsprospectsscreen> {
child: Text( child: Text(
productName ?? "-", productName ?? "-",
maxLines: 2, maxLines: 2,
overflow: overflow: TextOverflow.ellipsis,
TextOverflow
.ellipsis,
style: TextStyle( style: TextStyle(
fontFamily: fontFamily: "JakartaMedium",
"JakartaMedium",
fontSize: 14, fontSize: 14,
color: color: AppColors.semi_black,
AppColors
.semi_black,
), ),
), ),
), ),
Expanded( Expanded(
flex: 3, flex: 3,
child: Text( child: Text(
textAlign: textAlign: TextAlign.right,
TextAlign.right,
"₹$prodPrice", "₹$prodPrice",
style: TextStyle( style: TextStyle(
fontFamily: fontFamily: "JakartaMedium",
"JakartaMedium",
fontSize: 14, fontSize: 14,
color: color: AppColors.semi_black,
AppColors
.semi_black,
), ),
), ),
), ),
...@@ -1062,42 +1033,51 @@ class _AddleadsprospectsscreenState extends State<Addleadsprospectsscreen> { ...@@ -1062,42 +1033,51 @@ class _AddleadsprospectsscreenState extends State<Addleadsprospectsscreen> {
Text( Text(
"x $prodQty", "x $prodQty",
style: TextStyle( style: TextStyle(
fontFamily: fontFamily: "JakartaMedium",
"JakartaMedium",
fontSize: 14, fontSize: 14,
color: color: AppColors.grey_semi,
AppColors.grey_semi,
), ),
), ),
SizedBox(height: 5), SizedBox(height: 5),
DottedLine( DottedLine(
dashGapLength: 4, dashGapLength: 4,
dashGapColor: dashGapColor: Colors.white,
Colors.white, dashColor: AppColors.grey_semi,
dashColor:
AppColors.grey_semi,
dashLength: 2, dashLength: 2,
lineThickness: 0.5, lineThickness: 0.5,
), ),
SizedBox(height: 5), SizedBox(height: 5),
Row( Row(
mainAxisAlignment: mainAxisAlignment: MainAxisAlignment.spaceBetween,
MainAxisAlignment
.spaceBetween,
children: [ children: [
Text( Text(
"₹$totalPrice", "₹$totalPrice",
style: TextStyle( style: TextStyle(
fontFamily: fontFamily: "JakartaMedium",
"JakartaMedium",
fontSize: 14, fontSize: 14,
color: color: AppColors.semi_black,
AppColors
.semi_black,
), ),
), ),
], ],
), ),
SizedBox(height: 5),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Expanded(
child: Text(
remark, // Now this is a String, not a TextEditingController
style: TextStyle(
fontFamily: "JakartaMedium",
fontSize: 14,
color: AppColors.semi_black,
),
maxLines: 1,
overflow: TextOverflow.ellipsis,
),
),
],
)
], ],
), ),
), ),
......
lib/screens/crm/followUpUpdateScreen.dart
View file @ dc88a3f9
...@@ -11,6 +11,8 @@ import 'package:generp/Utils/commonWidgets.dart'; ...@@ -11,6 +11,8 @@ import 'package:generp/Utils/commonWidgets.dart';
import 'package:generp/Utils/dropdownTheme.dart'; import 'package:generp/Utils/dropdownTheme.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import '../order/ordersListByModes.dart';
class Followupupdatescreen extends StatefulWidget { class Followupupdatescreen extends StatefulWidget {
final leadID; final leadID;
final mode; final mode;
...@@ -391,7 +393,7 @@ class _FollowupupdatescreenState extends State<Followupupdatescreen> { ...@@ -391,7 +393,7 @@ class _FollowupupdatescreenState extends State<Followupupdatescreen> {
), ),
items: items:
<String>[ <String>[
// 'Order Gain', 'Order Gain',
'Order Lost', 'Order Lost',
'No Requirement', 'No Requirement',
] ]
...@@ -709,6 +711,9 @@ class _FollowupupdatescreenState extends State<Followupupdatescreen> { ...@@ -709,6 +711,9 @@ class _FollowupupdatescreenState extends State<Followupupdatescreen> {
provider.selectedCompetitor, provider.selectedCompetitor,
provider.selectedLeadStatus, provider.selectedLeadStatus,
provider.selectNextAppointmentType, provider.selectNextAppointmentType,
provider.followUpFeedbackController,
provider.selectedTime,
provider.currentLocationLatLng,
provider.smsSent, provider.smsSent,
widget.mode, widget.mode,
); );
......
lib/screens/crm/generateQuotationScreen.dart
View file @ dc88a3f9
...@@ -166,23 +166,28 @@ class _GeneratequotationscreenState extends State<Generatequotationscreen> { ...@@ -166,23 +166,28 @@ class _GeneratequotationscreenState extends State<Generatequotationscreen> {
MaterialPageRoute( MaterialPageRoute(
builder: builder:
(context) => (context) =>
Generatequotationaddeditproduct( Generatequotationaddeditproduct(
leadId: widget.leadId, leadId: widget.leadId,
type: "add", type: "add",
), ),
settings: RouteSettings( settings: RouteSettings(
name: 'Generatequotationaddeditproduct', name: 'Generatequotationaddeditproduct',
), ),
), ),
); );
if (res != null) { if (res != null && res == true) {
print("result $res"); print("result $res");
// provider // Force refresh the provider and UI
// .crmLeadDetailsGenerateQuoteViewAPIFunction( await provider.crmLeadDetailsGenerateQuoteViewAPIFunction(
// context, context,
// widget.leadId, widget.leadId,
// ); );
// Force UI update
if (mounted) {
setState(() {});
}
} }
}, },
child: Container( child: Container(
...@@ -229,30 +234,39 @@ class _GeneratequotationscreenState extends State<Generatequotationscreen> { ...@@ -229,30 +234,39 @@ class _GeneratequotationscreenState extends State<Generatequotationscreen> {
MaterialPageRoute( MaterialPageRoute(
builder: builder:
( (
context, context,
) => Generatequotationaddeditproduct( ) => Generatequotationaddeditproduct(
leadId: widget.leadId, leadId: widget.leadId,
type: "edit", type: "edit",
product: product:
provider provider
.leadProductsList[lp], .leadProductsList[lp],
index: lp, index: lp,
), ),
settings: RouteSettings( settings: RouteSettings(
name: name:
'Generatequotationaddeditproduct', 'Generatequotationaddeditproduct',
), ),
), ),
); );
if (res != null) { if (res != null && res == true) {
print("result $res"); print("result $res");
// Force refresh after editing
await provider.crmLeadDetailsGenerateQuoteViewAPIFunction(
context,
widget.leadId,
);
// Force UI update
if (mounted) {
setState(() {});
}
} }
}, },
child: Container( child: Container(
height: 115, height: 125,
width: width: MediaQuery.of(context).size.width * 0.8,
MediaQuery.of(context).size.width *
0.8,
decoration: BoxDecoration( decoration: BoxDecoration(
color: Color(0xFFE6F6FF), color: Color(0xFFE6F6FF),
borderRadius: BorderRadius.circular(14), borderRadius: BorderRadius.circular(14),
...@@ -261,17 +275,12 @@ class _GeneratequotationscreenState extends State<Generatequotationscreen> { ...@@ -261,17 +275,12 @@ class _GeneratequotationscreenState extends State<Generatequotationscreen> {
horizontal: 10, horizontal: 10,
vertical: 8, vertical: 8,
), ),
margin: EdgeInsets.symmetric( margin: EdgeInsets.symmetric(
horizontal: 5, horizontal: 5,
// vertical: 10,
), ),
child: Row( child: Row(
mainAxisAlignment: mainAxisAlignment: MainAxisAlignment.start,
MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
crossAxisAlignment:
CrossAxisAlignment.start,
children: [ children: [
Expanded( Expanded(
flex: 1, flex: 1,
...@@ -282,87 +291,77 @@ class _GeneratequotationscreenState extends State<Generatequotationscreen> { ...@@ -282,87 +291,77 @@ class _GeneratequotationscreenState extends State<Generatequotationscreen> {
SizedBox(width: 10), SizedBox(width: 10),
Expanded( Expanded(
flex: 6, flex: 6,
child: SizedBox( child: Column(
child: Column( crossAxisAlignment: CrossAxisAlignment.start,
// mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.spaceBetween, // Changed to spaceBetween
crossAxisAlignment: children: [
CrossAxisAlignment.start, // Top section - Product name and price
mainAxisAlignment: Column(
MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Row( Row(
children: [ children: [
Expanded( Expanded(
flex: 4, flex: 4,
child: Text( child: Text(
provider provider.leadProductsList[lp].productName ?? "-",
.leadProductsList[lp] maxLines: 1,
.productName ?? overflow: TextOverflow.ellipsis,
"-", style: TextStyle(
maxLines: 1, fontFamily: "JakartaMedium",
overflow: fontSize: 14,
TextOverflow color: AppColors.semi_black,
.ellipsis, ),
style: TextStyle(
fontFamily:
"JakartaMedium",
fontSize: 14,
color:
AppColors
.semi_black,
), ),
), ),
), Expanded(
Expanded( flex: 3,
flex: 2, child: Text(
child: Text( textAlign: TextAlign.right,
textAlign: maxLines: 1,
TextAlign.right, "₹${provider.leadProductsList[lp].price ?? "-"}",
"₹${provider.leadProductsList[lp].price ?? "-"}", style: TextStyle(
style: TextStyle( fontFamily: "JakartaMedium",
fontFamily: fontSize: 14,
"JakartaMedium", color: AppColors.semi_black,
fontSize: 14, ),
color:
AppColors
.semi_black,
), ),
), ),
],
),
SizedBox(height: 1), // Reduced spacing
Text(
"x ${provider.leadProductsList[lp].qty ?? "-"}",
style: TextStyle(
fontFamily: "JakartaMedium",
fontSize: 12, // Slightly smaller font
color: AppColors.grey_semi,
), ),
],
),
Text(
"x ${provider.leadProductsList[lp].qty ?? "-"}",
style: TextStyle(
fontFamily:
"JakartaMedium",
fontSize: 14,
color:
AppColors.grey_semi,
), ),
), ],
SizedBox(height: 5), ),
DottedLine(
// Middle section - Dotted line
Center(
child: DottedLine(
dashGapLength: 4, dashGapLength: 4,
dashGapColor: Colors.white, dashGapColor: Colors.white,
dashColor: dashColor: AppColors.grey_semi,
AppColors.grey_semi,
dashLength: 2, dashLength: 2,
lineThickness: 0.5, lineThickness: 0.5,
), ),
SizedBox(height: 5), ),
Text(
"₹${provider.leadProductsList[lp].prodTotalPrice ?? " - "}", // Bottom section - Total price
style: TextStyle( Text(
fontFamily: "₹${provider.leadProductsList[lp].prodTotalPrice ?? " - "}",
"JakartaMedium", style: TextStyle(
fontSize: 14, fontFamily: "JakartaMedium",
color: fontSize: 14,
AppColors.semi_black, color: AppColors.semi_black,
),
), ),
], ),
), ],
), ),
), ),
], ],
...@@ -374,192 +373,6 @@ class _GeneratequotationscreenState extends State<Generatequotationscreen> { ...@@ -374,192 +373,6 @@ class _GeneratequotationscreenState extends State<Generatequotationscreen> {
), ),
], ],
errorWidget(context, provider.productRowsError), errorWidget(context, provider.productRowsError),
// if (provider.leadProductsList.isNotEmpty ||
// provider
// .editProductPriceControllers
// .isNotEmpty) ...[
// ListView.builder(
// itemCount:
// provider.editProductPriceControllers.length,
// physics: const NeverScrollableScrollPhysics(),
// shrinkWrap: true,
// itemBuilder: (context, j) {
// return Container(
// padding: const EdgeInsets.symmetric(
// horizontal: 10,
// vertical: 10,
// ),
// margin: const EdgeInsets.symmetric(
// vertical: 10,
// ),
// decoration: BoxDecoration(
// color: Colors.white,
// borderRadius: BorderRadius.circular(20),
// ),
// child: Column(
// crossAxisAlignment:
// CrossAxisAlignment.start,
// children: [
// TextWidget(context, "Product"),
// DropdownButtonHideUnderline(
// child: Row(
// children: [
// Expanded(
// child: DropdownButton2<
// LeadProducts
// >(
// isExpanded: true,
// hint: const Text(
// 'Select Product',
// style: TextStyle(
// fontSize: 14,
// ),
// overflow:
// TextOverflow.ellipsis,
// ),
// items:
// provider.leadProductsList
// .map(
// (
// ord,
// ) => DropdownMenuItem<
// LeadProducts
// >(
// value: ord,
// child: Text(
// "(Product Name: ${ord.productName})",
// style:
// const TextStyle(
// fontSize:
// 14,
// ),
// overflow:
// TextOverflow
// .ellipsis,
// ),
// ),
// )
// .toList(),
// value:
// provider.selectedProductIds[j] !=
// null
// ? provider
// .leadProductsList
// .firstWhere(
// (ord) =>
// ord.id ==
// provider
// .selectedProductIds[j],
// orElse:
// () =>
// provider
// .leadProductsList[0],
// )
// : null,
// onChanged: (
// LeadProducts? value,
// ) {
// if (value != null) {
// provider
// .updateSelectedProductIds(
// j,
// value,
// );
// provider.selectedProductIds[j] =
// value.id?.toString() ??
// '';
// provider.updateTotalAmount(
// j,
// );
// }
// },
// buttonStyleData:
// ddtheme.buttonStyleData,
// iconStyleData:
// ddtheme.iconStyleData,
// menuItemStyleData:
// ddtheme.menuItemStyleData,
// dropdownStyleData:
// ddtheme.dropdownStyleData,
// ),
// ),
// ],
// ),
// ),
// const SizedBox(height: 10),
// Row(
// children: [
// Expanded(
// flex: 2,
// child: textControllerWidget(
// context,
// provider
// .editProductPriceControllers[j],
// "Product Price",
// "Enter Product Price",
// (value) =>
// provider.updateTotalAmount(j),
// TextInputType.number,
// false,
// FilteringTextInputFormatter
// .digitsOnly,
// ),
// ),
// ],
// ),
// const SizedBox(height: 10),
// Row(
// children: [
// Expanded(
// flex: 2,
// child: textControllerWidget(
// context,
// provider
// .editQuantityControllers[j],
// "Quantity",
// "Enter Quantity",
// (value) =>
// provider.updateTotalAmount(j),
// TextInputType.number,
// false,
// FilteringTextInputFormatter
// .digitsOnly,
// ),
// ),
// ],
// ),
// const SizedBox(height: 10),
// Row(
// children: [
// Expanded(
// flex: 2,
// child: textControllerWidget(
// context,
// provider
// .editTotalAmountControllers[j],
// "Amount",
// "Total Amount",
// (_) {},
// TextInputType.number,
// true,
// FilteringTextInputFormatter
// .digitsOnly,
// ),
// ),
// ],
// ),
// // IconButton(
// // icon: const Icon(Icons.delete),
// // onPressed: provider.editProductPriceControllers.length > 1
// // ? () => provider.editRemoveRow(j)
// // : null,
// // ),
// ],
// ),
// );
// },
// ),
// ],
], ],
), ),
), ),
...@@ -599,22 +412,22 @@ class _GeneratequotationscreenState extends State<Generatequotationscreen> { ...@@ -599,22 +412,22 @@ class _GeneratequotationscreenState extends State<Generatequotationscreen> {
], ],
), ),
items: items:
<String>["Extra", "Including"] <String>["Extra", "Including"]
.map( .map(
(value) => (value) =>
DropdownMenuItem<String>( DropdownMenuItem<String>(
value: value, value: value,
child: Text( child: Text(
value ?? '', value ?? '',
style: const TextStyle( style: const TextStyle(
fontSize: 14, fontSize: 14,
), ),
overflow: overflow:
TextOverflow.ellipsis, TextOverflow.ellipsis,
), ),
), ),
) )
.toList(), .toList(),
value: provider.selectedTaxes, value: provider.selectedTaxes,
onChanged: (String? newValue) { onChanged: (String? newValue) {
setState(() { setState(() {
...@@ -624,9 +437,9 @@ class _GeneratequotationscreenState extends State<Generatequotationscreen> { ...@@ -624,9 +437,9 @@ class _GeneratequotationscreenState extends State<Generatequotationscreen> {
buttonStyleData: ddtheme.buttonStyleData, buttonStyleData: ddtheme.buttonStyleData,
iconStyleData: ddtheme.iconStyleData, iconStyleData: ddtheme.iconStyleData,
menuItemStyleData: menuItemStyleData:
ddtheme.menuItemStyleData, ddtheme.menuItemStyleData,
dropdownStyleData: dropdownStyleData:
ddtheme.dropdownStyleData, ddtheme.dropdownStyleData,
), ),
), ),
], ],
...@@ -689,7 +502,7 @@ class _GeneratequotationscreenState extends State<Generatequotationscreen> { ...@@ -689,7 +502,7 @@ class _GeneratequotationscreenState extends State<Generatequotationscreen> {
), ),
floatingActionButtonLocation: floatingActionButtonLocation:
FloatingActionButtonLocation.centerFloat, FloatingActionButtonLocation.centerFloat,
bottomNavigationBar: Material( bottomNavigationBar: Material(
elevation: 2, elevation: 2,
shadowColor: Colors.black12, shadowColor: Colors.black12,
...@@ -708,239 +521,195 @@ class _GeneratequotationscreenState extends State<Generatequotationscreen> { ...@@ -708,239 +521,195 @@ class _GeneratequotationscreenState extends State<Generatequotationscreen> {
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: children:
provider.buttonsLoading provider.buttonsLoading
? [ ? [
SizedBox(width: 25), SizedBox(width: 25),
CircularProgressIndicator.adaptive( CircularProgressIndicator.adaptive(
valueColor: AlwaysStoppedAnimation( valueColor: AlwaysStoppedAnimation(
AppColors.app_blue, AppColors.app_blue,
), ),
), ),
SizedBox(width: 25), SizedBox(width: 25),
] ]
: [ : [
Expanded( Expanded(
child: InkResponse( child: InkResponse(
onTap: onTap:
provider.buttonsLoading provider.buttonsLoading
? null ? null
: () { : () {
HapticFeedback.mediumImpact(); HapticFeedback.mediumImpact();
provider.buttonsLoading = true; provider.buttonsLoading = true;
//genquotedown //genquotedown
final insertedData = final insertedData =
provider.productRows; provider.productRows;
print(insertedData); print(insertedData);
provider provider
.crmLeadDetailsGenerateQuoteSubmitAPIFunction( .crmLeadDetailsGenerateQuoteSubmitAPIFunction(
context, context,
widget.leadId, widget.leadId,
insertedData, insertedData,
"genquotedown", "genquotedown",
); );
}, },
child: Container( child: Container(
height: 45, height: 45,
alignment: Alignment.center, alignment: Alignment.center,
decoration: BoxDecoration( decoration: BoxDecoration(
// color: AppColors.app_blue, // color: AppColors.app_blue,
borderRadius: BorderRadius.circular(10), borderRadius: BorderRadius.circular(10),
), ),
child: child:
provider.submitLoading provider.submitLoading
? CircularProgressIndicator.adaptive( ? CircularProgressIndicator.adaptive(
valueColor: valueColor:
AlwaysStoppedAnimation<Color>( AlwaysStoppedAnimation<Color>(
AppColors.app_blue, AppColors.app_blue,
), ),
) )
: Row( : Row(
mainAxisAlignment: mainAxisAlignment:
MainAxisAlignment.center, MainAxisAlignment.center,
children: [ children: [
SvgPicture.asset( SvgPicture.asset(
"assets/svg/crm/download_quote_ic.svg", "assets/svg/crm/download_quote_ic.svg",
), ),
SizedBox(width: 10), SizedBox(width: 10),
Text( Text(
"Download", "Download",
style: TextStyle( style: TextStyle(
fontSize: 14, fontSize: 14,
fontFamily: fontFamily:
"JakartaRegular", "JakartaRegular",
),
),
],
),
), ),
), ),
), ],
SvgPicture.asset( ),
"assets/svg/crm/vertical_line_ic.svg", ),
), ),
Expanded( ),
child: InkResponse( SvgPicture.asset(
onTap: "assets/svg/crm/vertical_line_ic.svg",
provider.buttonsLoading ),
? null Expanded(
: () { child: InkResponse(
HapticFeedback.mediumImpact(); onTap:
provider.buttonsLoading = true; provider.buttonsLoading
//genquotemail, ? null
final insertedData = : () {
provider.productRows; HapticFeedback.mediumImpact();
print(insertedData); provider.buttonsLoading = true;
provider //genquotemail,
.crmLeadDetailsGenerateQuoteSubmitAPIFunction( final insertedData =
context, provider.productRows;
widget.leadId, print(insertedData);
insertedData, provider
"genquotemail", .crmLeadDetailsGenerateQuoteSubmitAPIFunction(
); context,
}, widget.leadId,
child: Container( insertedData,
height: 45, "genquotemail",
alignment: Alignment.center, );
},
child: Container(
height: 45,
alignment: Alignment.center,
decoration: BoxDecoration( decoration: BoxDecoration(
// color: AppColors.app_blue, // color: AppColors.app_blue,
borderRadius: BorderRadius.circular(10), borderRadius: BorderRadius.circular(10),
), ),
child: child:
provider.submitLoading provider.submitLoading
? CircularProgressIndicator.adaptive( ? CircularProgressIndicator.adaptive(
valueColor: valueColor:
AlwaysStoppedAnimation<Color>( AlwaysStoppedAnimation<Color>(
AppColors.app_blue, AppColors.app_blue,
), ),
) )
: Row( : Row(
mainAxisAlignment: mainAxisAlignment:
MainAxisAlignment.center, MainAxisAlignment.center,
children: [ children: [
SvgPicture.asset( SvgPicture.asset(
"assets/svg/crm/email_quote_ic.svg", "assets/svg/crm/email_quote_ic.svg",
), ),
SizedBox(width: 10), SizedBox(width: 10),
Text( Text(
"Email", "Email",
style: TextStyle( style: TextStyle(
fontSize: 14, fontSize: 14,
fontFamily: fontFamily:
"JakartaRegular", "JakartaRegular",
),
),
],
),
), ),
), ),
), ],
SvgPicture.asset( ),
"assets/svg/crm/vertical_line_ic.svg", ),
), ),
Expanded( ),
child: InkResponse( SvgPicture.asset(
onTap: "assets/svg/crm/vertical_line_ic.svg",
provider.buttonsLoading ),
? null Expanded(
: () { child: InkResponse(
HapticFeedback.mediumImpact(); onTap:
provider.buttonsLoading = true; provider.buttonsLoading
//genquotewhatsapp, ? null
final insertedData = : () {
provider.productRows; HapticFeedback.mediumImpact();
print(insertedData); provider.buttonsLoading = true;
provider //genquotewhatsapp,
.crmLeadDetailsGenerateQuoteSubmitAPIFunction( final insertedData =
context, provider.productRows;
widget.leadId, print(insertedData);
insertedData, provider
"genquotewhatsapp", .crmLeadDetailsGenerateQuoteSubmitAPIFunction(
); context,
}, widget.leadId,
child: Container( insertedData,
height: 45, "genquotewhatsapp",
alignment: Alignment.center, );
},
child: Container(
height: 45,
alignment: Alignment.center,
decoration: BoxDecoration( decoration: BoxDecoration(
// color: AppColors.app_blue, // color: AppColors.app_blue,
borderRadius: BorderRadius.circular(10), borderRadius: BorderRadius.circular(10),
), ),
child: child:
provider.submitLoading provider.submitLoading
? CircularProgressIndicator.adaptive( ? CircularProgressIndicator.adaptive(
valueColor: valueColor:
AlwaysStoppedAnimation<Color>( AlwaysStoppedAnimation<Color>(
AppColors.app_blue, AppColors.app_blue,
), ),
) )
: Row( : Row(
mainAxisAlignment: mainAxisAlignment:
MainAxisAlignment.center, MainAxisAlignment.center,
children: [ children: [
SvgPicture.asset( SvgPicture.asset(
"assets/svg/crm/whatsapp_quote_ic.svg", "assets/svg/crm/whatsapp_quote_ic.svg",
), ),
SizedBox(width: 10), SizedBox(width: 10),
Text( Text(
"Whatsapp", "Whatsapp",
style: TextStyle( style: TextStyle(
fontSize: 14, fontSize: 14,
fontFamily: fontFamily:
"JakartaRegular", "JakartaRegular",
),
),
],
),
), ),
), ),
), ],
// Expanded( ),
// child: InkResponse( ),
// onTap: ),
// provider.submitLoading ),
// ? null ],
// : () {
// //genquotewhatsappbymynum,
// final insertedData = provider.getFormData();
// provider
// .crmLeadDetailsGenerateQuoteSubmitAPIFunction(
// context,
// widget.leadId,
// insertedData,
// "genquotewhatsappbymynum",
// );
// },
// child: Container(
// height: 45,
// alignment: Alignment.center,
// margin: const EdgeInsets.symmetric(
// horizontal: 10,
// vertical: 15,
// ),
// padding: const EdgeInsets.symmetric(
// horizontal: 10,
// vertical: 5,
// ),
// decoration: BoxDecoration(
// // color: AppColors.app_blue,
// borderRadius: BorderRadius.circular(10),
// ),
// child:
// provider.submitLoading
// ? CircularProgressIndicator.adaptive(
// valueColor: AlwaysStoppedAnimation<Color>(
// AppColors.app_blue,
// ),
// )
// : SvgPicture.asset(
// "assets/svg/whatsapp_quote_self.svg",
// ),
// ),
// ),
// ),
],
), ),
), ),
), ),
...@@ -950,4 +719,4 @@ class _GeneratequotationscreenState extends State<Generatequotationscreen> { ...@@ -950,4 +719,4 @@ class _GeneratequotationscreenState extends State<Generatequotationscreen> {
}, },
); );
} }
} }
\ No newline at end of file
lib/screens/finance/AllPaymentRequesitionListsByModes.dart
View file @ dc88a3f9
...@@ -77,7 +77,7 @@ class _AllpaymentrequesitionlistsbymodesState ...@@ -77,7 +77,7 @@ class _AllpaymentrequesitionlistsbymodesState
_scrollController.addListener(() { _scrollController.addListener(() {
if (_scrollController.position.pixels >= if (_scrollController.position.pixels >=
_scrollController.position.maxScrollExtent - 200 && _scrollController.position.maxScrollExtent - 200 &&
!provider.isLoadingMore && !provider.isLoadingMore &&
provider.hasMoreData) { provider.hasMoreData) {
provider.paymentRequestionListsAPIFunction( provider.paymentRequestionListsAPIFunction(
...@@ -213,17 +213,17 @@ class _AllpaymentrequesitionlistsbymodesState ...@@ -213,17 +213,17 @@ class _AllpaymentrequesitionlistsbymodesState
} }
return connection == "Online" return connection == "Online"
? Platform.isAndroid ? Platform.isAndroid
? WillPopScope( ? WillPopScope(
onWillPop: () { onWillPop: () {
return onBackPressed(context); return onBackPressed(context);
}, },
child: SafeArea( child: SafeArea(
top: false, top: false,
bottom: true, bottom: true,
child: _scaffold(context), child: _scaffold(context),
), ),
) )
: _scaffold(context) : _scaffold(context)
: NoNetwork(context); : NoNetwork(context);
} }
...@@ -246,11 +246,11 @@ class _AllpaymentrequesitionlistsbymodesState ...@@ -246,11 +246,11 @@ class _AllpaymentrequesitionlistsbymodesState
} else if (widget.mode == "apr_lvl2") { } else if (widget.mode == "apr_lvl2") {
shouldShowButtons = shouldShowButtons =
!isLevel2Finalized && !isLevel2Finalized &&
[ [
"Requested", "Requested",
"Level 1 Approved", "Level 1 Approved",
"Level 1 approved", "Level 1 approved",
].contains(status); ].contains(status);
} else if (widget.mode == "process") { } else if (widget.mode == "process") {
shouldShowButtons = [ shouldShowButtons = [
"Level 2 Approved", "Level 2 Approved",
...@@ -338,311 +338,311 @@ class _AllpaymentrequesitionlistsbymodesState ...@@ -338,311 +338,311 @@ class _AllpaymentrequesitionlistsbymodesState
), ),
backgroundColor: AppColors.scaffold_bg_color, backgroundColor: AppColors.scaffold_bg_color,
body: body:
provider.isLoading && requestLists.isEmpty provider.isLoading && requestLists.isEmpty
? Center( ? Center(
child: CircularProgressIndicator.adaptive( child: CircularProgressIndicator.adaptive(
valueColor: AlwaysStoppedAnimation<Color>( valueColor: AlwaysStoppedAnimation<Color>(
AppColors.app_blue, AppColors.app_blue,
),
),
)
: requestLists.isNotEmpty
? RefreshIndicator(
onRefresh: () async {
provider.resetPagination();
await provider.paymentRequestionListsAPIFunction(
context,
widget.mode,
"",
"",
);
},
child: Scrollbar(
controller: _scrollController, // attach here
thumbVisibility: false,
child: ListView.builder(
controller: _scrollController,
physics: const AlwaysScrollableScrollPhysics(),
itemCount:
requestLists.length +
(provider.hasMoreData ? 1 : 0),
itemBuilder: (context, index) {
// loader row for pagination
if (index == requestLists.length) {
return provider.isLoadingMore
? const Padding(
padding: EdgeInsets.all(16),
child: Center(
child: CircularProgressIndicator(),
), ),
), )
) : const SizedBox.shrink();
: requestLists.isNotEmpty }
? RefreshIndicator(
onRefresh: () async { // Your swipe logic untouched
provider.resetPagination(); final request = requestLists[index];
await provider.paymentRequestionListsAPIFunction( shouldShowSwipeButtons(request.status);
return InkResponse(
onTap: () async {
HapticFeedback.selectionClick();
var res = await Navigator.push(
context, context,
widget.mode, MaterialPageRoute(
"", builder:
"", (context) => Paymentrequestionlistdetails(
pageName: widget.pageTitleName,
mode: widget.mode,
paymentRequestId:
requestLists[index].id,
),
settings: RouteSettings(
name: "Paymentrequestionlistdetails",
),
),
); );
if (routeSettingName ==
"Paymentrequestionlistdetails") {
print("croos refresh");
provider.paymentRequestionListsAPIFunction(
context,
widget.mode,
"",
"",
);
}
}, },
child: Scrollbar( child: Container(
controller: _scrollController, // attach here margin: EdgeInsets.symmetric(
thumbVisibility: false, horizontal: 10,
child: ListView.builder( vertical: 5,
controller: _scrollController, ),
physics: const AlwaysScrollableScrollPhysics(), decoration: BoxDecoration(
itemCount: color: Colors.white,
requestLists.length + borderRadius: BorderRadius.circular(16),
(provider.hasMoreData ? 1 : 0), ),
itemBuilder: (context, index) { child: ClipRRect(
// loader row for pagination borderRadius: BorderRadius.circular(20),
if (index == requestLists.length) { child: Slidable(
return provider.isLoadingMore startActionPane:
? const Padding( shouldShowButtons
padding: EdgeInsets.all(16), ? ActionPane(
child: Center( motion: const ScrollMotion(),
child: CircularProgressIndicator(), dragDismissible: false,
),
)
: const SizedBox.shrink();
}
// Your swipe logic untouched // dismissible: DismissiblePane(onDismissed: () {}),
final request = requestLists[index]; children: [
shouldShowSwipeButtons(request.status); if (shouldShowButtons &&
![
"admin",
"self",
].contains(widget.mode)) ...[
SlidableAction(
onPressed: (context) {
_showLevelRejectionSheet(
context,
requestLists[index].id,
);
},
backgroundColor: Color(
0xFFFFE5E5,
),
foregroundColor: Color(
0xFFEF3739,
),
icon: Icons.clear,
label: 'Reject',
),
],
return InkResponse( if (widget.mode == "process") ...[
onTap: () async { SlidableAction(
HapticFeedback.selectionClick(); onPressed: (context) {
var res = await Navigator.push( detailsProvider
context, .approveRejectPaymentRequestAPIFunction(
MaterialPageRoute( context,
builder: requestLists[index]
(context) => Paymentrequestionlistdetails( .id,
pageName: widget.pageTitleName, );
mode: widget.mode, detailsProvider.preValues();
paymentRequestId: _showAddPaymentSheet(
requestLists[index].id, context,
), requestLists[index].id,
settings: RouteSettings( );
name: "Paymentrequestionlistdetails", },
backgroundColor: Color(
0xFFFFF8E5,
), ),
foregroundColor: Color(
0xFFFFB600,
),
icon: Icons.add,
label: 'Add Payment',
), ),
); ],
if (routeSettingName == ],
"Paymentrequestionlistdetails") { )
print("croos refresh"); : null,
provider.paymentRequestionListsAPIFunction( endActionPane:
context, shouldShowButtons
widget.mode, ? ActionPane(
"", motion: const ScrollMotion(),
"", key: ValueKey(
); requestLists[index].id,
} ),
}, dragDismissible: false,
child: Container(
margin: EdgeInsets.symmetric(
horizontal: 10,
vertical: 5,
),
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.circular(16),
),
child: ClipRRect(
borderRadius: BorderRadius.circular(20),
child: Slidable(
startActionPane:
shouldShowButtons
? ActionPane(
motion: const ScrollMotion(),
dragDismissible: false,
// dismissible: DismissiblePane(onDismissed: () {}), // dismissible: DismissiblePane(
children: [ //
if (shouldShowButtons && // onDismissed: () {},
![ // closeOnCancel: true,
"admin", // resizeDuration: Duration(milliseconds: 300),),
"self", children: [
].contains(widget.mode)) ...[ if ([
SlidableAction( "apr_lvl1",
onPressed: (context) { "apr_lvl2",
_showLevelRejectionSheet( "self_apr_lvl2",
context, ].contains(widget.mode)) ...[
requestLists[index].id, SlidableAction(
); onPressed: (context) {
}, detailsProvider
backgroundColor: Color( .paymentRequesitionDetails(
0xFFFFE5E5, context,
), requestLists[index]
foregroundColor: Color( .id,
0xFFEF3739, );
), detailsProvider.preValues();
icon: Icons.clear, detailsProvider
label: 'Reject', .approveRejectPaymentRequestAPIFunction(
), context,
], requestLists[index]
.id,
);
_showLevelApprovalSheet(
context,
requestLists[index].id,
);
},
backgroundColor: Color(
0xFFE9FFE8,
),
foregroundColor: Color(
0xFF4CB443,
),
icon: Icons.check,
label: 'Approve',
),
],
],
)
: null,
if (widget.mode == "process") ...[ child: Container(
SlidableAction( padding: EdgeInsets.symmetric(
onPressed: (context) { horizontal: 10,
detailsProvider vertical: 10,
.approveRejectPaymentRequestAPIFunction( ),
context, child: Column(
requestLists[index] children: [
.id, Row(
); children: [
detailsProvider.preValues(); Expanded(
_showAddPaymentSheet( flex: 1,
context, child: Container(
requestLists[index].id, height: 50,
); width: 50,
}, padding: EdgeInsets.all(8.0),
backgroundColor: Color( decoration: BoxDecoration(
0xFFFFF8E5, color: getDecorationColor(
), requestLists[index].status,
foregroundColor: Color( ),
0xFFFFB600, shape: BoxShape.circle,
), ),
icon: Icons.add, child: Center(
label: 'Add Payment', child: Text(
), getText(
], requestLists[index]
], .status,
)
: null,
endActionPane:
shouldShowButtons
? ActionPane(
motion: const ScrollMotion(),
key: ValueKey(
requestLists[index].id,
), ),
dragDismissible: false, style: TextStyle(
color: getTextColor(
// dismissible: DismissiblePane( requestLists[index]
// .status,
// onDismissed: () {}, ),
// closeOnCancel: true, fontSize: getSize(
// resizeDuration: Duration(milliseconds: 300),), requestLists[index]
children: [ .status,
if ([
"apr_lvl1",
"apr_lvl2",
"self_apr_lvl2",
].contains(widget.mode)) ...[
SlidableAction(
onPressed: (context) {
detailsProvider
.paymentRequesitionDetails(
context,
requestLists[index]
.id,
);
detailsProvider.preValues();
detailsProvider
.approveRejectPaymentRequestAPIFunction(
context,
requestLists[index]
.id,
);
_showLevelApprovalSheet(
context,
requestLists[index].id,
);
},
backgroundColor: Color(
0xFFE9FFE8,
),
foregroundColor: Color(
0xFF4CB443,
),
icon: Icons.check,
label: 'Approve',
),
],
],
)
: null,
child: Container(
padding: EdgeInsets.symmetric(
horizontal: 10,
vertical: 10,
),
child: Column(
children: [
Row(
children: [
Expanded(
flex: 1,
child: Container(
height: 50,
width: 50,
padding: EdgeInsets.all(8.0),
decoration: BoxDecoration(
color: getDecorationColor(
requestLists[index].status,
),
shape: BoxShape.circle,
),
child: Center(
child: Text(
getText(
requestLists[index]
.status,
),
style: TextStyle(
color: getTextColor(
requestLists[index]
.status,
),
fontSize: getSize(
requestLists[index]
.status,
),
fontFamily: "JakartaBold",
),
),
),
), ),
fontFamily: "JakartaBold",
), ),
SizedBox(width: 10), ),
Expanded( ),
flex: 4, ),
child: SizedBox( ),
child: Column( SizedBox(width: 10),
crossAxisAlignment: Expanded(
CrossAxisAlignment.start, flex: 4,
children: [ child: SizedBox(
Text( child: Column(
requestLists[index] crossAxisAlignment:
.accountName!, CrossAxisAlignment.start,
maxLines: 1, children: [
overflow: Text(
TextOverflow.ellipsis, requestLists[index]
style: TextStyle( .accountName!,
fontFamily: maxLines: 1,
"JakartaRegular", overflow:
fontSize: 14, TextOverflow.ellipsis,
color: style: TextStyle(
AppColors fontFamily:
.semi_black, "JakartaRegular",
), fontSize: 14,
), color:
Text( AppColors
"${requestLists[index].date}", .semi_black,
style: TextStyle(
fontFamily:
"JakartaRegular",
fontSize: 14,
color:
AppColors.app_blue,
),
),
],
),
), ),
), ),
Expanded( Text(
flex: 3, "${requestLists[index].date}",
child: Text( style: TextStyle(
maxLines: 1, fontFamily:
"₹ ${requestLists[index].amount!}", "JakartaRegular",
textAlign: TextAlign.right, fontSize: 14,
style: TextStyle( color:
fontFamily: "JakartaMedium", AppColors.app_blue,
fontSize: 14,
color: AppColors.app_blue,
),
), ),
), ),
], ],
), ),
], ),
), ),
), Expanded(
flex: 3,
child: Text(
maxLines: 1,
"₹ ${requestLists[index].amount!}",
textAlign: TextAlign.right,
style: TextStyle(
fontFamily: "JakartaMedium",
fontSize: 14,
color: AppColors.app_blue,
),
),
),
],
), ),
), ],
), ),
); ),
}, ),
), ),
), ),
) );
: Emptywidget(context), },
),
),
)
: Emptywidget(context),
); );
}, },
); );
...@@ -708,7 +708,7 @@ class _AllpaymentrequesitionlistsbymodesState ...@@ -708,7 +708,7 @@ class _AllpaymentrequesitionlistsbymodesState
provider.requestedAmount, provider.requestedAmount,
"Requested Amount", "Requested Amount",
"Enter Requested Amount", "Enter Requested Amount",
(p0) {}, (p0) {},
TextInputType.numberWithOptions(), TextInputType.numberWithOptions(),
true, true,
null, null,
...@@ -721,7 +721,7 @@ class _AllpaymentrequesitionlistsbymodesState ...@@ -721,7 +721,7 @@ class _AllpaymentrequesitionlistsbymodesState
provider.approvedAmount, provider.approvedAmount,
"Approved Amount", "Approved Amount",
"Enter Approved Amount", "Enter Approved Amount",
(p0) { (p0) {
provider.onChangeApprov(p0); provider.onChangeApprov(p0);
}, },
TextInputType.numberWithOptions(), TextInputType.numberWithOptions(),
...@@ -739,7 +739,7 @@ class _AllpaymentrequesitionlistsbymodesState ...@@ -739,7 +739,7 @@ class _AllpaymentrequesitionlistsbymodesState
remarks, remarks,
"Remarks", "Remarks",
"Enter Remarks", "Enter Remarks",
(p0) {}, (p0) {},
TextInputType.text, TextInputType.text,
false, false,
null, null,
...@@ -761,23 +761,23 @@ class _AllpaymentrequesitionlistsbymodesState ...@@ -761,23 +761,23 @@ class _AllpaymentrequesitionlistsbymodesState
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
), ),
items: items:
provider.paymentsAccounts provider.paymentsAccounts
.map( .map(
(paymenents) => DropdownMenuItem< (paymenents) => DropdownMenuItem<
PaymentAccounts PaymentAccounts
>( >(
value: paymenents, value: paymenents,
child: Text( child: Text(
paymenents.name ?? '', paymenents.name ?? '',
style: const TextStyle( style: const TextStyle(
fontSize: 14, fontSize: 14,
), ),
overflow: overflow:
TextOverflow.ellipsis, TextOverflow.ellipsis,
), ),
), ),
) )
.toList(), .toList(),
value: provider.selectedPaymentAccounts, value: provider.selectedPaymentAccounts,
onChanged: (PaymentAccounts? value) { onChanged: (PaymentAccounts? value) {
if (value != null) { if (value != null) {
...@@ -792,7 +792,8 @@ class _AllpaymentrequesitionlistsbymodesState ...@@ -792,7 +792,8 @@ class _AllpaymentrequesitionlistsbymodesState
provider.selectedID = value.id!; provider.selectedID = value.id!;
provider.selectedValue = value.name!; provider.selectedValue = value.name!;
print( print(
"hfjkshfg${provider.selectedID}", "hfjkshfg" +
provider.selectedID.toString(),
); );
} }
} }
...@@ -800,35 +801,35 @@ class _AllpaymentrequesitionlistsbymodesState ...@@ -800,35 +801,35 @@ class _AllpaymentrequesitionlistsbymodesState
dropdownSearchData: DropdownSearchData( dropdownSearchData: DropdownSearchData(
searchInnerWidgetHeight: 50, searchInnerWidgetHeight: 50,
searchController: searchController:
provider provider
.paymentAccountSearchController, .paymentAccountSearchController,
searchInnerWidget: Padding( searchInnerWidget: Padding(
padding: const EdgeInsets.all(8), padding: const EdgeInsets.all(8),
child: TextFormField( child: TextFormField(
controller: controller:
provider provider
.paymentAccountSearchController, .paymentAccountSearchController,
decoration: InputDecoration( decoration: InputDecoration(
isDense: true, isDense: true,
contentPadding: contentPadding:
const EdgeInsets.symmetric( const EdgeInsets.symmetric(
horizontal: 10, horizontal: 10,
vertical: 8, vertical: 8,
), ),
hintText: 'Search account...', hintText: 'Search account...',
border: OutlineInputBorder( border: OutlineInputBorder(
borderRadius: borderRadius:
BorderRadius.circular(8), BorderRadius.circular(8),
), ),
), ),
), ),
), ),
searchMatchFn: (item, searchValue) { searchMatchFn: (item, searchValue) {
return item.value?.name return item.value?.name
?.toLowerCase() ?.toLowerCase()
.contains( .contains(
searchValue.toLowerCase(), searchValue.toLowerCase(),
) ?? ) ??
false; false;
}, },
...@@ -843,9 +844,9 @@ class _AllpaymentrequesitionlistsbymodesState ...@@ -843,9 +844,9 @@ class _AllpaymentrequesitionlistsbymodesState
buttonStyleData: ddtheme.buttonStyleData, buttonStyleData: ddtheme.buttonStyleData,
iconStyleData: ddtheme.iconStyleData, iconStyleData: ddtheme.iconStyleData,
menuItemStyleData: menuItemStyleData:
ddtheme.menuItemStyleData, ddtheme.menuItemStyleData,
dropdownStyleData: dropdownStyleData:
ddtheme.dropdownStyleData, ddtheme.dropdownStyleData,
), ),
), ),
], ],
...@@ -856,13 +857,13 @@ class _AllpaymentrequesitionlistsbymodesState ...@@ -856,13 +857,13 @@ class _AllpaymentrequesitionlistsbymodesState
HapticFeedback.selectionClick(); HapticFeedback.selectionClick();
provider provider
.paymentrequisitionApproveSubmitAPIFunction( .paymentrequisitionApproveSubmitAPIFunction(
context, context,
widget.mode, widget.mode,
paymentID, paymentID,
provider.approvedAmount.text, provider.approvedAmount.text,
remarks.text, remarks.text,
provider.selectedID, provider.selectedID,
); );
}, },
child: Container( child: Container(
alignment: Alignment.center, alignment: Alignment.center,
...@@ -898,26 +899,33 @@ class _AllpaymentrequesitionlistsbymodesState ...@@ -898,26 +899,33 @@ class _AllpaymentrequesitionlistsbymodesState
}, },
); );
}, },
).whenComplete(() { ).then((value) {
// This runs only when the bottom sheet is explicitly popped
print("closing Sheet"); print("closing Sheet");
WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
var provider = Provider.of<Requestionlistprovider>(
context,
listen: false,
);
final detailsprov = Provider.of<Requesitionlidtdetailsprovider>(
context,
listen: false,
);
detailsprov.resetAll();
provider.paymentRequestionListsAPIFunction( // Use the original context with mounted check
context, if (context.mounted) {
widget.mode, WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
"", if (context.mounted) {
"", var provider = Provider.of<Requestionlistprovider>(
); context,
}); listen: false,
);
final detailsprov = Provider.of<Requesitionlidtdetailsprovider>(
context,
listen: false,
);
detailsprov.resetAll();
provider.paymentRequestionListsAPIFunction(
context,
widget.mode,
"",
"",
);
}
});
}
}); });
} }
...@@ -978,7 +986,7 @@ class _AllpaymentrequesitionlistsbymodesState ...@@ -978,7 +986,7 @@ class _AllpaymentrequesitionlistsbymodesState
context, context,
provider.requestedAmount, provider.requestedAmount,
"Requested Amount", "Requested Amount",
(p0) {}, (p0) {},
), ),
textControllerWidget( textControllerWidget(
...@@ -986,7 +994,7 @@ class _AllpaymentrequesitionlistsbymodesState ...@@ -986,7 +994,7 @@ class _AllpaymentrequesitionlistsbymodesState
remarks, remarks,
"Remarks", "Remarks",
"Enter Remarks", "Enter Remarks",
(p0) {}, (p0) {},
TextInputType.text, TextInputType.text,
false, false,
null, null,
...@@ -1000,11 +1008,11 @@ class _AllpaymentrequesitionlistsbymodesState ...@@ -1000,11 +1008,11 @@ class _AllpaymentrequesitionlistsbymodesState
HapticFeedback.selectionClick(); HapticFeedback.selectionClick();
provider provider
.paymentrequisitionRejectSubmitAPIFunction( .paymentrequisitionRejectSubmitAPIFunction(
context, context,
widget.mode, widget.mode,
paymentID, paymentID,
remarks.text, remarks.text,
); );
}, },
child: Container( child: Container(
alignment: Alignment.center, alignment: Alignment.center,
...@@ -1098,7 +1106,7 @@ class _AllpaymentrequesitionlistsbymodesState ...@@ -1098,7 +1106,7 @@ class _AllpaymentrequesitionlistsbymodesState
child: Padding( child: Padding(
padding: EdgeInsets.only( padding: EdgeInsets.only(
bottom: bottom:
MediaQuery.of(context).viewInsets.bottom, MediaQuery.of(context).viewInsets.bottom,
), ),
child: Column( child: Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
...@@ -1108,7 +1116,7 @@ class _AllpaymentrequesitionlistsbymodesState ...@@ -1108,7 +1116,7 @@ class _AllpaymentrequesitionlistsbymodesState
Expanded( Expanded(
child: Column( child: Column(
crossAxisAlignment: crossAxisAlignment:
CrossAxisAlignment.start, CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: [ children: [
Align( Align(
...@@ -1125,7 +1133,7 @@ class _AllpaymentrequesitionlistsbymodesState ...@@ -1125,7 +1133,7 @@ class _AllpaymentrequesitionlistsbymodesState
context, context,
provider.proposedPaymentAccount, provider.proposedPaymentAccount,
"Enter Proposed Payment Account", "Enter Proposed Payment Account",
(p0) {}, (p0) {},
), ),
TextWidget( TextWidget(
context, context,
...@@ -1136,7 +1144,7 @@ class _AllpaymentrequesitionlistsbymodesState ...@@ -1136,7 +1144,7 @@ class _AllpaymentrequesitionlistsbymodesState
children: [ children: [
Expanded( Expanded(
child: DropdownButton2< child: DropdownButton2<
PaymentAccounts PaymentAccounts
>( >(
isExpanded: true, isExpanded: true,
hint: Text( hint: Text(
...@@ -1145,41 +1153,41 @@ class _AllpaymentrequesitionlistsbymodesState ...@@ -1145,41 +1153,41 @@ class _AllpaymentrequesitionlistsbymodesState
fontSize: 14, fontSize: 14,
), ),
overflow: overflow:
TextOverflow TextOverflow
.ellipsis, .ellipsis,
), ),
items: items:
provider provider
.paymentsAccounts .paymentsAccounts
.map( .map(
( (
paymenents, paymenents,
) => DropdownMenuItem< ) => DropdownMenuItem<
PaymentAccounts PaymentAccounts
>( >(
value: value:
paymenents, paymenents,
child: Text( child: Text(
paymenents paymenents
.name ?? .name ??
'', '',
style: TextStyle( style: TextStyle(
fontSize: fontSize:
14, 14,
), ),
overflow: overflow:
TextOverflow TextOverflow
.ellipsis, .ellipsis,
), ),
), ),
) )
.toList(), .toList(),
value: value:
provider provider
.selectedPaymentAccounts, .selectedPaymentAccounts,
onChanged: ( onChanged: (
PaymentAccounts? value, PaymentAccounts? value,
) { ) {
if (value != null && if (value != null &&
provider provider
.paymentsAccounts .paymentsAccounts
...@@ -1188,9 +1196,9 @@ class _AllpaymentrequesitionlistsbymodesState ...@@ -1188,9 +1196,9 @@ class _AllpaymentrequesitionlistsbymodesState
provider.selectedPaymentAccounts = provider.selectedPaymentAccounts =
value; value;
provider.selectedID = provider.selectedID =
value.id!; value.id!;
provider.selectedValue = provider.selectedValue =
value.name!; value.name!;
print( print(
"Selected Account: ${value.name}, ID: ${value.id}", "Selected Account: ${value.name}, ID: ${value.id}",
); );
...@@ -1199,56 +1207,56 @@ class _AllpaymentrequesitionlistsbymodesState ...@@ -1199,56 +1207,56 @@ class _AllpaymentrequesitionlistsbymodesState
}, },
dropdownSearchData: DropdownSearchData( dropdownSearchData: DropdownSearchData(
searchInnerWidgetHeight: searchInnerWidgetHeight:
50, 50,
searchController: searchController:
provider provider
.paymentAccountSearchController, .paymentAccountSearchController,
searchInnerWidget: Padding( searchInnerWidget: Padding(
padding: padding:
const EdgeInsets.all( const EdgeInsets.all(
8, 8,
), ),
child: TextFormField( child: TextFormField(
controller: controller:
provider provider
.paymentAccountSearchController, .paymentAccountSearchController,
decoration: InputDecoration( decoration: InputDecoration(
isDense: true, isDense: true,
contentPadding: contentPadding:
EdgeInsets.symmetric( EdgeInsets.symmetric(
horizontal: horizontal:
10, 10,
vertical: 8, vertical: 8,
), ),
hintText: hintText:
'Search account...', 'Search account...',
border: OutlineInputBorder( border: OutlineInputBorder(
borderRadius: borderRadius:
BorderRadius.circular( BorderRadius.circular(
8, 8,
), ),
), ),
), ),
), ),
), ),
searchMatchFn: ( searchMatchFn: (
item, item,
searchValue, searchValue,
) { ) {
return item return item
.value .value
?.name ?.name
?.toLowerCase() ?.toLowerCase()
.contains( .contains(
searchValue searchValue
.toLowerCase(), .toLowerCase(),
) ?? ) ??
false; false;
}, },
), ),
onMenuStateChange: ( onMenuStateChange: (
isOpen, isOpen,
) { ) {
if (!isOpen) { if (!isOpen) {
provider provider
.paymentAccountSearchController .paymentAccountSearchController
...@@ -1256,16 +1264,16 @@ class _AllpaymentrequesitionlistsbymodesState ...@@ -1256,16 +1264,16 @@ class _AllpaymentrequesitionlistsbymodesState
} }
}, },
buttonStyleData: buttonStyleData:
ddtheme ddtheme
.buttonStyleData, .buttonStyleData,
iconStyleData: iconStyleData:
ddtheme.iconStyleData, ddtheme.iconStyleData,
menuItemStyleData: menuItemStyleData:
ddtheme ddtheme
.menuItemStyleData, .menuItemStyleData,
dropdownStyleData: dropdownStyleData:
ddtheme ddtheme
.dropdownStyleData, .dropdownStyleData,
), ),
), ),
], ],
...@@ -1275,29 +1283,29 @@ class _AllpaymentrequesitionlistsbymodesState ...@@ -1275,29 +1283,29 @@ class _AllpaymentrequesitionlistsbymodesState
context, context,
provider.approvedAmountReadonly, provider.approvedAmountReadonly,
"Approved Amount", "Approved Amount",
(p0) {}, (p0) {},
), ),
textControllerWidget( textControllerWidget(
context, context,
provider.approvedAmount, provider.approvedAmount,
"Payment Amount", "Payment Amount",
"Enter Payment Amount", "Enter Payment Amount",
(p0) { (p0) {
if (numberFormat.parse( if (numberFormat.parse(
provider provider
.approvedAmountReadonly .approvedAmountReadonly
.text, .text,
) < ) <
numberFormat.parse( numberFormat.parse(
provider provider
.approvedAmount .approvedAmount
.text, .text,
)) { )) {
provider.proposedAmountError = provider.proposedAmountError =
"Amount should not be greater than Approved amount"; "Amount should not be greater than Approved amount";
} else { } else {
provider.proposedAmountError = provider.proposedAmountError =
""; "";
} }
}, },
TextInputType.numberWithOptions(), TextInputType.numberWithOptions(),
...@@ -1313,7 +1321,7 @@ class _AllpaymentrequesitionlistsbymodesState ...@@ -1313,7 +1321,7 @@ class _AllpaymentrequesitionlistsbymodesState
paymentReferenceNumber, paymentReferenceNumber,
"Enter Payment Reference Number", "Enter Payment Reference Number",
"Payment Reference Number", "Payment Reference Number",
(p0) {}, (p0) {},
TextInputType.text, TextInputType.text,
false, false,
null, null,
...@@ -1326,7 +1334,7 @@ class _AllpaymentrequesitionlistsbymodesState ...@@ -1326,7 +1334,7 @@ class _AllpaymentrequesitionlistsbymodesState
remarks, remarks,
"Remarks", "Remarks",
"Enter Remarks", "Enter Remarks",
(p0) {}, (p0) {},
TextInputType.text, TextInputType.text,
false, false,
null, null,
...@@ -1345,13 +1353,13 @@ class _AllpaymentrequesitionlistsbymodesState ...@@ -1345,13 +1353,13 @@ class _AllpaymentrequesitionlistsbymodesState
), ),
height: 45, height: 45,
width: width:
MediaQuery.of( MediaQuery.of(
context, context,
).size.width, ).size.width,
decoration: BoxDecoration( decoration: BoxDecoration(
color: Color(0xFFE6F6FF), color: Color(0xFFE6F6FF),
borderRadius: borderRadius:
BorderRadius.circular(12), BorderRadius.circular(12),
border: Border.all( border: Border.all(
color: AppColors.app_blue, color: AppColors.app_blue,
width: 0.5, width: 0.5,
...@@ -1362,7 +1370,7 @@ class _AllpaymentrequesitionlistsbymodesState ...@@ -1362,7 +1370,7 @@ class _AllpaymentrequesitionlistsbymodesState
"Add Attachment", "Add Attachment",
style: TextStyle( style: TextStyle(
fontFamily: fontFamily:
"JakartaMedium", "JakartaMedium",
color: AppColors.app_blue, color: AppColors.app_blue,
), ),
), ),
...@@ -1373,23 +1381,23 @@ class _AllpaymentrequesitionlistsbymodesState ...@@ -1373,23 +1381,23 @@ class _AllpaymentrequesitionlistsbymodesState
provider.imagePath != null) ...[ provider.imagePath != null) ...[
Padding( Padding(
padding: padding:
const EdgeInsets.symmetric( const EdgeInsets.symmetric(
vertical: 4.0, vertical: 4.0,
), ),
child: Row( child: Row(
mainAxisAlignment: mainAxisAlignment:
MainAxisAlignment MainAxisAlignment
.spaceBetween, .spaceBetween,
children: [ children: [
Text( Text(
"${provider.imagePath}", "${provider.imagePath}",
style: TextStyle( style: TextStyle(
color: color:
AppColors AppColors
.semi_black, .semi_black,
fontSize: 11, fontSize: 11,
fontWeight: fontWeight:
FontWeight.w600, FontWeight.w600,
), ),
), ),
InkResponse( InkResponse(
...@@ -1397,11 +1405,11 @@ class _AllpaymentrequesitionlistsbymodesState ...@@ -1397,11 +1405,11 @@ class _AllpaymentrequesitionlistsbymodesState
HapticFeedback.selectionClick(); HapticFeedback.selectionClick();
setState(() { setState(() {
provider.imagePicked = provider.imagePicked =
0; 0;
provider.imagePath = provider.imagePath =
null; null;
provider.imageFilePath = provider.imageFilePath =
null; null;
}); });
}, },
child: SvgPicture.asset( child: SvgPicture.asset(
...@@ -1418,73 +1426,73 @@ class _AllpaymentrequesitionlistsbymodesState ...@@ -1418,73 +1426,73 @@ class _AllpaymentrequesitionlistsbymodesState
context, context,
provider.accountName, provider.accountName,
"Enter Account Name", "Enter Account Name",
(p0) {}, (p0) {},
), ),
textControllerReadonlyWidget( textControllerReadonlyWidget(
context, context,
provider.branch, provider.branch,
"Enter Branch Name", "Enter Branch Name",
(p0) {}, (p0) {},
), ),
textControllerReadonlyWidget( textControllerReadonlyWidget(
context, context,
provider.requestingPurpose, provider.requestingPurpose,
"Enter Requesting Purpose", "Enter Requesting Purpose",
(p0) {}, (p0) {},
), ),
textControllerReadonlyWidget( textControllerReadonlyWidget(
context, context,
provider.description, provider.description,
"Enter Description", "Enter Description",
(p0) {}, (p0) {},
), ),
textControllerReadonlyWidget( textControllerReadonlyWidget(
context, context,
provider.amount, provider.amount,
"Enter Amount", "Enter Amount",
(p0) {}, (p0) {},
), ),
textControllerReadonlyWidget( textControllerReadonlyWidget(
context, context,
provider.paymentMode, provider.paymentMode,
"Enter Payment Mode", "Enter Payment Mode",
(p0) {}, (p0) {},
), ),
textControllerReadonlyWidget( textControllerReadonlyWidget(
context, context,
provider.bankHolderName, provider.bankHolderName,
"Bank Account Holder Name", "Bank Account Holder Name",
(p0) {}, (p0) {},
), ),
textControllerReadonlyWidget( textControllerReadonlyWidget(
context, context,
provider.bankAccountNumber, provider.bankAccountNumber,
"Bank Account Number", "Bank Account Number",
(p0) {}, (p0) {},
), ),
textControllerReadonlyWidget( textControllerReadonlyWidget(
context, context,
provider.bankName, provider.bankName,
"Bank Name", "Bank Name",
(p0) {}, (p0) {},
), ),
textControllerReadonlyWidget( textControllerReadonlyWidget(
context, context,
provider.bankBranchName, provider.bankBranchName,
"Bank Branch Name", "Bank Branch Name",
(p0) {}, (p0) {},
), ),
textControllerReadonlyWidget( textControllerReadonlyWidget(
context, context,
provider.bankIfscCode, provider.bankIfscCode,
"Bank IFSC Code", "Bank IFSC Code",
(p0) {}, (p0) {},
), ),
textControllerReadonlyWidget( textControllerReadonlyWidget(
context, context,
provider.bankUpiID, provider.bankUpiID,
"Bank UPI ID", "Bank UPI ID",
(p0) {}, (p0) {},
), ),
], ],
), ),
...@@ -1509,15 +1517,15 @@ class _AllpaymentrequesitionlistsbymodesState ...@@ -1509,15 +1517,15 @@ class _AllpaymentrequesitionlistsbymodesState
HapticFeedback.selectionClick(); HapticFeedback.selectionClick();
provider provider
.paymentrequisitionProcessSubmitAPIFunction( .paymentrequisitionProcessSubmitAPIFunction(
context, context,
widget.mode, widget.mode,
paymentReferenceNumber.text, paymentReferenceNumber.text,
provider.approvedAmount.text, provider.approvedAmount.text,
paymentID, paymentID,
provider.selectedID, provider.selectedID,
remarks.text, remarks.text,
provider.imagePath, provider.imagePath,
); );
}, },
child: Container( child: Container(
height: 45, height: 45,
...@@ -1585,9 +1593,9 @@ class _AllpaymentrequesitionlistsbymodesState ...@@ -1585,9 +1593,9 @@ class _AllpaymentrequesitionlistsbymodesState
return Padding( return Padding(
padding: EdgeInsets.only( padding: EdgeInsets.only(
bottom: bottom:
MediaQuery.of( MediaQuery.of(
context, context,
).viewInsets.bottom, // This handles keyboard ).viewInsets.bottom, // This handles keyboard
), ),
child: Container( child: Container(
margin: EdgeInsets.only( margin: EdgeInsets.only(
......
lib/screens/finance/FileViewer.dart
View file @ dc88a3f9
...@@ -10,6 +10,7 @@ import 'package:url_launcher/url_launcher.dart'; ...@@ -10,6 +10,7 @@ import 'package:url_launcher/url_launcher.dart';
import 'package:flutter_pdfview/flutter_pdfview.dart'; import 'package:flutter_pdfview/flutter_pdfview.dart';
import 'package:http/http.dart' as http; import 'package:http/http.dart' as http;
import 'dart:typed_data'; import 'dart:typed_data';
import 'package:photo_view/photo_view.dart';
import '../../Utils/app_colors.dart'; import '../../Utils/app_colors.dart';
...@@ -24,7 +25,7 @@ class Fileviewer extends StatefulWidget { ...@@ -24,7 +25,7 @@ class Fileviewer extends StatefulWidget {
class _FileviewerState extends State<Fileviewer> { class _FileviewerState extends State<Fileviewer> {
final Completer<InAppWebViewController> _controller = final Completer<InAppWebViewController> _controller =
Completer<InAppWebViewController>(); Completer<InAppWebViewController>();
var empId = ""; var empId = "";
var sessionId = ""; var sessionId = "";
bool isLoading = true; bool isLoading = true;
...@@ -36,6 +37,11 @@ class _FileviewerState extends State<Fileviewer> { ...@@ -36,6 +37,11 @@ class _FileviewerState extends State<Fileviewer> {
bool pullToRefreshEnabled = true; bool pullToRefreshEnabled = true;
final GlobalKey webViewKey = GlobalKey(); final GlobalKey webViewKey = GlobalKey();
// Zoom control variables
PhotoViewController _photoViewController = PhotoViewController();
PhotoViewScaleStateController _scaleStateController = PhotoViewScaleStateController();
String getFileExtension(String fileName) { String getFileExtension(String fileName) {
print(widget.fileUrl); print(widget.fileUrl);
return fileName.split('.').last.toLowerCase(); return fileName.split('.').last.toLowerCase();
...@@ -51,36 +57,52 @@ class _FileviewerState extends State<Fileviewer> { ...@@ -51,36 +57,52 @@ class _FileviewerState extends State<Fileviewer> {
} }
var Finalurl; var Finalurl;
@override @override
void initState() { void initState() {
// loadData();
pullToRefreshController = pullToRefreshController =
kIsWeb kIsWeb
? null ? null
: PullToRefreshController( : PullToRefreshController(
settings: pullToRefreshSettings, settings: pullToRefreshSettings,
onRefresh: () async { onRefresh: () async {
if (defaultTargetPlatform == TargetPlatform.android) { if (defaultTargetPlatform == TargetPlatform.android) {
webViewController?.reload(); webViewController?.reload();
} else if (defaultTargetPlatform == TargetPlatform.iOS) { } else if (defaultTargetPlatform == TargetPlatform.iOS) {
webViewController?.loadUrl( webViewController?.loadUrl(
urlRequest: URLRequest( urlRequest: URLRequest(
url: await webViewController?.getUrl(), url: await webViewController?.getUrl(),
), ),
); );
} }
}, },
); );
// print("URL:${widget.url}");
// Initialize photo view controllers
_photoViewController = PhotoViewController();
_scaleStateController = PhotoViewScaleStateController();
super.initState(); super.initState();
} }
@override
void dispose() {
_photoViewController.dispose();
_scaleStateController.dispose();
pullToRefreshController?.dispose();
super.dispose();
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
resizeToAvoidBottomInset: true, resizeToAvoidBottomInset: true,
appBar: appbarNew(context, "File Viewer", 0xFFFFFFFF), appBar: appbarNew(context, "File Viewer", 0xFFFFFFFF),
body: SafeArea(child: Center(child: fileWidget(context))), body: SafeArea(
child: Center(
child: fileWidget(context)
),
),
); );
} }
...@@ -91,28 +113,91 @@ class _FileviewerState extends State<Fileviewer> { ...@@ -91,28 +113,91 @@ class _FileviewerState extends State<Fileviewer> {
case 'jpeg': case 'jpeg':
case 'png': case 'png':
case 'gif': case 'gif':
return CachedNetworkImage( case 'bmp':
imageUrl: widget.fileUrl, case 'webp':
placeholder: return _buildImageViewer();
(context, url) =>
const Center(child: CircularProgressIndicator()),
errorWidget: (context, url, error) => const Icon(Icons.error),
fit: BoxFit.contain,
);
case 'pdf': case 'pdf':
return SfPdfViewer.network(widget.fileUrl, key: GlobalKey()); return _buildPdfViewer();
case 'doc': case 'doc':
case 'docx': case 'docx':
case 'xls': case 'xls':
case 'xlsx': case 'xlsx':
return InAppWebView( case 'ppt':
case 'pptx':
return _buildDocumentViewer();
default:
return _buildUnsupportedViewer();
}
}
Widget _buildImageViewer() {
return PhotoView(
imageProvider: CachedNetworkImageProvider(widget.fileUrl),
loadingBuilder: (context, event) => Center(
child: Container(
width: 40,
height: 40,
child: CircularProgressIndicator(
value: event == null ? 0 : event.cumulativeBytesLoaded / (event.expectedTotalBytes ?? 1),
),
),
),
errorBuilder: (context, error, stackTrace) => Center(
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Icon(Icons.error_outline, color: Colors.red, size: 50),
SizedBox(height: 10),
Text(
'Failed to load image',
style: TextStyle(fontSize: 16, color: Colors.grey),
),
],
),
),
backgroundDecoration: BoxDecoration(color: Colors.white),
minScale: PhotoViewComputedScale.contained * 0.5,
maxScale: PhotoViewComputedScale.covered * 4.0,
initialScale: PhotoViewComputedScale.contained,
basePosition: Alignment.center,
scaleStateController: _scaleStateController,
controller: _photoViewController,
enableRotation: true,
gestureDetectorBehavior: HitTestBehavior.deferToChild,
filterQuality: FilterQuality.high,
);
}
Widget _buildPdfViewer() {
return SfPdfViewer.network(
widget.fileUrl,
key: GlobalKey(),
canShowScrollHead: true,
canShowPaginationDialog: true,
pageLayoutMode: PdfPageLayoutMode.single,
interactionMode: PdfInteractionMode.pan,
enableDoubleTapZooming: true,
enableTextSelection: true,
onZoomLevelChanged: (PdfZoomDetails details) {
// Use the correct property name
//print('Zoom level changed: ${details.zoomLevel}');
},
);
}
Widget _buildDocumentViewer() {
return Stack(
children: [
InAppWebView(
key: webViewKey,
initialUrlRequest: URLRequest(url: WebUri(widget.fileUrl)), initialUrlRequest: URLRequest(url: WebUri(widget.fileUrl)),
androidOnGeolocationPermissionsShowPrompt: ( androidOnGeolocationPermissionsShowPrompt: (
InAppWebViewController controller, InAppWebViewController controller,
String origin, String origin,
) async { ) async {
return GeolocationPermissionShowPromptResponse( return GeolocationPermissionShowPromptResponse(
origin: origin, origin: origin,
allow: true, allow: true,
...@@ -120,27 +205,41 @@ class _FileviewerState extends State<Fileviewer> { ...@@ -120,27 +205,41 @@ class _FileviewerState extends State<Fileviewer> {
); );
}, },
initialOptions: InAppWebViewGroupOptions( initialOptions: InAppWebViewGroupOptions(
crossPlatform: InAppWebViewOptions(
useShouldOverrideUrlLoading: true,
mediaPlaybackRequiresUserGesture: false,
javaScriptEnabled: true,
clearCache: true,
supportZoom: true,
),
android: AndroidInAppWebViewOptions( android: AndroidInAppWebViewOptions(
useWideViewPort: true, useWideViewPort: true,
loadWithOverviewMode: true, loadWithOverviewMode: true,
allowContentAccess: true, allowContentAccess: true,
geolocationEnabled: true, geolocationEnabled: true,
allowFileAccess: true, allowFileAccess: true,
databaseEnabled: true, // Enables the WebView database databaseEnabled: true,
domStorageEnabled: true, // Enables DOM storage domStorageEnabled: true,
builtInZoomControls: true, // Enables the built-in zoom controls builtInZoomControls: true,
displayZoomControls: false, // Disables displaying zoom controls displayZoomControls: false,
safeBrowsingEnabled: true, // Enables Safe Browsing safeBrowsingEnabled: true,
clearSessionCache: true, clearSessionCache: true,
supportMultipleWindows: false,
),
ios: IOSInAppWebViewOptions(
allowsInlineMediaPlayback: true,
allowsAirPlayForMediaPlayback: true,
allowsPictureInPictureMediaPlayback: true,
allowsBackForwardNavigationGestures: true,
allowsLinkPreview: true,
isFraudulentWebsiteWarningEnabled: true,
), ),
ios: IOSInAppWebViewOptions(allowsInlineMediaPlayback: true),
), ),
androidOnPermissionRequest: ( androidOnPermissionRequest: (
InAppWebViewController controller, InAppWebViewController controller,
String origin, String origin,
List<String> resources, List<String> resources,
) async { ) async {
return PermissionRequestResponse( return PermissionRequestResponse(
resources: resources, resources: resources,
action: PermissionRequestResponseAction.GRANT, action: PermissionRequestResponseAction.GRANT,
...@@ -152,18 +251,29 @@ class _FileviewerState extends State<Fileviewer> { ...@@ -152,18 +251,29 @@ class _FileviewerState extends State<Fileviewer> {
}, },
pullToRefreshController: pullToRefreshController, pullToRefreshController: pullToRefreshController,
onLoadStart: (controller, url) { onLoadStart: (controller, url) {
return setState(() { setState(() {
isLoading = true; isLoading = true;
}); });
}, },
onLoadStop: (controller, url) { onLoadStop: (controller, url) {
pullToRefreshController?.endRefreshing(); pullToRefreshController?.endRefreshing();
return setState(() { setState(() {
isLoading = false; isLoading = false;
}); });
// Enable zooming in WebView
controller.evaluateJavascript(source: """
var meta = document.createElement('meta');
meta.name = 'viewport';
meta.content = 'width=device-width, initial-scale=1.0, maximum-scale=4.0, user-scalable=yes';
document.getElementsByTagName('head')[0].appendChild(meta);
""");
}, },
onReceivedError: (controller, request, error) { onReceivedError: (controller, request, error) {
pullToRefreshController?.endRefreshing(); pullToRefreshController?.endRefreshing();
setState(() {
isLoading = false;
});
}, },
onProgressChanged: (controller, progress) { onProgressChanged: (controller, progress) {
if (progress == 100) { if (progress == 100) {
...@@ -172,21 +282,101 @@ class _FileviewerState extends State<Fileviewer> { ...@@ -172,21 +282,101 @@ class _FileviewerState extends State<Fileviewer> {
}, },
onConsoleMessage: (controller, consoleMessage) { onConsoleMessage: (controller, consoleMessage) {
if (kDebugMode) { if (kDebugMode) {
debugPrint("consoleMessage$consoleMessage"); debugPrint("consoleMessage: ${consoleMessage.message}");
} }
debugPrint("JavaScript console message: ${consoleMessage.message}");
}, },
); ),
default:
return Container(); // Loading indicator for documents
} if (isLoading)
Positioned.fill(
child: Container(
color: Colors.black.withOpacity(0.3),
child: Center(
child: Container(
padding: EdgeInsets.all(20),
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.circular(10),
boxShadow: [
BoxShadow(
color: Colors.black26,
blurRadius: 10,
),
],
),
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
CircularProgressIndicator(
valueColor: AlwaysStoppedAnimation<Color>(AppColors.app_blue),
),
SizedBox(height: 10),
Text(
'Loading Document...',
style: TextStyle(
fontSize: 14,
color: Colors.grey[700],
),
),
],
),
),
),
),
),
],
);
}
Widget _buildUnsupportedViewer() {
return Center(
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Icon(
Icons.insert_drive_file,
size: 64,
color: Colors.grey[400],
),
SizedBox(height: 16),
Text(
'Unsupported File Format',
style: TextStyle(
fontSize: 18,
fontWeight: FontWeight.w600,
color: Colors.grey[600],
),
),
SizedBox(height: 8),
Text(
'Format: ${getFileExtension(widget.fileName).toUpperCase()}',
style: TextStyle(
fontSize: 14,
color: Colors.grey[500],
),
),
SizedBox(height: 16),
ElevatedButton.icon(
onPressed: () {
_launchUrl(widget.fileUrl);
},
icon: Icon(Icons.open_in_new),
label: Text('Open in External App'),
style: ElevatedButton.styleFrom(
backgroundColor: AppColors.app_blue,
foregroundColor: Colors.white,
),
),
],
),
);
} }
Future<Uint8List?> _loadPdf(String url) async { Future<Uint8List?> _loadPdf(String url) async {
try { try {
final response = await http.get(Uri.parse(url)); final response = await http.get(Uri.parse(url));
if (response.statusCode == 200) { if (response.statusCode == 200) {
print(response.bodyBytes);
return response.bodyBytes; return response.bodyBytes;
} }
} catch (e) { } catch (e) {
...@@ -194,4 +384,4 @@ class _FileviewerState extends State<Fileviewer> { ...@@ -194,4 +384,4 @@ class _FileviewerState extends State<Fileviewer> {
} }
return null; return null;
} }
} }
\ No newline at end of file
lib/screens/finance/PaymentRequestionListDetails.dart
View file @ dc88a3f9
...@@ -1360,14 +1360,14 @@ class _PaymentrequestionlistdetailsState ...@@ -1360,14 +1360,14 @@ class _PaymentrequestionlistdetailsState
context, context,
provider.requestedAmount, provider.requestedAmount,
"Enter Requested Amount", "Enter Requested Amount",
(p0) {}, (p0) {},
), ),
textControllerWidget( textControllerWidget(
context, context,
provider.approvedAmount, provider.approvedAmount,
"Approved Amount", "Approved Amount",
"Enter Approved Amount", "Enter Approved Amount",
(p0) { (p0) {
provider.onChangeApprov(p0); provider.onChangeApprov(p0);
}, },
TextInputType.numberWithOptions(), TextInputType.numberWithOptions(),
...@@ -1383,7 +1383,7 @@ class _PaymentrequestionlistdetailsState ...@@ -1383,7 +1383,7 @@ class _PaymentrequestionlistdetailsState
remarks, remarks,
"Remarks", "Remarks",
"Enter Remarks", "Enter Remarks",
(p0) { (p0) {
provider.remarksError = null; provider.remarksError = null;
provider.notifyListeners(); provider.notifyListeners();
}, },
...@@ -1408,30 +1408,30 @@ class _PaymentrequestionlistdetailsState ...@@ -1408,30 +1408,30 @@ class _PaymentrequestionlistdetailsState
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
), ),
items: items:
provider.paymentsAccounts provider.paymentsAccounts
.map( .map(
(paymenents) => DropdownMenuItem< (paymenents) => DropdownMenuItem<
PaymentAccounts PaymentAccounts
>( >(
value: paymenents, value: paymenents,
child: Text( child: Text(
paymenents.name ?? '', paymenents.name ?? '',
style: const TextStyle( style: const TextStyle(
fontSize: 14, fontSize: 14,
), ),
overflow: overflow:
TextOverflow.ellipsis, TextOverflow.ellipsis,
), ),
), ),
) )
.toList(), .toList(),
value: value:
provider.paymentsAccounts.contains( provider.paymentsAccounts.contains(
provider.selectedPaymentAccounts, provider.selectedPaymentAccounts,
) )
? provider.selectedPaymentAccounts ? provider.selectedPaymentAccounts
: null, : null,
// value: provider.selectedPaymentAccounts, // value: provider.selectedPaymentAccounts,
onChanged: (PaymentAccounts? value) { onChanged: (PaymentAccounts? value) {
if (value != null) { if (value != null) {
...@@ -1446,7 +1446,8 @@ class _PaymentrequestionlistdetailsState ...@@ -1446,7 +1446,8 @@ class _PaymentrequestionlistdetailsState
provider.selectedID = value.id!; provider.selectedID = value.id!;
provider.selectedValue = value.name!; provider.selectedValue = value.name!;
print( print(
"hfjkshfg${provider.selectedID}", "hfjkshfg" +
provider.selectedID.toString(),
); );
} }
} }
...@@ -1454,35 +1455,35 @@ class _PaymentrequestionlistdetailsState ...@@ -1454,35 +1455,35 @@ class _PaymentrequestionlistdetailsState
dropdownSearchData: DropdownSearchData( dropdownSearchData: DropdownSearchData(
searchInnerWidgetHeight: 50, searchInnerWidgetHeight: 50,
searchController: searchController:
provider provider
.paymentAccountSearchController, .paymentAccountSearchController,
searchInnerWidget: Padding( searchInnerWidget: Padding(
padding: const EdgeInsets.all(8), padding: const EdgeInsets.all(8),
child: TextFormField( child: TextFormField(
controller: controller:
provider provider
.paymentAccountSearchController, .paymentAccountSearchController,
decoration: InputDecoration( decoration: InputDecoration(
isDense: true, isDense: true,
contentPadding: contentPadding:
const EdgeInsets.symmetric( const EdgeInsets.symmetric(
horizontal: 10, horizontal: 10,
vertical: 8, vertical: 8,
), ),
hintText: 'Search account...', hintText: 'Search account...',
border: OutlineInputBorder( border: OutlineInputBorder(
borderRadius: borderRadius:
BorderRadius.circular(8), BorderRadius.circular(8),
), ),
), ),
), ),
), ),
searchMatchFn: (item, searchValue) { searchMatchFn: (item, searchValue) {
return item.value?.name return item.value?.name
?.toLowerCase() ?.toLowerCase()
.contains( .contains(
searchValue.toLowerCase(), searchValue.toLowerCase(),
) ?? ) ??
false; false;
}, },
...@@ -1497,9 +1498,9 @@ class _PaymentrequestionlistdetailsState ...@@ -1497,9 +1498,9 @@ class _PaymentrequestionlistdetailsState
buttonStyleData: ddtheme.buttonStyleData, buttonStyleData: ddtheme.buttonStyleData,
iconStyleData: ddtheme.iconStyleData, iconStyleData: ddtheme.iconStyleData,
menuItemStyleData: menuItemStyleData:
ddtheme.menuItemStyleData, ddtheme.menuItemStyleData,
dropdownStyleData: dropdownStyleData:
ddtheme.dropdownStyleData, ddtheme.dropdownStyleData,
), ),
), ),
], ],
...@@ -1511,15 +1512,21 @@ class _PaymentrequestionlistdetailsState ...@@ -1511,15 +1512,21 @@ class _PaymentrequestionlistdetailsState
), ),
InkWell( InkWell(
onTap: () { onTap: () {
print("🖱️ === SUBMIT BUTTON TAPPED ===");
print("📋 Mode: ${widget.mode}");
print("📋 Payment ID: $paymentID");
print("📋 Approved Amount: ${provider.approvedAmount.text}");
print("📋 Remarks: ${remarks.text}");
print("📋 Selected Account ID: ${provider.selectedID}");
provider provider
.paymentrequisitionApproveSubmitAPIFunction( .paymentrequisitionApproveSubmitAPIFunction(
context, context,
widget.mode, widget.mode,
paymentID, paymentID,
provider.approvedAmount.text, provider.approvedAmount.text,
remarks.text, remarks.text,
provider.selectedID, provider.selectedID,
); );
}, },
child: Container( child: Container(
alignment: Alignment.center, alignment: Alignment.center,
......
lib/screens/hrm/AdvanceListScreen.dart 0 → 100644
View file @ dc88a3f9
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import '../../Notifiers/HomeScreenNotifier.dart';
import '../../Models/hrmModels/advanceListResponse.dart';
import 'package:intl/intl.dart';
import 'package:flutter_svg/svg.dart';
import '../../Notifiers/hrmProvider/advanceProvider.dart';
import '../../Utils/app_colors.dart';
class AdvanceListScreen extends StatefulWidget {
const AdvanceListScreen({super.key});
@override
State<AdvanceListScreen> createState() => _AdvanceListScreenState();
}
class _AdvanceListScreenState extends State<AdvanceListScreen> {
final ScrollController _scrollController = ScrollController();
@override
void initState() {
super.initState();
final provider = Provider.of<AdvanceListProvider>(context, listen: false);
final homeProvider = Provider.of<HomescreenNotifier>(context, listen: false);
WidgetsBinding.instance.addPostFrameCallback((_) {
provider.fetchAdvanceList(context, homeProvider.session, homeProvider.empId);
});
_scrollController.addListener(() {
if (_scrollController.position.pixels >=
_scrollController.position.maxScrollExtent - 200) {
provider.loadMoreAdvanceList(context, homeProvider.session, homeProvider.empId);
}
});
}
@override
Widget build(BuildContext context) {
final double screenWidth = MediaQuery.of(context).size.width;
final double screenHeight = MediaQuery.of(context).size.height;
final bool isSmallScreen = screenWidth < 360;
final bool isLargeScreen = screenWidth > 600;
return Scaffold(
appBar: AppBar(
automaticallyImplyLeading: false,
backgroundColor: Colors.white,
title: Row(
children: [
InkResponse(
onTap: () => Navigator.pop(context, true),
child: SvgPicture.asset(
"assets/svg/appbar_back_button.svg",
height: isSmallScreen ? 22 : 25,
),
),
SizedBox(width: isSmallScreen ? 8 : 10),
Text(
"Advance List",
style: TextStyle(
fontSize: isSmallScreen ? 16 : 18,
fontFamily: "Plus Jakarta Sans",
fontWeight: FontWeight.w600,
color: Colors.black87,
),
),
],
),
),
backgroundColor: AppColors.scaffold_bg_color,
body: Consumer<AdvanceListProvider>(
builder: (context, provider, _) {
if (provider.isLoading && provider.advanceList.isEmpty) {
return const Center(child: CircularProgressIndicator());
}
if (provider.errorMessage != null) {
return Padding(
padding: EdgeInsets.symmetric(horizontal: isSmallScreen ? 16 : 20),
child: Center(
child: Text(
provider.errorMessage!,
style: TextStyle(
color: Colors.red,
fontSize: isSmallScreen ? 14 : 16,
fontFamily: "Plus Jakarta Sans",
),
textAlign: TextAlign.center,
),
),
);
}
if (provider.advanceList.isEmpty) {
return Padding(
padding: EdgeInsets.symmetric(horizontal: isSmallScreen ? 16 : 20),
child: Center(
child: Text(
"No records found.",
style: TextStyle(
fontSize: isSmallScreen ? 14 : 16,
fontFamily: "Plus Jakarta Sans",
color: AppColors.grey_semi,
),
),
),
);
}
return ListView.builder(
controller: _scrollController,
padding: EdgeInsets.all(isSmallScreen ? 8 : isLargeScreen ? 16 : 12),
itemCount: provider.advanceList.length +
(provider.isLoading ? 1 : 0), // for pagination loader
itemBuilder: (context, index) {
if (index == provider.advanceList.length) {
return Padding(
padding: EdgeInsets.all(isSmallScreen ? 12.0 : 16.0),
child: const Center(child: CircularProgressIndicator()),
);
}
AdvanceList item = provider.advanceList[index];
return _buildAdvanceCard(item, screenWidth);
},
);
},
),
);
}
Widget _buildAdvanceCard(AdvanceList item, double screenWidth) {
final bool isSmallScreen = screenWidth < 360;
final bool isLargeScreen = screenWidth > 600;
final date = item.createdDatetime != null
? _formatDate(item.createdDatetime!)
: "-";
return Card(
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(isSmallScreen ? 12 : 16)),
margin: EdgeInsets.symmetric(
vertical: isSmallScreen ? 5 : 7,
horizontal: isLargeScreen ? 4 : 0,
),
elevation: 0,
child: Padding(
padding: EdgeInsets.symmetric(
horizontal: isSmallScreen ? 12 : isLargeScreen ? 18 : 14,
vertical: isSmallScreen ? 10 : isLargeScreen ? 14 : 12,
),
child: Row(
children: [
// Circular Avatar - Responsive size
CircleAvatar(
backgroundColor: _getAvatarColor(item.type),
radius: isSmallScreen ? 18 : isLargeScreen ? 26 : 22,
child: Text(
(item.narration?.isNotEmpty == true)
? item.type![0].toUpperCase()
: "?",
style: TextStyle(
color: _getAvatarTxtColor(item.type),
fontWeight: FontWeight.bold,
fontSize: isSmallScreen ? 12 : isLargeScreen ? 16 : 14,
),
),
),
SizedBox(width: isSmallScreen ? 12 : isLargeScreen ? 16 : 14),
// Title + Subtitle
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
item.narration ?? "No Title",
style: TextStyle(
fontFamily: "JakartaRegular",
fontSize: isSmallScreen ? 13 : isLargeScreen ? 16 : 14,
color: AppColors.semi_black,
),
maxLines: 2,
overflow: TextOverflow.ellipsis,
),
SizedBox(height: isSmallScreen ? 2 : 4),
Text(
date,
style: TextStyle(
fontFamily: "JakartaRegular",
fontSize: isSmallScreen ? 12 : isLargeScreen ? 14 : 13,
color: AppColors.grey_semi,
),
),
],
),
),
SizedBox(width: isSmallScreen ? 8 : isLargeScreen ? 12 : 10),
// Right side amounts
Column(
crossAxisAlignment: CrossAxisAlignment.end,
children: [
if (item.issuedAmount != "₹ 0.00")
Text(
"${item.issuedAmount ?? "0"}",
style: TextStyle(
fontFamily: "JakartaMedium",
fontSize: isSmallScreen ? 13 : isLargeScreen ? 16 : 14,
color: const Color(0xff1487c9),
),
textAlign: TextAlign.end,
),
if (item.deductedAmount != "₹ 0.00")
SizedBox(height: isSmallScreen ? 1 : 2),
if (item.deductedAmount != "₹ 0.00")
Text(
"-${item.deductedAmount ?? "0"}",
style: TextStyle(
fontFamily: "JakartaMedium",
fontSize: isSmallScreen ? 13 : isLargeScreen ? 16 : 14,
color: AppColors.red,
),
textAlign: TextAlign.end,
),
],
),
],
),
),
);
}
String _formatDate(String dateStr) {
try {
final date = DateTime.parse(dateStr);
return DateFormat("dd MMM yy").format(date);
} catch (_) {
return dateStr;
}
}
@override
void dispose() {
_scrollController.dispose();
super.dispose();
}
/// Avatar color generator
Color _getAvatarColor(value) {
var color = AppColors.approved_bg_color;
switch (value) {
case 'issued':
return AppColors.requested_bg_color;
case 'received':
return AppColors.approved_bg_color;
}
return color;
}
Color _getAvatarTxtColor(value) {
var color = AppColors.approved_text_color;
switch (value) {
case 'issued':
return AppColors.requested_text_color;
case 'received':
return AppColors.approved_text_color;
}
return color;
}
String getText(value) {
switch (value) {
case 'issued':
return "I";
case 'received':
return "R";
default:
return "-";
}
}
}
\ No newline at end of file
lib/screens/hrm/CasualLeaveHistoryScreen.dart 0 → 100644
View file @ dc88a3f9
import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:provider/provider.dart';
import '../../Notifiers/hrmProvider/CasualLeaveHistoryProvider.dart';
import '../../Utils/app_colors.dart';
class CasualLeaveHistoryScreen extends StatefulWidget {
const CasualLeaveHistoryScreen({super.key});
@override
State<CasualLeaveHistoryScreen> createState() =>
_CasualLeaveHistoryScreenState();
}
class _CasualLeaveHistoryScreenState extends State<CasualLeaveHistoryScreen> {
@override
void initState() {
super.initState();
// Fetch data once when the screen loads
Future.delayed(Duration.zero, () {
final provider =
Provider.of<CasualLeaveHistoryProvider>(context, listen: false);
provider.fetchCasualLeaveHistory(context);
});
}
@override
Widget build(BuildContext context) {
final double screenWidth = MediaQuery.of(context).size.width;
final double screenHeight = MediaQuery.of(context).size.height;
final bool isSmallScreen = screenWidth < 360;
final bool isLargeScreen = screenWidth > 600;
final bool isTablet = screenWidth > 768;
return Scaffold(
backgroundColor: AppColors.scaffold_bg_color,
appBar: AppBar(
automaticallyImplyLeading: false,
backgroundColor: Colors.white,
title: Row(
children: [
InkResponse(
onTap: () => Navigator.pop(context, true),
child: SvgPicture.asset(
"assets/svg/appbar_back_button.svg",
height: isSmallScreen ? 22 : isTablet ? 28 : 25,
),
),
SizedBox(width: isSmallScreen ? 8 : isTablet ? 12 : 10),
Text(
"Casual Leave History",
style: TextStyle(
fontSize: isSmallScreen ? 16 : isTablet ? 20 : 18,
fontFamily: "Plus Jakarta Sans",
fontWeight: FontWeight.w600,
color: Colors.black87,
),
),
],
),
),
body: Consumer<CasualLeaveHistoryProvider>(
builder: (context, provider, _) {
if (provider.isLoading) {
return const Center(child: CircularProgressIndicator());
}
if (provider.errorMessage != null) {
return Padding(
padding: EdgeInsets.symmetric(horizontal: isSmallScreen ? 16 : 20),
child: Center(
child: Text(
provider.errorMessage!,
style: TextStyle(
color: Colors.white,
fontSize: isSmallScreen ? 14 : 16,
fontFamily: "Plus Jakarta Sans",
),
textAlign: TextAlign.center,
),
),
);
}
if (provider.casualLeaveHistoryList.isEmpty) {
return Padding(
padding: EdgeInsets.symmetric(horizontal: isSmallScreen ? 16 : 20),
child: Center(
child: Text(
"No leave history found",
style: TextStyle(
color: Colors.white,
fontSize: isSmallScreen ? 14 : 16,
fontFamily: "Plus Jakarta Sans",
),
),
),
);
}
return ListView.builder(
padding: EdgeInsets.all(isSmallScreen ? 8 : isTablet ? 16 : 12),
itemCount: provider.casualLeaveHistoryList.length,
itemBuilder: (context, index) {
final item = provider.casualLeaveHistoryList[index];
return Padding(
padding: EdgeInsets.symmetric(
vertical: isSmallScreen ? 4 : isTablet ? 8 : 6,
),
child: Container(
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.circular(
isSmallScreen ? 12 : isTablet ? 20 : 16,
),
),
padding: EdgeInsets.symmetric(
horizontal: isSmallScreen ? 12 : isTablet ? 18 : 14,
vertical: isSmallScreen ? 8 : isTablet ? 14 : 10,
),
child: Row(
children: [
// --- Avatar Circle ---
Container(
height: isSmallScreen ? 40 : isTablet ? 54 : 46,
width: isSmallScreen ? 40 : isTablet ? 54 : 46,
decoration: BoxDecoration(
color: _getAvatarColor(item.type),
shape: BoxShape.circle,
),
child: Center(
child: Text(
getText(item.type),
style: TextStyle(
fontSize: isSmallScreen ? 13 : isTablet ? 17 : 15,
fontFamily: "Plus Jakarta Sans",
fontWeight: FontWeight.w500,
color: _getAvatarTxtColor(item.type),
),
),
),
),
SizedBox(width: isSmallScreen ? 10 : isTablet ? 16 : 12),
// --- Main Content ---
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
item.des ?? "No Description",
style: TextStyle(
fontFamily: "JakartaRegular",
fontSize: isSmallScreen ? 13 : isTablet ? 16 : 14,
color: AppColors.semi_black,
height: 1.2,
),
maxLines: 2,
overflow: TextOverflow.ellipsis,
),
SizedBox(height: isSmallScreen ? 2 : isTablet ? 6 : 4),
Text(
item.year ?? "",
style: TextStyle(
fontFamily: "JakartaRegular",
fontSize: isSmallScreen ? 12 : isTablet ? 14 : 13,
color: AppColors.grey_semi,
),
),
],
),
),
// --- Duration Badge (like "1 Day") ---
Container(
decoration: BoxDecoration(
color: Colors.blue.shade50,
borderRadius: BorderRadius.circular(
isSmallScreen ? 16 : isTablet ? 24 : 20,
),
),
padding: EdgeInsets.symmetric(
horizontal: isSmallScreen ? 12 : isTablet ? 16 : 14,
vertical: isSmallScreen ? 4 : isTablet ? 8 : 6,
),
child: Text(
"${item.cnt ?? '0'} Day${(item.cnt ?? '0') == '1' ? '' : 's'}",
style: TextStyle(
fontFamily: "JakartaMedium",
fontSize: isSmallScreen ? 12 : isTablet ? 15 : 14,
color: Color(0xff1487c9),
),
),
),
],
),
),
);
},
);
},
),
);
}
/// Avatar color generator
Color _getAvatarColor(value) {
var color = AppColors.approved_bg_color;
switch (value) {
case 'minus':
return AppColors.rejected_bg_color;
case 'plus':
return AppColors.approved_bg_color;
}
return color;
}
Color _getAvatarTxtColor(value) {
var color = AppColors.approved_text_color;
switch (value) {
case 'minus':
return AppColors.rejected_text_color;
case 'plus':
return AppColors.approved_text_color;
}
return color;
}
String getText(value) {
switch (value) {
case 'minus':
return "M";
case 'plus':
return "P";
default:
return "-";
}
}
}
\ No newline at end of file
lib/screens/hrm/HrmDashboardScreen.dart
View file @ dc88a3f9
...@@ -3,6 +3,8 @@ import 'package:flutter_svg/svg.dart'; ...@@ -3,6 +3,8 @@ import 'package:flutter_svg/svg.dart';
import 'package:generp/screens/hrm/Attendancelist.dart'; import 'package:generp/screens/hrm/Attendancelist.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import '../../Utils/app_colors.dart'; import '../../Utils/app_colors.dart';
import 'AdvanceListScreen.dart';
import 'CasualLeaveHistoryScreen.dart';
import 'LeaveApplicationScreen.dart'; import 'LeaveApplicationScreen.dart';
import 'TourExpensesListScreen.dart'; import 'TourExpensesListScreen.dart';
import 'RewardListScreen.dart'; import 'RewardListScreen.dart';
...@@ -24,6 +26,8 @@ class _HrmdashboardScreenState extends State<HrmdashboardScreen> { ...@@ -24,6 +26,8 @@ class _HrmdashboardScreenState extends State<HrmdashboardScreen> {
"Tour Bill List", "Tour Bill List",
"Rewards List", "Rewards List",
"Attendance Request List", "Attendance Request List",
"Advance List",
"Casual Leave List"
]; ];
@override @override
...@@ -215,7 +219,7 @@ class _HrmdashboardScreenState extends State<HrmdashboardScreen> { ...@@ -215,7 +219,7 @@ class _HrmdashboardScreenState extends State<HrmdashboardScreen> {
crossAxisCount: (constraints.maxWidth / crossAxisCount: (constraints.maxWidth /
180) 180)
.floor() .floor()
.clamp(2, 4), .clamp(2, 6),
crossAxisSpacing: 1, crossAxisSpacing: 1,
mainAxisSpacing: 2, mainAxisSpacing: 2,
childAspectRatio: 1.8, childAspectRatio: 1.8,
...@@ -224,7 +228,7 @@ class _HrmdashboardScreenState extends State<HrmdashboardScreen> { ...@@ -224,7 +228,7 @@ class _HrmdashboardScreenState extends State<HrmdashboardScreen> {
final page = pages[index]; final page = pages[index];
return _buildTile( return _buildTile(
label: page.pageName ?? "", label: page.pageName ?? "",//in page number there is 6 items comming from serever it showing only four
subtitle: _getSubtitle( subtitle: _getSubtitle(
page.pageName ?? "", page.pageName ?? "",
), ),
...@@ -244,6 +248,11 @@ class _HrmdashboardScreenState extends State<HrmdashboardScreen> { ...@@ -244,6 +248,11 @@ class _HrmdashboardScreenState extends State<HrmdashboardScreen> {
); );
}, },
), ),
////////////
SizedBox(height: 40,)
], ],
), ),
], ],
...@@ -355,6 +364,10 @@ class _HrmdashboardScreenState extends State<HrmdashboardScreen> { ...@@ -355,6 +364,10 @@ class _HrmdashboardScreenState extends State<HrmdashboardScreen> {
return ""; return "";
case "Team Attendance Approval": case "Team Attendance Approval":
return ""; return "";
case "Advance List":
return "Advance Payment";
case "Casual Leave List":
return "Track Casual Leave";
default: default:
return ""; return "";
} }
...@@ -375,6 +388,10 @@ class _HrmdashboardScreenState extends State<HrmdashboardScreen> { ...@@ -375,6 +388,10 @@ class _HrmdashboardScreenState extends State<HrmdashboardScreen> {
return "assets/svg/hrm/logout_ic.svg"; return "assets/svg/hrm/logout_ic.svg";
case "Team Attendance Approval": case "Team Attendance Approval":
return "assets/svg/hrm/check_ic.svg"; return "assets/svg/hrm/check_ic.svg";
case "Advance List":
return "assets/svg/hrm/advance_list_ic.svg";
case "Casual Leave List":
return "assets/svg/hrm/casual_leave_history_ic.svg";
default: default:
return "assets/svg/hrm/groupIc.svg"; return "assets/svg/hrm/groupIc.svg";
} }
...@@ -432,6 +449,24 @@ class _HrmdashboardScreenState extends State<HrmdashboardScreen> { ...@@ -432,6 +449,24 @@ class _HrmdashboardScreenState extends State<HrmdashboardScreen> {
), ),
); );
break; break;
case "Advance List":
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => AdvanceListScreen(),
),
);
break;
case "Casual Leave List":
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => CasualLeaveHistoryScreen(),
),
);
break;
} }
} }
} }
lib/screens/notifierExports.dart
View file @ dc88a3f9
...@@ -65,6 +65,6 @@ export 'package:generp/Notifiers/hrmProvider/tourExpensesDetailsProvider.dart'; ...@@ -65,6 +65,6 @@ export 'package:generp/Notifiers/hrmProvider/tourExpensesDetailsProvider.dart';
export 'package:generp/Notifiers/hrmProvider/rewardListProvider.dart'; export 'package:generp/Notifiers/hrmProvider/rewardListProvider.dart';
export 'package:generp/Notifiers/hrmProvider/LeaveApplicationListProvider.dart'; export 'package:generp/Notifiers/hrmProvider/LeaveApplicationListProvider.dart';
export 'package:generp/Notifiers/hrmProvider/LeaveApplicationDetailsProvider.dart'; export 'package:generp/Notifiers/hrmProvider/LeaveApplicationDetailsProvider.dart';
export 'package:generp/Notifiers/hrmProvider/CasualLeaveHistoryProvider.dart';
export 'package:generp/Notifiers/hrmprovider/orgprovider.dart'; export 'package:generp/Notifiers/hrmprovider/orgprovider.dart';
lib/screens/order/addOrder.dart
View file @ dc88a3f9
...@@ -25,8 +25,14 @@ import 'package:dropdown_search/dropdown_search.dart'; ...@@ -25,8 +25,14 @@ import 'package:dropdown_search/dropdown_search.dart';
class AddorderScreen extends StatefulWidget { class AddorderScreen extends StatefulWidget {
final pageTitleName; final pageTitleName;
final mode; final mode;
final leadId;
final feedback;
final followupType;
final inTime;
final loc;
const AddorderScreen({super.key, this.pageTitleName, this.mode});
const AddorderScreen({super.key, this.pageTitleName, this.mode, this.leadId, this.feedback, this.followupType, this.inTime, this.loc});
@override @override
State<AddorderScreen> createState() => _AddorderScreenState(); State<AddorderScreen> createState() => _AddorderScreenState();
...@@ -45,30 +51,99 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -45,30 +51,99 @@ class _AddorderScreenState extends State<AddorderScreen> {
@override @override
void initState() { void initState() {
// TODO: implement initState
super.initState(); super.initState();
_connectivity.initialise(); _connectivity.initialise();
_connectivity.myStream.listen((source) { _connectivity.myStream.listen((source) {
setState(() => _source = source); setState(() => _source = source);
}); });
WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
var provider = Provider.of<Addorderprovider>(context, listen: false); WidgetsBinding.instance.addPostFrameCallback((_) async {
final provider = Provider.of<Addorderprovider>(context, listen: false);
final homeProvider = Provider.of<HomescreenNotifier>(context, listen: false);
if (provider.dateNow == null) { if (provider.dateNow == null) {
provider.setDate(DateTime.now()); provider.setDate(DateTime.now());
} }
provider.getLocationPermission(context); provider.getLocationPermission(context);
provider.getCurrentLocation(); provider.getCurrentLocation();
provider.ordersAddOrderAPIViewFunction(context, widget.mode);
provider.ordersAddOrderSelectAccountAPIFunction( // fetch select account API
await provider.ordersAddOrderSelectAccountAPIFunction(
context, context,
widget.mode, widget.mode,
provider.selectedAccountID, provider.selectedAccountID,
'', '',
); );
if (widget.pageTitleName != "Add Order") {
provider.ordersAddOrderAPIViewFunction(
context,
widget.mode,
"",
"",
"",
"",
"",
);
}
if (widget.pageTitleName == "Add Order") {
await provider.fetchAddOrderViewData(
context,
homeProvider.empId,
homeProvider.session,
widget.mode,
widget.leadId,
widget.feedback,
widget.followupType,
widget.inTime,
widget.loc,
);
debugPrint(" fetchAddOrderViewData finished");
debugPrint("Assign data to all fields##################################");
final account = provider.accountDetails;
if (account != null) {
await provider.ordersAddOrderSelectAccountAPIFunction(
context,
widget.mode,
account.id,
"",
);
// provider.getDistrictAPI(context, account.district);
// provider.getSubLocationAPI(context, account.subLocality);
provider.ordersAddOrderAccountDetailsAPIFunction(context, account.id);
provider.selectedAccountID = account.id;
provider.selectedAccountName = account.name;
provider.selectedBillingStateID = account.state;
// Fill text controllers
provider.billingNameController.text = account.name ?? "";
provider.billingAddressController.text = account.address ?? "";
provider.billingPincodeController.text = account.pincode ?? "";
provider.orderReceivedDateController.text = account.date ?? "";
provider.billingStateSearchController.text = account.state!;
provider.selecetdBillingStates = "account.state" as States?;
debugPrint("Auto filled");
provider.accountList.first = account.name as AccountList;
// provider.billingDistrictSearchController.text = district as String;
// provider.selectedBillingDistricts = district as Districts?;
//
// provider.billingSubLocSearchController.text = account.subLocality!;
// provider.selectedBillingSubLocations = account.subLocality as SubLocations?;
provider.dropDownSearchController.text = account.name!;
provider.selectedAccountName = account.name;
provider.notifyListeners();
}
}
}); });
} }
@override @override
void dispose() { void dispose() {
focusNodes.map((e) => e.dispose()); focusNodes.map((e) => e.dispose());
...@@ -137,21 +212,22 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -137,21 +212,22 @@ class _AddorderScreenState extends State<AddorderScreen> {
} }
return (connection == "Online") return (connection == "Online")
? Platform.isAndroid ? Platform.isAndroid
? WillPopScope( ? WillPopScope(
onWillPop: () => onBackPressed(context), onWillPop: () => onBackPressed(context),
child: SafeArea( child: SafeArea(
top: false, top: false,
bottom: true, bottom: true,
child: _scaffold(context), child: _scaffold(context),
), ),
) )
: _scaffold(context) : _scaffold(context)
: NoNetwork(context); : NoNetwork(context);
} }
Widget _scaffold(BuildContext context) { Widget _scaffold(BuildContext context) {
return Consumer<Addorderprovider>( return Consumer<Addorderprovider>(
builder: (context, provider, child) { builder: (context, provider, child) {
return WillPopScope( return WillPopScope(
child: SafeArea( child: SafeArea(
top: false, top: false,
...@@ -198,9 +274,9 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -198,9 +274,9 @@ class _AddorderScreenState extends State<AddorderScreen> {
return CircleAvatar( return CircleAvatar(
radius: 12, radius: 12,
backgroundColor: backgroundColor:
stepIndex <= _currentStep stepIndex <= _currentStep
? AppColors.app_blue ? AppColors.app_blue
: Colors.grey[300], : Colors.grey[300],
); );
}, },
steps: [ steps: [
...@@ -225,14 +301,14 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -225,14 +301,14 @@ class _AddorderScreenState extends State<AddorderScreen> {
showSearchBox: true, showSearchBox: true,
searchFieldProps: TextFieldProps( searchFieldProps: TextFieldProps(
controller: controller:
provider.dropDownSearchController, provider.dropDownSearchController,
decoration: InputDecoration( decoration: InputDecoration(
isDense: true, isDense: true,
contentPadding: contentPadding:
const EdgeInsets.symmetric( const EdgeInsets.symmetric(
horizontal: 10, horizontal: 10,
vertical: 8, vertical: 8,
), ),
hintText: 'Search Account...', hintText: 'Search Account...',
border: OutlineInputBorder( border: OutlineInputBorder(
borderSide: BorderSide( borderSide: BorderSide(
...@@ -242,14 +318,14 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -242,14 +318,14 @@ class _AddorderScreenState extends State<AddorderScreen> {
borderRadius: BorderRadius.circular(8), borderRadius: BorderRadius.circular(8),
), ),
suffixIcon: suffixIcon:
provider.isLoading provider.isLoading
? const CircularProgressIndicator() ? const CircularProgressIndicator()
: null, : null,
), ),
onChanged: (value) { onChanged: (value) {
Timer( Timer(
const Duration(milliseconds: 500), const Duration(milliseconds: 500),
() { () {
print('Search query: $value'); print('Search query: $value');
// Items are fetched via the items parameter // Items are fetched via the items parameter
}, },
...@@ -264,21 +340,21 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -264,21 +340,21 @@ class _AddorderScreenState extends State<AddorderScreen> {
), ),
itemBuilder: itemBuilder:
(context, item, isDisabled, isSelected) => (context, item, isDisabled, isSelected) =>
Padding( Padding(
padding: EdgeInsets.symmetric( padding: EdgeInsets.symmetric(
horizontal: 12, horizontal: 12,
vertical: 10, vertical: 10,
), ),
child: SizedBox( child: SizedBox(
height: 20, height: 20,
child: Text( child: Text(
item.text!, item.text!,
style: const TextStyle( style: const TextStyle(
fontSize: 14, fontSize: 14,
),
),
), ),
), ),
),
),
), ),
items: (filter, infiniteScrollProps) async { items: (filter, infiniteScrollProps) async {
print('Fetching items for filter: $filter'); print('Fetching items for filter: $filter');
...@@ -295,13 +371,14 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -295,13 +371,14 @@ class _AddorderScreenState extends State<AddorderScreen> {
if (value != null) { if (value != null) {
print('Selected account: ${value.text}'); print('Selected account: ${value.text}');
provider.selectedAccountList = (value); provider.selectedAccountList = (value);
provider.selectedAccountID = value.id!; provider.selectedAccountID = value!.id!;
provider.selectedAccountName = value.text!; provider.selectedAccountName = value!.text!;
provider provider
.ordersAddOrderAccountDetailsAPIFunction( .ordersAddOrderAccountDetailsAPIFunction(
context, context,
value.id, value.id,
); );
} }
}, },
selectedItem: provider.selectedAccountList, selectedItem: provider.selectedAccountList,
...@@ -336,7 +413,7 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -336,7 +413,7 @@ class _AddorderScreenState extends State<AddorderScreen> {
borderRadius: BorderRadius.circular(8), borderRadius: BorderRadius.circular(8),
), ),
contentPadding: contentPadding:
ddtheme.buttonStyleData.padding, ddtheme.buttonStyleData.padding,
fillColor: AppColors.text_field_color, fillColor: AppColors.text_field_color,
filled: true, filled: true,
), ),
...@@ -351,6 +428,7 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -351,6 +428,7 @@ class _AddorderScreenState extends State<AddorderScreen> {
// }, // },
), ),
if (provider.selectAccountError != null) ...[ if (provider.selectAccountError != null) ...[
errorWidget( errorWidget(
context, context,
...@@ -371,39 +449,39 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -371,39 +449,39 @@ class _AddorderScreenState extends State<AddorderScreen> {
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
), ),
items: items:
provider.employees provider.employees
.map( .map(
(e) => DropdownMenuItem< (e) => DropdownMenuItem<
Employees Employees
>( >(
value: e, value: e,
child: Text( child: Text(
e.name!, e.name!,
style: const TextStyle( style: const TextStyle(
fontSize: 14, fontSize: 14,
), ),
), ),
), ),
) )
.toList(), .toList(),
value: provider.selectedEmployees, value: provider.selectedEmployees,
onChanged: (Employees? value) { onChanged: (Employees? value) {
if (provider.employees.isNotEmpty) { if (provider.employees.isNotEmpty) {
provider.selectedEmployees = provider.selectedEmployees =
value; value;
provider.selectedEmployeeID = provider.selectedEmployeeID =
value!.id!; value!.id!;
provider.selectedEmployeeName = provider.selectedEmployeeName =
value.name!; value.name!;
} }
}, },
buttonStyleData: buttonStyleData:
ddtheme.buttonStyleData, ddtheme.buttonStyleData,
iconStyleData: ddtheme.iconStyleData, iconStyleData: ddtheme.iconStyleData,
menuItemStyleData: menuItemStyleData:
ddtheme.menuItemStyleData, ddtheme.menuItemStyleData,
dropdownStyleData: dropdownStyleData:
ddtheme.dropdownStyleData, ddtheme.dropdownStyleData,
), ),
), ),
], ],
...@@ -437,14 +515,14 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -437,14 +515,14 @@ class _AddorderScreenState extends State<AddorderScreen> {
), ),
child: TextFormField( child: TextFormField(
controller: controller:
provider provider
.orderReceivedDateController, .orderReceivedDateController,
keyboardType: TextInputType.text, keyboardType: TextInputType.text,
enabled: false, enabled: false,
maxLines: 1, maxLines: 1,
readOnly: true, readOnly: true,
onChanged: onChanged:
provider.onChangeOrderDate, provider.onChangeOrderDate,
decoration: InputDecoration( decoration: InputDecoration(
hintText: "Enter Date", hintText: "Enter Date",
hintStyle: TextStyle( hintStyle: TextStyle(
...@@ -497,39 +575,39 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -497,39 +575,39 @@ class _AddorderScreenState extends State<AddorderScreen> {
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
), ),
items: items:
provider.billingStates provider.billingStates
.map( .map(
(e) => (e) =>
DropdownMenuItem<States>( DropdownMenuItem<States>(
value: e, value: e,
child: Text( child: Text(
e.name!, e.name!,
style: style:
const TextStyle( const TextStyle(
fontSize: 14, fontSize: 14,
), ),
), ),
), ),
) )
.toList(), .toList(),
// value: // value:
// provider.selecetdBillingStates, // provider.selecetdBillingStates,
value: value:
provider.billingStates.isNotEmpty provider.billingStates.isNotEmpty
? provider.selecetdBillingStates != ? provider.selecetdBillingStates !=
null null
? provider.billingStates.firstWhere( ? provider.billingStates.firstWhere(
(ord) => (ord) =>
ord.id == ord.id ==
provider provider
.selectedBillingStateID, .selectedBillingStateID,
orElse: orElse:
() => () =>
provider provider
.billingStates[0], .billingStates[0],
) )
: null : null
: null, : null,
onChanged: (States? value) { onChanged: (States? value) {
if (provider if (provider
.billingStates .billingStates
...@@ -541,20 +619,20 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -541,20 +619,20 @@ class _AddorderScreenState extends State<AddorderScreen> {
provider.billingSubLocations provider.billingSubLocations
.clear(); .clear();
provider.selectedBillingDistrictId = provider.selectedBillingDistrictId =
null; null;
provider.selectedBillingDistrictValue = provider.selectedBillingDistrictValue =
""; "";
provider.selectedBillingSubLocID = provider.selectedBillingSubLocID =
null; null;
provider.selectedBillingSubLocValue = provider.selectedBillingSubLocValue =
''; '';
} }
provider.selecetdBillingStates = provider.selecetdBillingStates =
value; value;
provider.selectedBillingStateID = provider.selectedBillingStateID =
value!.id!; value!.id!;
provider.selectedBillingStateName = provider.selectedBillingStateName =
value.name!; value.name!;
provider.getDistrictAPI( provider.getDistrictAPI(
context, context,
provider.selectedBillingStateID, provider.selectedBillingStateID,
...@@ -564,35 +642,35 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -564,35 +642,35 @@ class _AddorderScreenState extends State<AddorderScreen> {
dropdownSearchData: DropdownSearchData( dropdownSearchData: DropdownSearchData(
searchInnerWidgetHeight: 50, searchInnerWidgetHeight: 50,
searchController: searchController:
provider provider
.billingStateSearchController, .billingStateSearchController,
searchInnerWidget: Padding( searchInnerWidget: Padding(
padding: const EdgeInsets.all(8), padding: const EdgeInsets.all(8),
child: TextFormField( child: TextFormField(
controller: controller:
provider provider
.billingStateSearchController, .billingStateSearchController,
decoration: InputDecoration( decoration: InputDecoration(
isDense: true, isDense: true,
contentPadding: contentPadding:
const EdgeInsets.symmetric( const EdgeInsets.symmetric(
horizontal: 10, horizontal: 10,
vertical: 8, vertical: 8,
), ),
hintText: 'Search Sate...', hintText: 'Search Sate...',
border: OutlineInputBorder( border: OutlineInputBorder(
borderRadius: borderRadius:
BorderRadius.circular(8), BorderRadius.circular(8),
), ),
), ),
), ),
), ),
searchMatchFn: (item, searchValue) { searchMatchFn: (item, searchValue) {
return item.value?.name return item.value?.name
?.toLowerCase() ?.toLowerCase()
.contains( .contains(
searchValue.toLowerCase(), searchValue.toLowerCase(),
) ?? ) ??
false; false;
}, },
), ),
...@@ -604,12 +682,12 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -604,12 +682,12 @@ class _AddorderScreenState extends State<AddorderScreen> {
} }
}, },
buttonStyleData: buttonStyleData:
ddtheme.buttonStyleData, ddtheme.buttonStyleData,
iconStyleData: ddtheme.iconStyleData, iconStyleData: ddtheme.iconStyleData,
menuItemStyleData: menuItemStyleData:
ddtheme.menuItemStyleData, ddtheme.menuItemStyleData,
dropdownStyleData: dropdownStyleData:
ddtheme.dropdownStyleData, ddtheme.dropdownStyleData,
), ),
), ),
], ],
...@@ -635,56 +713,56 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -635,56 +713,56 @@ class _AddorderScreenState extends State<AddorderScreen> {
style: const TextStyle(fontSize: 14), style: const TextStyle(fontSize: 14),
), ),
items: items:
provider.billingDistricts provider.billingDistricts
.map( .map(
(e) => DropdownMenuItem< (e) => DropdownMenuItem<
Districts Districts
>( >(
value: e, value: e,
child: Text( child: Text(
e.district!, e.district!,
style: const TextStyle( style: const TextStyle(
fontSize: 14, fontSize: 14,
), ),
), ),
), ),
) )
.toList(), .toList(),
// value: // value:
// provider // provider
// .selectedBillingDistricts, // .selectedBillingDistricts,
value: value:
provider.billingDistricts.isNotEmpty provider.billingDistricts.isNotEmpty
? provider.selectedBillingDistricts != ? provider.selectedBillingDistricts !=
null null
? provider.billingDistricts.firstWhere( ? provider.billingDistricts.firstWhere(
(ord) => (ord) =>
ord.id == ord.id ==
provider provider
.selectedBillingDistrictId, .selectedBillingDistrictId,
orElse: () { orElse: () {
provider.selectedBillingDistricts = provider.selectedBillingDistricts =
provider provider
.billingDistricts[0]; .billingDistricts[0];
provider.selectedBillingDistrictId = provider.selectedBillingDistrictId =
provider provider
.billingDistricts[0] .billingDistricts[0]
.id; .id;
provider.selectedBillingDistrictValue = provider.selectedBillingDistrictValue =
provider provider
.billingDistricts[0] .billingDistricts[0]
.district; .district;
provider.getSubLocationAPI( provider.getSubLocationAPI(
context, context,
provider provider
.selectedBillingDistrictId, .selectedBillingDistrictId,
); );
return provider return provider
.billingDistricts[0]; .billingDistricts[0];
}, },
) )
: null : null
: null, : null,
onChanged: (Districts? value) { onChanged: (Districts? value) {
if (provider if (provider
.billingDistricts .billingDistricts
...@@ -695,16 +773,16 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -695,16 +773,16 @@ class _AddorderScreenState extends State<AddorderScreen> {
provider.billingSubLocations provider.billingSubLocations
.clear(); .clear();
provider.selectedBillingSubLocID = provider.selectedBillingSubLocID =
null; null;
provider.selectedBillingSubLocValue = provider.selectedBillingSubLocValue =
""; "";
} }
provider.selectedBillingDistricts = provider.selectedBillingDistricts =
value; value;
provider.selectedBillingDistrictId = provider.selectedBillingDistrictId =
value!.id!; value!.id!;
provider.selectedBillingDistrictValue = provider.selectedBillingDistrictValue =
value.district!; value.district!;
provider.getSubLocationAPI( provider.getSubLocationAPI(
context, context,
...@@ -716,35 +794,35 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -716,35 +794,35 @@ class _AddorderScreenState extends State<AddorderScreen> {
dropdownSearchData: DropdownSearchData( dropdownSearchData: DropdownSearchData(
searchInnerWidgetHeight: 50, searchInnerWidgetHeight: 50,
searchController: searchController:
provider provider
.billingDistrictSearchController, .billingDistrictSearchController,
searchInnerWidget: Padding( searchInnerWidget: Padding(
padding: const EdgeInsets.all(8), padding: const EdgeInsets.all(8),
child: TextFormField( child: TextFormField(
controller: controller:
provider provider
.billingDistrictSearchController, .billingDistrictSearchController,
decoration: InputDecoration( decoration: InputDecoration(
isDense: true, isDense: true,
contentPadding: contentPadding:
const EdgeInsets.symmetric( const EdgeInsets.symmetric(
horizontal: 10, horizontal: 10,
vertical: 8, vertical: 8,
), ),
hintText: 'Search District...', hintText: 'Search District...',
border: OutlineInputBorder( border: OutlineInputBorder(
borderRadius: borderRadius:
BorderRadius.circular(8), BorderRadius.circular(8),
), ),
), ),
), ),
), ),
searchMatchFn: (item, searchValue) { searchMatchFn: (item, searchValue) {
return item.value?.district return item.value?.district
?.toLowerCase() ?.toLowerCase()
.contains( .contains(
searchValue.toLowerCase(), searchValue.toLowerCase(),
) ?? ) ??
false; false;
}, },
), ),
...@@ -756,12 +834,12 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -756,12 +834,12 @@ class _AddorderScreenState extends State<AddorderScreen> {
} }
}, },
buttonStyleData: buttonStyleData:
ddtheme.buttonStyleData, ddtheme.buttonStyleData,
iconStyleData: ddtheme.iconStyleData, iconStyleData: ddtheme.iconStyleData,
menuItemStyleData: menuItemStyleData:
ddtheme.menuItemStyleData, ddtheme.menuItemStyleData,
dropdownStyleData: dropdownStyleData:
ddtheme.dropdownStyleData, ddtheme.dropdownStyleData,
), ),
), ),
], ],
...@@ -786,54 +864,54 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -786,54 +864,54 @@ class _AddorderScreenState extends State<AddorderScreen> {
style: const TextStyle(fontSize: 14), style: const TextStyle(fontSize: 14),
), ),
items: items:
provider.billingSubLocations provider.billingSubLocations
.map( .map(
(e) => DropdownMenuItem< (e) => DropdownMenuItem<
SubLocations SubLocations
>( >(
value: e, value: e,
child: Text( child: Text(
e.subLocality!, e.subLocality!,
style: const TextStyle( style: const TextStyle(
fontSize: 14, fontSize: 14,
), ),
), ),
), ),
) )
.toList(), .toList(),
// value: // value:
// provider // provider
// .selectedBillingSubLocations, // .selectedBillingSubLocations,
value: value:
provider
.billingSubLocations
.isNotEmpty
? provider.selectedBillingSubLocations !=
null
? provider.billingSubLocations.firstWhere(
(ord) =>
ord.id ==
provider
.selectedBillingSubLocID,
orElse: () {
provider.selectedBillingSubLocations =
provider provider
.billingSubLocations .billingSubLocations[0];
.isNotEmpty provider.selectedBillingSubLocID =
? provider.selectedBillingSubLocations != provider
null .billingSubLocations[0]
? provider.billingSubLocations.firstWhere( .id;
(ord) => provider.selectedBillingSubLocValue =
ord.id == provider
provider .billingSubLocations[0]
.selectedBillingSubLocID, .subLocality;
orElse: () {
provider.selectedBillingSubLocations =
provider
.billingSubLocations[0];
provider.selectedBillingSubLocID =
provider
.billingSubLocations[0]
.id;
provider.selectedBillingSubLocValue =
provider
.billingSubLocations[0]
.subLocality;
return provider return provider
.billingSubLocations[0]; .billingSubLocations[0];
}, },
) )
: null : null
: null, : null,
onChanged: (SubLocations? value) { onChanged: (SubLocations? value) {
if (provider if (provider
.billingSubLocations .billingSubLocations
...@@ -841,44 +919,44 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -841,44 +919,44 @@ class _AddorderScreenState extends State<AddorderScreen> {
provider.selectedBillingSubLocations = provider.selectedBillingSubLocations =
value; value;
provider.selectedBillingSubLocID = provider.selectedBillingSubLocID =
value!.id!; value!.id!;
provider.selectedBillingSubLocValue = provider.selectedBillingSubLocValue =
value.subLocality!; value.subLocality!;
} }
}, },
dropdownSearchData: DropdownSearchData( dropdownSearchData: DropdownSearchData(
searchInnerWidgetHeight: 50, searchInnerWidgetHeight: 50,
searchController: searchController:
provider provider
.billingSubLocSearchController, .billingSubLocSearchController,
searchInnerWidget: Padding( searchInnerWidget: Padding(
padding: const EdgeInsets.all(8), padding: const EdgeInsets.all(8),
child: TextFormField( child: TextFormField(
controller: controller:
provider provider
.billingSubLocSearchController, .billingSubLocSearchController,
decoration: InputDecoration( decoration: InputDecoration(
isDense: true, isDense: true,
contentPadding: contentPadding:
const EdgeInsets.symmetric( const EdgeInsets.symmetric(
horizontal: 10, horizontal: 10,
vertical: 8, vertical: 8,
), ),
hintText: hintText:
'Search Sub Location...', 'Search Sub Location...',
border: OutlineInputBorder( border: OutlineInputBorder(
borderRadius: borderRadius:
BorderRadius.circular(8), BorderRadius.circular(8),
), ),
), ),
), ),
), ),
searchMatchFn: (item, searchValue) { searchMatchFn: (item, searchValue) {
return item.value?.subLocality return item.value?.subLocality
?.toLowerCase() ?.toLowerCase()
.contains( .contains(
searchValue.toLowerCase(), searchValue.toLowerCase(),
) ?? ) ??
false; false;
}, },
), ),
...@@ -890,12 +968,12 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -890,12 +968,12 @@ class _AddorderScreenState extends State<AddorderScreen> {
} }
}, },
buttonStyleData: buttonStyleData:
ddtheme.buttonStyleData, ddtheme.buttonStyleData,
iconStyleData: ddtheme.iconStyleData, iconStyleData: ddtheme.iconStyleData,
menuItemStyleData: menuItemStyleData:
ddtheme.menuItemStyleData, ddtheme.menuItemStyleData,
dropdownStyleData: dropdownStyleData:
ddtheme.dropdownStyleData, ddtheme.dropdownStyleData,
), ),
), ),
], ],
...@@ -982,41 +1060,41 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -982,41 +1060,41 @@ class _AddorderScreenState extends State<AddorderScreen> {
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
), ),
items: items:
provider.dispatchStates provider.dispatchStates
.map( .map(
(e) => (e) =>
DropdownMenuItem<States>( DropdownMenuItem<States>(
value: e, value: e,
child: Text( child: Text(
e.name!, e.name!,
style: style:
const TextStyle( const TextStyle(
fontSize: 14, fontSize: 14,
), ),
), ),
), ),
) )
.toList(), .toList(),
// value: // value:
// provider.selecetdDispatchStates, // provider.selecetdDispatchStates,
value: value:
provider.dispatchStates.isNotEmpty provider.dispatchStates.isNotEmpty
? provider.selecetdDispatchStates != ? provider.selecetdDispatchStates !=
null null
? provider.dispatchStates ? provider.dispatchStates
.firstWhere( .firstWhere(
(ord) => (ord) =>
ord.id == ord.id ==
provider provider
.selectedDispatchStateID, .selectedDispatchStateID,
orElse: orElse:
() => () =>
provider provider
.dispatchStates[0], .dispatchStates[0],
) )
: null : null
: null, : null,
onChanged: (States? value) { onChanged: (States? value) {
if (provider if (provider
.dispatchStates .dispatchStates
...@@ -1030,20 +1108,20 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -1030,20 +1108,20 @@ class _AddorderScreenState extends State<AddorderScreen> {
.clear(); .clear();
// provider.selectedDispatchDistricts = null; // provider.selectedDispatchDistricts = null;
provider.selectedDispatchDistrictId = provider.selectedDispatchDistrictId =
null; null;
provider.selectedDispatchDistrictValue = provider.selectedDispatchDistrictValue =
""; "";
provider.selectedDispatchSubLocID = provider.selectedDispatchSubLocID =
null; null;
provider.selectedDispatchSubLocValue = provider.selectedDispatchSubLocValue =
""; "";
} }
provider.selecetdDispatchStates = provider.selecetdDispatchStates =
value; value;
provider.selectedDispatchStateID = provider.selectedDispatchStateID =
value!.id!; value!.id!;
provider.selectedDispatchStateName = provider.selectedDispatchStateName =
value.name!; value.name!;
provider.getDispatchDistrictAPI( provider.getDispatchDistrictAPI(
context, context,
...@@ -1054,35 +1132,35 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -1054,35 +1132,35 @@ class _AddorderScreenState extends State<AddorderScreen> {
dropdownSearchData: DropdownSearchData( dropdownSearchData: DropdownSearchData(
searchInnerWidgetHeight: 50, searchInnerWidgetHeight: 50,
searchController: searchController:
provider provider
.dispatchStateSearchController, .dispatchStateSearchController,
searchInnerWidget: Padding( searchInnerWidget: Padding(
padding: const EdgeInsets.all(8), padding: const EdgeInsets.all(8),
child: TextFormField( child: TextFormField(
controller: controller:
provider provider
.dispatchStateSearchController, .dispatchStateSearchController,
decoration: InputDecoration( decoration: InputDecoration(
isDense: true, isDense: true,
contentPadding: contentPadding:
const EdgeInsets.symmetric( const EdgeInsets.symmetric(
horizontal: 10, horizontal: 10,
vertical: 8, vertical: 8,
), ),
hintText: 'Search Sate...', hintText: 'Search Sate...',
border: OutlineInputBorder( border: OutlineInputBorder(
borderRadius: borderRadius:
BorderRadius.circular(8), BorderRadius.circular(8),
), ),
), ),
), ),
), ),
searchMatchFn: (item, searchValue) { searchMatchFn: (item, searchValue) {
return item.value?.name return item.value?.name
?.toLowerCase() ?.toLowerCase()
.contains( .contains(
searchValue.toLowerCase(), searchValue.toLowerCase(),
) ?? ) ??
false; false;
}, },
), ),
...@@ -1094,12 +1172,12 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -1094,12 +1172,12 @@ class _AddorderScreenState extends State<AddorderScreen> {
} }
}, },
buttonStyleData: buttonStyleData:
ddtheme.buttonStyleData, ddtheme.buttonStyleData,
iconStyleData: ddtheme.iconStyleData, iconStyleData: ddtheme.iconStyleData,
menuItemStyleData: menuItemStyleData:
ddtheme.menuItemStyleData, ddtheme.menuItemStyleData,
dropdownStyleData: dropdownStyleData:
ddtheme.dropdownStyleData, ddtheme.dropdownStyleData,
), ),
), ),
], ],
...@@ -1126,63 +1204,64 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -1126,63 +1204,64 @@ class _AddorderScreenState extends State<AddorderScreen> {
style: const TextStyle(fontSize: 14), style: const TextStyle(fontSize: 14),
), ),
items: items:
provider.dispatchDistricts provider.dispatchDistricts
.map( .map(
(e) => DropdownMenuItem< (e) => DropdownMenuItem<
Districts Districts
>( >(
value: e, value: e,
child: Text( child: Text(
e.district!, e.district!,
style: const TextStyle( style: const TextStyle(
fontSize: 14, fontSize: 14,
), ),
), ),
), ),
) )
.toList(), .toList(),
// value: // value:
// provider // provider
// .selectedDispatchDistricts, // .selectedDispatchDistricts,
value: value:
provider provider
.dispatchDistricts .dispatchDistricts
.isNotEmpty .isNotEmpty
? provider.selectedDispatchDistricts != ? provider.selectedDispatchDistricts !=
null null
? provider.dispatchDistricts.firstWhere( ? provider.dispatchDistricts
(ord) => .firstWhere(
ord.id == (ord) =>
provider ord.id ==
.selectedDispatchDistrictId, provider
.selectedDispatchDistrictId,
orElse: () { orElse: () {
provider.selectedDispatchDistricts = provider.selectedDispatchDistricts =
provider provider
.dispatchDistricts[0]; .dispatchDistricts[0];
provider.selectedDispatchDistrictId = provider.selectedDispatchDistrictId =
provider provider
.dispatchDistricts[0] .dispatchDistricts[0]
.id; .id;
provider.selectedDispatchDistrictValue = provider.selectedDispatchDistrictValue =
provider provider
.dispatchDistricts[0] .dispatchDistricts[0]
.district; .district;
provider.getDispatchSubLocationAPI( provider.getDispatchSubLocationAPI(
context, context,
provider provider
.selectedBillingDistrictId, .selectedBillingDistrictId,
); );
return provider return provider
.dispatchDistricts[0]; .dispatchDistricts[0];
}, },
// orElse: // orElse:
// () => // () =>
// provider // provider
// .dispatchDistricts[0], // .dispatchDistricts[0],
) )
: null : null
: null, : null,
onChanged: (Districts? value) { onChanged: (Districts? value) {
if (provider if (provider
.dispatchDistricts .dispatchDistricts
...@@ -1194,16 +1273,16 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -1194,16 +1273,16 @@ class _AddorderScreenState extends State<AddorderScreen> {
.clear(); .clear();
// provider.selectedDispatchSubLocations=null; // provider.selectedDispatchSubLocations=null;
provider.selectedDispatchSubLocID = provider.selectedDispatchSubLocID =
null; null;
provider.selectedDispatchSubLocValue = provider.selectedDispatchSubLocValue =
""; "";
} }
provider.selectedDispatchDistricts = provider.selectedDispatchDistricts =
value; value;
provider.selectedDispatchDistrictId = provider.selectedDispatchDistrictId =
value!.id!; value!.id!;
provider.selectedDispatchDistrictValue = provider.selectedDispatchDistrictValue =
value.district!; value.district!;
provider.getDispatchSubLocationAPI( provider.getDispatchSubLocationAPI(
context, context,
...@@ -1215,35 +1294,35 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -1215,35 +1294,35 @@ class _AddorderScreenState extends State<AddorderScreen> {
dropdownSearchData: DropdownSearchData( dropdownSearchData: DropdownSearchData(
searchInnerWidgetHeight: 50, searchInnerWidgetHeight: 50,
searchController: searchController:
provider provider
.dispatchDistrictSearchController, .dispatchDistrictSearchController,
searchInnerWidget: Padding( searchInnerWidget: Padding(
padding: const EdgeInsets.all(8), padding: const EdgeInsets.all(8),
child: TextFormField( child: TextFormField(
controller: controller:
provider provider
.dispatchDistrictSearchController, .dispatchDistrictSearchController,
decoration: InputDecoration( decoration: InputDecoration(
isDense: true, isDense: true,
contentPadding: contentPadding:
const EdgeInsets.symmetric( const EdgeInsets.symmetric(
horizontal: 10, horizontal: 10,
vertical: 8, vertical: 8,
), ),
hintText: 'Search District...', hintText: 'Search District...',
border: OutlineInputBorder( border: OutlineInputBorder(
borderRadius: borderRadius:
BorderRadius.circular(8), BorderRadius.circular(8),
), ),
), ),
), ),
), ),
searchMatchFn: (item, searchValue) { searchMatchFn: (item, searchValue) {
return item.value?.district return item.value?.district
?.toLowerCase() ?.toLowerCase()
.contains( .contains(
searchValue.toLowerCase(), searchValue.toLowerCase(),
) ?? ) ??
false; false;
}, },
), ),
...@@ -1255,12 +1334,12 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -1255,12 +1334,12 @@ class _AddorderScreenState extends State<AddorderScreen> {
} }
}, },
buttonStyleData: buttonStyleData:
ddtheme.buttonStyleData, ddtheme.buttonStyleData,
iconStyleData: ddtheme.iconStyleData, iconStyleData: ddtheme.iconStyleData,
menuItemStyleData: menuItemStyleData:
ddtheme.menuItemStyleData, ddtheme.menuItemStyleData,
dropdownStyleData: dropdownStyleData:
ddtheme.dropdownStyleData, ddtheme.dropdownStyleData,
), ),
), ),
], ],
...@@ -1283,60 +1362,62 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -1283,60 +1362,62 @@ class _AddorderScreenState extends State<AddorderScreen> {
style: const TextStyle(fontSize: 14), style: const TextStyle(fontSize: 14),
), ),
items: items:
provider.dispatchSubLocations provider.dispatchSubLocations
.map( .map(
(e) => DropdownMenuItem< (e) => DropdownMenuItem<
SubLocations SubLocations
>( >(
value: e, value: e,
child: Text( child: Text(
e.subLocality!, e.subLocality!,
style: const TextStyle( style: const TextStyle(
fontSize: 14, fontSize: 14,
), ),
), ),
), ),
) )
.toList(), .toList(),
// value: // value:
// provider // provider
// .selectedDispatchSubLocations, // .selectedDispatchSubLocations,
value: value:
provider provider
.dispatchSubLocations .dispatchSubLocations
.isNotEmpty .isNotEmpty
? provider.selectedDispatchSubLocations != ? provider.selectedDispatchSubLocations !=
null null
? provider.dispatchSubLocations.firstWhere( ? provider
(ord) => .dispatchSubLocations
ord.id == .firstWhere(
provider (ord) =>
.selectedDispatchSubLocID, ord.id ==
provider
.selectedDispatchSubLocID,
orElse: () { orElse: () {
provider.selectedDispatchSubLocations = provider.selectedDispatchSubLocations =
provider provider
.dispatchSubLocations[0]; .dispatchSubLocations[0];
provider.selectedDispatchSubLocID = provider.selectedDispatchSubLocID =
provider provider
.dispatchSubLocations[0] .dispatchSubLocations[0]
.id; .id;
provider.selectedDispatchSubLocValue = provider.selectedDispatchSubLocValue =
provider provider
.dispatchSubLocations[0] .dispatchSubLocations[0]
.subLocality; .subLocality;
return provider return provider
.dispatchSubLocations[0]; .dispatchSubLocations[0];
}, },
// orElse: // orElse:
// () => // () =>
// provider // provider
// .dispatchSubLocations[0], // .dispatchSubLocations[0],
) )
: null : null
: null, : null,
onChanged: (SubLocations? value) { onChanged: (SubLocations? value) {
if (provider if (provider
.dispatchSubLocations .dispatchSubLocations
...@@ -1344,44 +1425,44 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -1344,44 +1425,44 @@ class _AddorderScreenState extends State<AddorderScreen> {
provider.selectedDispatchSubLocations = provider.selectedDispatchSubLocations =
value; value;
provider.selectedDispatchSubLocID = provider.selectedDispatchSubLocID =
value!.id!; value!.id!;
provider.selectedDispatchSubLocValue = provider.selectedDispatchSubLocValue =
value.subLocality!; value.subLocality!;
} }
}, },
dropdownSearchData: DropdownSearchData( dropdownSearchData: DropdownSearchData(
searchInnerWidgetHeight: 50, searchInnerWidgetHeight: 50,
searchController: searchController:
provider provider
.dispatchSubLocSearchController, .dispatchSubLocSearchController,
searchInnerWidget: Padding( searchInnerWidget: Padding(
padding: const EdgeInsets.all(8), padding: const EdgeInsets.all(8),
child: TextFormField( child: TextFormField(
controller: controller:
provider provider
.dispatchSubLocSearchController, .dispatchSubLocSearchController,
decoration: InputDecoration( decoration: InputDecoration(
isDense: true, isDense: true,
contentPadding: contentPadding:
const EdgeInsets.symmetric( const EdgeInsets.symmetric(
horizontal: 10, horizontal: 10,
vertical: 8, vertical: 8,
), ),
hintText: hintText:
'Search Sub Location...', 'Search Sub Location...',
border: OutlineInputBorder( border: OutlineInputBorder(
borderRadius: borderRadius:
BorderRadius.circular(8), BorderRadius.circular(8),
), ),
), ),
), ),
), ),
searchMatchFn: (item, searchValue) { searchMatchFn: (item, searchValue) {
return item.value?.subLocality return item.value?.subLocality
?.toLowerCase() ?.toLowerCase()
.contains( .contains(
searchValue.toLowerCase(), searchValue.toLowerCase(),
) ?? ) ??
false; false;
}, },
), ),
...@@ -1393,12 +1474,12 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -1393,12 +1474,12 @@ class _AddorderScreenState extends State<AddorderScreen> {
} }
}, },
buttonStyleData: buttonStyleData:
ddtheme.buttonStyleData, ddtheme.buttonStyleData,
iconStyleData: ddtheme.iconStyleData, iconStyleData: ddtheme.iconStyleData,
menuItemStyleData: menuItemStyleData:
ddtheme.menuItemStyleData, ddtheme.menuItemStyleData,
dropdownStyleData: dropdownStyleData:
ddtheme.dropdownStyleData, ddtheme.dropdownStyleData,
), ),
), ),
], ],
...@@ -1500,7 +1581,7 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -1500,7 +1581,7 @@ class _AddorderScreenState extends State<AddorderScreen> {
), ),
child: Row( child: Row(
mainAxisAlignment: mainAxisAlignment:
MainAxisAlignment.spaceBetween, MainAxisAlignment.spaceBetween,
children: [ children: [
Text( Text(
"${provider.imagePath}", "${provider.imagePath}",
...@@ -1561,21 +1642,21 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -1561,21 +1642,21 @@ class _AddorderScreenState extends State<AddorderScreen> {
style: const TextStyle(fontSize: 14), style: const TextStyle(fontSize: 14),
), ),
items: items:
provider.unloadingScope provider.unloadingScope
.map( .map(
(e) => (e) =>
DropdownMenuItem<String>( DropdownMenuItem<String>(
value: e, value: e,
child: Text( child: Text(
e, e,
style: style:
const TextStyle( const TextStyle(
fontSize: 14, fontSize: 14,
), ),
), ),
), ),
) )
.toList(), .toList(),
value: provider.selectedUnloadingScope, value: provider.selectedUnloadingScope,
onChanged: (String? value) { onChanged: (String? value) {
if (provider if (provider
...@@ -1586,12 +1667,12 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -1586,12 +1667,12 @@ class _AddorderScreenState extends State<AddorderScreen> {
} }
}, },
buttonStyleData: buttonStyleData:
ddtheme.buttonStyleData, ddtheme.buttonStyleData,
iconStyleData: ddtheme.iconStyleData, iconStyleData: ddtheme.iconStyleData,
menuItemStyleData: menuItemStyleData:
ddtheme.menuItemStyleData, ddtheme.menuItemStyleData,
dropdownStyleData: dropdownStyleData:
ddtheme.dropdownStyleData, ddtheme.dropdownStyleData,
), ),
), ),
], ],
...@@ -1616,21 +1697,21 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -1616,21 +1697,21 @@ class _AddorderScreenState extends State<AddorderScreen> {
style: const TextStyle(fontSize: 14), style: const TextStyle(fontSize: 14),
), ),
items: items:
provider.freightScope provider.freightScope
.map( .map(
(e) => (e) =>
DropdownMenuItem<String>( DropdownMenuItem<String>(
value: e, value: e,
child: Text( child: Text(
e, e,
style: style:
const TextStyle( const TextStyle(
fontSize: 14, fontSize: 14,
), ),
), ),
), ),
) )
.toList(), .toList(),
value: provider.selectedFreightScope, value: provider.selectedFreightScope,
onChanged: (String? value) { onChanged: (String? value) {
if (provider if (provider
...@@ -1675,23 +1756,23 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -1675,23 +1756,23 @@ class _AddorderScreenState extends State<AddorderScreen> {
scrollbarTheme: ScrollbarThemeData( scrollbarTheme: ScrollbarThemeData(
radius: const Radius.circular(15), radius: const Radius.circular(15),
thickness: thickness:
WidgetStateProperty.all<double>( MaterialStateProperty.all<
6, double
), >(6),
thumbVisibility: thumbVisibility:
WidgetStateProperty.all<bool>( MaterialStateProperty.all<bool>(
true, true,
), ),
), ),
), ),
menuItemStyleData: menuItemStyleData:
const MenuItemStyleData( const MenuItemStyleData(
height: 40, height: 40,
padding: EdgeInsets.only( padding: EdgeInsets.only(
left: 14, left: 14,
right: 14, right: 14,
), ),
), ),
), ),
), ),
], ],
...@@ -1716,21 +1797,21 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -1716,21 +1797,21 @@ class _AddorderScreenState extends State<AddorderScreen> {
style: const TextStyle(fontSize: 14), style: const TextStyle(fontSize: 14),
), ),
items: items:
provider.erectionScope provider.erectionScope
.map( .map(
(e) => (e) =>
DropdownMenuItem<String>( DropdownMenuItem<String>(
value: e, value: e,
child: Text( child: Text(
e, e,
style: style:
const TextStyle( const TextStyle(
fontSize: 14, fontSize: 14,
), ),
), ),
), ),
) )
.toList(), .toList(),
value: provider.selectedErectionScope, value: provider.selectedErectionScope,
onChanged: (String? value) { onChanged: (String? value) {
if (provider if (provider
...@@ -1741,12 +1822,12 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -1741,12 +1822,12 @@ class _AddorderScreenState extends State<AddorderScreen> {
} }
}, },
buttonStyleData: buttonStyleData:
ddtheme.buttonStyleData, ddtheme.buttonStyleData,
iconStyleData: ddtheme.iconStyleData, iconStyleData: ddtheme.iconStyleData,
menuItemStyleData: menuItemStyleData:
ddtheme.menuItemStyleData, ddtheme.menuItemStyleData,
dropdownStyleData: dropdownStyleData:
ddtheme.dropdownStyleData, ddtheme.dropdownStyleData,
), ),
), ),
], ],
...@@ -1771,21 +1852,21 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -1771,21 +1852,21 @@ class _AddorderScreenState extends State<AddorderScreen> {
style: const TextStyle(fontSize: 14), style: const TextStyle(fontSize: 14),
), ),
items: items:
provider.tpcApplicable provider.tpcApplicable
.map( .map(
(e) => (e) =>
DropdownMenuItem<String>( DropdownMenuItem<String>(
value: e, value: e,
child: Text( child: Text(
e, e,
style: style:
const TextStyle( const TextStyle(
fontSize: 14, fontSize: 14,
), ),
), ),
), ),
) )
.toList(), .toList(),
value: provider.selectedTpcStatus, value: provider.selectedTpcStatus,
onChanged: (String? value) { onChanged: (String? value) {
if (provider if (provider
...@@ -1795,12 +1876,12 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -1795,12 +1876,12 @@ class _AddorderScreenState extends State<AddorderScreen> {
} }
}, },
buttonStyleData: buttonStyleData:
ddtheme.buttonStyleData, ddtheme.buttonStyleData,
iconStyleData: ddtheme.iconStyleData, iconStyleData: ddtheme.iconStyleData,
menuItemStyleData: menuItemStyleData:
ddtheme.menuItemStyleData, ddtheme.menuItemStyleData,
dropdownStyleData: dropdownStyleData:
ddtheme.dropdownStyleData, ddtheme.dropdownStyleData,
), ),
), ),
], ],
...@@ -1821,14 +1902,14 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -1821,14 +1902,14 @@ class _AddorderScreenState extends State<AddorderScreen> {
showSearchBox: true, showSearchBox: true,
searchFieldProps: TextFieldProps( searchFieldProps: TextFieldProps(
controller: controller:
provider.dropDownTpcSearchController, provider.dropDownTpcSearchController,
decoration: InputDecoration( decoration: InputDecoration(
isDense: true, isDense: true,
contentPadding: contentPadding:
const EdgeInsets.symmetric( const EdgeInsets.symmetric(
horizontal: 10, horizontal: 10,
vertical: 8, vertical: 8,
), ),
hintText: 'Search ...', hintText: 'Search ...',
border: OutlineInputBorder( border: OutlineInputBorder(
borderSide: BorderSide( borderSide: BorderSide(
...@@ -1840,14 +1921,14 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -1840,14 +1921,14 @@ class _AddorderScreenState extends State<AddorderScreen> {
), ),
), ),
suffixIcon: suffixIcon:
provider.isLoading provider.isLoading
? const CircularProgressIndicator() ? const CircularProgressIndicator()
: null, : null,
), ),
onChanged: (value) { onChanged: (value) {
Timer( Timer(
const Duration(milliseconds: 500), const Duration(milliseconds: 500),
() { () {
print('Search query: $value'); print('Search query: $value');
// Items are fetched via the items parameter // Items are fetched via the items parameter
}, },
...@@ -1862,25 +1943,25 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -1862,25 +1943,25 @@ class _AddorderScreenState extends State<AddorderScreen> {
), ),
itemBuilder: itemBuilder:
( (
context, context,
item, item,
isDisabled, isDisabled,
isSelected, isSelected,
) => Padding( ) => Padding(
padding: EdgeInsets.symmetric( padding: EdgeInsets.symmetric(
horizontal: 12, horizontal: 12,
vertical: 10, vertical: 10,
), ),
child: SizedBox( child: SizedBox(
height: 20, height: 20,
child: Text( child: Text(
item.text!, item.text!,
style: const TextStyle( style: const TextStyle(
fontSize: 14, fontSize: 14,
),
),
), ),
), ),
),
),
), ),
items: (filter, infiniteScrollProps) async { items: (filter, infiniteScrollProps) async {
print('Fetching items for filter: $filter'); print('Fetching items for filter: $filter');
...@@ -1896,9 +1977,9 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -1896,9 +1977,9 @@ class _AddorderScreenState extends State<AddorderScreen> {
if (value != null) { if (value != null) {
print('Selected account: ${value.text}'); print('Selected account: ${value.text}');
provider.selectedTpcAgent = (value); provider.selectedTpcAgent = (value);
provider.selectedTpcAgentID = value.id!; provider.selectedTpcAgentID = value!.id!;
provider.selectedTpcAgentValue = provider.selectedTpcAgentValue =
value.text!; value!.text!;
} }
}, },
selectedItem: provider.selectedTpcAgent, selectedItem: provider.selectedTpcAgent,
...@@ -1933,7 +2014,7 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -1933,7 +2014,7 @@ class _AddorderScreenState extends State<AddorderScreen> {
borderRadius: BorderRadius.circular(8), borderRadius: BorderRadius.circular(8),
), ),
contentPadding: contentPadding:
ddtheme.buttonStyleData.padding, ddtheme.buttonStyleData.padding,
fillColor: AppColors.text_field_color, fillColor: AppColors.text_field_color,
filled: true, filled: true,
), ),
...@@ -2130,52 +2211,51 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -2130,52 +2211,51 @@ class _AddorderScreenState extends State<AddorderScreen> {
children: [ children: [
if (_currentStep == 3) ...[ if (_currentStep == 3) ...[
InkResponse( InkResponse(
onTap: onTap:
provider.submitClicked provider.submitClicked
? null ? null
: () { : () {
print(_currentStep); print(_currentStep);
if (provider.validateForm4()) { if (provider.validateForm4()) {
if (provider.productRows.isNotEmpty) { if (provider.productRows.isNotEmpty) {
provider.submitClicked = true; provider.submitClicked = true;
print( print(
"Encoded Products : ${provider.getJsonEncodedProducts()}", "Encoded Products : ${provider.getJsonEncodedProducts()}",
); );
provider.getCurrentLocation(); provider.getCurrentLocation();
provider provider
.ordersAddOrderAPISubmitFunction( .ordersAddOrderAPISubmitFunction(
context, context,
widget.mode, widget.mode,
provider.selectedEmployeeID, provider.selectedEmployeeID,
provider.selectedAccountID, provider.selectedAccountID,
provider provider.selectedDispatchStateID,
.selectedDispatchStateID, provider
provider .selectedDispatchDistrictId,
.selectedDispatchDistrictId, provider
provider .selectedDispatchSubLocID,
.selectedDispatchSubLocID, provider.selectedUnloadingScope,
provider.selectedUnloadingScope, provider.selectedFreightScope,
provider.selectedFreightScope, provider.selectedErectionScope,
provider.selectedErectionScope, provider.selectedTpcStatus,
provider.selectedTpcStatus, provider.selectedBillingStateID,
provider.selectedBillingStateID, provider
provider .selectedBillingDistrictId,
.selectedBillingDistrictId, provider
provider .selectedBillingSubLocID,
.selectedBillingSubLocID, provider.selectedTpcAgentID,
provider.selectedTpcAgentID, provider
provider .getJsonEncodedProducts(),
.getJsonEncodedProducts(), );
); } else {
} else { toast(context, "Add min. 1 product");
toast(context, "Add min. 1 product"); }
} } else {
} else { provider.submitClicked = false;
provider.submitClicked = false; }
} },
},
child: Container( child: Container(
height: 45, height: 45,
alignment: Alignment.center, alignment: Alignment.center,
...@@ -2416,14 +2496,14 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -2416,14 +2496,14 @@ class _AddorderScreenState extends State<AddorderScreen> {
onChanged: (value) async { onChanged: (value) async {
Future.delayed( Future.delayed(
Duration(milliseconds: 100), Duration(milliseconds: 100),
() async { () async {
await provider await provider
.ordersAddOrderSelectAccountAPIFunction( .ordersAddOrderSelectAccountAPIFunction(
context, context,
widget.mode, widget.mode,
provider.selectedAccountID, provider.selectedAccountID,
value, value,
); );
}, },
); );
}, },
...@@ -2486,25 +2566,27 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -2486,25 +2566,27 @@ class _AddorderScreenState extends State<AddorderScreen> {
onTap: () async { onTap: () async {
if (provider.accountList.isNotEmpty) { if (provider.accountList.isNotEmpty) {
provider.selectedAccountList = provider.selectedAccountList =
provider.accountList[index]; provider.accountList[index];
print( print(
"Selected Complaint Type: ${provider.accountList[index].text}, ID: ${provider.accountList[index].id}", "Selected Complaint Type: ${provider.accountList[index].text}, ID: ${provider.accountList[index].id}",
); );
provider.selectedAccountID = provider.selectedAccountID =
provider.accountList[index].id!; provider.accountList[index].id!;
provider.selectedAccountName = provider.selectedAccountName =
provider.accountList[index].text!; provider.accountList[index].text!;
print( print(
"hfjkshfg${provider.selectedAccountID}", "hfjkshfg" +
provider.selectedAccountID
.toString(),
); );
provider.dropDownSearchController.text = provider.dropDownSearchController.text =
provider.accountList[index].text!; provider.accountList[index].text!;
provider provider
.ordersAddOrderAccountDetailsAPIFunction( .ordersAddOrderAccountDetailsAPIFunction(
context, context,
provider.selectedAccountID, provider.selectedAccountID,
); );
} }
// provider.ordersAddPaymentSelectOrderAPIFunction(context, provider.selectedAccountID); // provider.ordersAddPaymentSelectOrderAPIFunction(context, provider.selectedAccountID);
provider.accountList = []; provider.accountList = [];
...@@ -2540,26 +2622,26 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -2540,26 +2622,26 @@ class _AddorderScreenState extends State<AddorderScreen> {
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
), ),
items: items:
provider.employees provider.employees
.map( .map(
(e) => DropdownMenuItem<Employees>( (e) => DropdownMenuItem<Employees>(
value: e, value: e,
child: Text( child: Text(
e.name!, e.name!,
style: const TextStyle( style: const TextStyle(
fontSize: 14, fontSize: 14,
), ),
), ),
), ),
) )
.toList(), .toList(),
value: provider.selectedEmployees, value: provider.selectedEmployees,
onChanged: (Employees? value) { onChanged: (Employees? value) {
if (provider.employees.isNotEmpty) { if (provider.employees.isNotEmpty) {
provider.selectedEmployees = value; provider.selectedEmployees = value;
provider.selectedEmployeeID = value!.id!; provider.selectedEmployeeID = value!.id!;
provider.selectedEmployeeName = provider.selectedEmployeeName =
value.name!; value.name!;
} }
}, },
buttonStyleData: ddtheme.buttonStyleData, buttonStyleData: ddtheme.buttonStyleData,
...@@ -2597,7 +2679,7 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -2597,7 +2679,7 @@ class _AddorderScreenState extends State<AddorderScreen> {
), ),
child: TextFormField( child: TextFormField(
controller: controller:
provider.orderReceivedDateController, provider.orderReceivedDateController,
keyboardType: TextInputType.text, keyboardType: TextInputType.text,
enabled: false, enabled: false,
maxLines: 1, maxLines: 1,
...@@ -2637,7 +2719,7 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -2637,7 +2719,7 @@ class _AddorderScreenState extends State<AddorderScreen> {
null, null,
TextInputAction.done, TextInputAction.done,
), ),
if (provider.billingNameError != null) if(provider.billingNameError!=null)
errorWidget(context, provider.billingNameError), errorWidget(context, provider.billingNameError),
TextWidget(context, "Billing State"), TextWidget(context, "Billing State"),
//dd //dd
...@@ -2653,34 +2735,34 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -2653,34 +2735,34 @@ class _AddorderScreenState extends State<AddorderScreen> {
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
), ),
items: items:
provider.billingStates provider.billingStates
.map( .map(
(e) => DropdownMenuItem<States>( (e) => DropdownMenuItem<States>(
value: e, value: e,
child: Text( child: Text(
e.name!, e.name!,
style: const TextStyle( style: const TextStyle(
fontSize: 14, fontSize: 14,
), ),
), ),
), ),
) )
.toList(), .toList(),
// value: provider.selecetdBillingStates, // value: provider.selecetdBillingStates,
value: value:
provider.billingStates.isNotEmpty provider.billingStates.isNotEmpty
? provider.selecetdBillingStates != null ? provider.selecetdBillingStates != null
? provider.billingStates.firstWhere( ? provider.billingStates.firstWhere(
(ord) => (ord) =>
ord.id == ord.id ==
provider provider
.selectedBillingStateID, .selectedBillingStateID,
orElse: orElse:
() => () =>
provider.billingStates[0], provider.billingStates[0],
) )
: null : null
: null, : null,
onChanged: (States? value) { onChanged: (States? value) {
if (provider.billingStates.isNotEmpty) { if (provider.billingStates.isNotEmpty) {
if (provider.billingDistricts.isNotEmpty) { if (provider.billingDistricts.isNotEmpty) {
...@@ -2688,15 +2770,15 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -2688,15 +2770,15 @@ class _AddorderScreenState extends State<AddorderScreen> {
provider.billingSubLocations.clear(); provider.billingSubLocations.clear();
provider.selectedBillingDistrictId = null; provider.selectedBillingDistrictId = null;
provider.selectedBillingDistrictValue = provider.selectedBillingDistrictValue =
""; "";
provider.selectedBillingSubLocID = null; provider.selectedBillingSubLocID = null;
provider.selectedBillingSubLocValue = ''; provider.selectedBillingSubLocValue = '';
} }
provider.selecetdBillingStates = value; provider.selecetdBillingStates = value;
provider.selectedBillingStateID = provider.selectedBillingStateID =
value!.id!; value!.id!;
provider.selectedBillingStateName = provider.selectedBillingStateName =
value.name!; value.name!;
provider.getDistrictAPI( provider.getDistrictAPI(
context, context,
provider.selectedBillingStateID, provider.selectedBillingStateID,
...@@ -2706,19 +2788,19 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -2706,19 +2788,19 @@ class _AddorderScreenState extends State<AddorderScreen> {
dropdownSearchData: DropdownSearchData( dropdownSearchData: DropdownSearchData(
searchInnerWidgetHeight: 50, searchInnerWidgetHeight: 50,
searchController: searchController:
provider.billingStateSearchController, provider.billingStateSearchController,
searchInnerWidget: Padding( searchInnerWidget: Padding(
padding: const EdgeInsets.all(8), padding: const EdgeInsets.all(8),
child: TextFormField( child: TextFormField(
controller: controller:
provider.billingStateSearchController, provider.billingStateSearchController,
decoration: InputDecoration( decoration: InputDecoration(
isDense: true, isDense: true,
contentPadding: contentPadding:
const EdgeInsets.symmetric( const EdgeInsets.symmetric(
horizontal: 10, horizontal: 10,
vertical: 8, vertical: 8,
), ),
hintText: 'Search Sate...', hintText: 'Search Sate...',
border: OutlineInputBorder( border: OutlineInputBorder(
borderRadius: BorderRadius.circular( borderRadius: BorderRadius.circular(
...@@ -2730,10 +2812,10 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -2730,10 +2812,10 @@ class _AddorderScreenState extends State<AddorderScreen> {
), ),
searchMatchFn: (item, searchValue) { searchMatchFn: (item, searchValue) {
return item.value?.name return item.value?.name
?.toLowerCase() ?.toLowerCase()
.contains( .contains(
searchValue.toLowerCase(), searchValue.toLowerCase(),
) ?? ) ??
false; false;
}, },
), ),
...@@ -2752,11 +2834,8 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -2752,11 +2834,8 @@ class _AddorderScreenState extends State<AddorderScreen> {
], ],
), ),
), ),
if (provider.selectedBillingStateError != null) if(provider.selectedBillingStateError!=null)
errorWidget( errorWidget(context, provider.selectedBillingStateError),
context,
provider.selectedBillingStateError,
),
TextWidget(context, "Billing District"), TextWidget(context, "Billing District"),
//dd //dd
DropdownButtonHideUnderline( DropdownButtonHideUnderline(
...@@ -2770,36 +2849,36 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -2770,36 +2849,36 @@ class _AddorderScreenState extends State<AddorderScreen> {
style: const TextStyle(fontSize: 14), style: const TextStyle(fontSize: 14),
), ),
items: items:
provider.billingDistricts provider.billingDistricts
.map( .map(
(e) => DropdownMenuItem<Districts>( (e) => DropdownMenuItem<Districts>(
value: e, value: e,
child: Text( child: Text(
e.district!, e.district!,
style: const TextStyle( style: const TextStyle(
fontSize: 14, fontSize: 14,
), ),
), ),
), ),
) )
.toList(), .toList(),
// value: provider.selectedBillingDistricts, // value: provider.selectedBillingDistricts,
value: value:
provider.billingDistricts.isNotEmpty provider.billingDistricts.isNotEmpty
? provider.selectedBillingDistricts != ? provider.selectedBillingDistricts !=
null null
? provider.billingDistricts.firstWhere( ? provider.billingDistricts.firstWhere(
(ord) => (ord) =>
ord.id == ord.id ==
provider provider
.selectedBillingDistrictId, .selectedBillingDistrictId,
orElse: orElse:
() => () =>
provider provider
.billingDistricts[0], .billingDistricts[0],
) )
: null : null
: null, : null,
onChanged: (Districts? value) { onChanged: (Districts? value) {
if (provider.billingDistricts.isNotEmpty) { if (provider.billingDistricts.isNotEmpty) {
if (provider if (provider
...@@ -2811,9 +2890,9 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -2811,9 +2890,9 @@ class _AddorderScreenState extends State<AddorderScreen> {
} }
provider.selectedBillingDistricts = value; provider.selectedBillingDistricts = value;
provider.selectedBillingDistrictId = provider.selectedBillingDistrictId =
value!.id!; value!.id!;
provider.selectedBillingDistrictValue = provider.selectedBillingDistrictValue =
value.district!; value.district!;
provider.getSubLocationAPI( provider.getSubLocationAPI(
context, context,
...@@ -2824,20 +2903,20 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -2824,20 +2903,20 @@ class _AddorderScreenState extends State<AddorderScreen> {
dropdownSearchData: DropdownSearchData( dropdownSearchData: DropdownSearchData(
searchInnerWidgetHeight: 50, searchInnerWidgetHeight: 50,
searchController: searchController:
provider.billingDistrictSearchController, provider.billingDistrictSearchController,
searchInnerWidget: Padding( searchInnerWidget: Padding(
padding: const EdgeInsets.all(8), padding: const EdgeInsets.all(8),
child: TextFormField( child: TextFormField(
controller: controller:
provider provider
.billingDistrictSearchController, .billingDistrictSearchController,
decoration: InputDecoration( decoration: InputDecoration(
isDense: true, isDense: true,
contentPadding: contentPadding:
const EdgeInsets.symmetric( const EdgeInsets.symmetric(
horizontal: 10, horizontal: 10,
vertical: 8, vertical: 8,
), ),
hintText: 'Search District...', hintText: 'Search District...',
border: OutlineInputBorder( border: OutlineInputBorder(
borderRadius: BorderRadius.circular( borderRadius: BorderRadius.circular(
...@@ -2849,10 +2928,10 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -2849,10 +2928,10 @@ class _AddorderScreenState extends State<AddorderScreen> {
), ),
searchMatchFn: (item, searchValue) { searchMatchFn: (item, searchValue) {
return item.value?.district return item.value?.district
?.toLowerCase() ?.toLowerCase()
.contains( .contains(
searchValue.toLowerCase(), searchValue.toLowerCase(),
) ?? ) ??
false; false;
}, },
), ),
...@@ -2871,7 +2950,7 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -2871,7 +2950,7 @@ class _AddorderScreenState extends State<AddorderScreen> {
], ],
), ),
), ),
if (provider.selectedBillingDistrictError != null) if(provider.selectedBillingDistrictError!=null)
errorWidget( errorWidget(
context, context,
provider.selectedBillingDistrictError, provider.selectedBillingDistrictError,
...@@ -2888,63 +2967,63 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -2888,63 +2967,63 @@ class _AddorderScreenState extends State<AddorderScreen> {
style: const TextStyle(fontSize: 14), style: const TextStyle(fontSize: 14),
), ),
items: items:
provider.billingSubLocations provider.billingSubLocations
.map( .map(
(e) => DropdownMenuItem<SubLocations>( (e) => DropdownMenuItem<SubLocations>(
value: e, value: e,
child: Text( child: Text(
e.subLocality!, e.subLocality!,
style: const TextStyle( style: const TextStyle(
fontSize: 14, fontSize: 14,
), ),
), ),
), ),
) )
.toList(), .toList(),
// value: provider.selectedBillingSubLocations, // value: provider.selectedBillingSubLocations,
value: value:
provider.billingSubLocations.isNotEmpty provider.billingSubLocations.isNotEmpty
? provider.selectedBillingSubLocations != ? provider.selectedBillingSubLocations !=
null null
? provider.billingSubLocations.firstWhere( ? provider.billingSubLocations.firstWhere(
(ord) => (ord) =>
ord.id == ord.id ==
provider provider
.selectedBillingSubLocID, .selectedBillingSubLocID,
orElse: orElse:
() => () =>
provider provider
.billingSubLocations[0], .billingSubLocations[0],
) )
: null : null
: null, : null,
onChanged: (SubLocations? value) { onChanged: (SubLocations? value) {
if (provider.billingSubLocations.isNotEmpty) { if (provider.billingSubLocations.isNotEmpty) {
provider.selectedBillingSubLocations = provider.selectedBillingSubLocations =
value; value;
provider.selectedBillingSubLocID = provider.selectedBillingSubLocID =
value!.id!; value!.id!;
provider.selectedBillingSubLocValue = provider.selectedBillingSubLocValue =
value.subLocality!; value.subLocality!;
} }
}, },
dropdownSearchData: DropdownSearchData( dropdownSearchData: DropdownSearchData(
searchInnerWidgetHeight: 50, searchInnerWidgetHeight: 50,
searchController: searchController:
provider.billingSubLocSearchController, provider.billingSubLocSearchController,
searchInnerWidget: Padding( searchInnerWidget: Padding(
padding: const EdgeInsets.all(8), padding: const EdgeInsets.all(8),
child: TextFormField( child: TextFormField(
controller: controller:
provider provider
.billingSubLocSearchController, .billingSubLocSearchController,
decoration: InputDecoration( decoration: InputDecoration(
isDense: true, isDense: true,
contentPadding: contentPadding:
const EdgeInsets.symmetric( const EdgeInsets.symmetric(
horizontal: 10, horizontal: 10,
vertical: 8, vertical: 8,
), ),
hintText: 'Search Sub Location...', hintText: 'Search Sub Location...',
border: OutlineInputBorder( border: OutlineInputBorder(
borderRadius: BorderRadius.circular( borderRadius: BorderRadius.circular(
...@@ -2956,10 +3035,10 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -2956,10 +3035,10 @@ class _AddorderScreenState extends State<AddorderScreen> {
), ),
searchMatchFn: (item, searchValue) { searchMatchFn: (item, searchValue) {
return item.value?.subLocality return item.value?.subLocality
?.toLowerCase() ?.toLowerCase()
.contains( .contains(
searchValue.toLowerCase(), searchValue.toLowerCase(),
) ?? ) ??
false; false;
}, },
), ),
...@@ -2978,11 +3057,8 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -2978,11 +3057,8 @@ class _AddorderScreenState extends State<AddorderScreen> {
], ],
), ),
), ),
if (provider.selectedBillingSubLocError != null) if(provider.selectedBillingSubLocError!=null)
errorWidget( errorWidget(context, provider.selectedBillingSubLocError),
context,
provider.selectedBillingSubLocError,
),
textControllerWidget( textControllerWidget(
context, context,
provider.billingAddressController, provider.billingAddressController,
...@@ -2996,7 +3072,7 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -2996,7 +3072,7 @@ class _AddorderScreenState extends State<AddorderScreen> {
focusNodes[2], focusNodes[2],
TextInputAction.next, TextInputAction.next,
), ),
if (provider.billingAddressError != null) if(provider.billingAddressError!=null)
errorWidget(context, provider.billingAddressError), errorWidget(context, provider.billingAddressError),
textControllerWidget( textControllerWidget(
...@@ -3013,7 +3089,7 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -3013,7 +3089,7 @@ class _AddorderScreenState extends State<AddorderScreen> {
TextInputAction.done, TextInputAction.done,
6, 6,
), ),
if (provider.billingPincodeError != null) if(provider.billingPincodeError!=null)
errorWidget(context, provider.billingPincodeError), errorWidget(context, provider.billingPincodeError),
TextWidget(context, "Dispatch State"), TextWidget(context, "Dispatch State"),
...@@ -3029,36 +3105,36 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -3029,36 +3105,36 @@ class _AddorderScreenState extends State<AddorderScreen> {
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
), ),
items: items:
provider.dispatchStates provider.dispatchStates
.map( .map(
(e) => DropdownMenuItem<States>( (e) => DropdownMenuItem<States>(
value: e, value: e,
child: Text( child: Text(
e.name!, e.name!,
style: const TextStyle( style: const TextStyle(
fontSize: 14, fontSize: 14,
), ),
), ),
), ),
) )
.toList(), .toList(),
// value: provider.selecetdDispatchStates, // value: provider.selecetdDispatchStates,
value: value:
provider.dispatchStates.isNotEmpty provider.dispatchStates.isNotEmpty
? provider.selecetdDispatchStates != ? provider.selecetdDispatchStates !=
null null
? provider.dispatchStates.firstWhere( ? provider.dispatchStates.firstWhere(
(ord) => (ord) =>
ord.id == ord.id ==
provider provider
.selectedDispatchStateID, .selectedDispatchStateID,
orElse: orElse:
() => () =>
provider provider
.dispatchStates[0], .dispatchStates[0],
) )
: null : null
: null, : null,
onChanged: (States? value) { onChanged: (States? value) {
if (provider.dispatchStates.isNotEmpty) { if (provider.dispatchStates.isNotEmpty) {
if (provider.dispatchDistricts.isNotEmpty) { if (provider.dispatchDistricts.isNotEmpty) {
...@@ -3066,17 +3142,17 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -3066,17 +3142,17 @@ class _AddorderScreenState extends State<AddorderScreen> {
provider.billingSubLocations.clear(); provider.billingSubLocations.clear();
// provider.selectedDispatchDistricts = null; // provider.selectedDispatchDistricts = null;
provider.selectedDispatchDistrictId = provider.selectedDispatchDistrictId =
null; null;
provider.selectedDispatchDistrictValue = provider.selectedDispatchDistrictValue =
""; "";
provider.selectedDispatchSubLocID = null; provider.selectedDispatchSubLocID = null;
provider.selectedDispatchSubLocValue = ""; provider.selectedDispatchSubLocValue = "";
} }
provider.selecetdDispatchStates = value; provider.selecetdDispatchStates = value;
provider.selectedDispatchStateID = provider.selectedDispatchStateID =
value!.id!; value!.id!;
provider.selectedDispatchStateName = provider.selectedDispatchStateName =
value.name!; value.name!;
provider.getDispatchDistrictAPI( provider.getDispatchDistrictAPI(
context, context,
...@@ -3087,20 +3163,20 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -3087,20 +3163,20 @@ class _AddorderScreenState extends State<AddorderScreen> {
dropdownSearchData: DropdownSearchData( dropdownSearchData: DropdownSearchData(
searchInnerWidgetHeight: 50, searchInnerWidgetHeight: 50,
searchController: searchController:
provider.dispatchStateSearchController, provider.dispatchStateSearchController,
searchInnerWidget: Padding( searchInnerWidget: Padding(
padding: const EdgeInsets.all(8), padding: const EdgeInsets.all(8),
child: TextFormField( child: TextFormField(
controller: controller:
provider provider
.dispatchStateSearchController, .dispatchStateSearchController,
decoration: InputDecoration( decoration: InputDecoration(
isDense: true, isDense: true,
contentPadding: contentPadding:
const EdgeInsets.symmetric( const EdgeInsets.symmetric(
horizontal: 10, horizontal: 10,
vertical: 8, vertical: 8,
), ),
hintText: 'Search Sate...', hintText: 'Search Sate...',
border: OutlineInputBorder( border: OutlineInputBorder(
borderRadius: BorderRadius.circular( borderRadius: BorderRadius.circular(
...@@ -3112,10 +3188,10 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -3112,10 +3188,10 @@ class _AddorderScreenState extends State<AddorderScreen> {
), ),
searchMatchFn: (item, searchValue) { searchMatchFn: (item, searchValue) {
return item.value?.name return item.value?.name
?.toLowerCase() ?.toLowerCase()
.contains( .contains(
searchValue.toLowerCase(), searchValue.toLowerCase(),
) ?? ) ??
false; false;
}, },
), ),
...@@ -3149,36 +3225,36 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -3149,36 +3225,36 @@ class _AddorderScreenState extends State<AddorderScreen> {
style: const TextStyle(fontSize: 14), style: const TextStyle(fontSize: 14),
), ),
items: items:
provider.dispatchDistricts provider.dispatchDistricts
.map( .map(
(e) => DropdownMenuItem<Districts>( (e) => DropdownMenuItem<Districts>(
value: e, value: e,
child: Text( child: Text(
e.district!, e.district!,
style: const TextStyle( style: const TextStyle(
fontSize: 14, fontSize: 14,
), ),
), ),
), ),
) )
.toList(), .toList(),
// value: provider.selectedDispatchDistricts, // value: provider.selectedDispatchDistricts,
value: value:
provider.dispatchDistricts.isNotEmpty provider.dispatchDistricts.isNotEmpty
? provider.selectedDispatchDistricts != ? provider.selectedDispatchDistricts !=
null null
? provider.dispatchDistricts.firstWhere( ? provider.dispatchDistricts.firstWhere(
(ord) => (ord) =>
ord.id == ord.id ==
provider provider
.selectedDispatchDistrictId, .selectedDispatchDistrictId,
orElse: orElse:
() => () =>
provider provider
.dispatchDistricts[0], .dispatchDistricts[0],
) )
: null : null
: null, : null,
onChanged: (Districts? value) { onChanged: (Districts? value) {
if (provider.dispatchDistricts.isNotEmpty) { if (provider.dispatchDistricts.isNotEmpty) {
if (provider if (provider
...@@ -3191,9 +3267,9 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -3191,9 +3267,9 @@ class _AddorderScreenState extends State<AddorderScreen> {
} }
provider.selectedDispatchDistricts = value; provider.selectedDispatchDistricts = value;
provider.selectedDispatchDistrictId = provider.selectedDispatchDistrictId =
value!.id!; value!.id!;
provider.selectedDispatchDistrictValue = provider.selectedDispatchDistrictValue =
value.district!; value.district!;
provider.getDispatchSubLocationAPI( provider.getDispatchSubLocationAPI(
context, context,
...@@ -3204,20 +3280,20 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -3204,20 +3280,20 @@ class _AddorderScreenState extends State<AddorderScreen> {
dropdownSearchData: DropdownSearchData( dropdownSearchData: DropdownSearchData(
searchInnerWidgetHeight: 50, searchInnerWidgetHeight: 50,
searchController: searchController:
provider.dispatchDistrictSearchController, provider.dispatchDistrictSearchController,
searchInnerWidget: Padding( searchInnerWidget: Padding(
padding: const EdgeInsets.all(8), padding: const EdgeInsets.all(8),
child: TextFormField( child: TextFormField(
controller: controller:
provider provider
.dispatchDistrictSearchController, .dispatchDistrictSearchController,
decoration: InputDecoration( decoration: InputDecoration(
isDense: true, isDense: true,
contentPadding: contentPadding:
const EdgeInsets.symmetric( const EdgeInsets.symmetric(
horizontal: 10, horizontal: 10,
vertical: 8, vertical: 8,
), ),
hintText: 'Search District...', hintText: 'Search District...',
border: OutlineInputBorder( border: OutlineInputBorder(
borderRadius: BorderRadius.circular( borderRadius: BorderRadius.circular(
...@@ -3229,10 +3305,10 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -3229,10 +3305,10 @@ class _AddorderScreenState extends State<AddorderScreen> {
), ),
searchMatchFn: (item, searchValue) { searchMatchFn: (item, searchValue) {
return item.value?.district return item.value?.district
?.toLowerCase() ?.toLowerCase()
.contains( .contains(
searchValue.toLowerCase(), searchValue.toLowerCase(),
) ?? ) ??
false; false;
}, },
), ),
...@@ -3266,37 +3342,37 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -3266,37 +3342,37 @@ class _AddorderScreenState extends State<AddorderScreen> {
style: const TextStyle(fontSize: 14), style: const TextStyle(fontSize: 14),
), ),
items: items:
provider.dispatchSubLocations provider.dispatchSubLocations
.map( .map(
(e) => DropdownMenuItem<SubLocations>( (e) => DropdownMenuItem<SubLocations>(
value: e, value: e,
child: Text( child: Text(
e.subLocality!, e.subLocality!,
style: const TextStyle( style: const TextStyle(
fontSize: 14, fontSize: 14,
), ),
), ),
), ),
) )
.toList(), .toList(),
// value: // value:
// provider.selectedDispatchSubLocations, // provider.selectedDispatchSubLocations,
value: value:
provider.dispatchSubLocations.isNotEmpty provider.dispatchSubLocations.isNotEmpty
? provider.selectedDispatchSubLocations != ? provider.selectedDispatchSubLocations !=
null null
? provider.dispatchSubLocations.firstWhere( ? provider.dispatchSubLocations.firstWhere(
(ord) => (ord) =>
ord.id == ord.id ==
provider provider
.selectedDispatchSubLocID, .selectedDispatchSubLocID,
orElse: orElse:
() => () =>
provider provider
.dispatchSubLocations[0], .dispatchSubLocations[0],
) )
: null : null
: null, : null,
onChanged: (SubLocations? value) { onChanged: (SubLocations? value) {
if (provider if (provider
.dispatchSubLocations .dispatchSubLocations
...@@ -3304,28 +3380,28 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -3304,28 +3380,28 @@ class _AddorderScreenState extends State<AddorderScreen> {
provider.selectedDispatchSubLocations = provider.selectedDispatchSubLocations =
value; value;
provider.selectedDispatchSubLocID = provider.selectedDispatchSubLocID =
value!.id!; value!.id!;
provider.selectedDispatchSubLocValue = provider.selectedDispatchSubLocValue =
value.subLocality!; value.subLocality!;
} }
}, },
dropdownSearchData: DropdownSearchData( dropdownSearchData: DropdownSearchData(
searchInnerWidgetHeight: 50, searchInnerWidgetHeight: 50,
searchController: searchController:
provider.dispatchSubLocSearchController, provider.dispatchSubLocSearchController,
searchInnerWidget: Padding( searchInnerWidget: Padding(
padding: const EdgeInsets.all(8), padding: const EdgeInsets.all(8),
child: TextFormField( child: TextFormField(
controller: controller:
provider provider
.dispatchSubLocSearchController, .dispatchSubLocSearchController,
decoration: InputDecoration( decoration: InputDecoration(
isDense: true, isDense: true,
contentPadding: contentPadding:
const EdgeInsets.symmetric( const EdgeInsets.symmetric(
horizontal: 10, horizontal: 10,
vertical: 8, vertical: 8,
), ),
hintText: 'Search Sub Location...', hintText: 'Search Sub Location...',
border: OutlineInputBorder( border: OutlineInputBorder(
borderRadius: BorderRadius.circular( borderRadius: BorderRadius.circular(
...@@ -3337,10 +3413,10 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -3337,10 +3413,10 @@ class _AddorderScreenState extends State<AddorderScreen> {
), ),
searchMatchFn: (item, searchValue) { searchMatchFn: (item, searchValue) {
return item.value?.subLocality return item.value?.subLocality
?.toLowerCase() ?.toLowerCase()
.contains( .contains(
searchValue.toLowerCase(), searchValue.toLowerCase(),
) ?? ) ??
false; false;
}, },
), ),
...@@ -3481,19 +3557,19 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -3481,19 +3557,19 @@ class _AddorderScreenState extends State<AddorderScreen> {
style: const TextStyle(fontSize: 14), style: const TextStyle(fontSize: 14),
), ),
items: items:
provider.unloadingScope provider.unloadingScope
.map( .map(
(e) => DropdownMenuItem<String>( (e) => DropdownMenuItem<String>(
value: e, value: e,
child: Text( child: Text(
e, e,
style: const TextStyle( style: const TextStyle(
fontSize: 14, fontSize: 14,
), ),
), ),
), ),
) )
.toList(), .toList(),
value: provider.selectedUnloadingScope, value: provider.selectedUnloadingScope,
onChanged: (String? value) { onChanged: (String? value) {
if (provider.unloadingScope.isNotEmpty) { if (provider.unloadingScope.isNotEmpty) {
...@@ -3521,19 +3597,19 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -3521,19 +3597,19 @@ class _AddorderScreenState extends State<AddorderScreen> {
style: const TextStyle(fontSize: 14), style: const TextStyle(fontSize: 14),
), ),
items: items:
provider.freightScope provider.freightScope
.map( .map(
(e) => DropdownMenuItem<String>( (e) => DropdownMenuItem<String>(
value: e, value: e,
child: Text( child: Text(
e, e,
style: const TextStyle( style: const TextStyle(
fontSize: 14, fontSize: 14,
), ),
), ),
), ),
) )
.toList(), .toList(),
value: provider.selectedFreightScope, value: provider.selectedFreightScope,
onChanged: (String? value) { onChanged: (String? value) {
if (provider.freightScope.isNotEmpty) { if (provider.freightScope.isNotEmpty) {
...@@ -3570,11 +3646,10 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -3570,11 +3646,10 @@ class _AddorderScreenState extends State<AddorderScreen> {
), ),
scrollbarTheme: ScrollbarThemeData( scrollbarTheme: ScrollbarThemeData(
radius: const Radius.circular(15), radius: const Radius.circular(15),
thickness: WidgetStateProperty.all<double>( thickness:
6, MaterialStateProperty.all<double>(6),
),
thumbVisibility: thumbVisibility:
WidgetStateProperty.all<bool>(true), MaterialStateProperty.all<bool>(true),
), ),
), ),
menuItemStyleData: const MenuItemStyleData( menuItemStyleData: const MenuItemStyleData(
...@@ -3598,19 +3673,19 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -3598,19 +3673,19 @@ class _AddorderScreenState extends State<AddorderScreen> {
style: const TextStyle(fontSize: 14), style: const TextStyle(fontSize: 14),
), ),
items: items:
provider.erectionScope provider.erectionScope
.map( .map(
(e) => DropdownMenuItem<String>( (e) => DropdownMenuItem<String>(
value: e, value: e,
child: Text( child: Text(
e, e,
style: const TextStyle( style: const TextStyle(
fontSize: 14, fontSize: 14,
), ),
), ),
), ),
) )
.toList(), .toList(),
value: provider.selectedErectionScope, value: provider.selectedErectionScope,
onChanged: (String? value) { onChanged: (String? value) {
if (provider.erectionScope.isNotEmpty) { if (provider.erectionScope.isNotEmpty) {
...@@ -3638,19 +3713,19 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -3638,19 +3713,19 @@ class _AddorderScreenState extends State<AddorderScreen> {
style: const TextStyle(fontSize: 14), style: const TextStyle(fontSize: 14),
), ),
items: items:
provider.tpcApplicable provider.tpcApplicable
.map( .map(
(e) => DropdownMenuItem<String>( (e) => DropdownMenuItem<String>(
value: e, value: e,
child: Text( child: Text(
e, e,
style: const TextStyle( style: const TextStyle(
fontSize: 14, fontSize: 14,
), ),
), ),
), ),
) )
.toList(), .toList(),
value: provider.selectedTpcStatus, value: provider.selectedTpcStatus,
onChanged: (String? value) { onChanged: (String? value) {
if (provider.tpcApplicable.isNotEmpty) { if (provider.tpcApplicable.isNotEmpty) {
...@@ -3687,13 +3762,13 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -3687,13 +3762,13 @@ class _AddorderScreenState extends State<AddorderScreen> {
onChanged: (value) async { onChanged: (value) async {
Future.delayed( Future.delayed(
Duration(milliseconds: 100), Duration(milliseconds: 100),
() async { () async {
await provider await provider
.ordersAddOrderTPCAgentFunction( .ordersAddOrderTPCAgentFunction(
context, context,
widget.mode, widget.mode,
value, value,
); );
}, },
); );
}, },
...@@ -3754,22 +3829,24 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -3754,22 +3829,24 @@ class _AddorderScreenState extends State<AddorderScreen> {
onTap: () async { onTap: () async {
if (provider.tpcAgent.isNotEmpty) { if (provider.tpcAgent.isNotEmpty) {
provider.selectedTpcAgent = provider.selectedTpcAgent =
provider.tpcAgent[index]; provider.tpcAgent[index];
print( print(
"Selected Complaint Type: ${provider.tpcAgent[index].text}, ID: ${provider.tpcAgent[index].id}", "Selected Complaint Type: ${provider.tpcAgent[index].text}, ID: ${provider.tpcAgent[index].id}",
); );
provider.selectedTpcAgentID = provider.selectedTpcAgentID =
provider.tpcAgent[index].id!; provider.tpcAgent[index].id!;
provider.selectedTpcAgentValue = provider.selectedTpcAgentValue =
provider.tpcAgent[index].text!; provider.tpcAgent[index].text!;
print( print(
"hfjkshfg${provider.selectedTpcAgentID}", "hfjkshfg" +
provider.selectedTpcAgentID
.toString(),
); );
provider provider
.dropDownTpcSearchController .dropDownTpcSearchController
.text = .text =
provider.tpcAgent[index].text!; provider.tpcAgent[index].text!;
} }
// provider.ordersAddPaymentSelectOrderAPIFunction(context, provider.selectedAccountID); // provider.ordersAddPaymentSelectOrderAPIFunction(context, provider.selectedAccountID);
// provider.tpcAgent = []; // provider.tpcAgent = [];
...@@ -3815,37 +3892,37 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -3815,37 +3892,37 @@ class _AddorderScreenState extends State<AddorderScreen> {
), ),
), ),
floatingActionButtonLocation: floatingActionButtonLocation:
FloatingActionButtonLocation.centerFloat, FloatingActionButtonLocation.centerFloat,
bottomNavigationBar: InkResponse( bottomNavigationBar: InkResponse(
onTap: onTap:
provider.submitClicked provider.submitClicked
? null ? null
: () { : () {
provider.submitClicked = true; provider.submitClicked = true;
// var order_prod_data = provider.getFormData(); // var order_prod_data = provider.getFormData();
///[{"product_id":"1","qty":"1","price":"500","cgst_p":"9","sgst_p":"9","igst_p":"0","total_price":"500"}, ///[{"product_id":"1","qty":"1","price":"500","cgst_p":"9","sgst_p":"9","igst_p":"0","total_price":"500"},
///{"product_id":"2","qty":"1","price":"1000","cgst_p":"9","sgst_p":"9","igst_p":"0","total_price":"1000"}] ///{"product_id":"2","qty":"1","price":"1000","cgst_p":"9","sgst_p":"9","igst_p":"0","total_price":"1000"}]
provider.getCurrentLocation(); provider.getCurrentLocation();
provider.ordersAddOrderAPISubmitFunction( provider.ordersAddOrderAPISubmitFunction(
context, context,
widget.mode, widget.mode,
provider.selectedEmployeeID, provider.selectedEmployeeID,
provider.selectedAccountID, provider.selectedAccountID,
provider.selectedDispatchStateID, provider.selectedDispatchStateID,
provider.selectedDispatchDistrictId, provider.selectedDispatchDistrictId,
provider.selectedDispatchSubLocID, provider.selectedDispatchSubLocID,
provider.selectedUnloadingScope, provider.selectedUnloadingScope,
provider.selectedFreightScope, provider.selectedFreightScope,
provider.selectedErectionScope, provider.selectedErectionScope,
provider.selectedTpcStatus, provider.selectedTpcStatus,
provider.selectedBillingStateID, provider.selectedBillingStateID,
provider.selectedBillingDistrictId, provider.selectedBillingDistrictId,
provider.selectedBillingSubLocID, provider.selectedBillingSubLocID,
provider.selectedTpcAgentID, provider.selectedTpcAgentID,
{}, {},
); );
}, },
child: Container( child: Container(
height: 45, height: 45,
alignment: Alignment.center, alignment: Alignment.center,
...@@ -3856,20 +3933,20 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -3856,20 +3933,20 @@ class _AddorderScreenState extends State<AddorderScreen> {
borderRadius: BorderRadius.circular(15), borderRadius: BorderRadius.circular(15),
), ),
child: child:
provider.submitClicked provider.submitClicked
? CircularProgressIndicator.adaptive( ? CircularProgressIndicator.adaptive(
valueColor: AlwaysStoppedAnimation<Color>( valueColor: AlwaysStoppedAnimation<Color>(
AppColors.white, AppColors.white,
), ),
) )
: Text( : Text(
"Submit", "Submit",
style: TextStyle( style: TextStyle(
fontSize: 15, fontSize: 15,
fontFamily: "JakartaMedium", fontFamily: "JakartaMedium",
color: Colors.white, color: Colors.white,
), ),
), ),
), ),
), ),
), ),
...@@ -3901,9 +3978,9 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -3901,9 +3978,9 @@ class _AddorderScreenState extends State<AddorderScreen> {
return Padding( return Padding(
padding: EdgeInsets.only( padding: EdgeInsets.only(
bottom: bottom:
MediaQuery.of( MediaQuery.of(
context, context,
).viewInsets.bottom, // This handles keyboard ).viewInsets.bottom, // This handles keyboard
), ),
child: Container( child: Container(
margin: EdgeInsets.only( margin: EdgeInsets.only(
...@@ -3935,7 +4012,7 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -3935,7 +4012,7 @@ class _AddorderScreenState extends State<AddorderScreen> {
Navigator.of(context).pop(false); Navigator.of(context).pop(false);
provider.imgFromGallery(context); provider.imgFromGallery(context);
}, },
child: SizedBox( child: Container(
height: 35, height: 35,
child: Text("Select photo from gallery"), child: Text("Select photo from gallery"),
), ),
...@@ -3946,7 +4023,7 @@ class _AddorderScreenState extends State<AddorderScreen> { ...@@ -3946,7 +4023,7 @@ class _AddorderScreenState extends State<AddorderScreen> {
Navigator.of(context).pop(false); Navigator.of(context).pop(false);
provider.imgFromCamera(context); provider.imgFromCamera(context);
}, },
child: SizedBox( child: Container(
height: 35, height: 35,
child: Text("Capture photo from camera"), child: Text("Capture photo from camera"),
), ),
...@@ -3997,7 +4074,7 @@ class OrderForm extends StatelessWidget { ...@@ -3997,7 +4074,7 @@ class OrderForm extends StatelessWidget {
), ),
); );
if (res != null) { if (res != null) {
print("result $res"); print("result ${res}");
} }
}, },
child: Container( child: Container(
...@@ -4035,10 +4112,10 @@ class OrderForm extends StatelessWidget { ...@@ -4035,10 +4112,10 @@ class OrderForm extends StatelessWidget {
provider.saleProducts provider.saleProducts
.firstWhere( .firstWhere(
(p) => p.id == product['product_id'], (p) => p.id == product['product_id'],
orElse: orElse:
() => () =>
SaleProducts(id: '', prodName: 'Unknown'), SaleProducts(id: '', prodName: 'Unknown'),
) )
.prodName; .prodName;
final prodPrice = product['price'] ?? '-'; final prodPrice = product['price'] ?? '-';
final prodQty = product['qty'] ?? '-'; final prodQty = product['qty'] ?? '-';
...@@ -4054,14 +4131,14 @@ class OrderForm extends StatelessWidget { ...@@ -4054,14 +4131,14 @@ class OrderForm extends StatelessWidget {
MaterialPageRoute( MaterialPageRoute(
builder: builder:
(context) => Addorderaddproduct( (context) => Addorderaddproduct(
type: "Edit", type: "Edit",
editIndex: index, editIndex: index,
), ),
settings: RouteSettings(name: 'Addorderaddproduct'), settings: RouteSettings(name: 'Addorderaddproduct'),
), ),
); );
if (res != null) { if (res != null) {
print("result $res"); print("result ${res}");
} }
}, },
child: Container( child: Container(
...@@ -4069,7 +4146,7 @@ class OrderForm extends StatelessWidget { ...@@ -4069,7 +4146,7 @@ class OrderForm extends StatelessWidget {
margin: EdgeInsets.only( margin: EdgeInsets.only(
left: index == 0 ? 10 : 5, left: index == 0 ? 10 : 5,
right: right:
index == provider.productRows.length - 1 ? 10 : 5, index == provider.productRows.length - 1 ? 10 : 5,
bottom: 5, bottom: 5,
), ),
padding: EdgeInsets.symmetric( padding: EdgeInsets.symmetric(
...@@ -4097,7 +4174,7 @@ class OrderForm extends StatelessWidget { ...@@ -4097,7 +4174,7 @@ class OrderForm extends StatelessWidget {
flex: 6, flex: 6,
child: Column( child: Column(
crossAxisAlignment: crossAxisAlignment:
CrossAxisAlignment.start, CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
children: [ children: [
Row( Row(
......
lib/services/api_calling.dart
View file @ dc88a3f9
...@@ -25,7 +25,9 @@ import 'package:generp/Models/crmModels/crmProspectDetailsAddLeadsResponse.dart' ...@@ -25,7 +25,9 @@ import 'package:generp/Models/crmModels/crmProspectDetailsAddLeadsResponse.dart'
import 'package:generp/Models/crmModels/crmProspectDetailsResponse.dart'; import 'package:generp/Models/crmModels/crmProspectDetailsResponse.dart';
import 'package:generp/Models/financeModels/addDirectPaymentResponse.dart'; import 'package:generp/Models/financeModels/addDirectPaymentResponse.dart';
import 'package:generp/Models/financeModels/paymentRequisitionPaymentsListResponse.dart'; import 'package:generp/Models/financeModels/paymentRequisitionPaymentsListResponse.dart';
import 'package:generp/Models/hrmModels/advanceListResponse.dart';
import 'package:generp/Models/hrmModels/attendanceRequestListResponse.dart'; import 'package:generp/Models/hrmModels/attendanceRequestListResponse.dart';
import 'package:generp/Models/hrmModels/casualLeaveHistoryResponse.dart';
import 'package:generp/Models/hrmModels/jobDescriptionResponse.dart'; import 'package:generp/Models/hrmModels/jobDescriptionResponse.dart';
import 'package:generp/Models/hrmModels/leaveApplicationDetailsResponse.dart'; import 'package:generp/Models/hrmModels/leaveApplicationDetailsResponse.dart';
import 'package:generp/Models/hrmModels/leaveApplicationLIstResponse.dart'; import 'package:generp/Models/hrmModels/leaveApplicationLIstResponse.dart';
...@@ -2368,19 +2370,41 @@ class ApiCalling { ...@@ -2368,19 +2370,41 @@ class ApiCalling {
} }
static Future<AddOrderViewResponse?> addOrderViewAPI( static Future<AddOrderViewResponse?> addOrderViewAPI(
empId, empId,
session, session,
mode, mode,
leadId,
feedback,
followupType,
inTime,
loc
) async { ) async {
try { try {
Map<String, String> data = { Map<String, String> data = {
'emp_id': (empId).toString(), 'emp_id': (empId).toString(),
'session_id': (session).toString(), 'session_id': (session).toString(),
'mode': (mode).toString(), 'mode': (mode).toString(),
'lead_id': (leadId).toString(),
'feedback': (feedback).toString(),
'followup_type': (followupType).toString(),
'in_time': (inTime).toString(),
'loc': (loc).toString(),
}; };
debugPrint("===========================Input to api ");
debugPrint("Lead Id: ${leadId}");
debugPrint("Follow Type: ${followupType}");
debugPrint("In Time: ${inTime}");
debugPrint("Location: ${loc}");
debugPrint("Mode: ${mode}");
debugPrint("feedback: ${feedback}");
debugPrint("=================End of INput=================");
final res = await post(data, ordersAddOrderViewUrl, {}); final res = await post(data, ordersAddOrderViewUrl, {});
if (res != null) { if (res != null) {
debugPrint(res.body); // debugPrint("Response start ================== ${AddOrderViewResponse.fromJson(jsonDecode(res.body)).accountDetails?.name}");
return AddOrderViewResponse.fromJson(jsonDecode(res.body)); return AddOrderViewResponse.fromJson(jsonDecode(res.body));
} else { } else {
debugPrint("Null Response"); debugPrint("Null Response");
...@@ -3604,6 +3628,7 @@ class ApiCalling { ...@@ -3604,6 +3628,7 @@ class ApiCalling {
'lead_status': leadStatus.toString(), 'lead_status': leadStatus.toString(),
'products': products.toString(), 'products': products.toString(),
}; };
debugPrint("✅✅✅✅✅✅✅✅✅✅✅✅✅✅✅✅✅ Product deteails ${products}");
final res = await post(data, crmNewProspectLeadSubmitUrl, {}); final res = await post(data, crmNewProspectLeadSubmitUrl, {});
if (res != null) { if (res != null) {
print(data); print(data);
...@@ -3738,6 +3763,21 @@ class ApiCalling { ...@@ -3738,6 +3763,21 @@ class ApiCalling {
alphabet, alphabet,
pageNumber, pageNumber,
) async { ) async {
debugPrint('crmLeadListFilterSubmitAPI Input data:');
debugPrint('empId: $empId');
debugPrint('session: $session');
debugPrint('mode: $mode');
debugPrint('status: $status');
debugPrint('openStatus: $openStatus');
debugPrint('mob: $mob');
debugPrint('com: $com');
debugPrint('source: $source');
debugPrint('reference: $reference');
debugPrint('team: $team');
debugPrint('segment: $segment');
debugPrint('alphabet: $alphabet');
debugPrint('pageNumber: $pageNumber');
debugPrint('End of input data');
try { try {
Map<String, String> data = { Map<String, String> data = {
'emp_id': (empId).toString(), 'emp_id': (empId).toString(),
...@@ -3936,8 +3976,10 @@ class ApiCalling { ...@@ -3936,8 +3976,10 @@ class ApiCalling {
productId, productId,
qty, qty,
amount, amount,
remark,
) async { ) async {
try { try {
debugPrint("💡💡💡💡💡💡💡💡💡AddEditProducts: ${remark}");
Map<String, String> data = { Map<String, String> data = {
'emp_id': (empId).toString(), 'emp_id': (empId).toString(),
'session_id': (session).toString(), 'session_id': (session).toString(),
...@@ -3947,7 +3989,9 @@ class ApiCalling { ...@@ -3947,7 +3989,9 @@ class ApiCalling {
'product_id': (productId).toString(), 'product_id': (productId).toString(),
'qty': (qty).toString(), 'qty': (qty).toString(),
'amount': (amount).toString(), 'amount': (amount).toString(),
'remarks': (remark).toString(),
}; };
final res = await post(data, crmLeadDetailsAddEditProductsUrl, {}); final res = await post(data, crmLeadDetailsAddEditProductsUrl, {});
if (res != null) { if (res != null) {
print("AddEditProducts $data"); print("AddEditProducts $data");
...@@ -4591,8 +4635,10 @@ class ApiCalling { ...@@ -4591,8 +4635,10 @@ class ApiCalling {
quantity, quantity,
amount, amount,
leadStatus, leadStatus,
remarks,
) async { ) async {
try { try {
debugPrint("💡💡💡💡💡💡 remarks $remarks");
Map<String, String> data = { Map<String, String> data = {
'emp_id': (empId).toString(), 'emp_id': (empId).toString(),
'session_id': (session).toString(), 'session_id': (session).toString(),
...@@ -4601,6 +4647,7 @@ class ApiCalling { ...@@ -4601,6 +4647,7 @@ class ApiCalling {
'quantity': quantity.toString(), 'quantity': quantity.toString(),
'amount': amount.toString(), 'amount': amount.toString(),
'lead_status': leadStatus.toString(), 'lead_status': leadStatus.toString(),
'remarks' : remarks.toString(),
}; };
final res = await post(data, crmProspectDetailsAddLeadUrl, {}); final res = await post(data, crmProspectDetailsAddLeadUrl, {});
if (res != null) { if (res != null) {
...@@ -5445,6 +5492,31 @@ class ApiCalling { ...@@ -5445,6 +5492,31 @@ class ApiCalling {
return null; return null;
} }
} }
/// CasualLeaveHistory api
static Future<CasualLeaveHistoryResponse?> casualLeaveHistoryAPI(
session,
empId,
) async {
debugPrint("🔥🔥🔥🔥🔥🔥🔥Response");
try {
Map<String, String> data = {
'session_id': (session).toString(),
'emp_id': (empId).toString(),
};
final res = await post(data, CasuaLeaveHistoryUrl, {});
if (res != null) {
print(data);
debugPrint(res.body);
return CasualLeaveHistoryResponse.fromJson(jsonDecode(res.body));
} else {
debugPrint("Null Response");
return null;
}
} catch (e) {
debugPrint('hello bev=bug $e ');
return null;
}
}
//add leave request //add leave request
static Future<CommonResponse?> leaveRequestAddAPI( static Future<CommonResponse?> leaveRequestAddAPI(
...@@ -5515,6 +5587,34 @@ class ApiCalling { ...@@ -5515,6 +5587,34 @@ class ApiCalling {
} }
} }
/// AdvanceListApi
static Future<AdvanceListResponse?> advanceListAPI(
session,
empId,
pageNumber
) async {
debugPrint("🔥🔥🔥🔥🔥🔥🔥Response");
try {
Map<String, String> data = {
'session_id': (session).toString(),
'emp_id': (empId).toString(),
'page_number': (pageNumber).toString(), // FIX: Use pageNumber parameter, not empId
};
final res = await post(data, AdvanceListUrl, {});
if (res != null) {
print("Request Data: $data");
debugPrint("🔥🔥🔥🔥🔥🔥🔥 Response: ${res.body}");
return AdvanceListResponse.fromJson(jsonDecode(res.body));
} else {
debugPrint("Null Response");
return null;
}
} catch (e) {
debugPrint('API Error: $e');
return null;
}
}
// static Future<CommonResponse?> TpcIssueListApprovalAPI( // static Future<CommonResponse?> TpcIssueListApprovalAPI(
// empId, // empId,
// session, // session,
......
lib/services/api_names.dart
View file @ dc88a3f9
...@@ -181,9 +181,9 @@ const crmDashboardQuotationsUrl = "${baseUrl_test}crm_dashboard_quotations_list" ...@@ -181,9 +181,9 @@ const crmDashboardQuotationsUrl = "${baseUrl_test}crm_dashboard_quotations_list"
const ogcharturl = "${baseUrl_test}organisation_structures"; const ogcharturl = "${baseUrl_test}organisation_structures";
const JobDesciptionUrl ="${baseUrl_test}job_description"; const JobDesciptionUrl ="${baseUrl_test}job_description";
///HRM ///HRM
//Attendance //Attendance
const HrmAccessiblePagesUrl ="${baseUrl_test}hrm_accessible_pages"; const HrmAccessiblePagesUrl ="${baseUrl_test}hrm_accessible_pages";
const AttendanceRequestListUrl ="${baseUrl_test}attendance_request_list"; const AttendanceRequestListUrl ="${baseUrl_test}attendance_request_list";
const AttendanceRequestDetailsUrl ="${baseUrl_test}attendance_request_details"; const AttendanceRequestDetailsUrl ="${baseUrl_test}attendance_request_details";
...@@ -203,9 +203,9 @@ const LeaveApplicationDetailsUrl ="${baseUrl_test}leave_request_details"; ...@@ -203,9 +203,9 @@ const LeaveApplicationDetailsUrl ="${baseUrl_test}leave_request_details";
const LeaveRequestAdditionUrl ="${baseUrl_test}add_leave_request"; const LeaveRequestAdditionUrl ="${baseUrl_test}add_leave_request";
const LeaveRequestRejectAprroveUrl ="${baseUrl_test}leaves_approve_reject"; const LeaveRequestRejectAprroveUrl ="${baseUrl_test}leaves_approve_reject";
const CasuaLeaveHistoryUrl ="${baseUrl_test}casual_leave_history";
const AdvanceListUrl ="${baseUrl_test}advance_list";
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment