saroj.sutar
/
inbound.sahyog.ui
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

generate pagination done

dev_ankit^2
Priya Chetiwal 2025-02-07 15:01:41 +05:30
parent 5be06c49ec
commit 039e7be559
6 changed files with 359 additions and 291 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

400
lib/feature/presentation/screens/transporter/view/sub_views/generate_fright_bill.dart
View File

@ -333,10 +333,6 @@ class GenerateFrightBill extends StatelessWidget {
child: Center(child: Text(controller.errorMessage.value))); child: Center(child: Text(controller.errorMessage.value)));
} }
if (controller.grnDetails.isEmpty) { if (controller.grnDetails.isEmpty) {
return SizedBox( return SizedBox(
height: controller.isFilterVisibleGenerateFreight.value height: controller.isFilterVisibleGenerateFreight.value
? MediaQuery.sizeOf(context).height * 0.4 ? MediaQuery.sizeOf(context).height * 0.4
@ -348,206 +344,226 @@ class GenerateFrightBill extends StatelessWidget {
); );
} }
return Column( return Column(
mainAxisAlignment: MainAxisAlignment.end,
crossAxisAlignment: CrossAxisAlignment.end,
children: [ children: [
Container( SizedBox(
padding: EdgeInsets.symmetric(horizontal: 10), width: MediaQuery.sizeOf(context).width,
margin: EdgeInsets.only(top: 16), height: controller.isFilterVisibleGenerateFreight.value == true
height: 45, ? MediaQuery.of(context).size.height * 0.3
color: AppColors.primaryClr, : MediaQuery.of(context).size.height * 0.64,
child: Row( child: Column(
children: [ children: [
TextView( Container(
text: AppStrings.viewGrnDetails, padding: EdgeInsets.symmetric(horizontal: 10),
style: 14.txtBoldWhite), margin: EdgeInsets.only(top: 16),
Spacer(), height: 45,
CommonBtn( color: AppColors.primaryClr,
width: 150, child: Row(
bkClr: AppColors.white, children: [
borderClr: AppColors.primaryClr, TextView(
style: 12.txtBoldBlue, text: AppStrings.viewGrnDetails,
text: "Generate Freight Bill", style: 14.txtBoldWhite),
clickAction: () { Spacer(),
bool hasSelectedRows = controller.grnDetails CommonBtn(
.any((element) => element.isSelected); width: 150,
if (!hasSelectedRows) { bkClr: AppColors.white,
showPopup( borderClr: AppColors.primaryClr,
context: context, style: 12.txtBoldBlue,
onClick: () { text: "Generate Freight Bill",
Get.back(); clickAction: () {
}); bool hasSelectedRows = controller.grnDetails
} else { .any((element) => element.isSelected);
CommonAlertDialog.showDialog( if (!hasSelectedRows) {
dismissable: false, showPopup(
message: "Are you sure want to\nsave this?", context: context,
positiveText: "Save", onClick: () {
negativeText: "Cancel", Get.back();
positiveBtCallback: () { });
Get.back(); } else {
controller.addFreightBill(); CommonAlertDialog.showDialog(
showFreightBill(context); dismissable: false,
}, message:
negativeBtCallback: () { "Are you sure want to\nsave this?",
Get.back(); positiveText: "Save",
}); negativeText: "Cancel",
} positiveBtCallback: () {
}), Get.back();
], controller.addFreightBill();
), showFreightBill(context);
), },
Container( negativeBtCallback: () {
margin: EdgeInsets.only(bottom: 16, top: 16), Get.back();
height: });
controller.isFilterVisibleGenerateFreight.value == true }
? MediaQuery.of(context).size.height * 0.3 }),
: MediaQuery.of(context).size.height * 0.64, ],
child: RawScrollbar( ),
thumbColor: AppColors.clrD9, ),
radius: Radius.circular(2), Container(
trackVisibility: true, margin: EdgeInsets.only(bottom: 16, top: 16),
thumbVisibility: true, child: RawScrollbar(
thickness: 14, thumbColor: AppColors.clrD9,
controller: controller.verticalScrollController, radius: Radius.circular(2),
child: SingleChildScrollView( trackVisibility: true,
controller: controller.verticalScrollController, thumbVisibility: true,
child: RawScrollbar( thickness: 14,
thumbColor: AppColors.clrD9, controller: controller.verticalScrollController,
radius: Radius.circular(2), child: SingleChildScrollView(
thickness: 14, controller: controller.verticalScrollController,
trackVisibility: true, child: RawScrollbar(
thumbVisibility: true, thumbColor: AppColors.clrD9,
controller: controller.horizontalScrollController, radius: Radius.circular(2),
child: SingleChildScrollView( thickness: 14,
scrollDirection: Axis.horizontal, trackVisibility: true,
controller: controller.horizontalScrollController, thumbVisibility: true,
child: Container( controller: controller.horizontalScrollController,
margin: EdgeInsets.only(bottom: 24), child: SingleChildScrollView(
decoration: BoxDecoration( scrollDirection: Axis.horizontal,
border: Border.all( controller: controller.horizontalScrollController,
color: Colors.grey.shade400, child: Container(
width: 1.0, margin: EdgeInsets.only(bottom: 24),
), decoration: BoxDecoration(
), border: Border.all(
child: DataTable( color: Colors.grey.shade400,
dataRowHeight: 40, width: 1.0,
headingRowHeight: 40,
headingRowColor:
WidgetStateProperty.all(AppColors.clrF2),
border: TableBorder(
horizontalInside:
BorderSide(color: AppColors.clrGrey),
verticalInside:
BorderSide(color: AppColors.clrGrey),
bottom: BorderSide(color: AppColors.clrGrey),
left: BorderSide(color: AppColors.clrGrey),
right: BorderSide(color: AppColors.clrGrey),
top: BorderSide(color: AppColors.clrGrey),
),
columns: [
DataColumn(
label: Transform.scale(
scale: 0.80,
child: Checkbox(
value: controller.selectAllField.value,
onChanged: (value) {
controller.selectAll(value ?? false);
},
activeColor: AppColors.primaryClr,
checkColor: Colors.white,
materialTapTargetSize: MaterialTapTargetSize
.shrinkWrap,
), ),
), ),
), child: DataTable(
// dataColumn(AppStrings.srNo), dataRowHeight: 40,
dataColumn(AppStrings.mrnNo), headingRowHeight: 40,
dataColumn(AppStrings.plantNo), headingRowColor:
dataColumn(AppStrings.product), WidgetStateProperty.all(AppColors.clrF2),
dataColumn(AppStrings.date), border: TableBorder(
dataColumn(AppStrings.fromLocation), horizontalInside:
dataColumn(AppStrings.vehicleNo), BorderSide(color: AppColors.clrGrey),
dataColumn(AppStrings.transporterLrNo), verticalInside:
dataColumn(AppStrings.transporterLrNoDate), BorderSide(color: AppColors.clrGrey),
dataColumn(AppStrings.dispQty), bottom:
dataColumn(AppStrings.netQty), BorderSide(color: AppColors.clrGrey),
dataColumn(AppStrings.billingQty), left: BorderSide(color: AppColors.clrGrey),
dataColumn(AppStrings.uom), right: BorderSide(color: AppColors.clrGrey),
dataColumn(AppStrings.freightRate), top: BorderSide(color: AppColors.clrGrey),
dataColumn(AppStrings.freightAmount), ),
], columns: [
rows: List<DataRow>.generate( DataColumn(
controller.grnDetails.length, (index) { label: Transform.scale(
final stoppage = controller.grnDetails[index]; scale: 0.80,
return DataRow( child: Checkbox(
selected: stoppage.isSelected, value:
cells: [ controller.selectAllField.value,
DataCell( onChanged: (value) {
Transform.scale( controller
scale: 0.80, .selectAll(value ?? false);
child: Checkbox( },
value: stoppage.isSelected, activeColor: AppColors.primaryClr,
onChanged: (value) { checkColor: Colors.white,
controller.toggleSelection( materialTapTargetSize:
index, value ?? false); MaterialTapTargetSize.shrinkWrap,
}, ),
activeColor: AppColors.primaryClr,
checkColor: Colors.white,
materialTapTargetSize:
MaterialTapTargetSize.shrinkWrap,
), ),
), ),
), // dataColumn(AppStrings.srNo),
// editableCell(index, "0${index + 1}"), dataColumn(AppStrings.mrnNo),
editableCell(index, stoppage.grnNo ?? ""), dataColumn(AppStrings.plantNo),
editableCell( dataColumn(AppStrings.product),
index, stoppage.plantCode ?? ""), dataColumn(AppStrings.date),
editableCell( dataColumn(AppStrings.fromLocation),
index, stoppage.materialCode ?? ""), dataColumn(AppStrings.vehicleNo),
editableCell( dataColumn(AppStrings.transporterLrNo),
index, dataColumn(AppStrings.transporterLrNoDate),
DateFormat('yyyy-MM-dd').format( dataColumn(AppStrings.dispQty),
stoppage.grnDate ?? dataColumn(AppStrings.netQty),
DateTime.now())), dataColumn(AppStrings.billingQty),
editableCell( dataColumn(AppStrings.uom),
index, stoppage.fromLocation ?? ""), dataColumn(AppStrings.freightRate),
editableCell( dataColumn(AppStrings.freightAmount),
index, stoppage.vehicleNo ?? ""), ],
editableCell(index, stoppage.lrNo ?? ""), rows: List<DataRow>.generate(
editableCell( controller.grnDetails.length, (index) {
index, final stoppage =
DateFormat('yyyy-MM-dd').format( controller.grnDetails[index];
stoppage.lrDate ?? DateTime.now())), return DataRow(
editableCell(index, selected: stoppage.isSelected,
stoppage.dispQty?.toString() ?? ""), cells: [
editableCell(index, DataCell(
stoppage.netQty?.toString() ?? ""), Transform.scale(
editableCell(index, scale: 0.80,
stoppage.billingQty?.toString() ?? ""), child: Checkbox(
editableCell(index, "-"), value: stoppage.isSelected,
editableCell(index, onChanged: (value) {
stoppage.freightRate?.toString() ?? ""), controller.toggleSelection(
editableCell( index, value ?? false);
index, },
stoppage.shipmentCost?.toString() ?? activeColor: AppColors.primaryClr,
""), checkColor: Colors.white,
], materialTapTargetSize:
); MaterialTapTargetSize
}), .shrinkWrap,
),
),
),
// editableCell(index, "0${index + 1}"),
editableCell(
index, stoppage.grnNo ?? ""),
editableCell(
index, stoppage.plantCode ?? ""),
editableCell(
index, stoppage.materialCode ?? ""),
editableCell(
index,
DateFormat('yyyy-MM-dd').format(
stoppage.grnDate ??
DateTime.now())),
editableCell(
index, stoppage.fromLocation ?? ""),
editableCell(
index, stoppage.vehicleNo ?? ""),
editableCell(
index, stoppage.lrNo ?? ""),
editableCell(
index,
DateFormat('yyyy-MM-dd').format(
stoppage.lrDate ??
DateTime.now())),
editableCell(index,
stoppage.dispQty?.toString() ?? ""),
editableCell(index,
stoppage.netQty?.toString() ?? ""),
editableCell(
index,
stoppage.billingQty?.toString() ??
""),
editableCell(index, "-"),
editableCell(
index,
stoppage.freightRate?.toString() ??
""),
editableCell(
index,
stoppage.shipmentCost?.toString() ??
""),
],
);
}),
),
),
),
), ),
), ),
), ),
), ),
), ],
), ),
), ),
CustomPagination( Padding(
currentPage: controller.currentPageViewFreight.value + 1, padding: EdgeInsets.only(bottom: 4),
totalPages: controller.totalPagesViewFreight.value, child: CustomPagination(
onPageChanged: (page) { currentPage: controller.currentPageGenerateFreight.value + 1,
controller.viewFreightView(page: page - 1); totalPages: controller.totalPagesGenerateFreight.value,
}, onPageChanged: (page) {
), controller.postData(page: page - 1);
},
),
)
], ],
); );
}), }),

14
lib/feature/presentation/screens/transporter/view/sub_views/pending_generation.dart
View File

@ -524,13 +524,13 @@ class PendingGeneration extends StatelessWidget {
], ],
); );
}), }),
// CustomPagination( CustomPagination(
// currentPage: controller.currentPage.value, currentPage: controller.currentPagePendingFreight.value,
// totalPages: controller.totalPages.value, totalPages: controller.totalPagesPendingFreight.value,
// onPageChanged: (int page) { onPageChanged: (int page) {
// // controller.onPageChanged(page); controller.grnPending(page: page -1);
// }, },
// ), ),
], ],
); );
} }

50
lib/feature/presentation/screens/transporter/view/transport_view.dart
View File

@ -161,8 +161,7 @@ class _TransportViewState extends State<TransportView> {
child: Column( child: Column(
children: [ children: [
Container( Container(
color: Colors.white, // padding: EdgeInsets.only(bottom: 16),
padding: EdgeInsets.only(bottom: 16),
margin: EdgeInsets.all(16), margin: EdgeInsets.all(16),
child: Column( child: Column(
children: [ children: [
@ -258,26 +257,35 @@ class _TransportViewState extends State<TransportView> {
), ),
), ),
Obx( Obx(
() => SimpleDropdown( () => ctrl.selectedUser.value == 0
? SimpleDropdown(
onSelected: (newValue) { onSelected: (newValue) {
ctrl.selectedDropdownItemViewFreight.value = newValue; ctrl.selectedDropdownItemGenerateFreight.value =
ctrl.viewFreightView(); newValue;
}, ctrl.postData();
items: ctrl.selectElementSize, },
selectedItem: ctrl.selectedDropdownItemViewFreight.value, items: ctrl.selectElementSize,
), selectedItem:
ctrl.selectedDropdownItemGenerateFreight.value,
)
: ctrl.selectedUser.value == 1
? SimpleDropdown(
onSelected: (newValue) {
ctrl.selectedDropdownItemViewFreight
.value = newValue;
ctrl.viewFreightView();
},
items: ctrl.selectElementSize,
selectedItem: ctrl
.selectedDropdownItemViewFreight.value,
)
: ctrl.selectedUser.value == 2
? Text('data')
: Text('data'),
),
SizedBox(
width: 10,
), ),
// Obx(() => SimpleDropdown<int>(
// items: [1, 2, 3, 4],
// selectedItem: ctrl. selectedDropdownItem.value, // Bind external state
// onSelected: (val) => ctrl. selectedDropdownItem.value = val,
// width: 150,
// borderClr: Colors.blue,
// )),
SizedBox(width: 10,),
], ],
), ),
), ),

125
lib/feature/presentation/screens/transporter/view_model/transport_controller.dart
View File

@ -153,9 +153,10 @@ class TransportController extends GetxController {
getInvoiceView(); getInvoiceView();
super.onInit(); super.onInit();
} }
Rxn<int> selectedDropdownItemViewFreight = Rxn<int>(); Rxn<int> selectedDropdownItemViewFreight = Rxn<int>();
Rxn<int> selectedDropdownItemPendingFreight = Rxn<int>();
Rxn<int> selectedDropdownItemGenerateFreight = Rxn<int>();
refreshApis() { refreshApis() {
getFreightBills(); getFreightBills();
@ -164,6 +165,8 @@ class TransportController extends GetxController {
getSubFreightBillsView(); getSubFreightBillsView();
postData(); postData();
selectedDropdownItemViewFreight.value = null; selectedDropdownItemViewFreight.value = null;
selectedDropdownItemPendingFreight.value = null;
selectedDropdownItemGenerateFreight.value = null;
} }
getInvoiceView() async { getInvoiceView() async {
@ -220,7 +223,12 @@ class TransportController extends GetxController {
var grnPendingLoader = false.obs; var grnPendingLoader = false.obs;
var errorMessage = ''.obs; var errorMessage = ''.obs;
postData() async { // for Generate
var totalElementsGenerateFreight = 0.obs;
RxInt currentPageGenerateFreight = 1.obs;
RxInt totalPagesGenerateFreight = 3.obs;
postData({int page = 0}) async {
try { try {
isLoading.value = true; isLoading.value = true;
Map<String, String> requestBody = { Map<String, String> requestBody = {
@ -231,18 +239,24 @@ class TransportController extends GetxController {
"grnFromDate": "", "grnFromDate": "",
"grnToDate": "" "grnToDate": ""
}; };
var response = await PostRequests.addFreightBill(requestBody); var response = await PostRequests.addFreightBill(
page: page,
size: selectedDropdownItemGenerateFreight.value ?? 1,
requestBody: requestBody);
if (response != null) { if (response != null) {
List<Content> flattenedContent = List<Content> flattenedContent =
response.content!.expand((list) => list).toList(); response.content!.expand((list) => list).toList();
grnDetails.assignAll(flattenedContent); grnDetails.assignAll(flattenedContent);
totalPagesGenerateFreight.value = response.totalPages ?? 0;
totalElementsGenerateFreight.value = response.totalElements ?? 0;
currentPageGenerateFreight.value = page;
} }
} finally { } finally {
isLoading.value = false; isLoading.value = false;
} }
} }
void displayFilteredData() async { void displayFilteredData({int page = 0}) async {
try { try {
isLoading.value = true; isLoading.value = true;
Map<String, String> requestBody = { Map<String, String> requestBody = {
@ -254,7 +268,10 @@ class TransportController extends GetxController {
"grnToDate": "" "grnToDate": ""
}; };
var response = await PostRequests.addFreightBill(requestBody); var response = await PostRequests.addFreightBill(
page: page,
size: selectedDropdownItemGenerateFreight.value ?? 4,
requestBody: requestBody);
if (response != null) { if (response != null) {
List<Content> flattenedContent = List<Content> flattenedContent =
response.content!.expand((list) => list).toList(); response.content!.expand((list) => list).toList();
@ -272,12 +289,14 @@ class TransportController extends GetxController {
selectTransactionTypeFreight.value.toUpperCase()); selectTransactionTypeFreight.value.toUpperCase());
}).toList(); }).toList();
print("Filtered Data: ${filteredData.length}"); if (page == 0) {
grnDetails.assignAll(flattenedContent);
grnDetails.assignAll(filteredData); } else {
grnDetails.addAll(flattenedContent);
print("✅ Filtered Data: ${filteredData.length} items displayed."); }
print("✅ Filtered Data: ${grnDetails.length} items displayed."); totalPagesGenerateFreight.value = response.totalPages ?? 0;
totalElementsGenerateFreight.value = response.totalElements ?? 0;
currentPageGenerateFreight.value = page;
} else { } else {
print("❌ No response from API."); print("❌ No response from API.");
} }
@ -411,13 +430,6 @@ class TransportController extends GetxController {
} }
RxString selectedPlant = "".obs; RxString selectedPlant = "".obs;
List plantList = [
"Plant 1",
"Plant 2",
"Plant 3",
"Plant 4",
"Plant 5",
];
RxString selectedFreight = "".obs; RxString selectedFreight = "".obs;
addFreightBill() async { addFreightBill() async {
@ -457,23 +469,36 @@ class TransportController extends GetxController {
////////////////////////////////////////// PRIYA /////////////////////////////////////////////// ////////////////////////////////////////// PRIYA ///////////////////////////////////////////////
var freightBillData = <FreightBill>[].obs; var freightBillData = <FreightBill>[].obs;
var totalElementsViewFreight = 0.obs;
var pageSize = 2.obs; var pageSize = 2.obs;
var sortField = "grn_date".obs; var sortField = "grn_date".obs;
var sortDirection = "desc".obs; var sortDirection = "desc".obs;
// view freight
var totalElementsViewFreight = 0.obs;
RxInt currentPageViewFreight = 1.obs; RxInt currentPageViewFreight = 1.obs;
RxInt totalPagesViewFreight = 3.obs; RxInt totalPagesViewFreight = 3.obs;
final int limit = 10;
RxList selectElementSize = [
4,
8,
12,
16,
20,
].obs;
viewFreightView({int page = 0}) async { // for pending
var totalElementsPendingFreight = 0.obs;
RxInt currentPagePendingFreight = 1.obs;
RxInt totalPagesPendingFreight = 3.obs;
final int limit = 10;
// RxList selectElementSize = [
// 4,
// 8,
// 12,
// 16,
// 20,
// ].obs;
RxList selectElementSize = [
1,
2,
3,
4,
5,
].obs;
viewFreightView({int page = 0}) async {
try { try {
freightViewLoader.value = true; freightViewLoader.value = true;
@ -488,7 +513,9 @@ class TransportController extends GetxController {
}; };
var response = await PostRequests.viewFreightBill( var response = await PostRequests.viewFreightBill(
page: page, size: selectedDropdownItemViewFreight.value ?? 4, requestBody: requestBody); page: page,
size: selectedDropdownItemViewFreight.value ?? 4,
requestBody: requestBody);
if (response != null) { if (response != null) {
List<FreightBill> flattenedContent = List<FreightBill> flattenedContent =
@ -514,7 +541,7 @@ class TransportController extends GetxController {
var grnPendingData = <GrnPending>[].obs; var grnPendingData = <GrnPending>[].obs;
grnPending() async { grnPending({int page = 0}) async {
try { try {
grnPendingLoader.value = true; grnPendingLoader.value = true;
@ -528,12 +555,17 @@ class TransportController extends GetxController {
}; };
var response = await PostRequests.grnPending( var response = await PostRequests.grnPending(
requestBody, page: page,
size: selectedDropdownItemPendingFreight.value ?? 4,
requestBody: requestBody,
); );
if (response != null) { if (response != null) {
List<GrnPending> flattenedContent = List<GrnPending> flattenedContent =
response.content!.expand((list) => list).toList(); response.content!.expand((list) => list).toList();
grnPendingData.assignAll(flattenedContent); grnPendingData.assignAll(flattenedContent);
totalPagesPendingFreight.value = response.totalPages ?? 0;
totalElementsPendingFreight.value = response.totalElements ?? 0;
currentPagePendingFreight.value = page;
print( print(
'response from pending tab${response.first.toString()} and ${flattenedContent.length} and ${grnPendingData.value[0].codeValue} and ${grnPendingData.value[0].plantCode} and ${grnPendingData.value[0].materialCode}'); 'response from pending tab${response.first.toString()} and ${flattenedContent.length} and ${grnPendingData.value[0].codeValue} and ${grnPendingData.value[0].plantCode} and ${grnPendingData.value[0].materialCode}');
} }
@ -542,7 +574,7 @@ class TransportController extends GetxController {
} }
} }
void displayFilteredDataFromViewFreight({int page = 0, int size = 4}) async { void displayFilteredDataFromViewFreight({int page = 0}) async {
try { try {
freightViewLoader.value = true; freightViewLoader.value = true;
@ -556,12 +588,10 @@ class TransportController extends GetxController {
"grnToDate": "", "grnToDate": "",
}; };
print(
"🔎 Filter Request - Page: $page, Size: $size, Plant: ${selectPlantViewFreight.value}, "
"Product: ${selectProductViewFreight.value}, Freight Bill: ${selectFreightBillValidate.value}");
var response = await PostRequests.viewFreightBill( var response = await PostRequests.viewFreightBill(
page: page, size: size, requestBody: requestBody); // Pass pagination page: page,
size: selectedDropdownItemViewFreight.value ?? 4,
requestBody: requestBody); // Pass pagination
if (response != null && response.content != null) { if (response != null && response.content != null) {
List<FreightBill> flattenedContent = List<FreightBill> flattenedContent =
@ -594,7 +624,7 @@ class TransportController extends GetxController {
} }
} }
void displayFilteredDataFromPending() async { void displayFilteredDataFromPending({int page = 0}) async {
try { try {
isLoading.value = true; isLoading.value = true;
Map<String, String> requestBody = { Map<String, String> requestBody = {
@ -606,7 +636,11 @@ class TransportController extends GetxController {
"grnToDate": "" "grnToDate": ""
}; };
var response = await PostRequests.grnPending(requestBody); var response = await PostRequests.grnPending(
page: page,
size: selectedDropdownItemPendingFreight.value ?? 4,
requestBody: requestBody,
);
if (response != null) { if (response != null) {
List<GrnPending> flattenedContent = List<GrnPending> flattenedContent =
response.content!.expand((list) => list).toList(); response.content!.expand((list) => list).toList();
@ -621,9 +655,16 @@ class TransportController extends GetxController {
selectTransactionTypeFreight.value.toUpperCase()); selectTransactionTypeFreight.value.toUpperCase());
}).toList(); }).toList();
print("pending Data grnPendingData: ${filteredData.length}"); if (page == 0) {
grnPendingData.assignAll(flattenedContent);
} else {
grnPendingData.addAll(flattenedContent);
}
grnPendingData.assignAll(filteredData); // Update pagination details
totalPagesPendingFreight.value = response.totalPages ?? 0;
totalElementsPendingFreight.value = response.totalElements ?? 0;
currentPagePendingFreight.value = page;
print( print(
"✅ pending Data: ${filteredData.length} items displayed pending."); "✅ pending Data: ${filteredData.length} items displayed pending.");

4
lib/services/network/ApiUrls.dart
View File

@ -2,7 +2,7 @@ class ApiUrls {
ApiUrls._(); ApiUrls._();
static const String baseUrl = "http://46.28.44.130:9092/"; static const String baseUrl = "http://46.28.44.130:9092/";
static const addFreightBill = static const addFreightBill =
'bill/grndetails?page=0&size=20&sort=grn_date,desc'; 'bill/grndetails';
static const getFreightBills = 'bill/dropdown'; static const getFreightBills = 'bill/dropdown';
static const getAllPayments = "http://46.28.44.130:9092/invoice/getPayments"; static const getAllPayments = "http://46.28.44.130:9092/invoice/getPayments";
static const generateFreightBill = static const generateFreightBill =
@ -32,7 +32,7 @@ class ApiUrls {
static const userTypeDetails = static const userTypeDetails =
"http://46.28.44.130:9093/api/user-types/usertypedetails?page=0&size=15&sort=last_updated_on,desc"; "http://46.28.44.130:9093/api/user-types/usertypedetails?page=0&size=15&sort=last_updated_on,desc";
static const grnPendingDetails = static const grnPendingDetails =
"http://46.28.44.130:9092/bill/grndetailsPanding?page=0&size=20&sort=grn_date,desc"; "http://46.28.44.130:9092/bill/grndetailsPanding?page=";
static const viewSubDetailsOfViewFreightBill = "http://46.28.44.130:9092/bill/grndetailsByFreightBill?freightBillCode="; static const viewSubDetailsOfViewFreightBill = "http://46.28.44.130:9092/bill/grndetailsByFreightBill?freightBillCode=";
static const getInvoiceDetails = "http://46.28.44.130:9092/invoice/getInvoice"; static const getInvoiceDetails = "http://46.28.44.130:9092/invoice/getInvoice";
} }

57
lib/services/network/post_request.dart
View File

@ -20,12 +20,17 @@ import 'ApiUrls.dart';
class PostRequests { class PostRequests {
PostRequests._(); PostRequests._();
static Future<GenerateFreightBills?> addFreightBill( static Future<GenerateFreightBills?> addFreightBill({
int page = 0,
int size = 15,
String sort = 'last_updated_on,desc',
Map<String, dynamic>? requestBody,
}
Map<String, String> requestBody) async { ) async {
var apiResponse = var apiResponse =
await RemoteService.simplePost(requestBody, ApiUrls.addFreightBill); await RemoteService.simplePost(requestBody ?? {},'${ApiUrls.addFreightBill}?page=$page&size=$size&sort=$sort'
);
if (apiResponse != null) { if (apiResponse != null) {
return generateFreightBillsFromJson(apiResponse.response!); return generateFreightBillsFromJson(apiResponse.response!);
@ -34,8 +39,6 @@ class PostRequests {
} }
} }
static Future<GenerateBillsResModel?> freightBill( static Future<GenerateBillsResModel?> freightBill(
List<Map<String, dynamic>> requestBody) async { List<Map<String, dynamic>> requestBody) async {
var apiResponse = var apiResponse =
@ -75,7 +78,7 @@ class PostRequests {
static Future<PaymentResModel?> getAllPayments( static Future<PaymentResModel?> getAllPayments(
Map<String, String> requestBody) async { Map<String, String> requestBody) async {
var apiResponse = var apiResponse =
await RemoteService.postUser(requestBody, ApiUrls.getAllPayments); await RemoteService.postUser(requestBody, ApiUrls.getAllPayments);
if (apiResponse != null) { if (apiResponse != null) {
return paymentResModelFromJson(apiResponse.response!); return paymentResModelFromJson(apiResponse.response!);
@ -83,6 +86,7 @@ class PostRequests {
return null; return null;
} }
} }
static Future<EditUserResModel?> editUser( static Future<EditUserResModel?> editUser(
Map<String, String> requestBody, String id) async { Map<String, String> requestBody, String id) async {
var apiResponse = var apiResponse =
@ -96,23 +100,13 @@ class PostRequests {
} }
} }
static Future<ViewFreightBillResModel?> viewFreightBillF(
Map<String, String> requestBody,
) async {
var apiResponse = await RemoteService.postUser(requestBody,
'${ApiUrls.viewFreightBill}');
if (apiResponse != null) {
return viewFreightBillResModelFromJson(apiResponse.response!);
} else {
return null;
}
}
static Future<ViewFreightBillResModel?> viewFreightBill({ static Future<ViewFreightBillResModel?> viewFreightBill({
int page = 0, int page = 0,
int size = 15, int size = 15,
String sort = 'last_updated_on,desc', String sort = 'last_updated_on,desc',
Map<String, String>? requestBody, Map<String, dynamic>? requestBody,
}) async { }) async {
// Construct dynamic URL with query parameters // Construct dynamic URL with query parameters
String url = 'http://46.28.44.130:9092/bill/freightbill' String url = 'http://46.28.44.130:9092/bill/freightbill'
@ -120,9 +114,8 @@ class PostRequests {
try { try {
var apiResponse = await RemoteService.postUser( var apiResponse = await RemoteService.postUser(
requestBody ?? {}, // Use empty map if no request body requestBody ?? {}, // Use empty map if no request body
url url);
);
if (apiResponse == null) return null; if (apiResponse == null) return null;
if (apiResponse.response == null || apiResponse.response!.isEmpty) { if (apiResponse.response == null || apiResponse.response!.isEmpty) {
@ -224,20 +217,30 @@ class PostRequests {
} }
} }
static Future<GrnPendingBillsResModel?> grnPending( static Future<GrnPendingBillsResModel?> grnPending({
Map<String, String> requestBody) async { int page = 0,
var apiResponse = int size = 15,
await RemoteService.postUser(requestBody, ApiUrls.grnPendingDetails); String sort = 'last_updated_on,desc',
Map<String, dynamic>? requestBody,
}) async {
String url = 'http://46.28.44.130:9092/bill/grndetailsPanding'
'?page=$page&size=$size&sort=$sort';
var apiResponse = await RemoteService.postUser(
requestBody ?? {}, url
);
print('response from pending ${apiResponse?.response.toString()} and ${requestBody.toString()}');
if (apiResponse != null) { if (apiResponse != null) {
return grnPendingBillsResModelFromJson(apiResponse.response!); return grnPendingBillsResModelFromJson(apiResponse.response!);
} else { } else {
return null; return null;
} }
} }
static Future<GetInvoiceResponse?> getInvoice( static Future<GetInvoiceResponse?> getInvoice(
Map<String, String> requestBody) async { Map<String, String> requestBody) async {
var apiResponse = var apiResponse =
await RemoteService.postUser(requestBody, ApiUrls.getInvoiceDetails); await RemoteService.postUser(requestBody, ApiUrls.getInvoiceDetails);
print('response data from invoice ${apiResponse.toString()}'); print('response data from invoice ${apiResponse.toString()}');
if (apiResponse != null) { if (apiResponse != null) {
return getInvoiceResponseFromJson(apiResponse.response!); return getInvoiceResponseFromJson(apiResponse.response!);