diff --git a/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateController.java b/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateController.java index 670c2c6facdae45dfb25f400afaec151df8056a8..bb59ed57afa5d00552a64c943d0eab9c5ab2eae5 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateController.java +++ b/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateController.java @@ -80,8 +80,8 @@ public class TemplateController extends BaseController public String postNormal(@RequestParam(value = "templateName") String templateName, @ModelAttribute("NewTransaction") Transaction transaction, @RequestParam(value = "isPayment", required = false) boolean isPayment, - @RequestParam(value = "ignoreCategory") Boolean ignoreCategory, - @RequestParam(value = "ignoreAccount") Boolean ignoreAccount) + @RequestParam(value = "includeCategory") Boolean includeCategory, + @RequestParam(value = "includeAccount") Boolean includeAccount) { transactionService.handleAmount(transaction, isPayment); transactionService.handleTags(transaction); @@ -91,7 +91,7 @@ public class TemplateController extends BaseController throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "templateName must not be empty"); } - templateService.createFromTransaction(templateName, transaction, ignoreCategory, ignoreAccount); + templateService.createFromTransaction(templateName, transaction, includeCategory, includeAccount); return "redirect:/templates"; } diff --git a/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateService.java b/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateService.java index 4fc84a49d3626533807eaabac9fe192c059f915b..07fefa6c985bccd3ded1fb91763716105a61b9be 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateService.java +++ b/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateService.java @@ -43,15 +43,15 @@ public class TemplateService implements Resetable { } - public void createFromTransaction(String templateName, Transaction transaction, boolean ignoreCategory, boolean ignoreAccount) + public void createFromTransaction(String templateName, Transaction transaction, boolean includeCategory, boolean includeAccount) { final Template template = new Template(templateName, transaction); - if(ignoreCategory) + if(!includeCategory) { template.setCategory(null); } - if(ignoreAccount) + if(!includeAccount) { template.setAccount(null); } diff --git a/src/main/resources/languages/_de.properties b/src/main/resources/languages/_de.properties index 66d619c26e4518b9ce4307463a2118a428f9588c..b40ac64252359f055cb3421ac66d10e3a5e59bf0 100644 --- a/src/main/resources/languages/_de.properties +++ b/src/main/resources/languages/_de.properties @@ -246,8 +246,8 @@ search.in.description=Beschreibung search.in.category=Kategorie search.in.tags=Tags -template.checkbox.ignore.category=Kategorie nicht übernehmen -template.checkbox.ignore.account=Konto nicht übernehmen +template.checkbox.include.category=Kategorie übernehmen +template.checkbox.include.account=Konto übernehmen # ABOUT about=Über {0} diff --git a/src/main/resources/languages/_en.properties b/src/main/resources/languages/_en.properties index 8356570c7549f7a362c48c45ce47e4dea6ab1007..261d7f1864a53ce41eb810913da40b97e11148e4 100644 --- a/src/main/resources/languages/_en.properties +++ b/src/main/resources/languages/_en.properties @@ -246,8 +246,8 @@ search.in.description=Description search.in.category=Category search.in.tags=Tags -template.checkbox.ignore.category=Omit selected category -template.checkbox.ignore.account=Omit selected account +template.checkbox.include.category=Include category +template.checkbox.include.account=Include account # ABOUT about=About {0} diff --git a/src/main/resources/static/js/templates.js b/src/main/resources/static/js/templates.js index 496d4ecd0c96761d85f2417d3fa3372d169e1356..f537fd39b84d2baf823ce6b62b22550f8891ed83 100644 --- a/src/main/resources/static/js/templates.js +++ b/src/main/resources/static/js/templates.js @@ -67,8 +67,8 @@ function saveAsTemplate() let form = document.getElementsByName('NewTransaction')[0]; form.appendChild(createAdditionalHiddenInput('templateName', templateName)); - form.appendChild(createAdditionalHiddenInput('ignoreCategory', document.getElementById('ignore-category').checked)); - form.appendChild(createAdditionalHiddenInput('ignoreAccount', document.getElementById('ignore-account').checked)); + form.appendChild(createAdditionalHiddenInput('includeCategory', document.getElementById('include-category').checked)); + form.appendChild(createAdditionalHiddenInput('includeAccount', document.getElementById('include-account').checked)); // replace form target url form.action = $('#buttonCreateTemplate').attr('data-url'); diff --git a/src/main/resources/templates/templates/createFromTransactionModal.ftl b/src/main/resources/templates/templates/createFromTransactionModal.ftl index c82f42f2f1035e7a4d2b07ebc0870d6a04a77a55..da4a5c464359e8494ac7dd405af15233017b26c1 100644 --- a/src/main/resources/templates/templates/createFromTransactionModal.ftl +++ b/src/main/resources/templates/templates/createFromTransactionModal.ftl @@ -12,14 +12,14 @@ </div> <div class="col s12"> <label> - <input id="ignore-category" type="checkbox"> - <span class="columnName-checkbox-label text-color">${locale.getString('template.checkbox.ignore.category')}</span> + <input id="include-category" type="checkbox" checked="checked"> + <span class="columnName-checkbox-label text-color">${locale.getString('template.checkbox.include.category')}</span> </label> </div> <div class="col s12"> <label> - <input id="ignore-account" type="checkbox" checked="checked"> - <span class="columnName-checkbox-label text-color">${locale.getString('template.checkbox.ignore.account')}</span> + <input id="include-account" type="checkbox"> + <span class="columnName-checkbox-label text-color">${locale.getString('template.checkbox.include.account')}</span> </label> </div> </div>