From 23b7a1372a0e4f1e85447e353b60ea7df0ccb26c Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Wed, 26 Feb 2020 17:03:44 +0200 Subject: [PATCH] Model fixes --- lib/data/models/client_model.dart | 1 - lib/data/models/client_model.g.dart | 58 ++++++++++++-------- lib/data/models/company_gateway_model.g.dart | 24 ++++---- lib/data/models/company_model.g.dart | 24 ++++---- lib/data/models/credit_model.g.dart | 24 ++++---- lib/data/models/document_model.g.dart | 24 ++++---- lib/data/models/entities.dart | 2 + lib/data/models/expense_model.g.dart | 48 ++++++++-------- lib/data/models/gateway_token_model.g.dart | 24 ++++---- lib/data/models/group_model.g.dart | 24 ++++---- lib/data/models/invoice_model.g.dart | 48 ++++++++-------- lib/data/models/payment_model.g.dart | 24 ++++---- lib/data/models/product_model.g.dart | 24 ++++---- lib/data/models/project_model.g.dart | 24 ++++---- lib/data/models/quote_model.g.dart | 48 ++++++++-------- lib/data/models/task_model.g.dart | 24 ++++---- lib/data/models/tax_rate_model.g.dart | 24 ++++---- lib/data/models/user_model.g.dart | 24 ++++---- lib/data/models/vendor_model.g.dart | 48 ++++++++-------- lib/ui/app/forms/decorated_form_field.dart | 3 + lib/ui/group/view/group_view.dart | 8 ++- lib/utils/platforms.dart | 4 +- 22 files changed, 285 insertions(+), 271 deletions(-) diff --git a/lib/data/models/client_model.dart b/lib/data/models/client_model.dart index 9296c2c20..d8c44d430 100644 --- a/lib/data/models/client_model.dart +++ b/lib/data/models/client_model.dart @@ -131,7 +131,6 @@ abstract class ClientEntity extends Object String get groupId; @nullable - @BuiltValueField(serialize: false) int get lastUpdatedActivities; bool get areActivitiesLoaded => diff --git a/lib/data/models/client_model.g.dart b/lib/data/models/client_model.g.dart index 6b78ec37e..7c5cd61ef 100644 --- a/lib/data/models/client_model.g.dart +++ b/lib/data/models/client_model.g.dart @@ -215,13 +215,13 @@ class _$ClientEntitySerializer implements StructuredSerializer { serializers.serialize(object.gatewayTokens, specifiedType: const FullType( BuiltList, const [const FullType(GatewayTokenEntity)])), - 'updated_at', - serializers.serialize(object.updatedAt, - specifiedType: const FullType(int)), - 'archived_at', - serializers.serialize(object.archivedAt, - specifiedType: const FullType(int)), ]; + if (object.lastUpdatedActivities != null) { + result + ..add('lastUpdatedActivities') + ..add(serializers.serialize(object.lastUpdatedActivities, + specifiedType: const FullType(int))); + } if (object.isChanged != null) { result ..add('isChanged') @@ -234,6 +234,18 @@ class _$ClientEntitySerializer implements StructuredSerializer { ..add(serializers.serialize(object.createdAt, specifiedType: const FullType(int))); } + if (object.updatedAt != null) { + result + ..add('updated_at') + ..add(serializers.serialize(object.updatedAt, + specifiedType: const FullType(int))); + } + if (object.archivedAt != null) { + result + ..add('archived_at') + ..add(serializers.serialize(object.archivedAt, + specifiedType: const FullType(int))); + } if (object.isDeleted != null) { result ..add('is_deleted') @@ -276,6 +288,10 @@ class _$ClientEntitySerializer implements StructuredSerializer { result.groupId = serializers.deserialize(value, specifiedType: const FullType(String)) as String; break; + case 'lastUpdatedActivities': + result.lastUpdatedActivities = serializers.deserialize(value, + specifiedType: const FullType(int)) as int; + break; case 'name': result.name = serializers.deserialize(value, specifiedType: const FullType(String)) as String; @@ -496,12 +512,6 @@ class _$ContactEntitySerializer implements StructuredSerializer { 'custom_value4', serializers.serialize(object.customValue4, specifiedType: const FullType(String)), - 'updated_at', - serializers.serialize(object.updatedAt, - specifiedType: const FullType(int)), - 'archived_at', - serializers.serialize(object.archivedAt, - specifiedType: const FullType(int)), ]; if (object.password != null) { result @@ -527,6 +537,18 @@ class _$ContactEntitySerializer implements StructuredSerializer { ..add(serializers.serialize(object.createdAt, specifiedType: const FullType(int))); } + if (object.updatedAt != null) { + result + ..add('updated_at') + ..add(serializers.serialize(object.updatedAt, + specifiedType: const FullType(int))); + } + if (object.archivedAt != null) { + result + ..add('archived_at') + ..add(serializers.serialize(object.archivedAt, + specifiedType: const FullType(int))); + } if (object.isDeleted != null) { result ..add('is_deleted') @@ -1084,12 +1106,6 @@ class _$ClientEntity extends ClientEntity { if (gatewayTokens == null) { throw new BuiltValueNullFieldError('ClientEntity', 'gatewayTokens'); } - if (updatedAt == null) { - throw new BuiltValueNullFieldError('ClientEntity', 'updatedAt'); - } - if (archivedAt == null) { - throw new BuiltValueNullFieldError('ClientEntity', 'archivedAt'); - } } @override @@ -1672,12 +1688,6 @@ class _$ContactEntity extends ContactEntity { if (customValue4 == null) { throw new BuiltValueNullFieldError('ContactEntity', 'customValue4'); } - if (updatedAt == null) { - throw new BuiltValueNullFieldError('ContactEntity', 'updatedAt'); - } - if (archivedAt == null) { - throw new BuiltValueNullFieldError('ContactEntity', 'archivedAt'); - } } @override diff --git a/lib/data/models/company_gateway_model.g.dart b/lib/data/models/company_gateway_model.g.dart index 37cc85bad..3e6ef037a 100644 --- a/lib/data/models/company_gateway_model.g.dart +++ b/lib/data/models/company_gateway_model.g.dart @@ -165,12 +165,6 @@ class _$CompanyGatewayEntitySerializer 'config', serializers.serialize(object.config, specifiedType: const FullType(String)), - 'updated_at', - serializers.serialize(object.updatedAt, - specifiedType: const FullType(int)), - 'archived_at', - serializers.serialize(object.archivedAt, - specifiedType: const FullType(int)), ]; if (object.isChanged != null) { result @@ -184,6 +178,18 @@ class _$CompanyGatewayEntitySerializer ..add(serializers.serialize(object.createdAt, specifiedType: const FullType(int))); } + if (object.updatedAt != null) { + result + ..add('updated_at') + ..add(serializers.serialize(object.updatedAt, + specifiedType: const FullType(int))); + } + if (object.archivedAt != null) { + result + ..add('archived_at') + ..add(serializers.serialize(object.archivedAt, + specifiedType: const FullType(int))); + } if (object.isDeleted != null) { result ..add('is_deleted') @@ -741,12 +747,6 @@ class _$CompanyGatewayEntity extends CompanyGatewayEntity { if (config == null) { throw new BuiltValueNullFieldError('CompanyGatewayEntity', 'config'); } - if (updatedAt == null) { - throw new BuiltValueNullFieldError('CompanyGatewayEntity', 'updatedAt'); - } - if (archivedAt == null) { - throw new BuiltValueNullFieldError('CompanyGatewayEntity', 'archivedAt'); - } } @override diff --git a/lib/data/models/company_model.g.dart b/lib/data/models/company_model.g.dart index 046df5bdd..cd42ba1d6 100644 --- a/lib/data/models/company_model.g.dart +++ b/lib/data/models/company_model.g.dart @@ -185,12 +185,6 @@ class _$CompanyEntitySerializer implements StructuredSerializer { 'settings', serializers.serialize(object.settings, specifiedType: const FullType(SettingsEntity)), - 'updated_at', - serializers.serialize(object.updatedAt, - specifiedType: const FullType(int)), - 'archived_at', - serializers.serialize(object.archivedAt, - specifiedType: const FullType(int)), ]; if (object.plan != null) { result @@ -222,6 +216,18 @@ class _$CompanyEntitySerializer implements StructuredSerializer { ..add(serializers.serialize(object.createdAt, specifiedType: const FullType(int))); } + if (object.updatedAt != null) { + result + ..add('updated_at') + ..add(serializers.serialize(object.updatedAt, + specifiedType: const FullType(int))); + } + if (object.archivedAt != null) { + result + ..add('archived_at') + ..add(serializers.serialize(object.archivedAt, + specifiedType: const FullType(int))); + } if (object.isDeleted != null) { result ..add('is_deleted') @@ -2889,12 +2895,6 @@ class _$CompanyEntity extends CompanyEntity { if (settings == null) { throw new BuiltValueNullFieldError('CompanyEntity', 'settings'); } - if (updatedAt == null) { - throw new BuiltValueNullFieldError('CompanyEntity', 'updatedAt'); - } - if (archivedAt == null) { - throw new BuiltValueNullFieldError('CompanyEntity', 'archivedAt'); - } } @override diff --git a/lib/data/models/credit_model.g.dart b/lib/data/models/credit_model.g.dart index d3f452ab1..4bcc4342b 100644 --- a/lib/data/models/credit_model.g.dart +++ b/lib/data/models/credit_model.g.dart @@ -131,12 +131,6 @@ class _$CreditEntitySerializer implements StructuredSerializer { 'client_id', serializers.serialize(object.clientId, specifiedType: const FullType(int)), - 'updated_at', - serializers.serialize(object.updatedAt, - specifiedType: const FullType(int)), - 'archived_at', - serializers.serialize(object.archivedAt, - specifiedType: const FullType(int)), ]; if (object.isChanged != null) { result @@ -150,6 +144,18 @@ class _$CreditEntitySerializer implements StructuredSerializer { ..add(serializers.serialize(object.createdAt, specifiedType: const FullType(int))); } + if (object.updatedAt != null) { + result + ..add('updated_at') + ..add(serializers.serialize(object.updatedAt, + specifiedType: const FullType(int))); + } + if (object.archivedAt != null) { + result + ..add('archived_at') + ..add(serializers.serialize(object.archivedAt, + specifiedType: const FullType(int))); + } if (object.isDeleted != null) { result ..add('is_deleted') @@ -517,12 +523,6 @@ class _$CreditEntity extends CreditEntity { if (clientId == null) { throw new BuiltValueNullFieldError('CreditEntity', 'clientId'); } - if (updatedAt == null) { - throw new BuiltValueNullFieldError('CreditEntity', 'updatedAt'); - } - if (archivedAt == null) { - throw new BuiltValueNullFieldError('CreditEntity', 'archivedAt'); - } } @override diff --git a/lib/data/models/document_model.g.dart b/lib/data/models/document_model.g.dart index 669d22e22..da37389f3 100644 --- a/lib/data/models/document_model.g.dart +++ b/lib/data/models/document_model.g.dart @@ -137,12 +137,6 @@ class _$DocumentEntitySerializer 'is_default', serializers.serialize(object.isDefault, specifiedType: const FullType(bool)), - 'updated_at', - serializers.serialize(object.updatedAt, - specifiedType: const FullType(int)), - 'archived_at', - serializers.serialize(object.archivedAt, - specifiedType: const FullType(int)), ]; if (object.invoiceId != null) { result @@ -204,6 +198,18 @@ class _$DocumentEntitySerializer ..add(serializers.serialize(object.createdAt, specifiedType: const FullType(int))); } + if (object.updatedAt != null) { + result + ..add('updated_at') + ..add(serializers.serialize(object.updatedAt, + specifiedType: const FullType(int))); + } + if (object.archivedAt != null) { + result + ..add('archived_at') + ..add(serializers.serialize(object.archivedAt, + specifiedType: const FullType(int))); + } if (object.isDeleted != null) { result ..add('is_deleted') @@ -639,12 +645,6 @@ class _$DocumentEntity extends DocumentEntity { if (isDefault == null) { throw new BuiltValueNullFieldError('DocumentEntity', 'isDefault'); } - if (updatedAt == null) { - throw new BuiltValueNullFieldError('DocumentEntity', 'updatedAt'); - } - if (archivedAt == null) { - throw new BuiltValueNullFieldError('DocumentEntity', 'archivedAt'); - } } @override diff --git a/lib/data/models/entities.dart b/lib/data/models/entities.dart index 2464fde0d..5f4be9e0b 100644 --- a/lib/data/models/entities.dart +++ b/lib/data/models/entities.dart @@ -176,9 +176,11 @@ abstract class BaseEntity implements SelectableEntity { @BuiltValueField(wireName: 'created_at') int get createdAt; + @nullable @BuiltValueField(wireName: 'updated_at') int get updatedAt; + @nullable @BuiltValueField(wireName: 'archived_at') int get archivedAt; diff --git a/lib/data/models/expense_model.g.dart b/lib/data/models/expense_model.g.dart index ed13f48dc..7d8c8d38a 100644 --- a/lib/data/models/expense_model.g.dart +++ b/lib/data/models/expense_model.g.dart @@ -188,12 +188,6 @@ class _$ExpenseEntitySerializer implements StructuredSerializer { 'custom_value2', serializers.serialize(object.customValue2, specifiedType: const FullType(String)), - 'updated_at', - serializers.serialize(object.updatedAt, - specifiedType: const FullType(int)), - 'archived_at', - serializers.serialize(object.archivedAt, - specifiedType: const FullType(int)), ]; if (object.categoryId != null) { result @@ -243,6 +237,18 @@ class _$ExpenseEntitySerializer implements StructuredSerializer { ..add(serializers.serialize(object.createdAt, specifiedType: const FullType(int))); } + if (object.updatedAt != null) { + result + ..add('updated_at') + ..add(serializers.serialize(object.updatedAt, + specifiedType: const FullType(int))); + } + if (object.archivedAt != null) { + result + ..add('archived_at') + ..add(serializers.serialize(object.archivedAt, + specifiedType: const FullType(int))); + } if (object.isDeleted != null) { result ..add('is_deleted') @@ -450,12 +456,6 @@ class _$ExpenseCategoryEntitySerializer final result = [ 'name', serializers.serialize(object.name, specifiedType: const FullType(String)), - 'updated_at', - serializers.serialize(object.updatedAt, - specifiedType: const FullType(int)), - 'archived_at', - serializers.serialize(object.archivedAt, - specifiedType: const FullType(int)), ]; if (object.isChanged != null) { result @@ -469,6 +469,18 @@ class _$ExpenseCategoryEntitySerializer ..add(serializers.serialize(object.createdAt, specifiedType: const FullType(int))); } + if (object.updatedAt != null) { + result + ..add('updated_at') + ..add(serializers.serialize(object.updatedAt, + specifiedType: const FullType(int))); + } + if (object.archivedAt != null) { + result + ..add('archived_at') + ..add(serializers.serialize(object.archivedAt, + specifiedType: const FullType(int))); + } if (object.isDeleted != null) { result ..add('is_deleted') @@ -973,12 +985,6 @@ class _$ExpenseEntity extends ExpenseEntity { if (customValue2 == null) { throw new BuiltValueNullFieldError('ExpenseEntity', 'customValue2'); } - if (updatedAt == null) { - throw new BuiltValueNullFieldError('ExpenseEntity', 'updatedAt'); - } - if (archivedAt == null) { - throw new BuiltValueNullFieldError('ExpenseEntity', 'archivedAt'); - } } @override @@ -1413,12 +1419,6 @@ class _$ExpenseCategoryEntity extends ExpenseCategoryEntity { if (name == null) { throw new BuiltValueNullFieldError('ExpenseCategoryEntity', 'name'); } - if (updatedAt == null) { - throw new BuiltValueNullFieldError('ExpenseCategoryEntity', 'updatedAt'); - } - if (archivedAt == null) { - throw new BuiltValueNullFieldError('ExpenseCategoryEntity', 'archivedAt'); - } } @override diff --git a/lib/data/models/gateway_token_model.g.dart b/lib/data/models/gateway_token_model.g.dart index 543187d36..e07634275 100644 --- a/lib/data/models/gateway_token_model.g.dart +++ b/lib/data/models/gateway_token_model.g.dart @@ -132,12 +132,6 @@ class _$GatewayTokenEntitySerializer 'is_default', serializers.serialize(object.isDefault, specifiedType: const FullType(bool)), - 'updated_at', - serializers.serialize(object.updatedAt, - specifiedType: const FullType(int)), - 'archived_at', - serializers.serialize(object.archivedAt, - specifiedType: const FullType(int)), ]; if (object.isChanged != null) { result @@ -151,6 +145,18 @@ class _$GatewayTokenEntitySerializer ..add(serializers.serialize(object.createdAt, specifiedType: const FullType(int))); } + if (object.updatedAt != null) { + result + ..add('updated_at') + ..add(serializers.serialize(object.updatedAt, + specifiedType: const FullType(int))); + } + if (object.archivedAt != null) { + result + ..add('archived_at') + ..add(serializers.serialize(object.archivedAt, + specifiedType: const FullType(int))); + } if (object.isDeleted != null) { result ..add('is_deleted') @@ -494,12 +500,6 @@ class _$GatewayTokenEntity extends GatewayTokenEntity { if (isDefault == null) { throw new BuiltValueNullFieldError('GatewayTokenEntity', 'isDefault'); } - if (updatedAt == null) { - throw new BuiltValueNullFieldError('GatewayTokenEntity', 'updatedAt'); - } - if (archivedAt == null) { - throw new BuiltValueNullFieldError('GatewayTokenEntity', 'archivedAt'); - } } @override diff --git a/lib/data/models/group_model.g.dart b/lib/data/models/group_model.g.dart index 1f98d42fd..6fc1dc3bd 100644 --- a/lib/data/models/group_model.g.dart +++ b/lib/data/models/group_model.g.dart @@ -114,12 +114,6 @@ class _$GroupEntitySerializer implements StructuredSerializer { 'settings', serializers.serialize(object.settings, specifiedType: const FullType(SettingsEntity)), - 'updated_at', - serializers.serialize(object.updatedAt, - specifiedType: const FullType(int)), - 'archived_at', - serializers.serialize(object.archivedAt, - specifiedType: const FullType(int)), ]; if (object.isChanged != null) { result @@ -133,6 +127,18 @@ class _$GroupEntitySerializer implements StructuredSerializer { ..add(serializers.serialize(object.createdAt, specifiedType: const FullType(int))); } + if (object.updatedAt != null) { + result + ..add('updated_at') + ..add(serializers.serialize(object.updatedAt, + specifiedType: const FullType(int))); + } + if (object.archivedAt != null) { + result + ..add('archived_at') + ..add(serializers.serialize(object.archivedAt, + specifiedType: const FullType(int))); + } if (object.isDeleted != null) { result ..add('is_deleted') @@ -446,12 +452,6 @@ class _$GroupEntity extends GroupEntity { if (settings == null) { throw new BuiltValueNullFieldError('GroupEntity', 'settings'); } - if (updatedAt == null) { - throw new BuiltValueNullFieldError('GroupEntity', 'updatedAt'); - } - if (archivedAt == null) { - throw new BuiltValueNullFieldError('GroupEntity', 'archivedAt'); - } } @override diff --git a/lib/data/models/invoice_model.g.dart b/lib/data/models/invoice_model.g.dart index 15184cc03..6d55ae4ff 100644 --- a/lib/data/models/invoice_model.g.dart +++ b/lib/data/models/invoice_model.g.dart @@ -222,12 +222,6 @@ class _$InvoiceEntitySerializer implements StructuredSerializer { serializers.serialize(object.invitations, specifiedType: const FullType( BuiltList, const [const FullType(InvitationEntity)])), - 'updated_at', - serializers.serialize(object.updatedAt, - specifiedType: const FullType(int)), - 'archived_at', - serializers.serialize(object.archivedAt, - specifiedType: const FullType(int)), ]; if (object.clientId != null) { result @@ -301,6 +295,18 @@ class _$InvoiceEntitySerializer implements StructuredSerializer { ..add(serializers.serialize(object.createdAt, specifiedType: const FullType(int))); } + if (object.updatedAt != null) { + result + ..add('updated_at') + ..add(serializers.serialize(object.updatedAt, + specifiedType: const FullType(int))); + } + if (object.archivedAt != null) { + result + ..add('archived_at') + ..add(serializers.serialize(object.archivedAt, + specifiedType: const FullType(int))); + } if (object.isDeleted != null) { result ..add('is_deleted') @@ -760,12 +766,6 @@ class _$InvitationEntitySerializer 'viewed_date', serializers.serialize(object.viewedDate, specifiedType: const FullType(String)), - 'updated_at', - serializers.serialize(object.updatedAt, - specifiedType: const FullType(int)), - 'archived_at', - serializers.serialize(object.archivedAt, - specifiedType: const FullType(int)), ]; if (object.isChanged != null) { result @@ -779,6 +779,18 @@ class _$InvitationEntitySerializer ..add(serializers.serialize(object.createdAt, specifiedType: const FullType(int))); } + if (object.updatedAt != null) { + result + ..add('updated_at') + ..add(serializers.serialize(object.updatedAt, + specifiedType: const FullType(int))); + } + if (object.archivedAt != null) { + result + ..add('archived_at') + ..add(serializers.serialize(object.archivedAt, + specifiedType: const FullType(int))); + } if (object.isDeleted != null) { result ..add('is_deleted') @@ -1325,12 +1337,6 @@ class _$InvoiceEntity extends InvoiceEntity { if (invitations == null) { throw new BuiltValueNullFieldError('InvoiceEntity', 'invitations'); } - if (updatedAt == null) { - throw new BuiltValueNullFieldError('InvoiceEntity', 'updatedAt'); - } - if (archivedAt == null) { - throw new BuiltValueNullFieldError('InvoiceEntity', 'archivedAt'); - } } @override @@ -2295,12 +2301,6 @@ class _$InvitationEntity extends InvitationEntity { if (viewedDate == null) { throw new BuiltValueNullFieldError('InvitationEntity', 'viewedDate'); } - if (updatedAt == null) { - throw new BuiltValueNullFieldError('InvitationEntity', 'updatedAt'); - } - if (archivedAt == null) { - throw new BuiltValueNullFieldError('InvitationEntity', 'archivedAt'); - } } @override diff --git a/lib/data/models/payment_model.g.dart b/lib/data/models/payment_model.g.dart index b460059d6..06b701050 100644 --- a/lib/data/models/payment_model.g.dart +++ b/lib/data/models/payment_model.g.dart @@ -152,12 +152,6 @@ class _$PaymentEntitySerializer implements StructuredSerializer { serializers.serialize(object.credits, specifiedType: const FullType( BuiltList, const [const FullType(PaymentableEntity)])), - 'updated_at', - serializers.serialize(object.updatedAt, - specifiedType: const FullType(int)), - 'archived_at', - serializers.serialize(object.archivedAt, - specifiedType: const FullType(int)), ]; if (object.number != null) { result @@ -243,6 +237,18 @@ class _$PaymentEntitySerializer implements StructuredSerializer { ..add(serializers.serialize(object.createdAt, specifiedType: const FullType(int))); } + if (object.updatedAt != null) { + result + ..add('updated_at') + ..add(serializers.serialize(object.updatedAt, + specifiedType: const FullType(int))); + } + if (object.archivedAt != null) { + result + ..add('archived_at') + ..add(serializers.serialize(object.archivedAt, + specifiedType: const FullType(int))); + } if (object.isDeleted != null) { result ..add('is_deleted') @@ -823,12 +829,6 @@ class _$PaymentEntity extends PaymentEntity { if (credits == null) { throw new BuiltValueNullFieldError('PaymentEntity', 'credits'); } - if (updatedAt == null) { - throw new BuiltValueNullFieldError('PaymentEntity', 'updatedAt'); - } - if (archivedAt == null) { - throw new BuiltValueNullFieldError('PaymentEntity', 'archivedAt'); - } } @override diff --git a/lib/data/models/product_model.g.dart b/lib/data/models/product_model.g.dart index 3c763ff1e..90f7f558e 100644 --- a/lib/data/models/product_model.g.dart +++ b/lib/data/models/product_model.g.dart @@ -156,12 +156,6 @@ class _$ProductEntitySerializer implements StructuredSerializer { 'custom_value2', serializers.serialize(object.customValue2, specifiedType: const FullType(String)), - 'updated_at', - serializers.serialize(object.updatedAt, - specifiedType: const FullType(int)), - 'archived_at', - serializers.serialize(object.archivedAt, - specifiedType: const FullType(int)), ]; if (object.customValue3 != null) { result @@ -199,6 +193,18 @@ class _$ProductEntitySerializer implements StructuredSerializer { ..add(serializers.serialize(object.createdAt, specifiedType: const FullType(int))); } + if (object.updatedAt != null) { + result + ..add('updated_at') + ..add(serializers.serialize(object.updatedAt, + specifiedType: const FullType(int))); + } + if (object.archivedAt != null) { + result + ..add('archived_at') + ..add(serializers.serialize(object.archivedAt, + specifiedType: const FullType(int))); + } if (object.isDeleted != null) { result ..add('is_deleted') @@ -655,12 +661,6 @@ class _$ProductEntity extends ProductEntity { if (customValue2 == null) { throw new BuiltValueNullFieldError('ProductEntity', 'customValue2'); } - if (updatedAt == null) { - throw new BuiltValueNullFieldError('ProductEntity', 'updatedAt'); - } - if (archivedAt == null) { - throw new BuiltValueNullFieldError('ProductEntity', 'archivedAt'); - } } @override diff --git a/lib/data/models/project_model.g.dart b/lib/data/models/project_model.g.dart index b33102d72..12950541e 100644 --- a/lib/data/models/project_model.g.dart +++ b/lib/data/models/project_model.g.dart @@ -147,12 +147,6 @@ class _$ProjectEntitySerializer implements StructuredSerializer { 'custom_value4', serializers.serialize(object.customValue4, specifiedType: const FullType(String)), - 'updated_at', - serializers.serialize(object.updatedAt, - specifiedType: const FullType(int)), - 'archived_at', - serializers.serialize(object.archivedAt, - specifiedType: const FullType(int)), ]; if (object.isChanged != null) { result @@ -166,6 +160,18 @@ class _$ProjectEntitySerializer implements StructuredSerializer { ..add(serializers.serialize(object.createdAt, specifiedType: const FullType(int))); } + if (object.updatedAt != null) { + result + ..add('updated_at') + ..add(serializers.serialize(object.updatedAt, + specifiedType: const FullType(int))); + } + if (object.archivedAt != null) { + result + ..add('archived_at') + ..add(serializers.serialize(object.archivedAt, + specifiedType: const FullType(int))); + } if (object.isDeleted != null) { result ..add('is_deleted') @@ -564,12 +570,6 @@ class _$ProjectEntity extends ProjectEntity { if (customValue4 == null) { throw new BuiltValueNullFieldError('ProjectEntity', 'customValue4'); } - if (updatedAt == null) { - throw new BuiltValueNullFieldError('ProjectEntity', 'updatedAt'); - } - if (archivedAt == null) { - throw new BuiltValueNullFieldError('ProjectEntity', 'archivedAt'); - } } @override diff --git a/lib/data/models/quote_model.g.dart b/lib/data/models/quote_model.g.dart index f683d6504..5c118bfde 100644 --- a/lib/data/models/quote_model.g.dart +++ b/lib/data/models/quote_model.g.dart @@ -233,12 +233,6 @@ class _$QuoteEntitySerializer implements StructuredSerializer { serializers.serialize(object.invitations, specifiedType: const FullType( BuiltList, const [const FullType(InvitationEntity)])), - 'updated_at', - serializers.serialize(object.updatedAt, - specifiedType: const FullType(int)), - 'archived_at', - serializers.serialize(object.archivedAt, - specifiedType: const FullType(int)), ]; if (object.invoiceNumber != null) { result @@ -276,6 +270,18 @@ class _$QuoteEntitySerializer implements StructuredSerializer { ..add(serializers.serialize(object.createdAt, specifiedType: const FullType(int))); } + if (object.updatedAt != null) { + result + ..add('updated_at') + ..add(serializers.serialize(object.updatedAt, + specifiedType: const FullType(int))); + } + if (object.archivedAt != null) { + result + ..add('archived_at') + ..add(serializers.serialize(object.archivedAt, + specifiedType: const FullType(int))); + } if (object.isDeleted != null) { result ..add('is_deleted') @@ -557,12 +563,6 @@ class _$InvitationEntitySerializer 'viewed_date', serializers.serialize(object.viewedDate, specifiedType: const FullType(String)), - 'updated_at', - serializers.serialize(object.updatedAt, - specifiedType: const FullType(int)), - 'archived_at', - serializers.serialize(object.archivedAt, - specifiedType: const FullType(int)), ]; if (object.isChanged != null) { result @@ -576,6 +576,18 @@ class _$InvitationEntitySerializer ..add(serializers.serialize(object.createdAt, specifiedType: const FullType(int))); } + if (object.updatedAt != null) { + result + ..add('updated_at') + ..add(serializers.serialize(object.updatedAt, + specifiedType: const FullType(int))); + } + if (object.archivedAt != null) { + result + ..add('archived_at') + ..add(serializers.serialize(object.archivedAt, + specifiedType: const FullType(int))); + } if (object.isDeleted != null) { result ..add('is_deleted') @@ -1142,12 +1154,6 @@ class _$QuoteEntity extends QuoteEntity { if (invitations == null) { throw new BuiltValueNullFieldError('QuoteEntity', 'invitations'); } - if (updatedAt == null) { - throw new BuiltValueNullFieldError('QuoteEntity', 'updatedAt'); - } - if (archivedAt == null) { - throw new BuiltValueNullFieldError('QuoteEntity', 'archivedAt'); - } } @override @@ -1753,12 +1759,6 @@ class _$InvitationEntity extends InvitationEntity { if (viewedDate == null) { throw new BuiltValueNullFieldError('InvitationEntity', 'viewedDate'); } - if (updatedAt == null) { - throw new BuiltValueNullFieldError('InvitationEntity', 'updatedAt'); - } - if (archivedAt == null) { - throw new BuiltValueNullFieldError('InvitationEntity', 'archivedAt'); - } } @override diff --git a/lib/data/models/task_model.g.dart b/lib/data/models/task_model.g.dart index a9f06f366..e16fb237c 100644 --- a/lib/data/models/task_model.g.dart +++ b/lib/data/models/task_model.g.dart @@ -179,12 +179,6 @@ class _$TaskEntitySerializer implements StructuredSerializer { 'custom_value2', serializers.serialize(object.customValue2, specifiedType: const FullType(String)), - 'updated_at', - serializers.serialize(object.updatedAt, - specifiedType: const FullType(int)), - 'archived_at', - serializers.serialize(object.archivedAt, - specifiedType: const FullType(int)), ]; if (object.invoiceId != null) { result @@ -246,6 +240,18 @@ class _$TaskEntitySerializer implements StructuredSerializer { ..add(serializers.serialize(object.createdAt, specifiedType: const FullType(int))); } + if (object.updatedAt != null) { + result + ..add('updated_at') + ..add(serializers.serialize(object.updatedAt, + specifiedType: const FullType(int))); + } + if (object.archivedAt != null) { + result + ..add('archived_at') + ..add(serializers.serialize(object.archivedAt, + specifiedType: const FullType(int))); + } if (object.isDeleted != null) { result ..add('is_deleted') @@ -797,12 +803,6 @@ class _$TaskEntity extends TaskEntity { if (customValue2 == null) { throw new BuiltValueNullFieldError('TaskEntity', 'customValue2'); } - if (updatedAt == null) { - throw new BuiltValueNullFieldError('TaskEntity', 'updatedAt'); - } - if (archivedAt == null) { - throw new BuiltValueNullFieldError('TaskEntity', 'archivedAt'); - } } @override diff --git a/lib/data/models/tax_rate_model.g.dart b/lib/data/models/tax_rate_model.g.dart index 7697dbefc..5a99a48ae 100644 --- a/lib/data/models/tax_rate_model.g.dart +++ b/lib/data/models/tax_rate_model.g.dart @@ -122,12 +122,6 @@ class _$TaxRateEntitySerializer implements StructuredSerializer { serializers.serialize(object.name, specifiedType: const FullType(String)), 'rate', serializers.serialize(object.rate, specifiedType: const FullType(double)), - 'updated_at', - serializers.serialize(object.updatedAt, - specifiedType: const FullType(int)), - 'archived_at', - serializers.serialize(object.archivedAt, - specifiedType: const FullType(int)), ]; if (object.isChanged != null) { result @@ -141,6 +135,18 @@ class _$TaxRateEntitySerializer implements StructuredSerializer { ..add(serializers.serialize(object.createdAt, specifiedType: const FullType(int))); } + if (object.updatedAt != null) { + result + ..add('updated_at') + ..add(serializers.serialize(object.updatedAt, + specifiedType: const FullType(int))); + } + if (object.archivedAt != null) { + result + ..add('archived_at') + ..add(serializers.serialize(object.archivedAt, + specifiedType: const FullType(int))); + } if (object.isDeleted != null) { result ..add('is_deleted') @@ -459,12 +465,6 @@ class _$TaxRateEntity extends TaxRateEntity { if (rate == null) { throw new BuiltValueNullFieldError('TaxRateEntity', 'rate'); } - if (updatedAt == null) { - throw new BuiltValueNullFieldError('TaxRateEntity', 'updatedAt'); - } - if (archivedAt == null) { - throw new BuiltValueNullFieldError('TaxRateEntity', 'archivedAt'); - } } @override diff --git a/lib/data/models/user_model.g.dart b/lib/data/models/user_model.g.dart index 32a5d8a47..9d26d10ab 100644 --- a/lib/data/models/user_model.g.dart +++ b/lib/data/models/user_model.g.dart @@ -121,12 +121,6 @@ class _$UserEntitySerializer implements StructuredSerializer { 'phone', serializers.serialize(object.phone, specifiedType: const FullType(String)), - 'updated_at', - serializers.serialize(object.updatedAt, - specifiedType: const FullType(int)), - 'archived_at', - serializers.serialize(object.archivedAt, - specifiedType: const FullType(int)), ]; if (object.customValue1 != null) { result @@ -170,6 +164,18 @@ class _$UserEntitySerializer implements StructuredSerializer { ..add(serializers.serialize(object.createdAt, specifiedType: const FullType(int))); } + if (object.updatedAt != null) { + result + ..add('updated_at') + ..add(serializers.serialize(object.updatedAt, + specifiedType: const FullType(int))); + } + if (object.archivedAt != null) { + result + ..add('archived_at') + ..add(serializers.serialize(object.archivedAt, + specifiedType: const FullType(int))); + } if (object.isDeleted != null) { result ..add('is_deleted') @@ -539,12 +545,6 @@ class _$UserEntity extends UserEntity { if (phone == null) { throw new BuiltValueNullFieldError('UserEntity', 'phone'); } - if (updatedAt == null) { - throw new BuiltValueNullFieldError('UserEntity', 'updatedAt'); - } - if (archivedAt == null) { - throw new BuiltValueNullFieldError('UserEntity', 'archivedAt'); - } } @override diff --git a/lib/data/models/vendor_model.g.dart b/lib/data/models/vendor_model.g.dart index b59cc8ced..8fd27ab1a 100644 --- a/lib/data/models/vendor_model.g.dart +++ b/lib/data/models/vendor_model.g.dart @@ -162,12 +162,6 @@ class _$VendorEntitySerializer implements StructuredSerializer { serializers.serialize(object.contacts, specifiedType: const FullType( BuiltList, const [const FullType(VendorContactEntity)])), - 'updated_at', - serializers.serialize(object.updatedAt, - specifiedType: const FullType(int)), - 'archived_at', - serializers.serialize(object.archivedAt, - specifiedType: const FullType(int)), ]; if (object.currencyId != null) { result @@ -187,6 +181,18 @@ class _$VendorEntitySerializer implements StructuredSerializer { ..add(serializers.serialize(object.createdAt, specifiedType: const FullType(int))); } + if (object.updatedAt != null) { + result + ..add('updated_at') + ..add(serializers.serialize(object.updatedAt, + specifiedType: const FullType(int))); + } + if (object.archivedAt != null) { + result + ..add('archived_at') + ..add(serializers.serialize(object.archivedAt, + specifiedType: const FullType(int))); + } if (object.isDeleted != null) { result ..add('is_deleted') @@ -368,12 +374,6 @@ class _$VendorContactEntitySerializer 'phone', serializers.serialize(object.phone, specifiedType: const FullType(String)), - 'updated_at', - serializers.serialize(object.updatedAt, - specifiedType: const FullType(int)), - 'archived_at', - serializers.serialize(object.archivedAt, - specifiedType: const FullType(int)), ]; if (object.isChanged != null) { result @@ -387,6 +387,18 @@ class _$VendorContactEntitySerializer ..add(serializers.serialize(object.createdAt, specifiedType: const FullType(int))); } + if (object.updatedAt != null) { + result + ..add('updated_at') + ..add(serializers.serialize(object.updatedAt, + specifiedType: const FullType(int))); + } + if (object.archivedAt != null) { + result + ..add('archived_at') + ..add(serializers.serialize(object.archivedAt, + specifiedType: const FullType(int))); + } if (object.isDeleted != null) { result ..add('is_deleted') @@ -810,12 +822,6 @@ class _$VendorEntity extends VendorEntity { if (contacts == null) { throw new BuiltValueNullFieldError('VendorEntity', 'contacts'); } - if (updatedAt == null) { - throw new BuiltValueNullFieldError('VendorEntity', 'updatedAt'); - } - if (archivedAt == null) { - throw new BuiltValueNullFieldError('VendorEntity', 'archivedAt'); - } } @override @@ -1202,12 +1208,6 @@ class _$VendorContactEntity extends VendorContactEntity { if (phone == null) { throw new BuiltValueNullFieldError('VendorContactEntity', 'phone'); } - if (updatedAt == null) { - throw new BuiltValueNullFieldError('VendorContactEntity', 'updatedAt'); - } - if (archivedAt == null) { - throw new BuiltValueNullFieldError('VendorContactEntity', 'archivedAt'); - } } @override diff --git a/lib/ui/app/forms/decorated_form_field.dart b/lib/ui/app/forms/decorated_form_field.dart index e6b983722..5eb047471 100644 --- a/lib/ui/app/forms/decorated_form_field.dart +++ b/lib/ui/app/forms/decorated_form_field.dart @@ -19,6 +19,7 @@ class DecoratedFormField extends StatelessWidget { this.enabled = true, this.hint, this.expands = false, + this.autofocus = false, }) : super(key: key); final TextEditingController controller; @@ -34,6 +35,7 @@ class DecoratedFormField extends StatelessWidget { final bool autocorrect; final bool obscureText; final bool expands; + final bool autofocus; final TextInputAction textInputAction; final ValueChanged onFieldSubmitted; final ValueChanged onChanged; @@ -43,6 +45,7 @@ class DecoratedFormField extends StatelessWidget { return TextFormField( key: ValueKey(label), controller: controller, + autofocus: autofocus, decoration: InputDecoration( labelText: label, hintText: hint, diff --git a/lib/ui/group/view/group_view.dart b/lib/ui/group/view/group_view.dart index 0c587f3ef..41561ea32 100644 --- a/lib/ui/group/view/group_view.dart +++ b/lib/ui/group/view/group_view.dart @@ -239,9 +239,11 @@ class SettingsViewer extends StatelessWidget { localization.counterPadding: settings.counterPadding?.toString(), localization.sharedInvoiceQuoteCounter: settings.sharedInvoiceQuoteCounter?.toString(), - //localization.defaultInvoiceTerms: settings.defaultInvoiceTerms, - //localization.defaultQuoteTerms: settings.defaultQuoteTerms, - localization.quoteFooter: settings.defaultQuoteFooter?.toString(), + localization.invoiceTerms: settings.defaultInvoiceTerms, + localization.quoteTerms: settings.defaultQuoteTerms, + localization.quoteFooter: settings.defaultQuoteFooter, + localization.creditTerms: settings.defaultCreditTerms, + localization.creditFooter: settings.defaultCreditFooter, localization.invoiceTaxRates: settings.numberOfInvoiceTaxRates?.toString(), localization.itemTaxRates: settings.numberOfItemTaxRates?.toString(), diff --git a/lib/utils/platforms.dart b/lib/utils/platforms.dart index 98625320c..0aa041909 100644 --- a/lib/utils/platforms.dart +++ b/lib/utils/platforms.dart @@ -38,10 +38,8 @@ AppLayout calculateLayout(BuildContext context) { if (size < kMobileLayoutWidth) { return AppLayout.mobile; - } else if (size > kTabletLayoutWidth) { - return AppLayout.desktop; } else { - return AppLayout.tablet; + return AppLayout.desktop; } }