Skip to content
This repository has been archived by the owner on Nov 26, 2024. It is now read-only.

Develop #559

Merged
merged 28 commits into from
Sep 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
c0569ee
Added pagination for billReport and collectionReport
Saloni-eGov Sep 7, 2023
2173e79
Merge pull request #544 from egovernments/PFM-4080-Pagination
rahuldevgarg Sep 7, 2023
74dc87b
Fixed the query according to the requirement.
Saloni-eGov Sep 8, 2023
6909562
Fixed the query.
Saloni-eGov Sep 8, 2023
d5871ea
Fixed the query and added exception handling
Saloni-eGov Sep 8, 2023
08e89c7
PFM-4462
rahuldevgarg Sep 8, 2023
a71b2ba
Added log statemnet for query and prepared statement
Saloni-eGov Sep 8, 2023
9bd60f7
Added log statemnet for query and prepared statement
Saloni-eGov Sep 8, 2023
24b6b19
PFM-4518
rahuldevgarg Sep 8, 2023
e512299
added regex
rahuldevgarg Sep 8, 2023
8154925
Changed the logic and query for CollectionReportData
Saloni-eGov Sep 8, 2023
c06c2ef
changed billReport contract
rahuldevgarg Sep 8, 2023
6ac94d4
added view button
rahuldevgarg Sep 8, 2023
dd3bca6
Changed query
Saloni-eGov Sep 8, 2023
bb0ce7d
uncommented view Screen
rahuldevgarg Sep 8, 2023
dc20c67
Merge pull request #552 from egovernments/PFM-4518
rahuldevgarg Sep 8, 2023
d0f799e
Changed query.
Saloni-eGov Sep 8, 2023
5bbe50c
Merge pull request #553 from egovernments/PFM-4518
rahuldevgarg Sep 8, 2023
7baa86f
Merge pull request #550 from egovernments/PFM-4462
rahuldevgarg Sep 8, 2023
dbaa65b
Merge pull request #554 from egovernments/PFM-4518-frontend
rahuldevgarg Sep 8, 2023
8d871df
added api contract changes
rahuldevgarg Sep 8, 2023
daf70d7
added api contract changes
rahuldevgarg Sep 8, 2023
3f979c7
Merge pull request #555 from egovernments/PFM-4518-frontend
rahuldevgarg Sep 8, 2023
89d1b3e
fixed query
gargrahuldev Sep 8, 2023
7292a34
Merge pull request #556 from rahuldevgarg-egov/patch-4
rahuldevgarg Sep 8, 2023
b1aac76
Merge pull request #557 from egovernments/PFM-4518
rahuldevgarg Sep 8, 2023
ab416e9
added api pagination in frontend
rahuldevgarg Sep 8, 2023
c7f6dea
Merge pull request #558 from egovernments/PFM-4518-frontend
rahuldevgarg Sep 8, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions frontend/mgramseva/lib/components/dashboard/bills_table.dart
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,21 @@ class BillsTable extends StatefulWidget {
final double rightColumnWidth;
final double? height;
final ScrollPhysics? scrollPhysics;
ScrollController scrollController = ScrollController();
BillsTable(
{Key? key,
required this.headerList,
required this.tableData,
required this.leftColumnWidth,
required this.rightColumnWidth, this.height, this.scrollPhysics})
: super(key: key);
BillsTable.withScrollController(
{Key? key,
required this.headerList,
required this.tableData,
required this.leftColumnWidth,
required this.rightColumnWidth, this.height, this.scrollPhysics, required this.scrollController})
: super(key: key);

@override
State<StatefulWidget> createState() {
Expand All @@ -27,7 +35,6 @@ class BillsTable extends StatefulWidget {
}

class _BillsTable extends State<BillsTable> {
final ScrollController controller = ScrollController();
final double columnRowFixedHeight = 52.0;

@override
Expand Down Expand Up @@ -134,7 +141,7 @@ class _BillsTable extends State<BillsTable> {
return LayoutBuilder(builder: (context, constraints) {
var data = widget.tableData[index].tableRow.first;
return ScrollParent(
controller,
widget.scrollController,
InkWell(
onTap: () {
if (data.callBack != null) {
Expand Down
8 changes: 5 additions & 3 deletions frontend/mgramseva/lib/model/common/BillsTableData.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ import '../../utils/models.dart';

class BillsTableData{
List<TableHeader> tableHeaders;
List<TableDataRow> tabledata;

BillsTableData(this.tableHeaders, this.tabledata);
List<TableDataRow> tableData;
bool isEmpty(){
return tableData.isEmpty;
}
BillsTableData(this.tableHeaders, this.tableData);
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ class CollectionReportData {
String? oldConnectionNo;
String? userId;
String? paymentMode;
List<double>? paymentAmount;
double? paymentAmount;

CollectionReportData(
{this.tenantName,
Expand All @@ -23,7 +23,7 @@ class CollectionReportData {
oldConnectionNo = json['oldConnectionNo'];
userId = json['userId'];
paymentMode = json['paymentMode'];
paymentAmount = json['paymentAmount'].cast<double>();
paymentAmount = json['paymentAmount'];
}

Map<String, dynamic> toJson() {
Expand Down
Loading
Loading