From a5e37bade12bd09f6d61e107fe751194b5ad5e80 Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Sat, 21 Jan 2023 16:16:57 +0100
Subject: [PATCH] #724 - disable skipped rows
---
.../main/resources/templates/helpers/customSelectMacros.ftl | 4 ++--
.../resources/templates/transactions/transactionImport.ftl | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/BudgetMasterServer/src/main/resources/templates/helpers/customSelectMacros.ftl b/BudgetMasterServer/src/main/resources/templates/helpers/customSelectMacros.ftl
index 9ad1ffa0d..78cce0aed 100644
--- a/BudgetMasterServer/src/main/resources/templates/helpers/customSelectMacros.ftl
+++ b/BudgetMasterServer/src/main/resources/templates/helpers/customSelectMacros.ftl
@@ -20,8 +20,8 @@
</div>
</#macro>
-<#macro customCategorySelect categories selectedCategory inputClasses labelText id showName=true rowClasses="">
- <@customSelectStart "category-select-wrapper" categories inputClasses labelText id "label" false rowClasses>
+<#macro customCategorySelect categories selectedCategory inputClasses labelText id showName=true rowClasses="" disabled=false>
+ <@customSelectStart "category-select-wrapper" categories inputClasses labelText id "label" disabled rowClasses>
<div class="custom-select-trigger" tabindex="0">
<div class="custom-select-selected-item">
<#if selectedCategory??><@customSelectOptionCategoryContent category=selectedCategory classes="no-margin-left" datasetValue=true showName=showName/></#if>
diff --git a/BudgetMasterServer/src/main/resources/templates/transactions/transactionImport.ftl b/BudgetMasterServer/src/main/resources/templates/transactions/transactionImport.ftl
index 8949588dd..6f3468460 100644
--- a/BudgetMasterServer/src/main/resources/templates/transactions/transactionImport.ftl
+++ b/BudgetMasterServer/src/main/resources/templates/transactions/transactionImport.ftl
@@ -248,16 +248,16 @@
<td data-order="${locale.getString(csvTransaction.getStatus().getLocalizationKey())}" data-search="${locale.getString(csvTransaction.getStatus().getLocalizationKey())}"><@statusBanner csvTransaction.getStatus()/></td>
<td data-order="${csvTransaction.getDate()}" data-search="${csvTransaction.getDate()}">${csvTransaction.getDate()}</td>
<td data-order="${csvTransaction.getCategory().getName()}" data-search="${csvTransaction.getCategory().getName()}">
- <@customSelectMacros.customCategorySelect categories csvTransaction.getCategory() "left-align no-margin-top no-margin-bottom" "" "csvTransaction-category-${index}" false "no-margin-bottom"/>
+ <@customSelectMacros.customCategorySelect categories csvTransaction.getCategory() "left-align no-margin-top no-margin-bottom" "" "csvTransaction-category-${index}" false "no-margin-bottom" csvTransaction.getStatus().name() == 'SKIPPED'/>
</td>
<td data-order="${csvTransaction.getName()}" data-search="${csvTransaction.getName()}">
<div class="input-field no-margin-top no-margin-bottom">
- <input class="no-margin-bottom" type="text" name="name" required value="${csvTransaction.getName()}">
+ <input class="no-margin-bottom" type="text" name="name" required value="${csvTransaction.getName()}" <#if csvTransaction.getStatus().name() == 'SKIPPED'>disabled</#if>>
</div>
</td>
<td data-order="${csvTransaction.getDescription()}" data-search="${csvTransaction.getDescription()}">
<div class="input-field no-margin-top no-margin-bottom">
- <input class="no-margin-bottom" type="text" name="description" value="${csvTransaction.getDescription()}">
+ <input class="no-margin-bottom" type="text" name="description" value="${csvTransaction.getDescription()}" <#if csvTransaction.getStatus().name() == 'SKIPPED'>disabled</#if>>
</div>
</td>
<td data-order="${currencyService.getCurrencyString(csvTransaction.getAmount())}" data-search="${currencyService.getCurrencyString(csvTransaction.getAmount())}">${currencyService.getCurrencyString(csvTransaction.getAmount())}</td>
--
GitLab