diff --git a/lib/data/models/expense_model.dart b/lib/data/models/expense_model.dart index 84ed7d533..736dc163d 100644 --- a/lib/data/models/expense_model.dart +++ b/lib/data/models/expense_model.dart @@ -155,7 +155,7 @@ abstract class ExpenseEntity extends Object updatedAt: 0, frequencyId: kFrequencyMonthly, lastSentDate: '', - nextSendDate: '', + nextSendDate: convertDateTimeToSqlDate(), remainingCycles: -1, recurringDates: BuiltList(), ); diff --git a/lib/ui/company_gateway/edit/company_gateway_edit_vm.dart b/lib/ui/company_gateway/edit/company_gateway_edit_vm.dart index 9ec28152f..d662c439a 100644 --- a/lib/ui/company_gateway/edit/company_gateway_edit_vm.dart +++ b/lib/ui/company_gateway/edit/company_gateway_edit_vm.dart @@ -35,7 +35,7 @@ class CompanyGatewayEditScreen extends StatelessWidget { builder: (context, viewModel) { return CompanyGatewayEdit( viewModel: viewModel, - key: ValueKey(viewModel.companyGateway.id), + key: ValueKey(viewModel.companyGateway.updatedAt), ); }, ); diff --git a/lib/ui/credit/edit/credit_edit_vm.dart b/lib/ui/credit/edit/credit_edit_vm.dart index 35eef1444..e61b6ac97 100644 --- a/lib/ui/credit/edit/credit_edit_vm.dart +++ b/lib/ui/credit/edit/credit_edit_vm.dart @@ -31,7 +31,7 @@ class CreditEditScreen extends StatelessWidget { builder: (context, viewModel) { return CreditEdit( viewModel: viewModel, - key: ValueKey(viewModel.invoice.id), + key: ValueKey(viewModel.invoice.updatedAt), ); }, ); diff --git a/lib/ui/design/edit/design_edit_vm.dart b/lib/ui/design/edit/design_edit_vm.dart index 9389de817..9d98ecc4e 100644 --- a/lib/ui/design/edit/design_edit_vm.dart +++ b/lib/ui/design/edit/design_edit_vm.dart @@ -26,7 +26,7 @@ class DesignEditScreen extends StatelessWidget { builder: (context, viewModel) { return DesignEdit( viewModel: viewModel, - key: ValueKey(viewModel.design.id), + key: ValueKey(viewModel.design.updatedAt), ); }, ); diff --git a/lib/ui/document/edit/document_edit_vm.dart b/lib/ui/document/edit/document_edit_vm.dart index c3f5a7a92..c4e8f696d 100644 --- a/lib/ui/document/edit/document_edit_vm.dart +++ b/lib/ui/document/edit/document_edit_vm.dart @@ -21,7 +21,7 @@ class DocumentEditScreen extends StatelessWidget { builder: (context, viewModel) { return DocumentEdit( viewModel: viewModel, - key: ValueKey(viewModel.document.id), + key: ValueKey(viewModel.document.updatedAt), ); }, ); diff --git a/lib/ui/expense/edit/expense_edit.dart b/lib/ui/expense/edit/expense_edit.dart index 786896ed2..1a29345f3 100644 --- a/lib/ui/expense/edit/expense_edit.dart +++ b/lib/ui/expense/edit/expense_edit.dart @@ -85,10 +85,12 @@ class _ExpenseEditState extends State : localization.editExpense), onCancelPressed: (context) => viewModel.onCancelPressed(context), onSavePressed: (context) => _onSavePressed(context), + /* actions: [ if (expense.isRecurring) if (expense.isRunning) EntityAction.stop else EntityAction.start, ], + */ onActionPressed: (context, action) => _onSavePressed(context, action), appBarBottom: TabBar( controller: _controller, diff --git a/lib/ui/expense/edit/expense_edit_vm.dart b/lib/ui/expense/edit/expense_edit_vm.dart index e01d3cfb3..397941520 100644 --- a/lib/ui/expense/edit/expense_edit_vm.dart +++ b/lib/ui/expense/edit/expense_edit_vm.dart @@ -29,7 +29,7 @@ class ExpenseEditScreen extends StatelessWidget { builder: (context, viewModel) { return ExpenseEdit( viewModel: viewModel, - key: ValueKey(viewModel.expense.id), + key: ValueKey(viewModel.expense.updatedAt), ); }, ); diff --git a/lib/ui/expense_category/edit/expense_category_edit_vm.dart b/lib/ui/expense_category/edit/expense_category_edit_vm.dart index bbc364ec3..fda5db792 100644 --- a/lib/ui/expense_category/edit/expense_category_edit_vm.dart +++ b/lib/ui/expense_category/edit/expense_category_edit_vm.dart @@ -30,7 +30,7 @@ class ExpenseCategoryEditScreen extends StatelessWidget { builder: (context, viewModel) { return ExpenseCategoryEdit( viewModel: viewModel, - key: ValueKey(viewModel.expenseCategory.id), + key: ValueKey(viewModel.expenseCategory.updatedAt), ); }, ); diff --git a/lib/ui/group/edit/group_edit_vm.dart b/lib/ui/group/edit/group_edit_vm.dart index 313b9d320..ea6336742 100644 --- a/lib/ui/group/edit/group_edit_vm.dart +++ b/lib/ui/group/edit/group_edit_vm.dart @@ -30,7 +30,7 @@ class GroupEditScreen extends StatelessWidget { builder: (context, viewModel) { return GroupEdit( viewModel: viewModel, - key: ValueKey(viewModel.group.id), + key: ValueKey(viewModel.group.updatedAt), ); }, ); diff --git a/lib/ui/payment/edit/payment_edit_vm.dart b/lib/ui/payment/edit/payment_edit_vm.dart index 6953a3326..41f458920 100644 --- a/lib/ui/payment/edit/payment_edit_vm.dart +++ b/lib/ui/payment/edit/payment_edit_vm.dart @@ -31,7 +31,7 @@ class PaymentEditScreen extends StatelessWidget { builder: (context, viewModel) { return PaymentEdit( viewModel: viewModel, - key: ValueKey(viewModel.payment.id), + key: ValueKey(viewModel.payment.updatedAt), ); }, ); diff --git a/lib/ui/payment_term/edit/payment_term_edit_vm.dart b/lib/ui/payment_term/edit/payment_term_edit_vm.dart index 0ae744f25..a61ae111e 100644 --- a/lib/ui/payment_term/edit/payment_term_edit_vm.dart +++ b/lib/ui/payment_term/edit/payment_term_edit_vm.dart @@ -31,7 +31,7 @@ class PaymentTermEditScreen extends StatelessWidget { builder: (context, viewModel) { return PaymentTermEdit( viewModel: viewModel, - key: ValueKey(viewModel.paymentTerm.id), + key: ValueKey(viewModel.paymentTerm.updatedAt), ); }, ); diff --git a/lib/ui/project/edit/project_edit_vm.dart b/lib/ui/project/edit/project_edit_vm.dart index c12080c3a..f4211b1e2 100644 --- a/lib/ui/project/edit/project_edit_vm.dart +++ b/lib/ui/project/edit/project_edit_vm.dart @@ -32,7 +32,7 @@ class ProjectEditScreen extends StatelessWidget { builder: (context, viewModel) { return ProjectEdit( viewModel: viewModel, - key: ValueKey(viewModel.project.id), + key: ValueKey(viewModel.project.updatedAt), ); }, ); diff --git a/lib/ui/quote/edit/quote_edit_vm.dart b/lib/ui/quote/edit/quote_edit_vm.dart index d8191d3bd..2a43286ed 100644 --- a/lib/ui/quote/edit/quote_edit_vm.dart +++ b/lib/ui/quote/edit/quote_edit_vm.dart @@ -31,7 +31,7 @@ class QuoteEditScreen extends StatelessWidget { builder: (context, viewModel) { return QuoteEdit( viewModel: viewModel, - key: ValueKey(viewModel.invoice.id), + key: ValueKey(viewModel.invoice.updatedAt), ); }, ); diff --git a/lib/ui/recurring_expense/edit/recurring_expense_edit_vm.dart b/lib/ui/recurring_expense/edit/recurring_expense_edit_vm.dart index e2d51b978..af7ae7c7d 100644 --- a/lib/ui/recurring_expense/edit/recurring_expense_edit_vm.dart +++ b/lib/ui/recurring_expense/edit/recurring_expense_edit_vm.dart @@ -31,7 +31,7 @@ class RecurringExpenseEditScreen extends StatelessWidget { builder: (context, viewModel) { return ExpenseEdit( viewModel: viewModel, - key: ValueKey(viewModel.expense.id), + key: ValueKey(viewModel.expense.updatedAt), ); }, ); diff --git a/lib/ui/recurring_invoice/edit/recurring_invoice_edit.dart b/lib/ui/recurring_invoice/edit/recurring_invoice_edit.dart index f2307b348..b00f0ecb6 100644 --- a/lib/ui/recurring_invoice/edit/recurring_invoice_edit.dart +++ b/lib/ui/recurring_invoice/edit/recurring_invoice_edit.dart @@ -97,10 +97,12 @@ class _RecurringInvoiceEditState extends State onCancelPressed: (context) => viewModel.onCancelPressed(context), onSavePressed: (context) => _onSavePressed(context), actions: [ + /* if (!recurringInvoice.isRunning) EntityAction.start else EntityAction.stop, + */ EntityAction.viewPdf, ], onActionPressed: (context, action) => _onSavePressed(context, action), diff --git a/lib/ui/recurring_invoice/edit/recurring_invoice_edit_vm.dart b/lib/ui/recurring_invoice/edit/recurring_invoice_edit_vm.dart index 3b5e3ccf2..144684a78 100644 --- a/lib/ui/recurring_invoice/edit/recurring_invoice_edit_vm.dart +++ b/lib/ui/recurring_invoice/edit/recurring_invoice_edit_vm.dart @@ -31,7 +31,7 @@ class RecurringInvoiceEditScreen extends StatelessWidget { builder: (context, viewModel) { return RecurringInvoiceEdit( viewModel: viewModel, - key: ValueKey(viewModel.invoice.id), + key: ValueKey(viewModel.invoice.updatedAt), ); }, ); diff --git a/lib/ui/subscription/edit/subscription_edit_vm.dart b/lib/ui/subscription/edit/subscription_edit_vm.dart index 6415d1393..7ff1b11d7 100644 --- a/lib/ui/subscription/edit/subscription_edit_vm.dart +++ b/lib/ui/subscription/edit/subscription_edit_vm.dart @@ -30,7 +30,7 @@ class SubscriptionEditScreen extends StatelessWidget { builder: (context, viewModel) { return SubscriptionEdit( viewModel: viewModel, - key: ValueKey(viewModel.subscription.id), + key: ValueKey(viewModel.subscription.updatedAt), ); }, ); diff --git a/lib/ui/task/edit/task_edit_vm.dart b/lib/ui/task/edit/task_edit_vm.dart index b4ececfa4..d5f4c55b3 100644 --- a/lib/ui/task/edit/task_edit_vm.dart +++ b/lib/ui/task/edit/task_edit_vm.dart @@ -29,7 +29,7 @@ class TaskEditScreen extends StatelessWidget { builder: (context, viewModel) { return TaskEdit( viewModel: viewModel, - key: ValueKey(viewModel.task.id), + key: ValueKey(viewModel.task.updatedAt), ); }, ); diff --git a/lib/ui/task_status/edit/task_status_edit_vm.dart b/lib/ui/task_status/edit/task_status_edit_vm.dart index b5f87414c..f24d3347d 100644 --- a/lib/ui/task_status/edit/task_status_edit_vm.dart +++ b/lib/ui/task_status/edit/task_status_edit_vm.dart @@ -30,7 +30,7 @@ class TaskStatusEditScreen extends StatelessWidget { builder: (context, viewModel) { return TaskStatusEdit( viewModel: viewModel, - key: ValueKey(viewModel.taskStatus.id), + key: ValueKey(viewModel.taskStatus.updatedAt), ); }, ); diff --git a/lib/ui/tax_rate/edit/tax_rate_edit_vm.dart b/lib/ui/tax_rate/edit/tax_rate_edit_vm.dart index 34fcebac1..293a8d79d 100644 --- a/lib/ui/tax_rate/edit/tax_rate_edit_vm.dart +++ b/lib/ui/tax_rate/edit/tax_rate_edit_vm.dart @@ -30,7 +30,7 @@ class TaxRateEditScreen extends StatelessWidget { builder: (context, viewModel) { return TaxRateEdit( viewModel: viewModel, - key: ValueKey(viewModel.taxRate.id), + key: ValueKey(viewModel.taxRate.updatedAt), ); }, ); diff --git a/lib/ui/token/edit/token_edit_vm.dart b/lib/ui/token/edit/token_edit_vm.dart index d468c9adb..6d9552cda 100644 --- a/lib/ui/token/edit/token_edit_vm.dart +++ b/lib/ui/token/edit/token_edit_vm.dart @@ -31,7 +31,7 @@ class TokenEditScreen extends StatelessWidget { builder: (context, viewModel) { return TokenEdit( viewModel: viewModel, - key: ValueKey(viewModel.token.id), + key: ValueKey(viewModel.token.updatedAt), ); }, ); diff --git a/lib/ui/user/edit/user_edit_vm.dart b/lib/ui/user/edit/user_edit_vm.dart index 97fc7aafb..abf80094c 100644 --- a/lib/ui/user/edit/user_edit_vm.dart +++ b/lib/ui/user/edit/user_edit_vm.dart @@ -31,7 +31,7 @@ class UserEditScreen extends StatelessWidget { builder: (context, viewModel) { return UserEdit( viewModel: viewModel, - key: ValueKey(viewModel.user.id), + key: ValueKey(viewModel.user.updatedAt), ); }, ); diff --git a/lib/ui/vendor/edit/vendor_edit_vm.dart b/lib/ui/vendor/edit/vendor_edit_vm.dart index ad4c1f062..b7e5da603 100644 --- a/lib/ui/vendor/edit/vendor_edit_vm.dart +++ b/lib/ui/vendor/edit/vendor_edit_vm.dart @@ -30,7 +30,7 @@ class VendorEditScreen extends StatelessWidget { builder: (context, viewModel) { return VendorEdit( viewModel: viewModel, - key: ValueKey(viewModel.vendor.id), + key: ValueKey(viewModel.vendor.updatedAt), ); }, ); diff --git a/lib/ui/webhook/edit/webhook_edit_vm.dart b/lib/ui/webhook/edit/webhook_edit_vm.dart index 66071e1e1..9ae65b16d 100644 --- a/lib/ui/webhook/edit/webhook_edit_vm.dart +++ b/lib/ui/webhook/edit/webhook_edit_vm.dart @@ -31,7 +31,7 @@ class WebhookEditScreen extends StatelessWidget { builder: (context, viewModel) { return WebhookEdit( viewModel: viewModel, - key: ValueKey(viewModel.webhook.id), + key: ValueKey(viewModel.webhook.updatedAt), ); }, ); diff --git a/stubs/ui/stub/edit/stub_edit_vm b/stubs/ui/stub/edit/stub_edit_vm index 34aada592..45d6f421e 100644 --- a/stubs/ui/stub/edit/stub_edit_vm +++ b/stubs/ui/stub/edit/stub_edit_vm @@ -30,7 +30,7 @@ class StubEditScreen extends StatelessWidget { builder: (context, viewModel) { return StubEdit( viewModel: viewModel, - key: ValueKey(viewModel.stub.id), + key: ValueKey(viewModel.stub.updatedAt), ); }, );