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

latest code of transporter

dev_branch
Priya Chetiwal 2025-02-06 23:05:39 +05:30
parent 409a9f6d87
commit 87e0f7608f
6 changed files with 388 additions and 248 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

316
lib/feature/presentation/screens/transporter/model/view_freight_bill_res_model.dart
View File

@ -9,95 +9,124 @@ ViewFreightBillResModel viewFreightBillResModelFromJson(String str) => ViewFreig
String viewFreightBillResModelToJson(ViewFreightBillResModel data) => json.encode(data.toJson()); String viewFreightBillResModelToJson(ViewFreightBillResModel data) => json.encode(data.toJson());
class ViewFreightBillResModel { class ViewFreightBillResModel {
final List<List<FreightBill>>? content; List<List<FreightBill>>? content;
final Pageable? pageable; Pageable? pageable;
final bool? last; int? totalPages;
final int? totalElements; int? totalElements;
final int? totalPages; bool? last;
final int? size; int? size;
final int? number; int? number;
final Sort? sort; Sort? sort;
final bool? first; int? numberOfElements;
final int? numberOfElements; bool? first;
final bool? empty; bool? empty;
ViewFreightBillResModel({ ViewFreightBillResModel({
this.content, this.content,
this.pageable, this.pageable,
this.last,
this.totalElements,
this.totalPages, this.totalPages,
this.totalElements,
this.last,
this.size, this.size,
this.number, this.number,
this.sort, this.sort,
this.first,
this.numberOfElements, this.numberOfElements,
this.first,
this.empty, this.empty,
}); });
ViewFreightBillResModel copyWith({
List<List<FreightBill>>? content,
Pageable? pageable,
int? totalPages,
int? totalElements,
bool? last,
int? size,
int? number,
Sort? sort,
int? numberOfElements,
bool? first,
bool? empty,
}) =>
ViewFreightBillResModel(
content: content ?? this.content,
pageable: pageable ?? this.pageable,
totalPages: totalPages ?? this.totalPages,
totalElements: totalElements ?? this.totalElements,
last: last ?? this.last,
size: size ?? this.size,
number: number ?? this.number,
sort: sort ?? this.sort,
numberOfElements: numberOfElements ?? this.numberOfElements,
first: first ?? this.first,
empty: empty ?? this.empty,
);
factory ViewFreightBillResModel.fromJson(Map<String, dynamic> json) => ViewFreightBillResModel( factory ViewFreightBillResModel.fromJson(Map<String, dynamic> json) => ViewFreightBillResModel(
content: json["content"] == null ? [] : List<List<FreightBill>>.from(json["content"]!.map((x) => List<FreightBill>.from(x.map((x) => FreightBill.fromJson(x))))), content: json["content"] == null ? [] : List<List<FreightBill>>.from(json["content"]!.map((x) => List<FreightBill>.from(x.map((x) => FreightBill.fromJson(x))))),
pageable: json["pageable"] == null ? null : Pageable.fromJson(json["pageable"]), pageable: json["pageable"] == null ? null : Pageable.fromJson(json["pageable"]),
last: json["last"],
totalElements: json["totalElements"],
totalPages: json["totalPages"], totalPages: json["totalPages"],
totalElements: json["totalElements"],
last: json["last"],
size: json["size"], size: json["size"],
number: json["number"], number: json["number"],
sort: json["sort"] == null ? null : Sort.fromJson(json["sort"]), sort: json["sort"] == null ? null : Sort.fromJson(json["sort"]),
first: json["first"],
numberOfElements: json["numberOfElements"], numberOfElements: json["numberOfElements"],
first: json["first"],
empty: json["empty"], empty: json["empty"],
); );
Map<String, dynamic> toJson() => { Map<String, dynamic> toJson() => {
"content": content == null ? [] : List<dynamic>.from(content!.map((x) => List<dynamic>.from(x.map((x) => x.toJson())))), "content": content == null ? [] : List<dynamic>.from(content!.map((x) => List<dynamic>.from(x.map((x) => x.toJson())))),
"pageable": pageable?.toJson(), "pageable": pageable?.toJson(),
"last": last,
"totalElements": totalElements,
"totalPages": totalPages, "totalPages": totalPages,
"totalElements": totalElements,
"last": last,
"size": size, "size": size,
"number": number, "number": number,
"sort": sort?.toJson(), "sort": sort?.toJson(),
"first": first,
"numberOfElements": numberOfElements, "numberOfElements": numberOfElements,
"first": first,
"empty": empty, "empty": empty,
}; };
} }
class FreightBill { class FreightBill {
final int? freightbillId; int? freightbillId;
final String? freightbillCode; String? freightbillCode;
final String? status; String? status;
final DateTime? statusDate; DateTime? statusDate;
final String? plantCode; String? plantCode;
final String? materialCode; String? plantDesc;
final String? fromLocation; String? materialCode;
final int? billingQty; String? materialDescription;
final dynamic uom; String? fromLocation;
final double? freightAmount; dynamic billingNetQty;
final double? cgst; dynamic uom;
final double? sgst; double? shipmentGrossCost;
final int? igst; double? cgst;
final double? totalGst; double? sgst;
final double? shipmentNetAmount; int? igst;
final DateTime? createdOn; double? totalGst;
final dynamic trasnporterInvoiceNo; double? shipmentNetCost;
final dynamic trasnporterInvoiceNoDate; DateTime? createdOn;
final dynamic utr1No; dynamic transporterInvoiceNo;
final dynamic utr2No; dynamic transporterInvoiceNoDate;
final dynamic utr3No; dynamic utr1No;
final dynamic utr4No; dynamic utr2No;
final dynamic utr5No; dynamic utr3No;
final dynamic utr1PaymentAmount; dynamic utr4No;
final dynamic utr2PaymentAmount; dynamic utr5No;
final dynamic utr3PaymentAmount; dynamic utr1PaymentAmount;
final dynamic utr4PaymentAmount; dynamic utr2PaymentAmount;
final dynamic utr5PaymentAmount; dynamic utr3PaymentAmount;
final dynamic utr1Date; dynamic utr4PaymentAmount;
final dynamic utr2Date; dynamic utr5PaymentAmount;
final dynamic utr3Date; dynamic utr1Date;
final dynamic utr4Date; dynamic utr2Date;
final dynamic utr5Date; dynamic utr3Date;
dynamic utr4Date;
dynamic utr5Date;
FreightBill({ FreightBill({
this.freightbillId, this.freightbillId,
@ -105,19 +134,21 @@ class FreightBill {
this.status, this.status,
this.statusDate, this.statusDate,
this.plantCode, this.plantCode,
this.plantDesc,
this.materialCode, this.materialCode,
this.materialDescription,
this.fromLocation, this.fromLocation,
this.billingQty, this.billingNetQty,
this.uom, this.uom,
this.freightAmount, this.shipmentGrossCost,
this.cgst, this.cgst,
this.sgst, this.sgst,
this.igst, this.igst,
this.totalGst, this.totalGst,
this.shipmentNetAmount, this.shipmentNetCost,
this.createdOn, this.createdOn,
this.trasnporterInvoiceNo, this.transporterInvoiceNo,
this.trasnporterInvoiceNoDate, this.transporterInvoiceNoDate,
this.utr1No, this.utr1No,
this.utr2No, this.utr2No,
this.utr3No, this.utr3No,
@ -135,25 +166,102 @@ class FreightBill {
this.utr5Date, this.utr5Date,
}); });
FreightBill copyWith({
int? freightbillId,
String? freightbillCode,
String? status,
DateTime? statusDate,
String? plantCode,
String? plantDesc,
String? materialCode,
String? materialDescription,
String? fromLocation,
dynamic billingNetQty,
dynamic uom,
double? shipmentGrossCost,
double? cgst,
double? sgst,
int? igst,
double? totalGst,
double? shipmentNetCost,
DateTime? createdOn,
dynamic transporterInvoiceNo,
dynamic transporterInvoiceNoDate,
dynamic utr1No,
dynamic utr2No,
dynamic utr3No,
dynamic utr4No,
dynamic utr5No,
dynamic utr1PaymentAmount,
dynamic utr2PaymentAmount,
dynamic utr3PaymentAmount,
dynamic utr4PaymentAmount,
dynamic utr5PaymentAmount,
dynamic utr1Date,
dynamic utr2Date,
dynamic utr3Date,
dynamic utr4Date,
dynamic utr5Date,
}) =>
FreightBill(
freightbillId: freightbillId ?? this.freightbillId,
freightbillCode: freightbillCode ?? this.freightbillCode,
status: status ?? this.status,
statusDate: statusDate ?? this.statusDate,
plantCode: plantCode ?? this.plantCode,
plantDesc: plantDesc ?? this.plantDesc,
materialCode: materialCode ?? this.materialCode,
materialDescription: materialDescription ?? this.materialDescription,
fromLocation: fromLocation ?? this.fromLocation,
billingNetQty: billingNetQty ?? this.billingNetQty,
uom: uom ?? this.uom,
shipmentGrossCost: shipmentGrossCost ?? this.shipmentGrossCost,
cgst: cgst ?? this.cgst,
sgst: sgst ?? this.sgst,
igst: igst ?? this.igst,
totalGst: totalGst ?? this.totalGst,
shipmentNetCost: shipmentNetCost ?? this.shipmentNetCost,
createdOn: createdOn ?? this.createdOn,
transporterInvoiceNo: transporterInvoiceNo ?? this.transporterInvoiceNo,
transporterInvoiceNoDate: transporterInvoiceNoDate ?? this.transporterInvoiceNoDate,
utr1No: utr1No ?? this.utr1No,
utr2No: utr2No ?? this.utr2No,
utr3No: utr3No ?? this.utr3No,
utr4No: utr4No ?? this.utr4No,
utr5No: utr5No ?? this.utr5No,
utr1PaymentAmount: utr1PaymentAmount ?? this.utr1PaymentAmount,
utr2PaymentAmount: utr2PaymentAmount ?? this.utr2PaymentAmount,
utr3PaymentAmount: utr3PaymentAmount ?? this.utr3PaymentAmount,
utr4PaymentAmount: utr4PaymentAmount ?? this.utr4PaymentAmount,
utr5PaymentAmount: utr5PaymentAmount ?? this.utr5PaymentAmount,
utr1Date: utr1Date ?? this.utr1Date,
utr2Date: utr2Date ?? this.utr2Date,
utr3Date: utr3Date ?? this.utr3Date,
utr4Date: utr4Date ?? this.utr4Date,
utr5Date: utr5Date ?? this.utr5Date,
);
factory FreightBill.fromJson(Map<String, dynamic> json) => FreightBill( factory FreightBill.fromJson(Map<String, dynamic> json) => FreightBill(
freightbillId: json["freightbill_id"], freightbillId: json["freightbill_id"],
freightbillCode: json["freightbill_code"], freightbillCode: json["freightbill_code"],
status: json["status"], status: json["status"],
statusDate: json["status_date"] == null ? null : DateTime.parse(json["status_date"]), statusDate: json["status_date"] == null ? null : DateTime.parse(json["status_date"]),
plantCode: json["plant_code"], plantCode: json["plant_code"],
plantDesc: json["plant_desc"],
materialCode: json["material_code"], materialCode: json["material_code"],
materialDescription: json["material_description"],
fromLocation: json["from_location"], fromLocation: json["from_location"],
billingQty: json["billing_qty"], billingNetQty: json["billing_net_qty"],
uom: json["uom"], uom: json["uom"],
freightAmount: json["freight_amount"]?.toDouble(), shipmentGrossCost: json["shipment_gross_cost"]?.toDouble(),
cgst: json["cgst"]?.toDouble(), cgst: json["cgst"]?.toDouble(),
sgst: json["sgst"]?.toDouble(), sgst: json["sgst"]?.toDouble(),
igst: json["igst"], igst: json["igst"],
totalGst: json["total_gst"]?.toDouble(), totalGst: json["total_gst"]?.toDouble(),
shipmentNetAmount: json["shipment_net_amount"]?.toDouble(), shipmentNetCost: json["shipment_net_cost"]?.toDouble(),
createdOn: json["created_on"] == null ? null : DateTime.parse(json["created_on"]), createdOn: json["created_on"] == null ? null : DateTime.parse(json["created_on"]),
trasnporterInvoiceNo: json["trasnporter_invoice_no"], transporterInvoiceNo: json["transporter_invoice_no"],
trasnporterInvoiceNoDate: json["trasnporter_invoice_no_date"], transporterInvoiceNoDate: json["transporter_invoice_no_date"],
utr1No: json["utr1_no"], utr1No: json["utr1_no"],
utr2No: json["utr2_no"], utr2No: json["utr2_no"],
utr3No: json["utr3_no"], utr3No: json["utr3_no"],
@ -177,19 +285,21 @@ class FreightBill {
"status": status, "status": status,
"status_date": "${statusDate!.year.toString().padLeft(4, '0')}-${statusDate!.month.toString().padLeft(2, '0')}-${statusDate!.day.toString().padLeft(2, '0')}", "status_date": "${statusDate!.year.toString().padLeft(4, '0')}-${statusDate!.month.toString().padLeft(2, '0')}-${statusDate!.day.toString().padLeft(2, '0')}",
"plant_code": plantCode, "plant_code": plantCode,
"plant_desc": plantDesc,
"material_code": materialCode, "material_code": materialCode,
"material_description": materialDescription,
"from_location": fromLocation, "from_location": fromLocation,
"billing_qty": billingQty, "billing_net_qty": billingNetQty,
"uom": uom, "uom": uom,
"freight_amount": freightAmount, "shipment_gross_cost": shipmentGrossCost,
"cgst": cgst, "cgst": cgst,
"sgst": sgst, "sgst": sgst,
"igst": igst, "igst": igst,
"total_gst": totalGst, "total_gst": totalGst,
"shipment_net_amount": shipmentNetAmount, "shipment_net_cost": shipmentNetCost,
"created_on": createdOn?.toIso8601String(), "created_on": createdOn?.toIso8601String(),
"trasnporter_invoice_no": trasnporterInvoiceNo, "transporter_invoice_no": transporterInvoiceNo,
"trasnporter_invoice_no_date": trasnporterInvoiceNoDate, "transporter_invoice_no_date": transporterInvoiceNoDate,
"utr1_no": utr1No, "utr1_no": utr1No,
"utr2_no": utr2No, "utr2_no": utr2No,
"utr3_no": utr3No, "utr3_no": utr3No,
@ -209,61 +319,89 @@ class FreightBill {
} }
class Pageable { class Pageable {
final Sort? sort; Sort? sort;
final int? offset; int? pageNumber;
final int? pageSize; int? pageSize;
final int? pageNumber; int? offset;
final bool? unpaged; bool? paged;
final bool? paged; bool? unpaged;
Pageable({ Pageable({
this.sort, this.sort,
this.offset,
this.pageSize,
this.pageNumber, this.pageNumber,
this.unpaged, this.pageSize,
this.offset,
this.paged, this.paged,
this.unpaged,
}); });
Pageable copyWith({
Sort? sort,
int? pageNumber,
int? pageSize,
int? offset,
bool? paged,
bool? unpaged,
}) =>
Pageable(
sort: sort ?? this.sort,
pageNumber: pageNumber ?? this.pageNumber,
pageSize: pageSize ?? this.pageSize,
offset: offset ?? this.offset,
paged: paged ?? this.paged,
unpaged: unpaged ?? this.unpaged,
);
factory Pageable.fromJson(Map<String, dynamic> json) => Pageable( factory Pageable.fromJson(Map<String, dynamic> json) => Pageable(
sort: json["sort"] == null ? null : Sort.fromJson(json["sort"]), sort: json["sort"] == null ? null : Sort.fromJson(json["sort"]),
offset: json["offset"],
pageSize: json["pageSize"],
pageNumber: json["pageNumber"], pageNumber: json["pageNumber"],
unpaged: json["unpaged"], pageSize: json["pageSize"],
offset: json["offset"],
paged: json["paged"], paged: json["paged"],
unpaged: json["unpaged"],
); );
Map<String, dynamic> toJson() => { Map<String, dynamic> toJson() => {
"sort": sort?.toJson(), "sort": sort?.toJson(),
"offset": offset,
"pageSize": pageSize,
"pageNumber": pageNumber, "pageNumber": pageNumber,
"unpaged": unpaged, "pageSize": pageSize,
"offset": offset,
"paged": paged, "paged": paged,
"unpaged": unpaged,
}; };
} }
class Sort { class Sort {
final bool? empty; bool? sorted;
final bool? sorted; bool? empty;
final bool? unsorted; bool? unsorted;
Sort({ Sort({
this.empty,
this.sorted, this.sorted,
this.empty,
this.unsorted, this.unsorted,
}); });
Sort copyWith({
bool? sorted,
bool? empty,
bool? unsorted,
}) =>
Sort(
sorted: sorted ?? this.sorted,
empty: empty ?? this.empty,
unsorted: unsorted ?? this.unsorted,
);
factory Sort.fromJson(Map<String, dynamic> json) => Sort( factory Sort.fromJson(Map<String, dynamic> json) => Sort(
empty: json["empty"],
sorted: json["sorted"], sorted: json["sorted"],
empty: json["empty"],
unsorted: json["unsorted"], unsorted: json["unsorted"],
); );
Map<String, dynamic> toJson() => { Map<String, dynamic> toJson() => {
"empty": empty,
"sorted": sorted, "sorted": sorted,
"empty": empty,
"unsorted": unsorted, "unsorted": unsorted,
}; };
} }

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

@ -12,6 +12,7 @@ import '../../../../../../../components/common/common_btn.dart';
import '../../../../../../../components/common/custom_drop_down.dart'; import '../../../../../../../components/common/custom_drop_down.dart';
import '../../../../../../../components/common/data_cell.dart'; import '../../../../../../../components/common/data_cell.dart';
import '../../../../../../../components/styles/app_strings.dart'; import '../../../../../../../components/styles/app_strings.dart';
import '../../../../widgets/custom_pagination.dart';
import '../../view_model/transport_controller.dart'; import '../../view_model/transport_controller.dart';
import '../../widgets/common_card.dart'; import '../../widgets/common_card.dart';
import '../../widgets/freightbill_dialog.dart'; import '../../widgets/freightbill_dialog.dart';
@ -368,6 +369,8 @@ class GenerateFrightBill extends StatelessWidget {
); );
} }
return Column( return Column(
mainAxisAlignment: MainAxisAlignment.end,
crossAxisAlignment: CrossAxisAlignment.end,
children: [ children: [
Container( Container(
padding: EdgeInsets.symmetric(horizontal: 10), padding: EdgeInsets.symmetric(horizontal: 10),
@ -416,9 +419,10 @@ class GenerateFrightBill extends StatelessWidget {
), ),
Container( Container(
margin: EdgeInsets.only(bottom: 16, top: 16), margin: EdgeInsets.only(bottom: 16, top: 16),
height: controller.isFilterVisibleGenerateFreight.value == true height:
? MediaQuery.of(context).size.height * 0.3 controller.isFilterVisibleGenerateFreight.value == true
: MediaQuery.of(context).size.height * 0.64, ? MediaQuery.of(context).size.height * 0.3
: MediaQuery.of(context).size.height * 0.64,
child: RawScrollbar( child: RawScrollbar(
thumbColor: AppColors.clrD9, thumbColor: AppColors.clrD9,
radius: Radius.circular(2), radius: Radius.circular(2),
@ -520,16 +524,19 @@ class GenerateFrightBill extends StatelessWidget {
), ),
// editableCell(index, "0${index + 1}"), // editableCell(index, "0${index + 1}"),
editableCell(index, stoppage.grnNo ?? ""), editableCell(index, stoppage.grnNo ?? ""),
editableCell(index, stoppage.plantCode ?? ""), editableCell(
index, stoppage.plantCode ?? ""),
editableCell( editableCell(
index, stoppage.materialCode ?? ""), index, stoppage.materialCode ?? ""),
editableCell( editableCell(
index, index,
DateFormat('yyyy-MM-dd').format( DateFormat('yyyy-MM-dd').format(
stoppage.grnDate ?? DateTime.now())), stoppage.grnDate ??
DateTime.now())),
editableCell( editableCell(
index, stoppage.fromLocation ?? ""), index, stoppage.fromLocation ?? ""),
editableCell(index, stoppage.vehicleNo ?? ""), editableCell(
index, stoppage.vehicleNo ?? ""),
editableCell(index, stoppage.lrNo ?? ""), editableCell(index, stoppage.lrNo ?? ""),
editableCell( editableCell(
index, index,
@ -537,15 +544,17 @@ class GenerateFrightBill extends StatelessWidget {
stoppage.lrDate ?? DateTime.now())), stoppage.lrDate ?? DateTime.now())),
editableCell(index, editableCell(index,
stoppage.dispQty?.toString() ?? ""), stoppage.dispQty?.toString() ?? ""),
editableCell( editableCell(index,
index, stoppage.netQty?.toString() ?? ""), stoppage.netQty?.toString() ?? ""),
editableCell(index, editableCell(index,
stoppage.billingQty?.toString() ?? ""), stoppage.billingQty?.toString() ?? ""),
editableCell(index, "-"), editableCell(index, "-"),
editableCell(index, editableCell(index,
stoppage.freightRate?.toString() ?? ""), stoppage.freightRate?.toString() ?? ""),
editableCell(index, editableCell(
stoppage.shipmentCost?.toString() ?? ""), index,
stoppage.shipmentCost?.toString() ??
""),
], ],
); );
}), }),
@ -559,6 +568,13 @@ class GenerateFrightBill extends StatelessWidget {
], ],
); );
}), }),
CustomPagination(
currentPage: controller.currentPage.value,
totalPages: controller.totalPages.value,
onPageChanged: (int page) {
controller.onPageChanged(page);
},
),
], ],
); );
} }

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

@ -3,6 +3,7 @@ import 'package:get/get.dart';
import 'package:intl/intl.dart'; import 'package:intl/intl.dart';
import 'package:shayog/components/styles/textStyles.dart'; import 'package:shayog/components/styles/textStyles.dart';
import 'package:shayog/feature/presentation/screens/transporter/view_model/transport_controller.dart'; import 'package:shayog/feature/presentation/screens/transporter/view_model/transport_controller.dart';
import 'package:shayog/feature/presentation/widgets/custom_pagination.dart';
import 'package:sizer/sizer.dart'; import 'package:sizer/sizer.dart';
import 'package:vph_web_date_picker/vph_web_date_picker.dart'; import 'package:vph_web_date_picker/vph_web_date_picker.dart';
import '../../../../../../../components/common/data_cell.dart'; import '../../../../../../../components/common/data_cell.dart';
@ -519,9 +520,17 @@ class PendingGeneration extends StatelessWidget {
), ),
), ),
), ),
], ],
); );
}), }),
CustomPagination(
currentPage: controller.currentPage.value,
totalPages: controller.totalPages.value,
onPageChanged: (int page) {
controller.onPageChanged(page);
},
),
], ],
); );
} }

80
lib/feature/presentation/screens/transporter/view/sub_views/view_freight_bill.dart
View File

@ -1,9 +1,7 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import 'package:shayog/components/common/common_btn.dart'; import 'package:shayog/components/common/common_btn.dart';
import 'package:shayog/components/styles/textStyles.dart'; import 'package:shayog/feature/presentation/widgets/custom_pagination.dart';
import 'package:shayog/feature/presentation/screens/transporter/model/sub_freight_view_dialog_model.dart';
import 'package:shayog/feature/presentation/screens/transporter/model/view_freight_bill_res_model.dart';
import 'package:sizer/sizer.dart'; import 'package:sizer/sizer.dart';
import 'package:vph_web_date_picker/vph_web_date_picker.dart'; import 'package:vph_web_date_picker/vph_web_date_picker.dart';
import '../../../../../../../components/common/data_cell.dart'; import '../../../../../../../components/common/data_cell.dart';
@ -11,11 +9,8 @@ import '../../../../../../../components/styles/app_colors.dart';
import '../../../../../../../components/styles/app_strings.dart'; import '../../../../../../../components/styles/app_strings.dart';
import '../../../../../../components/common/common_button.dart'; import '../../../../../../components/common/common_button.dart';
import '../../../../../../components/common/custom_drop_down.dart'; import '../../../../../../components/common/custom_drop_down.dart';
import '../../../../widgets/custom_pagination.dart';
import '../../../../widgets/text_view.dart'; import '../../../../widgets/text_view.dart';
import '../../view_model/transport_controller.dart'; import '../../view_model/transport_controller.dart';
import '../../widgets/common_card.dart';
import '../../widgets/freightbill_dialog.dart';
class ViewFreightBill extends StatelessWidget { class ViewFreightBill extends StatelessWidget {
ViewFreightBill({super.key}); ViewFreightBill({super.key});
@ -57,8 +52,6 @@ class ViewFreightBill extends StatelessWidget {
selected.plantCode ?? ""; selected.plantCode ?? "";
controller.showPlantErrorViewFreight.value = controller.showPlantErrorViewFreight.value =
false; false;
print(
"selectPlant${controller.selectPlant.value}");
} }
}, },
hintText: "Select Plant", hintText: "Select Plant",
@ -294,19 +287,6 @@ class ViewFreightBill extends StatelessWidget {
width: 100, width: 100,
text: AppStrings.submit, text: AppStrings.submit,
clickAction: () { clickAction: () {
// if (controller.showPlantErrorFreight
// .value ||
// controller.showProductErrorFreight
// .value ||
// controller.showTransactionErrorFreight
// .value
// ) {
// print(
// 'controller.showProductError.value ${controller
// .showProductError.value}');
// } else {
// controller.postData();
// }
controller controller
.handleFilterSubmitViewFreightBill(); .handleFilterSubmitViewFreightBill();
}, },
@ -323,7 +303,6 @@ class ViewFreightBill extends StatelessWidget {
), ),
) )
: SizedBox.shrink()), : SizedBox.shrink()),
Obx(() { Obx(() {
if (controller.freightViewLoader.value) { if (controller.freightViewLoader.value) {
return SizedBox( return SizedBox(
@ -347,7 +326,6 @@ class ViewFreightBill extends StatelessWidget {
if (controller.freightBillData.isEmpty || if (controller.freightBillData.isEmpty ||
controller.freightBillData == []) { controller.freightBillData == []) {
return SizedBox( return SizedBox(
height: controller.isFilterVisibleViewFreight.value height: controller.isFilterVisibleViewFreight.value
? MediaQuery.sizeOf(context).height * 0.4 ? MediaQuery.sizeOf(context).height * 0.4
: MediaQuery.sizeOf(context).height * 0.6, : MediaQuery.sizeOf(context).height * 0.6,
@ -460,14 +438,12 @@ class ViewFreightBill extends StatelessWidget {
controller.freightBillCode.value = controller.freightBillCode.value =
freightBill.freightbillCode ?? ""; freightBill.freightbillCode ?? "";
print(
'freightBill.trasnporterInvoiceNo ${freightBill.trasnporterInvoiceNo}');
return DataRow( return DataRow(
cells: [ cells: [
editableCell( editableCell(
index, "${freightBill.plantCode}"), index, "${freightBill.plantCode}-${freightBill.plantDesc}"),
editableCell( editableCell(
index, "${freightBill.materialCode}"), index, "${freightBill.materialCode}-${freightBill.materialDescription}"),
editableCell( editableCell(
index, index,
freightBill.freightbillCode ?? "-", freightBill.freightbillCode ?? "-",
@ -484,15 +460,15 @@ class ViewFreightBill extends StatelessWidget {
editableCell( editableCell(
index, "${freightBill.createdOn ?? "-"}"), index, "${freightBill.createdOn ?? "-"}"),
editableCell(index, editableCell(index,
"${freightBill.trasnporterInvoiceNo ?? "-"}"), "${freightBill.transporterInvoiceNo ?? "-"}"),
editableCell(index, editableCell(index,
"${freightBill.trasnporterInvoiceNoDate ?? "-"}"), "${freightBill.transporterInvoiceNoDate ?? "-"}"),
editableCell(index, editableCell(index,
"${freightBill.billingQty ?? "-"}"), "${freightBill.billingNetQty ?? "-"}"),
editableCell( editableCell(
index, "${freightBill.uom ?? "-"}"), index, "${freightBill.uom ?? "-"}"),
editableCell(index, editableCell(index,
"${freightBill.freightAmount ?? "-"}"), "${freightBill.shipmentGrossCost ?? "-"}"),
editableCell( editableCell(
index, "${freightBill.cgst ?? "-"}"), index, "${freightBill.cgst ?? "-"}"),
editableCell( editableCell(
@ -504,21 +480,21 @@ class ViewFreightBill extends StatelessWidget {
editableCell( editableCell(
index, "${freightBill.totalGst ?? "-"}"), index, "${freightBill.totalGst ?? "-"}"),
editableCell(index, editableCell(index,
"${freightBill.freightAmount ?? "-"}"), "${freightBill.shipmentNetCost ?? "-"}"),
editableCell(index, editableCell(index,
"${freightBill.trasnporterInvoiceNoDate ?? "-"}"), "${freightBill.transporterInvoiceNoDate ?? "-"}"),
editableCell( editableCell(
index, "${freightBill.status ?? "-"}"), index, freightBill.status ?? "-"),
editableCell( editableCell(
index, "${freightBill.totalGst ?? "-"}"), index, "${freightBill.totalGst ?? "-"}"),
editableCell(index, editableCell(index,
"${freightBill.trasnporterInvoiceNoDate ?? "-"}"), "${freightBill.transporterInvoiceNoDate ?? "-"}"),
editableCell( editableCell(
index, "${freightBill.utr5No ?? "-"}"), index, "${freightBill.utr5No ?? "-"}"),
editableCell( editableCell(
index, "${freightBill.utr1Date ?? "-"}"), index, "${freightBill.utr1Date ?? "-"}"),
editableCell(index, editableCell(index,
"${freightBill.freightAmount ?? "-"}"), "${freightBill.shipmentNetCost ?? "-"}"),
editableCell( editableCell(
index, "${freightBill.utr1No ?? "-"}"), index, "${freightBill.utr1No ?? "-"}"),
editableCell( editableCell(
@ -558,13 +534,6 @@ class ViewFreightBill extends StatelessWidget {
), ),
), ),
), ),
// CustomPagination(
// currentPage: controller.currentPage.value,
// totalPages: controller.totalPages.value,
// onPageChanged: (int page) {
// controller.onPageChanged(page);
// },
// ),
), ),
], ],
); );
@ -612,8 +581,7 @@ class ViewFreightBill extends StatelessWidget {
), ),
), ),
Expanded( Expanded(
child: contr.grnListDialog == null || child: contr.grnListDialog.isEmpty
contr.grnListDialog.isEmpty
? Center(child: Text('No data available.')) ? Center(child: Text('No data available.'))
: Column( : Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
@ -706,12 +674,20 @@ class ViewFreightBill extends StatelessWidget {
), ),
editableCell(index, editableCell(index,
"${freightBill.grnDate ?? "-"}"), "${freightBill.grnDate ?? "-"}"),
editableCell(index, editableCell(
"${freightBill.fromLocation ?? "-"}"), index,
editableCell(index, freightBill
"${freightBill.vehicleNo ?? "-"}"), .fromLocation ??
editableCell(index, "-"),
"${freightBill.transporterCode ?? "-"}"), editableCell(
index,
freightBill.vehicleNo ??
"-"),
editableCell(
index,
freightBill
.transporterCode ??
"-"),
editableCell(index, editableCell(index,
"${freightBill.lrDate ?? "-"}"), "${freightBill.lrDate ?? "-"}"),
editableCell(index, editableCell(index,
@ -763,3 +739,5 @@ class ViewFreightBill extends StatelessWidget {
); );
} }
} }

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

@ -22,6 +22,7 @@ import 'sub_views/view_freight_bill.dart';
import 'package:file_picker/file_picker.dart'; import 'package:file_picker/file_picker.dart';
import 'package:path_provider/path_provider.dart'; import 'package:path_provider/path_provider.dart';
class TransportView extends StatefulWidget { class TransportView extends StatefulWidget {
const TransportView({super.key}); const TransportView({super.key});
@ -57,7 +58,7 @@ class _TransportViewState extends State<TransportView> {
() => InkWell( () => InkWell(
onTap: () { onTap: () {
ctrl.selectedIndex.value = index; ctrl.selectedIndex.value = index;
ctrl.selectedUser.value =0; ctrl.selectedUser.value = 0;
}, },
child: Column( child: Column(
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
@ -164,97 +165,99 @@ class _TransportViewState extends State<TransportView> {
dataColumn("Add Signature"), dataColumn("Add Signature"),
], ],
rows: List<DataRow>.generate(ctrl.getInvoiceData.length, rows: List<DataRow>.generate(ctrl.getInvoiceData.length,
(index) { (index) {
final getInvoice = ctrl.getInvoiceData[index]; final getInvoice = ctrl.getInvoiceData[index];
return DataRow( return DataRow(
cells: [ cells: [
editableCell(index, "${getInvoice.invoiceId}"), editableCell(index, "${getInvoice.invoiceId}"),
editableCell(index, getInvoice.freightbillCode), editableCell(index, getInvoice.freightbillCode),
editableCell( editableCell(
index, index,
DateFormat("dd MMMM yyyy").format( DateFormat("dd MMMM yyyy").format(
DateTime.parse('${getInvoice.createdOn}'))), DateTime.parse('${getInvoice.createdOn}'))),
editableCell( editableCell(
index, "${getInvoice.sapReferenceno ?? "-"}"), index, "${getInvoice.sapReferenceno ?? "-"}"),
editableCell( editableCell(
index, index,
DateFormat("d MMMM yyyy").format(DateTime.parse( DateFormat("d MMMM yyyy").format(DateTime.parse(
'${getInvoice.shipmentCostDate}'))), '${getInvoice.shipmentCostDate}'))),
editableCell( editableCell(
index, "${getInvoice.shipmentCost ?? "-"}"), index, "${getInvoice.shipmentCost ?? "-"}"),
editableCell(index,"${getInvoice.statusId?? "-"}"), editableCell(index, "${getInvoice.statusId ?? "-"}"),
editableCell(index, getInvoice.materialCode?? "-"), editableCell(index, getInvoice.materialCode ?? "-"),
editableCell(index, getInvoice.materialDescription, isLink: true), editableCell(index, getInvoice.materialDescription,
editableCell(index,getInvoice. status?? "-"), isLink: true),
editableCell(index, getInvoice.plantCode?? "-", isLink: true), editableCell(index, getInvoice.status ?? "-"),
DataCell( editableCell(index, getInvoice.plantCode ?? "-",
Row( isLink: true),
mainAxisSize: MainAxisSize.min, DataCell(
children: [ Row(
Container( mainAxisSize: MainAxisSize.min,
padding: EdgeInsets.all(4), children: [
decoration: BoxDecoration( Container(
border: Border.all(color: Colors.blue), padding: EdgeInsets.all(4),
borderRadius: BorderRadius.circular(4), decoration: BoxDecoration(
), border: Border.all(color: Colors.blue),
child: InkWell( borderRadius: BorderRadius.circular(4),
onTap: () { }, ),
child: Row( child: InkWell(
mainAxisSize: MainAxisSize.min, onTap: () {},
children: [ child: Row(
Icon(Icons.download, mainAxisSize: MainAxisSize.min,
size: 16, color: Colors.blue), children: [
SizedBox(width: 4), Icon(Icons.download,
Text('Download', size: 16, color: Colors.blue),
style: TextStyle( SizedBox(width: 4),
color: Colors.blue, Text('Download',
fontSize: 12)), style: TextStyle(
], color: Colors.blue,
), fontSize: 12)),
), ],
), ),
SizedBox(width: 8), ),
Container( ),
padding: EdgeInsets.all(4), SizedBox(width: 8),
decoration: BoxDecoration( Container(
border: Border.all(color: Colors.blue), padding: EdgeInsets.all(4),
borderRadius: BorderRadius.circular(4), decoration: BoxDecoration(
), border: Border.all(color: Colors.blue),
child: InkWell( borderRadius: BorderRadius.circular(4),
onTap: () => handleFileUpload(index), ),
child: Row( child: InkWell(
mainAxisSize: MainAxisSize.min, onTap: () => handleFileUpload(index),
children: [ child: Row(
Icon(Icons.upload, mainAxisSize: MainAxisSize.min,
size: 16, color: Colors.blue), children: [
SizedBox(width: 4), Icon(Icons.upload,
Text('Upload', size: 16, color: Colors.blue),
style: TextStyle( SizedBox(width: 4),
color: Colors.blue, Text('Upload',
fontSize: 12)), style: TextStyle(
], color: Colors.blue,
), fontSize: 12)),
), ],
), ),
),
),
//###################### This Function is used to close or cut uploaded File in Local ####################### //###################### This Function is used to close or cut uploaded File in Local #######################
// if (uploadedFiles.containsKey(index)) // if (uploadedFiles.containsKey(index))
// IconButton( // IconButton(
// icon: Icon(Icons.close, size: 16, color: Colors.red), // icon: Icon(Icons.close, size: 16, color: Colors.red),
// onPressed: () { // onPressed: () {
// setState(() { // setState(() {
// uploadedFiles.remove(index); // uploadedFiles.remove(index);
// }); // });
// }, // },
// ), // ),
//########################################################################################################### //###########################################################################################################
], ],
), ),
), ),
], ],
); );
}), }),
), ),
), ),
), ),
@ -284,7 +287,8 @@ class _TransportViewState extends State<TransportView> {
PlatformFile file = result.files.first; PlatformFile file = result.files.first;
// Validate file size (optional) // Validate file size (optional)
if (file.size > 10 * 1024 * 1024) { // 10MB limit if (file.size > 10 * 1024 * 1024) {
// 10MB limit
ScaffoldMessenger.of(context).showSnackBar( ScaffoldMessenger.of(context).showSnackBar(
SnackBar( SnackBar(
content: Text('File size must be less than 10MB'), content: Text('File size must be less than 10MB'),
@ -316,14 +320,6 @@ class _TransportViewState extends State<TransportView> {
} }
} }
_commonText(String title) {
return Text(
title,
style: TextStyle(
fontSize: 13, color: Colors.black, fontWeight: FontWeight.w900),
);
}
_dashboardView() { _dashboardView() {
return RawScrollbar( return RawScrollbar(
child: Column( child: Column(
@ -350,8 +346,10 @@ class _TransportViewState extends State<TransportView> {
ctrl.selectedUser.value = index; ctrl.selectedUser.value = index;
ctrl.refreshApis(); ctrl.refreshApis();
ctrl.isFilterVisibleViewFreight.value = false; ctrl.isFilterVisibleViewFreight.value = false;
ctrl.isFilterVisiblePendingGeneration.value = false; ctrl.isFilterVisiblePendingGeneration.value =
ctrl.isFilterVisibleGenerateFreight.value = false; false;
ctrl.isFilterVisibleGenerateFreight.value =
false;
}, },
child: Container( child: Container(
margin: EdgeInsets.only(bottom: 10, top: 10), margin: EdgeInsets.only(bottom: 10, top: 10),

1
lib/main.dart
View File

@ -24,3 +24,4 @@ class MyApp extends StatelessWidget {
}); });
} }
} }