From d90d6a2b9504f2a7891d6e2f1b76573fbbf949b8 Mon Sep 17 00:00:00 2001 From: Robert Goldmann <deadlocker@gmx.de> Date: Sun, 3 Oct 2021 14:37:06 +0200 Subject: [PATCH] #596 - removed hotkey to create a new recurring transaction --- .../budgetmaster/hotkeys/GeneralHotKey.java | 1 - src/main/resources/languages/base_de.properties | 2 -- src/main/resources/languages/base_en.properties | 2 -- src/main/resources/static/js/hotkeys.js | 8 -------- .../integration/selenium/HotkeyTest.java | 12 ------------ 5 files changed, 25 deletions(-) diff --git a/src/main/java/de/deadlocker8/budgetmaster/hotkeys/GeneralHotKey.java b/src/main/java/de/deadlocker8/budgetmaster/hotkeys/GeneralHotKey.java index 1ca59e739..4c0a1bf08 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/hotkeys/GeneralHotKey.java +++ b/src/main/java/de/deadlocker8/budgetmaster/hotkeys/GeneralHotKey.java @@ -7,7 +7,6 @@ import java.text.MessageFormat; public enum GeneralHotKey implements HotKey { CREATE_TRANSACTION("hotkeys.transactions.new.normal", false), - CREATE_RECURRING_TRANSACTION("hotkeys.transactions.new.repeating", false), CREATE_TRANSFER_TRANSACTION("hotkeys.transactions.new.transfer", false), CREATE_TRANSACTION_FROM_TEMPLATE("hotkeys.transactions.new.template", false), SAVE_TRANSACTION("hotkeys.transactions.save", true), diff --git a/src/main/resources/languages/base_de.properties b/src/main/resources/languages/base_de.properties index 1580ae7fb..1366fbc4e 100644 --- a/src/main/resources/languages/base_de.properties +++ b/src/main/resources/languages/base_de.properties @@ -473,8 +473,6 @@ home.first.use.home=Los geht's! hotkeys.general=Allgemein hotkeys.transactions.new.normal=Neue Buchung anlegen hotkeys.transactions.new.normal.key=n -hotkeys.transactions.new.repeating=Neue wiederholende Buchung anlegen -hotkeys.transactions.new.repeating.key=r hotkeys.transactions.new.transfer=Neue Umbuchung anlegen hotkeys.transactions.new.transfer.key=t hotkeys.transactions.new.template=Neue Buchung aus Vorlage anlegen diff --git a/src/main/resources/languages/base_en.properties b/src/main/resources/languages/base_en.properties index abc0e8566..d26216f9e 100644 --- a/src/main/resources/languages/base_en.properties +++ b/src/main/resources/languages/base_en.properties @@ -474,8 +474,6 @@ home.first.use.home=Let''s go! hotkeys.general=General hotkeys.transactions.new.normal=Create a transaction hotkeys.transactions.new.normal.key=n -hotkeys.transactions.new.repeating=Create a recuring transaction -hotkeys.transactions.new.repeating.key=r hotkeys.transactions.new.transfer=Create a transfer hotkeys.transactions.new.transfer.key=t hotkeys.transactions.new.template=Create a transaction from template diff --git a/src/main/resources/static/js/hotkeys.js b/src/main/resources/static/js/hotkeys.js index 326c88180..4c873f114 100644 --- a/src/main/resources/static/js/hotkeys.js +++ b/src/main/resources/static/js/hotkeys.js @@ -6,14 +6,6 @@ Mousetrap.bind('n', function() } }); -Mousetrap.bind('r', function() -{ - if(areHotKeysEnabled()) - { - window.location.href = rootURL + '/transactions/newTransaction/normal'; - } -}); - Mousetrap.bind('t', function() { if(areHotKeysEnabled()) diff --git a/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/HotkeyTest.java b/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/HotkeyTest.java index 93e40cff4..cce9b7703 100644 --- a/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/HotkeyTest.java +++ b/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/HotkeyTest.java @@ -61,18 +61,6 @@ class HotkeyTest extends SeleniumTestBase assertThat(driver.getCurrentUrl()).endsWith("/newTransaction/normal"); } - @Test - void hotkey_newTransaction_recurring() - { - driver.findElement(By.tagName("body")).sendKeys("r"); - - WebDriverWait wait = new WebDriverWait(driver, 5); - wait.until(ExpectedConditions.presenceOfElementLocated(By.cssSelector("form[name='NewTransaction']"))); - - assertThat(driver.getCurrentUrl()).endsWith("/newTransaction/normal"); -// TODO: assert that repeating options are shown automatically - } - @Test void hotkey_newTransaction_transfer() { -- GitLab