#338 - added options to ignore account and category

src/main/java/de/deadlocker8/budgetmaster/templates/TemplateController.java

@@ -63,10 +63,11 @@ public class TemplateController extends BaseController
 	}
 
 	@PostMapping(value = "/templates/fromTransaction")
-	public String postNormal(Model model,
-							 @RequestParam(value = "templateName") String templateName,
+	public String postNormal(@RequestParam(value = "templateName") String templateName,
 							 @ModelAttribute("NewTransaction") Transaction transaction,
-							 @RequestParam(value = "isPayment", required = false) boolean isPayment)
+							 @RequestParam(value = "isPayment", required = false) boolean isPayment,
+							 @RequestParam(value = "ignoreCategory") Boolean ignoreCategory,
+							 @RequestParam(value = "ignoreAccount") Boolean ignoreAccount)
 	{
 		transactionService.handleAmount(transaction, isPayment);
 		transactionService.handleTags(transaction);
@@ -76,9 +77,7 @@ public class TemplateController extends BaseController
 			throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "templateName must not be empty");
 		}
 
-		final Template template = new Template(templateName, transaction);
-		templateService.getRepository().save(template);
-
+		templateService.createFromTransaction(templateName, transaction, ignoreCategory, ignoreAccount);
 		return "redirect:/templates";
 	}
 

src/main/java/de/deadlocker8/budgetmaster/templates/TemplateService.java

 package de.deadlocker8.budgetmaster.templates;
 
 import de.deadlocker8.budgetmaster.services.Resetable;
+import de.deadlocker8.budgetmaster.transactions.Transaction;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,4 +34,20 @@ public class TemplateService implements Resetable
 	public void createDefaults()
 	{
 	}
+
+	public void createFromTransaction(String templateName, Transaction transaction, boolean ignoreCategory, boolean ignoreAccount)
+	{
+		final Template template = new Template(templateName, transaction);
+		if(ignoreCategory)
+		{
+			template.setCategory(null);
+		}
+
+		if(ignoreAccount)
+		{
+			template.setAccount(null);
+		}
+
+		getRepository().save(template);
+	}
 }

src/main/resources/languages/_de.properties

@@ -246,6 +246,9 @@ 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
+
 # ABOUT
 about=Über {0}
 about.roadmap.link=Roadmap öffnen

src/main/resources/languages/_en.properties

@@ -246,6 +246,9 @@ 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
+
 # ABOUT
 about=About {0}
 about.roadmap.link=Open Roadmap

src/main/resources/static/js/templates.js

@@ -24,9 +24,20 @@ $(document).ready(function()
                 data: {},
                 success: function(data)
                 {
+                   createAndOpenModal(data)
+                }
+            });
+        });
+    }
+});
+
+function createAndOpenModal(data)
+{
+    let modalID = '#modalCreateFromTransaction';
+
     $('#saveAsTemplateModalContainer').html(data);
-                    $('#modalCreateFromTransaction').modal();
-                    $('#modalCreateFromTransaction').modal('open');
+    $(modalID).modal();
+    $(modalID).modal('open');
     let templateNameInput = document.getElementById('template-name');
     templateNameInput.focus();
     $(templateNameInput).on('keypress', function(e)
@@ -43,10 +54,6 @@ $(document).ready(function()
         saveAsTemplate();
     });
 }
-            });
-        });
-    }
-});
 
 function saveAsTemplate()
 {
@@ -58,18 +65,13 @@ function saveAsTemplate()
         return
     }
 
-    // insert additional input for template name
-    let inputTemplateName = document.createElement('input');
-    inputTemplateName.setAttribute('type', 'hidden');
-    inputTemplateName.setAttribute('name', 'templateName');
-    inputTemplateName.setAttribute('value', templateName);
-
     let form = document.getElementsByName('NewTransaction')[0];
-    form.appendChild(inputTemplateName);
+    form.appendChild(createAdditionalHiddenInput('templateName', templateName));
+    form.appendChild(createAdditionalHiddenInput('ignoreCategory', document.getElementById('ignore-category').checked));
+    form.appendChild(createAdditionalHiddenInput('ignoreAccount', document.getElementById('ignore-account').checked));
 
     // replace form target url
     form.action = $('#buttonCreateTemplate').attr('data-url');
-
     form.submit();
 }
 
@@ -97,3 +99,12 @@ function validateTemplateName(templateName)
 
     return true;
 }
+
+function createAdditionalHiddenInput(name, value)
+{
+    let newInput = document.createElement('input');
+    newInput.setAttribute('type', 'hidden');
+    newInput.setAttribute('name', name);
+    newInput.setAttribute('value', value);
+    return newInput;
+}
\ No newline at end of file

src/main/resources/templates/templates/createFromTransactionModal.ftl

@@ -10,6 +10,18 @@
                 <input id="template-name" type="text" name="templateName">
                 <label for="template-name">${locale.getString("transaction.new.label.name")}</label>
             </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>
+                </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>
+                </label>
+            </div>
         </div>
     </div>
     <div class="modal-footer background-color">

src/main/resources/templates/transactions/newTransactionNormal.ftl

@@ -5,6 +5,7 @@
         <@header.style "transactions"/>
         <@header.style "datepicker"/>
         <@header.style "categories"/>
+        <@header.style "filter"/>
         <#import "/spring.ftl" as s>
     </head>
     <body class="budgetmaster-blue-light">

src/main/resources/templates/transactions/newTransactionTransfer.ftl

@@ -5,6 +5,7 @@
         <@header.style "transactions"/>
         <@header.style "datepicker"/>
         <@header.style "categories"/>
+        <@header.style "filter"/>
         <#import "/spring.ftl" as s>
     </head>
     <body class="budgetmaster-blue-light">