From 8f84f2677c87d794f1057f42df226c12639b77bd Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Mon, 13 Mar 2023 12:36:56 +0530
Subject: [PATCH] incr: add template select and save menu items - add shortcut
for view hints, show shortcut to apply changes - update shortcut helper ui
---
reports/GoodsAndServiceTax/gstExporter.ts | 2 +-
reports/commonExporter.ts | 11 +-
src/components/ShortcutKeys.vue | 39 ++++++
src/components/ShortcutsHelper.vue | 108 ++++-------------
src/pages/ImportWizard.vue | 23 +---
src/pages/TemplateBuilder/TemplateBuilder.vue | 113 +++++++++++++++++-
src/utils/ui.ts | 65 ++++++++++
7 files changed, 248 insertions(+), 113 deletions(-)
create mode 100644 src/components/ShortcutKeys.vue
diff --git a/reports/GoodsAndServiceTax/gstExporter.ts b/reports/GoodsAndServiceTax/gstExporter.ts
index 01849fdd..f0d55f55 100644
--- a/reports/GoodsAndServiceTax/gstExporter.ts
+++ b/reports/GoodsAndServiceTax/gstExporter.ts
@@ -162,7 +162,7 @@ async function exportReport(extention: ExportExtention, report: BaseGSTR) {
return;
}
- await saveExportData(data, filePath, report.fyo);
+ await saveExportData(data, filePath);
report.fyo.telemetry.log(Verb.Exported, report.reportName, { extention });
}
diff --git a/reports/commonExporter.ts b/reports/commonExporter.ts
index e8001e54..d4cdcdc5 100644
--- a/reports/commonExporter.ts
+++ b/reports/commonExporter.ts
@@ -52,7 +52,7 @@ async function exportReport(extention: ExportExtention, report: Report) {
return;
}
- await saveExportData(data, filePath, report.fyo);
+ await saveExportData(data, filePath);
report.fyo.telemetry.log(Verb.Exported, report.reportName, { extention });
}
@@ -178,7 +178,12 @@ function getValueFromCell(cell: ReportCell, displayPrecision: number) {
return rawValue;
}
-export async function saveExportData(data: string, filePath: string, fyo: Fyo) {
+export async function saveExportData(
+ data: string,
+ filePath: string,
+ message?: string
+) {
await saveData(data, filePath);
- showExportInFolder(fyo.t`Export Successful`, filePath);
+ message ??= t`Export Successful`;
+ showExportInFolder(message, filePath);
}
diff --git a/src/components/ShortcutKeys.vue b/src/components/ShortcutKeys.vue
new file mode 100644
index 00000000..3507ceda
--- /dev/null
+++ b/src/components/ShortcutKeys.vue
@@ -0,0 +1,39 @@
+
+