From fba81e5b22d80bfd70917c1a4040b093e61140ef Mon Sep 17 00:00:00 2001 From: 18alantom <2.alan.tom@gmail.com> Date: Wed, 27 Apr 2022 17:32:43 +0530 Subject: [PATCH] fix: get listview to render --- fyo/model/naming.ts | 2 +- .../baseModels/JournalEntry/JournalEntry.ts | 10 +-- models/baseModels/Payment/Payment.ts | 4 +- src/App.vue | 3 +- src/components/Avatar.vue | 22 ++++-- src/components/BackLink.vue | 3 +- src/components/PageHeader.vue | 21 +++++- src/components/SearchBar.vue | 40 +++++----- src/components/Widgets/PartyWidget.vue | 2 +- src/pages/ChartOfAccounts.vue | 13 +--- src/pages/Dashboard/Dashboard.vue | 12 +-- src/pages/DataImport.vue | 16 +--- src/pages/GetStarted.vue | 15 +--- src/pages/InvoiceForm.vue | 11 +-- src/pages/JournalEntryForm.vue | 7 +- src/pages/ListView/List.vue | 74 +++++++++---------- src/pages/ListView/ListView.vue | 66 +++++++---------- src/pages/PrintView/PrintView.vue | 7 +- src/pages/Report.vue | 12 +-- src/pages/Settings/Settings.vue | 8 +- src/router.ts | 15 ++-- src/utils/sidebarConfig.ts | 32 ++++---- src/utils/types.ts | 2 +- translations/ar.csv | 2 +- translations/ca-ES.csv | 2 +- translations/de.csv | 2 +- translations/fr.csv | 2 +- translations/pt.csv | 2 +- 28 files changed, 175 insertions(+), 232 deletions(-) diff --git a/fyo/model/naming.ts b/fyo/model/naming.ts index e34b3ab0..d3e53c6a 100644 --- a/fyo/model/naming.ts +++ b/fyo/model/naming.ts @@ -74,7 +74,7 @@ export async function getLastInserted(schemaName: string, fyo: Fyo) { const lastInserted = await fyo.db.getAll(schemaName, { fields: ['name'], limit: 1, - orderBy: 'creation', + orderBy: 'created', order: 'desc', }); return lastInserted && lastInserted.length ? lastInserted[0] : null; diff --git a/models/baseModels/JournalEntry/JournalEntry.ts b/models/baseModels/JournalEntry/JournalEntry.ts index 4e89617f..0a9f1cc1 100644 --- a/models/baseModels/JournalEntry/JournalEntry.ts +++ b/models/baseModels/JournalEntry/JournalEntry.ts @@ -1,10 +1,10 @@ -import { Fyo } from 'fyo'; +import { Fyo, t } from 'fyo'; import { Doc } from 'fyo/model/doc'; import { Action, DefaultMap, FiltersMap, - ListViewSettings, + ListViewSettings } from 'fyo/model/types'; import { DateTime } from 'luxon'; import { getLedgerLinkAction } from 'models/helpers'; @@ -56,13 +56,13 @@ export class JournalEntry extends Doc { return [getLedgerLinkAction(fyo)]; } - static getListViewSettings(fyo: Fyo): ListViewSettings { + static getListViewSettings(): ListViewSettings { return { formRoute: (name) => `/edit/JournalEntry/${name}`, columns: [ 'date', { - label: fyo.t`Status`, + label: t`Status`, fieldtype: 'Select', size: 'small', render(doc) { @@ -84,7 +84,7 @@ export class JournalEntry extends Doc { }, }, { - label: fyo.t`Entry ID`, + label: t`Entry ID`, fieldtype: 'Data', fieldname: 'name', getValue(doc) { diff --git a/models/baseModels/Payment/Payment.ts b/models/baseModels/Payment/Payment.ts index 40808739..a2546625 100644 --- a/models/baseModels/Payment/Payment.ts +++ b/models/baseModels/Payment/Payment.ts @@ -1,4 +1,4 @@ -import { Fyo } from 'fyo'; +import { Fyo, t } from 'fyo'; import { DocValue } from 'fyo/core/types'; import { Doc } from 'fyo/model/doc'; import { @@ -374,7 +374,7 @@ export class Payment extends Doc { columns: [ 'party', { - label: fyo.t`Status`, + label: t`Status`, fieldname: 'status', fieldtype: 'Select', size: 'small', diff --git a/src/App.vue b/src/App.vue index 2118a3ae..90d0df0a 100644 --- a/src/App.vue +++ b/src/App.vue @@ -117,8 +117,7 @@ export default { if (hideGetStarted || onboardingComplete) { routeTo('/'); } else { - // routeTo('/get-started'); - routeTo('/settings'); + routeTo('/get-started'); } }, async changeDbFile() { diff --git a/src/components/Avatar.vue b/src/components/Avatar.vue index ff31babf..3d8fc1b2 100644 --- a/src/components/Avatar.vue +++ b/src/components/Avatar.vue @@ -8,7 +8,17 @@ />