Nhances/nhance_partner
Nhances/nhance_partner
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Repoen Issues fixes

Browse Source
This commit is contained in:
sanjeev.p 2026-01-06 12:38:34 +05:30
parent 1fefb22f46
commit c5df26f87a
14 changed files with 953 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.flutter-plugins-dependencies
View File

File diff suppressed because one or more lines are too long

5
lib/core/routing/app_router.dart
View File

@ -15,6 +15,7 @@ import '../../presentation/screens/Enquiry/policy_claims_endros/claims.dart';
import '../../presentation/screens/Enquiry/policy_claims_endros/endrosment.dart';
import '../../presentation/screens/Masters/Brokers/brokerList.dart';
import '../../presentation/screens/Masters/EndorsementType/endorsementList.dart';
import '../../presentation/screens/Masters/VehicleType/vehicleList.dart';
import '../../presentation/screens/StaffAttendance/attendanceAllDetails.dart';
import '../../presentation/screens/StaffAttendance/individual_Attendance.dart';
import '../../presentation/screens/UserManagement/Agent/agent.dart';
@ -276,6 +277,10 @@ final GoRouter appRouter = GoRouter(
path: AppRoutes.endorsementTypeLst,
builder: (context, state) => const EndorsementTypeList(),
),
GoRoute(
path: AppRoutes.vehicleTypeLst,
builder: (context, state) => const VehicleTypeList(),
),
GoRoute(
path: AppRoutes.paymentModeLst,
builder: (context, state) => const PaymentLsit(),

1
lib/core/routing/routes.dart
View File

@ -32,4 +32,5 @@ class AppRoutes {
static const String brokerLst = '/brokerLst';
static const String paymentModeLst = '/paymentMode';
static const String endorsementTypeLst = '/endorsementTypeLst';
static const String vehicleTypeLst = '/vehicleTypeLst';
}

5
lib/core/services/api_service.dart
View File

@ -730,6 +730,9 @@ class ApiService {
else if (masterName == 'EndorsementType') {
url = Uri.parse('${Env.apiUrl}master/updateEndorsementStatus/$id');
}
else if (masterName == 'VehicleType') {
url = Uri.parse('${Env.apiUrl}master/updateVehicleTypeStatus/$id');
}
else {
url = Uri.parse('${Env.apiUrl}master/updatePaymentModeStatus/$id');
}
@ -812,7 +815,7 @@ class ApiService {
);
// final url = Uri.parse(
// // 'http://localhost/nhance_partner_be/dashboard/partnerDashboard?manager_id=$id',
// 'http://localhost/nhance_partner_be/dashboard/partnerDashboard?manager_id=$id',
// );
final headers = {

11
lib/presentation/layouts/appheader.dart
View File

@ -229,6 +229,14 @@ class _AppHeaderState extends ConsumerState<AppHeader> {
context.go(AppRoutes.endorsementTypeLst);
},
),
_buildPopupItem(
label: "Vehicle Type",
onTap: () {
setState(() => _activeMenu = 'Masters');
_hidePopup();
context.go(AppRoutes.vehicleTypeLst);
},
),
SizedBox(height: 2),
_buildPopupItem(
label: "Payment Mode",
@ -400,7 +408,8 @@ class _AppHeaderState extends ConsumerState<AppHeader> {
),
const SizedBox(width: 16),
],
if (role != 'Accounts') ...[
// if (role != 'Accounts') ...[
if (!['Accounts', 'agent'].contains(role)) ...[
// Proposal button
Container(
width: 36,

4
lib/presentation/screens/Enquiry/enquiryList.dart
View File

@ -1080,7 +1080,7 @@ class EnquiryListState extends ConsumerState<EnquiryList> {
// validator: (value) => Validators.requiredField(value, "date"),
controller: controllers['startDate']!,
onDateSelected: (date) {
print("Picked Date: $date");
print("SPicked Date: $date");
controllers['startDate']?.text = DateFormat(
'dd-MM-yyyy',
@ -1124,7 +1124,7 @@ class EnquiryListState extends ConsumerState<EnquiryList> {
controller: controllers['endDate']!,
lastDate: DateTime.now(),
onDateSelected: (date) {
print("Picked Date: $date");
print("EPicked Date: $date");
controllers['endDate']?.text = DateFormat(
'dd-MM-yyyy',
).format(date);

472
lib/presentation/screens/Masters/VehicleType/vehicleList.dart Normal file
View File

@ -0,0 +1,472 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:go_router/go_router.dart';
import 'package:google_fonts/google_fonts.dart';
import 'package:nhance_partner/presentation/providers/userRoleProvider.dart';
import 'package:nhance_partner/presentation/screens/Masters/VehicleType/vehicleType.dart';
import '../../../../core/routing/routes.dart';
import '../../../../core/services/api_service.dart';
import '../../../../data/utils/Pagination.dart';
import '../../../layouts/main_layout.dart';
import '../../../layouts/responsive_layout.dart';
import '../../../providers/manager_provider.dart';
import '../../../themes/indicators/export_btn.dart';
import '../../../themes/indicators/filter_btn.dart';
import '../../../themes/indicators/search_field_theme.dart';
import '../../../themes/indicators/text_field_theme.dart';
import '../../../widgets/custom_action_popup.dart';
class VehicleTypeList extends ConsumerStatefulWidget {
const VehicleTypeList({super.key});
@override
ConsumerState<VehicleTypeList> createState() => VehicleTypeListState();
}
class VehicleTypeListState extends ConsumerState<VehicleTypeList> {
int currentPage = 1;
int itemsPerPage = 10;
late ApiService apiService;
dynamic managerId;
dynamic role;
dynamic prefid;
dynamic userId;
// List<Map<String, dynamic>> dataVal = [];
List<Map<String, dynamic>> getVehicleTypeData = [];
List<Map<String, dynamic>> originalData = [];
List<Map<String, dynamic>> filteredData = [];
bool isLoading = false;
Map<String, dynamic>? selectedVehicleType;
dynamic selectedId;
@override
void initState() {
super.initState();
apiService = ApiService();
Future.microtask(() {
final data1 = ref.read(managerIdProvider);
userId = ref.watch(userIdProvider);
// final data2 = ref.read(handlerIdProvider);
print("Edata1 => mId: $data1 -2 :");
prefid = data1;
role = ref.read(userRoleProvider);
print("E43 => mId: $prefid");
if (prefid != null && role != null) {
getVehicleType();
}
});
// getVehicleTypeList();
}
List<dynamic> get _paginatedData {
// Sort descending by id first
final sortedData = [...filteredData]
..sort((a, b) => int.parse(b['id']) - int.parse(a['id']));
if (sortedData.isEmpty) return [];
// Ensure currentPage is valid
final maxPage = (sortedData.length / itemsPerPage).ceil();
final safePage = currentPage.clamp(1, maxPage);
final startIndex = (safePage - 1) * itemsPerPage;
final endIndex = (startIndex + itemsPerPage).clamp(0, sortedData.length);
return sortedData.sublist(startIndex, endIndex);
}
void handleEdit(Map<String, dynamic> item) {
setState(() {
selectedId = item['id'];
selectedVehicleType = item;
});
}
void filterData(String query) {
setState(() {
final q = query.toLowerCase();
if (q.isEmpty) {
filteredData = getVehicleTypeData;
return;
}
filteredData = getVehicleTypeData.where((item) {
final isActiveStatus = item['is_active'] == "1" ? "active" : "inactive";
return (item['vehicle_type'] ?? '').toString().toLowerCase().contains(q) ||
isActiveStatus.contains(q);
}).toList();
});
}
final TextEditingController _searchStaffController = TextEditingController();
Future<void> getVehicleType() async {
print('getVehicleType called');
setState(() {
isLoading = true;
});
try {
final response = await apiService.fetchMasterDropDown('vehicleType');
if (response['status'] == 200) {
print('getVehicleType - ${response['data']}');
setState(() {
getVehicleTypeData = List<Map<String, dynamic>>.from(response['data']);
print('API Data - $getVehicleTypeData');
filteredData = List.from(getVehicleTypeData);
print('originalData - $filteredData');
});
} else {
getVehicleTypeData = [];
filteredData = [];
}
} catch (e) {
print('Exception occurred: $e');
} finally {
setState(() {
isLoading = false;
});
}
}
List<Widget> _buildPopupMenuActions(BuildContext context, dynamic data) {
return [
GestureDetector(
onTap: () {
Navigator.pop(context);
print('EDITStaff - ${data['id']}');
dynamic id = data['id'];
context.go('/staff/$id');
},
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
Icon(Icons.edit_sharp, color: Color(0xFF319718), size: 18),
SizedBox(width: 10),
Text('Edit'),
],
),
),
];
}
@override
Widget build(BuildContext context) {
managerId = ref.watch(managerIdProvider);
return MainLayout(
title: "Vehicle Type",
body: Container(
// padding: EdgeInsets.all(8.0),
// margin: EdgeInsets.all(10.0),
// color: Colors.yellow.shade50,
width: MediaQuery.of(context).size.width,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.start,
children: [
Container(
// height: 30,
// color: Colors.red.shade50,
width: MediaQuery.of(context).size.width,
child: GestureDetector(
onTap: () {
context.go(AppRoutes.dashboard);
},
child: Row(
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.start,
children: [
Text(
'Vehicle Type',
style: GoogleFonts.poppins(
fontSize: 14,
fontWeight: FontWeight.w500,
),
),
],
),
),
),
SizedBox(height: 5),
Expanded(
child: Container(
// color: Colors.green,
// color: Colors.green.shade50,
width: MediaQuery.of(context).size.width,
// margin: EdgeInsets.all(10.0),
decoration: BoxDecoration(
// color: Colors.white,
borderRadius: BorderRadius.circular(15.0),
),
padding: EdgeInsets.all(8.0),
child: Column(
children: [
Container(
// height: 40,
// color: Colors.pink,
child: Row(
crossAxisAlignment: CrossAxisAlignment.end,
mainAxisAlignment: MainAxisAlignment.start,
children: [
VehicleType(
key: ValueKey(selectedId),
data: selectedVehicleType,
id: selectedId,
onSubmit: () {
getVehicleType();
setState(() {
selectedVehicleType = null;
selectedId = null;
}); // reset after save
},
),
Spacer(),
ThemedSearchField(
hintText: 'Search',
// backgroundColor: Color(0xFFF6F8F8),
backgroundColor: Color(0xFFFFFFFF),
txtHeight: 30,
onChanged: filterData,
controller: _searchStaffController,
txtwidth: MediaQuery.of(context).size.width * 0.15,
),
SizedBox(width: 10),
ExportBtn(
sheetName: "VehicleType",
fileName: "vehicle_type_list",
txt: !ResponsiveLayout.isMobile(context)
? true
: false,
data: filteredData,
displayHeaders: ['S.No.', 'Vehicle Type', 'Status'],
keys: ["sno", "vehicle_type", "is_active"],
),
],
),
),
SizedBox(height: 10),
Container(
decoration: BoxDecoration(
color: Color(0xFFF1F5F9),
// color: Color(0xFFEDF6F5),
borderRadius: BorderRadius.circular(6),
),
padding: const EdgeInsets.symmetric(
vertical: 8,
horizontal: 16,
),
child: Row(
children: [
Expanded(
flex: 1,
child: Text('S.No.', style: _headerStyle),
),
Expanded(
flex: 5,
child: Text('Vehicle Type', style: _headerStyle),
),
Expanded(
flex: 2,
child: Text('Status', style: _headerStyle),
),
Expanded(
flex: 2,
child: Text('Action', style: _headerStyle),
),
],
),
),
Expanded(
child: Container(
color: Colors.white,
child: _buildDataTable(context),
),
),
],
),
),
),
Container(
// height: 20,
width: MediaQuery.of(context).size.width,
// color: Colors.green.shade50,
child: PaginationControls(
currentPage: currentPage,
itemsPerPage: itemsPerPage,
// totalItems: dataVal.length,
totalItems: filteredData.length,
// activeColor: layoutColor, // your theme color
onPageChanged: (page) {
setState(() {
currentPage = page;
});
},
onItemsPerPageChanged: (items) {
setState(() {
itemsPerPage = items;
currentPage = 1;
});
},
),
),
],
),
),
);
}
Widget _buildDataTable(BuildContext context) {
if (filteredData.isEmpty) {
return const SizedBox(
height: 50,
child: Center(child: Text('No available data')),
);
}
final sortedData = [..._paginatedData];
return ListView.builder(
// itemCount: filteredData.length + 1, // +1 for header, +1 for pagination
itemCount: sortedData.length + 1, // +1 for header, +1 for pagination
itemBuilder: (context, index) {
if (index == 0) return _buildHeader();
// if (index == dataVal.length + 1)
// return _buildPagination(context);
final startIndex = ((currentPage - 1) * itemsPerPage);
// final item = filteredData[index - 1];
final item = sortedData[index - 1];
final sno = startIndex + index;
return _buildDataRow(item, sno);
},
);
}
Widget _buildHeader() {
return SizedBox.shrink();
}
Widget _buildDataRow(Map<String, dynamic> item, sno) {
return Container(
padding: const EdgeInsets.symmetric(vertical: 1, horizontal: 16),
// margin: const EdgeInsets.only(top: 10),
decoration: BoxDecoration(
color: Colors.white,
// color: Color(0xFFE0F7F9),
border: const Border(
bottom: BorderSide(color: Colors.blueGrey, width: 0.15),
),
// borderRadius: BorderRadius.circular(8),
),
child: Row(
children: [
Expanded(flex: 1, child: Text('$sno' ?? '-', style: _dataBold)),
Expanded(flex: 5, child: Text(item['vehicle_type'] ?? '-', style: _dataBold)),
Expanded(flex: 2,
child: Row(
children: [
Container(
// color: Colors.yellow.shade50,
child: Transform.scale(
scale: 0.4, // reduce size (0.7–0.9 works well)
child: Switch(
value: item['is_active'] == "1",
onChanged: (val) {
setState(() {
item['is_active'] = val ? "1" : "0";
});
final response = apiService.updateStatusMasters(
item['id'],
val ? "0" : "1",
'VehicleType',
userId,
);
print("Response - $response");
},
activeColor: Color(0xFF2E7D6E), // thumb when active
// activeColor: Color(0xFF425B5B), // thumb when active
activeTrackColor: Color(0xFFDCFCE7), // track when active
// activeTrackColor: Color(0xFFB2D8D3), // track when active
inactiveThumbColor:
Colors.grey.shade400, // thumb when inactive
inactiveTrackColor:
Colors.grey.shade300, // track when inactive
),
),
),
],
),
),
Expanded(
flex: 2,
child: Center( // Add Center wrapper
child: Row(
mainAxisSize: MainAxisSize.min, // Add this
children: [
item['is_active'] == "1"
? Tooltip(
message: 'Edit',
child: IconButton(
icon: Image.asset(
"assets/miscellaneous/Edit.png",
height: 12,
width: 15,
),
onPressed: () {
handleEdit(item);
},
splashRadius: 28,
hoverColor: Colors.black12,
padding: const EdgeInsets.all(8),
constraints: const BoxConstraints(),
),
)
: Padding(
padding: const EdgeInsets.all(8.0), // Match IconButton padding
child: Image.asset(
"assets/miscellaneous/Edit_muted.png",
height: 12,
width: 15,
),
),
],
),
),
),
],
),
);
}
static final _dataSub = GoogleFonts.inter(
fontSize: 10,
fontWeight: FontWeight.w300,
color: Color(0xFF585757),
);
static final _dataBold = GoogleFonts.inter(
fontSize: 11.5,
fontWeight: FontWeight.w400,
color: Color(0xFF000000),
);
static final _headerStyle = GoogleFonts.poppins(
fontSize: 11.2,
fontWeight: FontWeight.w500,
color: Color(0xFF1E293B),
);
}

346
lib/presentation/screens/Masters/VehicleType/vehicleType.dart Normal file
View File

@ -0,0 +1,346 @@
import 'dart:convert';
// import 'dart:io' as html;
import 'dart:typed_data'; // Import for Uint8List
import 'package:dropdown_search/dropdown_search.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:go_router/go_router.dart';
import 'package:google_fonts/google_fonts.dart';
import 'package:http/http.dart' as http;
import 'package:nhance_partner/core/routing/routes.dart';
import 'package:nhance_partner/data/utils/toastNotification.dart';
import 'package:nhance_partner/presentation/themes/indicators/text_field_theme.dart';
import 'package:nhance_partner/presentation/themes/indicators/text_field_theme_inline_editor.dart';
import '../../../../core/config/env.dart';
import '../../../../core/services/api_service.dart';
import '../../../../data/services/auth_service.dart';
import '../../../../data/utils/validators.dart';
import '../../../layouts/main_layout.dart';
import '../../../layouts/responsive_layout.dart';
import '../../../providers/manager_provider.dart';
import 'package:universal_html/html.dart' as html;
import '../../../themes/indicators/input_field_decoration.dart';
class VehicleType extends ConsumerStatefulWidget {
final String? id;
final Map<String, dynamic>? data;
final VoidCallback onSubmit;
const VehicleType({super.key, this.id, this.data, required this.onSubmit});
@override
ConsumerState<VehicleType> createState() => VehicleTypeState();
}
class VehicleTypeState extends ConsumerState<VehicleType> {
final _formKey = GlobalKey<FormState>();
late ApiService apiService;
final GlobalKey<DropdownSearchState<Map<String, dynamic>>> dropDownKey =
GlobalKey<DropdownSearchState<Map<String, dynamic>>>();
final GlobalKey<DropdownSearchState<Map<String, dynamic>>>
dropDownKeyHandler = GlobalKey<DropdownSearchState<Map<String, dynamic>>>();
List<String> tabHeader = ['vehicle_type'];
late String isActive = "1";
String? selectedFileNames;
dynamic selectedId;
String? _token;
bool isLoading = false;
bool showHandler = false;
String? selectedRole;
List<Map<String, dynamic>> filteredRolesData = [];
List<Map<String, dynamic>> getRolesData = [];
List<dynamic>? selectedHandlerIds = [];
String? selectedHandler;
List<Map<String, dynamic>> filteredHandlersData = [];
List<Map<String, dynamic>> getHandlersData = [];
Map<String, TextEditingController> controllers = {};
dynamic userId;
dynamic managerId;
Map<String, dynamic> dataDetails() {
final data = {
"vehicle_type": controllers["vehicle_type"]?.text,
"is_active": isActive,
};
return data;
}
@override
void initState() {
super.initState();
apiService = ApiService();
for (String field in tabHeader) {
controllers[field] = TextEditingController();
}
_initializeToken();
updateData();
Future.microtask(() {
managerId = ref.watch(managerIdProvider);
userId = ref.watch(userIdProvider);
if (managerId != null) {
print('hansles');
// getHandlers(managerId);
}
});
}
Future<void> _initializeToken() async {
_token = await AuthService.getToken();
print("APISERTOKEN - $_token");
}
void updateData() async {
if (widget.data != null) {
dynamic id = widget.data?['id'];
final data = widget.data;
if (data == null) return;
setState(() {
selectedId = id;
controllers['vehicle_type']?.text = data['vehicle_type'] ?? '';
controllers["is_active"]?.text = data['is_active'].toString();
});
}
}
Future<void> handleSave() async {
if (controllers['vehicle_type'] == null ||
controllers['vehicle_type']!.text.trim().isEmpty) {
ToastHelper.showWarningToast(context, "Vehicle Type is required");
return;
}
if (!_formKey.currentState!.validate()) return;
setState(() {
if (_formKey.currentState!.validate()) {
dataDetails();
final dataSet = dataDetails();
print("dataSetAgent - $dataSet");
print("TYPE of is_active → ${dataSet['is_active'].runtimeType}");
print("TYPE of value → ${dataSet['value'].runtimeType}");
createUserData(dataSet);
} else {
// isDisable = false;
}
});
}
// Future<void> handleSave() async {
// // if (controllers['name'] != null && controllers['name'] != '') {
// // return;
// // }
// if (!_formKey.currentState!.validate()) return;
// setState(() {
// if (_formKey.currentState!.validate()) {
// dataDetails();
// final dataSet = dataDetails();
// print("dataSetAgent - $dataSet");
//
// print("TYPE of is_active → ${dataSet['is_active'].runtimeType}");
// print("TYPE of vehicle_type → ${dataSet['vehicle_type'].runtimeType}");
// createUserData(dataSet);
// } else {
// // isDisable = false;
// }
// });
// }
void refresh() {
print('REfresj');
widget.onSubmit();
setState(() {
// clear all text controllers
for (var controller in controllers.values) {
controller.clear();
} // 👈 clear selected agent
controllers['vehicle_type']?.clear();
});
}
Future<void> createUserData(data) async {
final bool isUpdating = selectedId != null;
final dynamic id = isUpdating ? int.tryParse(selectedId.toString()) : 0;
final String apiUrldata;
print("TYPE of id → $id - ${id.runtimeType}");
print("TYPE of id → $userId - ${userId.runtimeType}");
apiUrldata = isUpdating
? '${Env.apiUrl}/master/updateVehicleType/$selectedId'
: '${Env.apiUrl}/master/createVehicleType';
// final token = await getToken(); // Fetch token
if (_token == null) {
throw Exception('Token not found. Please log in.');
}
if (isUpdating) {
data['updated_by'] = userId.toString();
} else {
data['created_by'] = userId.toString();
}
print("data------- $data}");
try {
final response = await http.post(
Uri.parse(apiUrldata),
headers: {
'Authorization': 'Bearer $_token',
'Content-Type': 'application/json',
'app-signature': Env.App_Signature,
},
body: jsonEncode(data), // Convert map to JSON
);
if (response.statusCode == 200) {
final responseBody = jsonDecode(response.body);
final message = responseBody['message'];
print("VehicleType submitted successfully!");
print("Response: ${response.body}");
if (responseBody['status'] == 200) {
refresh();
isUpdating
? ToastHelper.showSuccessToast(context, message)
: ToastHelper.showSuccessToast(context, message);
} else {
print("Failed to submit plan. Status: ${response.statusCode}");
print("Error: ${response.body}");
showDialog(
context: context,
builder: (BuildContext context) {
return AlertDialog(
title: Text("Vehicle Type Creation Failed"),
content: Text(message),
actions: [
TextButton(
child: Text("OK"),
onPressed: () {
Navigator.of(context).pop();
},
),
],
);
},
);
}
} else if (response.statusCode == 403) {
await apiService.clearLocalStorageAndRedirect();
}
} catch (e) {
print(" Error submitting Staff: $e");
}
}
@override
void dispose() {
for (var controller in controllers.values) {
controller.dispose();
}
super.dispose();
}
@override
Widget build(BuildContext context) {
return Container(
child: Row(
mainAxisAlignment: MainAxisAlignment.end,
crossAxisAlignment: CrossAxisAlignment.end,
children: [
buildFormFields(),
SizedBox(width: 5),
InkWell(
onTap: () {
handleSave();
},
child: Container(
padding: EdgeInsets.symmetric(horizontal: 15.0, vertical: 6),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(8.0),
color: Color(0xFF2E7D6E),
),
child: Text(
'Save',
style: GoogleFonts.inter(color: Colors.white, fontSize: 10),
),
),
),
SizedBox(width: 5),
InkWell(
onTap: () {
refresh();
},
child: Container(
padding: EdgeInsets.all(6.0),
decoration: BoxDecoration(
color: const Color(0xFF2E7D6E),
borderRadius: BorderRadius.circular(5.0),
),
child: Icon(Icons.refresh, size: 13, color: Colors.white),
),
),
],
),
);
}
Widget buildFormFields() {
return Form(
key: _formKey,
child: Row(
children: [buildVehicleTypeName()],
),
);
}
Widget buildVehicleTypeName() {
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text("Vehicle Type *", style: _textStyle),
SizedBox(width: 10),
SizedBox(
child: ThemedFormInlineField(
controller: controllers['vehicle_type']!,
validator: (value) => Validators.requiredField(value, "vehicle_type"),
txtwidth: MediaQuery.of(context).size.width * 0.15,
inputFormatters: [
// This line now allows letters, numbers, hyphens, underscores, and spaces
FilteringTextInputFormatter.allow(RegExp(r'[a-zA-Z0-9\-_ ]')),
],
borderColor: Color(0xFFE2E8F0),
highlightColor: Color(0xFF50A398),
// txtheight: 30,
isdense: true,
errFieldHgt: 0,
),
),
],
);
}
static final _textStyle = GoogleFonts.inter(
fontSize: 11,
fontWeight: FontWeight.w600,
);
}

18
lib/presentation/screens/UserManagement/Agent/agentList.dart
View File

@ -323,20 +323,21 @@ class AgentListState extends ConsumerState<AgentList> {
data: filteredData,
displayHeaders: [
'S.No.',
'Partner Id',
'Partner Name',
'Email',
'Phone Number',
'Id',
'Retention Rate',
'Address',
'Status',
],
keys: [
"sno", // handled internally as i + 1
"agent_code",
"name",
"email",
"mobile",
"agent_code",
"retention_rate",
"address",
"is_active",
@ -404,6 +405,10 @@ class AgentListState extends ConsumerState<AgentList> {
flex: 1,
child: Text('S.No.', style: _headerStyle),
),
Expanded(
flex: 1,
child: Text('Partner Id', style: _headerStyle),
),
Expanded(
flex: 2,
child: Text('Partner Name', style: _headerStyle),
@ -416,10 +421,6 @@ class AgentListState extends ConsumerState<AgentList> {
flex: 2,
child: Text('Phone Number', style: _headerStyle),
),
Expanded(
flex: 1,
child: Text('Id', style: _headerStyle),
),
Expanded(
flex: 1,
child: Text(
@ -534,6 +535,7 @@ class AgentListState extends ConsumerState<AgentList> {
child: Row(
children: [
Expanded(flex: 1, child: Text('$sno' ?? '-', style: _dataBold)),
Expanded(flex: 1, child: Text(item['agent_code'] ?? '-', style: _dataBold)),
Expanded(flex: 2, child: Text(item['name'] ?? '-', style: _dataBold)),
Expanded(
flex: 3,
@ -543,10 +545,6 @@ class AgentListState extends ConsumerState<AgentList> {
flex: 2,
child: Text(item['mobile'] ?? '-', style: _dataBold),
),
Expanded(
flex: 1,
child: Text(item['agent_code'] ?? '-', style: _dataBold),
),
Expanded(
flex: 1,
child: Text(item['retention_rate'] ?? '-', style: _dataBold),

58
lib/presentation/screens/payout/payout_screen.dart
View File

@ -108,40 +108,44 @@ class _PayOutScreenState extends ConsumerState<PayOutScreen> {
for (String field in tabHeader) {
controllers[field] = TextEditingController();
}
// invoiceNoController = TextEditingController(text: generateInvoiceNumber());
Future.microtask(() async {
managerId = ref.watch(managerIdProvider);
userId = ref.watch(userIdProvider);
managerId = ref.read(managerIdProvider);
roleId = ref.read(userRoleProvider);
userId = ref.read(userIdProvider);
print('PayOutScreen => managerId: $managerId');
if (managerId != null) {
getAgentList(managerId);
getPosList(managerId);
}
await getBroker();
// ✅ EDIT MODE (MUST be here)
if (widget.editItem != null) {
print('editItemID ${widget.editItem}');
final invoiceID = widget.editItem!['id'];
final brokerID = widget.editItem!['broker_id'];
controllers['invoiceNo']?.text =
widget.editItem!['invoice_no'];
controllers['invoiceDate']?.text =
widget.editItem!['invoice_date_ui_format'];
controllers['invoiceStatus']?.text =
widget.editItem!['payout_status'];
_loadEditData(invoiceID, brokerID, managerId); // ✅ managerId ready
}
});
// 👉 CHECK EDIT MODE
if (widget.editItem != null) {
print('editItemID ${widget.editItem}');
final invoiceID = widget.editItem!['id'];
final brokerID = widget.editItem!['broker_id'];
// Invoice No
controllers['invoiceNo']?.text = widget.editItem!['invoice_no'];
// Invoice Date (UI format)
controllers['invoiceDate']?.text =
widget.editItem!['invoice_date_ui_format'];
controllers['invoiceStatus']?.text = widget.editItem!['payout_status'];
print('invoiceID $invoiceID');
print('brokerID $brokerID');
_loadEditData(invoiceID, brokerID,managerId);
}
}
void filterPolicyData(String query) {
final lowerQuery = query.toLowerCase();
@ -182,7 +186,7 @@ class _PayOutScreenState extends ConsumerState<PayOutScreen> {
}
Future<void> getPosList(int id) async {
print('E104 => Fns called => $id');
print('H104 => Fns called => $id');
final val = 'dropDown';
setState(() {
@ -232,13 +236,14 @@ class _PayOutScreenState extends ConsumerState<PayOutScreen> {
void _loadEditData(String invoiceID, brokerID, managerID) async {
setState(() => isLoadingEditData = true);
print("H010 => r : $roleId | mId: $managerID | ParmMID: $managerID | uId: $userId ");
print('_loadEditData');
final jsondata = {
// "id": invoiceID,
"invoice_id": invoiceID,
"broker_id": int.tryParse(brokerID ?? ''),
"manager_id": managerID
"manager_id": managerId
// "issued_date": formattedTillDate,
};
@ -468,6 +473,7 @@ class _PayOutScreenState extends ConsumerState<PayOutScreen> {
// Load policies (simulate API)
Future<void> loadPolicies() async {
print('loadPolicies');
print("H13 => r : $roleId | mId: $managerId | uId: $userId ");
try {
final List<int> agentIds = (selectedAgentId ?? [])
.map((e) => int.parse(e))

60
lib/presentation/screens/staff/Enquiry/enquiry_inline_list.dart
View File

@ -53,7 +53,7 @@ class EnquiryListStaffInline extends ConsumerStatefulWidget {
class EnquiryStaffState extends ConsumerState<EnquiryListStaffInline> {
// bool fromDashboard = false;
bool _dashboardInitHandled = false;
bool _resetKeyEnable = false;
bool _resetKeyEnable = false; // very first
int currentPage = 1;
int itemsPerPage = 10;
// int itemsPerPage = 5;
@ -682,6 +682,8 @@ class EnquiryStaffState extends ConsumerState<EnquiryListStaffInline> {
fromDt = _dashboardInitHandled ? controllers['startDate']?.text : '';
toDt = _dashboardInitHandled ? controllers['endDate']?.text : '';
print('End Date: ${controllers['endDate']?.text}');
print('STT Date: ${controllers['startDate']?.text}');
print('PrevPending FROM TO - $fromDt - $toDt');
} else if (dashboardKey != 'fromDashboard' &&
@ -691,27 +693,28 @@ class EnquiryStaffState extends ConsumerState<EnquiryListStaffInline> {
print('A1013 => Fns called => $managerId | $role');
final today = DateTime.now();
fromDt = dateFormat.format(today.subtract(Duration(days: 5)));
fromDt = dateFormat.format(today.subtract(Duration(days: 4)));
// fromDt = dateFormat.format(today);
toDt = dateFormat.format(today);
print('Enq FROM TO - $fromDt - $toDt');
} else {
print('A1113 => Fns called => $managerId | $role');
print('Enq 1- $fromDt - $toDt');
print('Pre Date its User Choosen Enq Inline list - $fromDt - $toDt');
if(_resetKeyEnable = true){
if (_resetKeyEnable) {
final dateFormat = DateFormat('dd-MM-yyyy');
final today = DateTime.now();
final yesterday = today.subtract(Duration(days: 1));
// final yesterday = today.subtract(Duration(days: 1));
// fromDt = dateFormat.format(yesterday.subtract(Duration(days: 15))); // Dont Delete any doubt Ref Suren
fromDt = dateFormat.format(today.subtract(const Duration(days: 4)));
toDt = dateFormat.format(today);
fromDt = dateFormat.format(yesterday.subtract(Duration(days: 15)));
toDt = dateFormat.format(yesterday);
setState(() {
controllers['startDate']?.text = fromDt;
controllers['endDate']?.text = toDt;
_resetKeyEnable = false; // ask suren Never forgot
});
} else {
fromDt = fromDateVal;
toDt = toDateVal;
@ -827,6 +830,40 @@ class EnquiryStaffState extends ConsumerState<EnquiryListStaffInline> {
}
void _applyFilter(String query) {
setState(() {
final List<dynamic> source = (selectedIndex == 0) ? inProgressData : completedData;
final String q = query.trim().toLowerCase();
completedCurrentPage = 1;
if (q.length < 2) {
filteredData = List<Map<String, dynamic>>.from(source);
return;
}
// 1. Filter the list
List<dynamic> results = source.where((item) {
final map = item as Map<String, dynamic>;
// Get the field values safely
String regNo = safeString(map['reg_no']).toLowerCase().trim();
String agentName = safeString(map['agent_name']).toLowerCase().trim();
// IF CONDITION: Check if query is exactly "new"
if (q == "new") {
// Only return items where the field is EXACTLY "new"
return regNo == "new" || agentName == "new";
} else {
// Regular partial search for any other query
return regNo.contains(q) || agentName.contains(q);
}
}).toList();
// 2. Final Type Casting to fix your "dynamic" error
filteredData = results.map((e) => e as Map<String, dynamic>).toList();
});
}
void _applyFilter_05012026(String query) {
print("FilterData - $query");
setState(() {
@ -2497,9 +2534,9 @@ class EnquiryStaffState extends ConsumerState<EnquiryListStaffInline> {
}
String formatEnquiryStatus(String? status) {
if (status == null) return '-';
if (status == null || status.trim().isEmpty) return '-';
switch (status.toLowerCase()) {
switch (status.trim().toLowerCase()) {
case 'to be assigned':
return 'To Be Assigned';
case 'in progress':
@ -2538,7 +2575,8 @@ class EnquiryStaffState extends ConsumerState<EnquiryListStaffInline> {
mainAxisAlignment: MainAxisAlignment.center,
children: [
Text(
item['enquiry_status'] ?? '-',
// item['enquiry_status'] ?? '-',
formatEnquiryStatus(item['enquiry_status']),
style: GoogleFonts.inter(
fontSize: 10,
color: Color(0XFF1e293b),

32
lib/presentation/screens/staff/assignStaff.dart
View File

@ -82,8 +82,8 @@ class _AddDialogState extends ConsumerState<AssignStaffDialog> {
final data = {
"id": widget.enquiryPrimaryId,
"assigned_to": selectedStaff,
// "insurer_id": selectedInsurer,
// "broker_id": selectedBroker,
"insurer_id": selectedInsurer,
"broker_id": selectedBroker,
"updated_by": widget.userId,
};
return data;
@ -230,8 +230,9 @@ class _AddDialogState extends ConsumerState<AssignStaffDialog> {
if (_formKey.currentState!.validate()) {
dataDetails();
final dataSet = dataDetails();
print("dataSetAgent - $dataSet");
// print("managerId - $managerId ,userId - $userId ");
print("b4 - $dataSet");
dataSet['from_dashboard_enquiry_status'] = 'Assigned';
print("Atr - $dataSet");
createUserData(dataSet);
} else {
// isDi sable = false;
@ -244,6 +245,7 @@ class _AddDialogState extends ConsumerState<AssignStaffDialog> {
final String apiUrldata;
apiUrldata = '${Env.apiUrl}enquiry/enquiryAssignUpdate';
// apiUrldata = 'http://localhost/nhance_partner_be/enquiry/enquiryAssignUpdate';
// final token = await getToken(); // Fetch token
@ -406,8 +408,8 @@ class _AddDialogState extends ConsumerState<AssignStaffDialog> {
children: [
buildRegistrationNumber(context),
buildSelectStaffMem(context),
// buildInsurer(context),
// buildBroker(context),
buildInsurer(context),
buildBroker(context),
],
),
);
@ -514,9 +516,9 @@ class _AddDialogState extends ConsumerState<AssignStaffDialog> {
label: "Select Staff Member",
).copyWith(
filled: true,
fillColor: Color(
0xFFEDF6F5,
), // 👈 makes the dropdown input white
fillColor: Color( 0xFFEDF6F5,), // 👈 makes the dropdown input white
isDense: true, // 👈 Makes the field compact
contentPadding: const EdgeInsets.symmetric(horizontal: 15, vertical: 0), // 👈 Vertical 0 helps center the text
),
),
@ -619,9 +621,9 @@ class _AddDialogState extends ConsumerState<AssignStaffDialog> {
label: "Select Insurer",
).copyWith(
filled: true,
fillColor: Color(
0xFFEDF6F5,
), // 👈 makes the dropdown input white
fillColor: Color(0xFFEDF6F5), // 👈 makes the dropdown input white
isDense: true, // 👈 Makes the field compact
contentPadding: const EdgeInsets.symmetric(horizontal: 15, vertical: 0), // 👈 Vertical 0 helps center the text
),
),
@ -723,9 +725,9 @@ class _AddDialogState extends ConsumerState<AssignStaffDialog> {
label: "Select Broker",
).copyWith(
filled: true,
fillColor: Color(
0xFFEDF6F5,
), // 👈 makes the dropdown input white
fillColor: Color(0xFFEDF6F5,), // 👈 makes the dropdown input white
isDense: true, // 👈 Makes the field compact
contentPadding: const EdgeInsets.symmetric(horizontal: 15, vertical: 0), // 👈 Vertical 0 helps center the text
),
),

8
lib/presentation/widgets/custom_Stdate_EnDate_Filter.dart
View File

@ -277,7 +277,7 @@ class _DateFilterRowState extends ConsumerState<DateFilterRow> {
// validator: (value) => Validators.requiredField(value, "date"),
controller: widget.startController,
onDateSelected: (date) {
print("Picked Date: $date");
print("SPicked Date: $date");
widget.startController.text = DateFormat(
'dd-MM-yyyy',
).format(date);
@ -322,9 +322,9 @@ class _DateFilterRowState extends ConsumerState<DateFilterRow> {
},
controller: widget.endController,
lastDate: DateTime.now(),
onDateSelected: (date) {
print("Picked Date: $date");
widget.endController.text = DateFormat('dd-MM-yyyy').format(date);
onDateSelected: (edate) {
print("EPicked Date: $edate");
widget.endController.text = DateFormat('dd-MM-yyyy').format(edate);
Future.microtask(() => widget.onFilter());
// controllers['date']?.text = date as String;
},

3
lib/presentation/widgets/topbar.dart
View File

@ -143,7 +143,8 @@ class _TopBarState extends ConsumerState<TopBar> {
),
],
SizedBox(width: 10),
if (role != 'Accounts') ...[
// if (role != 'Accounts') ...[
if (!['Accounts', 'agent'].contains(role)) ...[
// Proposal button
Container(
width: 36,