Skip to content

Commit

Permalink
#724 - collect column access errors and display them
Browse files Browse the repository at this point in the history
  • Loading branch information
@deadlocker8
deadlocker8 committed Jan 11, 2023
1 parent 7221c5c commit 3a8e773
Show file tree
Hide file tree
Showing 5 changed files with 58 additions and 8 deletions.
27 changes: 21 additions & 6 deletions ...r/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionImportController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import de.deadlocker8.budgetmaster.services.HelpersService;
import de.deadlocker8.budgetmaster.transactions.csvimport.*;
import de.deadlocker8.budgetmaster.utils.Mappings;
import de.thecodelabs.utils.util.Localization;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
Expand All @@ -33,7 +34,7 @@ private static class ModelAttributes

private static class ReturnValues
{
public static final String TRANSACTION_IMPORT = "transactions/transactionImport";
public static final String TRANSACTION_IMPORT = "TRANSACTIONS/transactionImport";
public static final String REDIRECT_IMPORT = "redirect:/transactionImport";
public static final String REDIRECT_CANCEL = "redirect:/transactionImport/cancel";
public static final String NEW_TRANSACTION_NORMAL = "transactions/newTransactionNormal";
Expand All @@ -51,6 +52,8 @@ private RequestAttributeNames()
public static final String CSV_TRANSACTIONS = "csvTransactions";
public static final String ERROR_UPLOAD = "errorUpload";
public static final String ERROR_UPLOAD_FILE = "errorUploadFile";
public static final String ERRORS_COLUMN_SETTINGS = "errorsColumnSettings";

}

private final TransactionService transactionService;
Expand Down Expand Up @@ -150,14 +153,25 @@ public String columnSettings(WebRequest request,

final List<CsvRow> csvRows = (List<CsvRow>) attribute;
final List<CsvTransaction> csvTransactions = new ArrayList<>();
for(CsvRow csvRow : csvRows)
final List<String> errors = new ArrayList<>();
for(int i = 0; i < csvRows.size(); i++)
{
final String date = csvRow.getColumns().get(csvColumnSettings.columnDate() - 1);
final String name = csvRow.getColumns().get(csvColumnSettings.columnName() - 1);
final String amount = csvRow.getColumns().get(csvColumnSettings.columnAmount() - 1);
csvTransactions.add(new CsvTransaction(date, name, amount, CsvTransactionStatus.PENDING));
final CsvRow csvRow = csvRows.get(i);
try
{
final String date = csvRow.getColumns().get(csvColumnSettings.columnDate() - 1);
final String name = csvRow.getColumns().get(csvColumnSettings.columnName() - 1);
final String amount = csvRow.getColumns().get(csvColumnSettings.columnAmount() - 1);
csvTransactions.add(new CsvTransaction(date, name, amount, CsvTransactionStatus.PENDING));
}
catch(IndexOutOfBoundsException e)
{
LOGGER.error("Invalid access to column", e);
errors.add(Localization.getString("transactions.import.error.column", i, csvRow));
}
}

request.setAttribute(RequestAttributeNames.ERRORS_COLUMN_SETTINGS, errors, RequestAttributes.SCOPE_SESSION);
request.setAttribute(RequestAttributeNames.CSV_TRANSACTIONS, csvTransactions, RequestAttributes.SCOPE_SESSION);

return ReturnValues.REDIRECT_IMPORT;
Expand Down Expand Up @@ -255,6 +269,7 @@ private void removeAllAttributes(WebRequest request)
request.removeAttribute(RequestAttributeNames.CSV_TRANSACTIONS, RequestAttributes.SCOPE_SESSION);
request.removeAttribute(RequestAttributeNames.ERROR_UPLOAD, RequestAttributes.SCOPE_SESSION);
request.removeAttribute(RequestAttributeNames.ERROR_UPLOAD_FILE, RequestAttributes.SCOPE_SESSION);
request.removeAttribute(RequestAttributeNames.ERRORS_COLUMN_SETTINGS, RequestAttributes.SCOPE_SESSION);
}

private Optional<CsvTransaction> getTransactionByIndex(WebRequest request, Integer index)
Expand Down
1 change: 1 addition & 0 deletions BudgetMasterServer/src/main/resources/languages/base_de.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -380,6 +380,7 @@ transactions.import.status.pending=ausstehend
transactions.import.status.imported=importiert
transactions.import.status.skipped=übersprungen
transactions.import.actions=Aktionen
transactions.import.error.column=Zugeordnete Spalten in Zeile {0} (Zählung beginnt relativ zu Anzahl übersprungener Zeilen) nicht gefunden: {1}

repeating.button.add=Wiederholung hinzufügen
repeating.button.remove=Wiederholung entfernen
Expand Down
3 changes: 2 additions & 1 deletion BudgetMasterServer/src/main/resources/languages/base_en.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@ transaction.new.label.repeating=Repeating
transaction.new.label.repeating.all=Every
transactions.recurring.headline=Active Recurring Transactions
transactions.recurring.placeholder=No active recurring transactions
transactions.import.matchColumns=Match columns
transactions.import.matchColumns=Associate columns
transactions.import.column=Column
transactions.import.separator=Separator
transactions.import.encoding=Encoding
Expand All @@ -379,6 +379,7 @@ transactions.import.status.pending=pending
transactions.import.status.imported=imported
transactions.import.status.skipped=skipped
transactions.import.actions=Actions
transactions.import.error.column=Associated columns not found in row {0} (counting starts relative to the number of skipped rows): {1}

repeating.button.add=Add repetition
repeating.button.remove=Remove repetition
Expand Down
2 changes: 2 additions & 0 deletions BudgetMasterServer/src/main/resources/static/js/transactionImport.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,6 @@ $(document).ready(function()
direction: 'left',
hoverEnabled: false
});

$('.collapsible').collapsible();
});
33 changes: 32 additions & 1 deletion BudgetMasterServer/src/main/resources/templates/transactions/transactionImport.ftl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<@header.header "BudgetMaster - ${locale.getString('menu.transactions.import')}"/>
<@header.style "transactions"/>
<@header.style "transactionImport"/>
<@header.style "collapsible"/>
<#import "/spring.ftl" as s>
</head>
<@header.body>
Expand Down Expand Up @@ -43,6 +44,7 @@

<#if csvTransactions??>
<@renderCsvTransactions/>
<@showColumnSettingsErrors/>
<#elseif csvRows?? >
<div class="container">
<div class="section center-align">
Expand Down Expand Up @@ -217,7 +219,7 @@
</td>
<td>${csvTransaction.getAmount()}</td>
<td>
<@header.buttonSubmit name='action' icon='save' localizationKey='' classes='text-white'/>
<@header.buttonSubmit name='action' icon='save' localizationKey='' classes='text-white'/>&nbsp;
<div class="fixed-action-btn edit-transaction-button">
<a class="btn-floating btn-flat waves-effect waves-light no-padding text-default edit-transaction-button-link">
<i class="material-icons">edit</i>
Expand All @@ -243,6 +245,35 @@
</tr>
</#macro>

<#macro showColumnSettingsErrors>
<#if errorsColumnSettings?has_content>
<div class="container">
<div class="row">
<div class="col s12">
<ul class="collapsible">
<li>
<div class="collapsible-header bold">
<i class="fas fa-exclamation-triangle text-red"></i>
${locale.getString("info.database.import.result.errors")}
</div>
<div class="collapsible-body">
<table class="bordered">
<#list errorsColumnSettings as error>
<tr>
<td><i class="fas fa-exclamation-triangle text-red"></i></td>
<td>${error}</td>
</tr>
</#list>
</table>
</div>
</li>
</ul>
</div>
</div>
</div>
</#if>
</#macro>

<#macro statusBanner status>
<#if status.name() == "PENDING">
<#assign bannerClasses="background-blue text-white">
Expand Down

0 comments on commit 3a8e773

Please sign in to comment.