From b3e7487a06fc7f20c9174979b3eaae9a74b2e807 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Tue, 5 Jan 2021 16:51:56 +0200 Subject: [PATCH] Update models --- lib/data/models/account_model.dart | 8 ++++++++ lib/data/models/company_model.dart | 10 ++++++++++ lib/data/models/expense_category_model.dart | 7 +++++++ lib/data/models/project_model.dart | 8 ++++++++ lib/data/models/task_status_model.dart | 8 ++++++++ 5 files changed, 41 insertions(+) diff --git a/lib/data/models/account_model.dart b/lib/data/models/account_model.dart index 209494ca0..72c92353b 100644 --- a/lib/data/models/account_model.dart +++ b/lib/data/models/account_model.dart @@ -16,6 +16,7 @@ abstract class AccountEntity latestVersion: '', currentVersion: '', reportErrors: reportErrors, + debug_enabled: false, ); } @@ -44,11 +45,18 @@ abstract class AccountEntity @BuiltValueField(wireName: 'current_version') String get currentVersion; + @BuiltValueField(wireName: 'debug_enabled') + bool get debugEnabled; + bool get isUpdateAvailable => Version.parse(currentVersion) < Version.parse(latestVersion) && isCronEnabled; bool get isCronEnabled => latestVersion != '0.0.0'; + // ignore: unused_element + static void _initializeBuilder(AccountEntityBuilder builder) => + builder..debugEnabled = false; + static Serializer get serializer => _$accountEntitySerializer; } diff --git a/lib/data/models/company_model.dart b/lib/data/models/company_model.dart index ae01a02d4..002dd36d6 100644 --- a/lib/data/models/company_model.dart +++ b/lib/data/models/company_model.dart @@ -88,6 +88,8 @@ abstract class CompanyEntity extends Object showTasksTable: false, invoiceTaskDocuments: false, isDisabled: false, + calculateExpenseTaxByAmount: false, + hideEmptyColumnsOnPdf: false, groups: BuiltList(), taxRates: BuiltList(), taskStatuses: BuiltList(), @@ -294,6 +296,12 @@ abstract class CompanyEntity extends Object @BuiltValueField(wireName: 'enabled_modules') int get enabledModules; + @BuiltValueField(wireName: 'calculate_expense_tax_by_amount') + bool get calculateExpenseTaxByAmount; + + @BuiltValueField(wireName: 'hide_empty_columns_on_pdf') + bool get hideEmptyColumnsOnPdf; + String get displayName => settings.name ?? ''; @override @@ -473,6 +481,8 @@ abstract class CompanyEntity extends Object // ignore: unused_element static void _initializeBuilder(CompanyEntityBuilder builder) => builder + ..calculateExpenseTaxByAmount = false + ..hideEmptyColumnsOnPdf = false ..enableProductDiscount = false ..defaultTaskIsDateBased = false; diff --git a/lib/data/models/expense_category_model.dart b/lib/data/models/expense_category_model.dart index 5977921d9..b80c53054 100644 --- a/lib/data/models/expense_category_model.dart +++ b/lib/data/models/expense_category_model.dart @@ -58,6 +58,7 @@ abstract class ExpenseCategoryEntity extends Object id: id ?? BaseEntity.nextId, isChanged: false, name: '', + color: '', isDeleted: false, createdAt: 0, updatedAt: 0, @@ -133,6 +134,8 @@ abstract class ExpenseCategoryEntity extends Object String get name; + String get color; + int compareTo( {ExpenseCategoryEntity expenseCategory, String sortField, @@ -158,6 +161,10 @@ abstract class ExpenseCategoryEntity extends Object return response; } + // ignore: unused_element + static void _initializeBuilder(ExpenseCategoryEntityBuilder builder) => + builder..color = ''; + static Serializer get serializer => _$expenseCategoryEntitySerializer; } diff --git a/lib/data/models/project_model.dart b/lib/data/models/project_model.dart index 99fe65f96..9aee04c04 100644 --- a/lib/data/models/project_model.dart +++ b/lib/data/models/project_model.dart @@ -46,6 +46,7 @@ abstract class ProjectItemResponse class ProjectFields { static const String number = 'number'; static const String name = 'name'; + static const String color = 'color'; static const String clientId = 'client_id'; static const String client = 'client'; static const String taskRate = 'task_rate'; @@ -72,6 +73,7 @@ abstract class ProjectEntity extends Object number: '', isChanged: false, name: '', + color: '', clientId: '', taskRate: 0.0, dueDate: '', @@ -111,6 +113,8 @@ abstract class ProjectEntity extends Object String get name; + String get color; + @override @BuiltValueField(wireName: 'client_id') String get clientId; @@ -333,5 +337,9 @@ abstract class ProjectEntity extends Object @override FormatNumberType get listDisplayAmountType => FormatNumberType.money; + // ignore: unused_element + static void _initializeBuilder(ProjectEntityBuilder builder) => + builder..color = ''; + static Serializer get serializer => _$projectEntitySerializer; } diff --git a/lib/data/models/task_status_model.dart b/lib/data/models/task_status_model.dart index dd58f003e..b5dc6be17 100644 --- a/lib/data/models/task_status_model.dart +++ b/lib/data/models/task_status_model.dart @@ -46,6 +46,7 @@ abstract class TaskStatusItemResponse class TaskStatusFields { static const String name = 'name'; + static const String color = 'color'; static const String sortOrder = 'sort_order'; static const String updatedAt = 'updated_at'; static const String archivedAt = 'archived_at'; @@ -59,6 +60,7 @@ abstract class TaskStatusEntity extends Object return _$TaskStatusEntity._( id: id ?? BaseEntity.nextId, name: '', + color: '', sortOrder: 9999, createdUserId: '', isDeleted: false, @@ -84,6 +86,8 @@ abstract class TaskStatusEntity extends Object @override String get name; + String get color; + @BuiltValueField(wireName: 'sort_order') int get sortOrder; @@ -155,6 +159,10 @@ abstract class TaskStatusEntity extends Object return name; } + // ignore: unused_element + static void _initializeBuilder(TaskStatusEntityBuilder builder) => + builder..color = ''; + static Serializer get serializer => _$taskStatusEntitySerializer; }