Sultan
/
invoice
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Client data table

This commit is contained in:
Hillel Coren 2020-05-15 13:07:55 +03:00
parent 1536dc57d1
commit 805fe56df0
4 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/data/models/client_model.dart
View File

@ -323,6 +323,9 @@ abstract class ClientEntity extends Object
case ClientFields.balance: case ClientFields.balance:
response = clientA.balance.compareTo(clientB.balance); response = clientA.balance.compareTo(clientB.balance);
break; break;
case ClientFields.paidToDate:
response = clientA.paidToDate.compareTo(clientB.paidToDate);
break;
case ClientFields.updatedAt: case ClientFields.updatedAt:
response = clientA.updatedAt.compareTo(clientB.updatedAt); response = clientA.updatedAt.compareTo(clientB.updatedAt);
break; break;
@ -352,6 +355,9 @@ abstract class ClientEntity extends Object
.toLowerCase() .toLowerCase()
.compareTo(clientB.customValue4.toLowerCase()); .compareTo(clientB.customValue4.toLowerCase());
break; break;
default:
print('## ERROR: sort by $sortField not implemented');
break;
} }
if (response == 0) { if (response == 0) {

4
lib/ui/app/tables/app_data_table.dart
View File

@ -749,8 +749,8 @@ class AppDataTable extends StatelessWidget {
: null, : null,
// IGNORE SORTING ON FIRST COLUMN // IGNORE SORTING ON FIRST COLUMN
sorted: displayCheckboxColumn sorted: displayCheckboxColumn
? dataColumnIndex == sortColumnIndex ? (dataColumnIndex + 1) == sortColumnIndex
: (dataColumnIndex - 1) == sortColumnIndex, : dataColumnIndex == sortColumnIndex,
ascending: sortAscending, ascending: sortAscending,
); );
rowIndex = 1; rowIndex = 1;

5
lib/ui/app/tables/entity_list.dart
View File

@ -171,8 +171,9 @@ class _EntityListState extends State<EntityList> {
), ),
), ),
numeric: EntityPresenter.isFieldNumeric(field), numeric: EntityPresenter.isFieldNumeric(field),
onSort: (int columnIndex, bool ascending) => onSort: (int columnIndex, bool ascending) {
widget.onSortColumn(field))), widget.onSortColumn(field);
})),
], ],
source: dataTableSource, source: dataTableSource,
header: DatatableHeader( header: DatatableHeader(

8
lib/ui/client/client_presenter.dart
View File

@ -6,13 +6,14 @@ import 'package:invoiceninja_flutter/utils/formatting.dart';
class ClientPresenter extends EntityPresenter { class ClientPresenter extends EntityPresenter {
static List<String> getTableFields(UserCompanyEntity userCompany) { static List<String> getTableFields(UserCompanyEntity userCompany) {
return [ return [
ClientFields.idNumber,
ClientFields.name, ClientFields.name,
ClientFields.balance,
ClientFields.paidToDate,
ClientFields.contact, ClientFields.contact,
ClientFields.contactEmail, ClientFields.contactEmail,
ClientFields.idNumber,
EntityFields.createdAt, EntityFields.createdAt,
//ClientFields.contactLastLogin, //ClientFields.contactLastLogin,
ClientFields.balance,
EntityFields.state, EntityFields.state,
]; ];
} }
@ -34,6 +35,9 @@ class ClientPresenter extends EntityPresenter {
return Text(client.idNumber); return Text(client.idNumber);
case ClientFields.balance: case ClientFields.balance:
return Text(formatNumber(client.balance, context, clientId: client.id)); return Text(formatNumber(client.balance, context, clientId: client.id));
case ClientFields.paidToDate:
return Text(
formatNumber(client.paidToDate, context, clientId: client.id));
} }
return super.getField(field: field, context: context); return super.getField(field: field, context: context);