Skip to content
Snippets Groups Projects
Commit a7ce3dc4 authored by Robert Goldmann's avatar Robert Goldmann
Browse files

#724 - add button to skip row

parent d0dd8a8c
No related branches found
No related tags found
No related merge requests found
...@@ -9,17 +9,13 @@ import org.springframework.stereotype.Controller; ...@@ -9,17 +9,13 @@ import org.springframework.stereotype.Controller;
import org.springframework.ui.Model; import org.springframework.ui.Model;
import org.springframework.validation.BindingResult; import org.springframework.validation.BindingResult;
import org.springframework.validation.FieldError; import org.springframework.validation.FieldError;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.context.request.RequestAttributes; import org.springframework.web.context.request.RequestAttributes;
import org.springframework.web.context.request.WebRequest; import org.springframework.web.context.request.WebRequest;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Random;
@Controller @Controller
@RequestMapping(Mappings.TRANSACTION_IMPORT) @RequestMapping(Mappings.TRANSACTION_IMPORT)
...@@ -159,6 +155,20 @@ public class TransactionImportController extends BaseController ...@@ -159,6 +155,20 @@ public class TransactionImportController extends BaseController
return ReturnValues.REDIRECT_IMPORT; return ReturnValues.REDIRECT_IMPORT;
} }
@GetMapping("/{index}/skip")
public String skip(WebRequest request, @PathVariable("index") Integer index)
{
final Object attribute = request.getAttribute(RequestAttributeNames.CSV_TRANSACTIONS, RequestAttributes.SCOPE_SESSION);
if(attribute == null)
{
return ReturnValues.REDIRECT_CANCEL;
}
final List<CsvTransaction> csvTransactions = (List<CsvTransaction>) attribute;
csvTransactions.get(index).setStatus(CsvTransactionStatus.SKIPPED);
return ReturnValues.REDIRECT_IMPORT;
}
private void removeAllAttributes(WebRequest request) private void removeAllAttributes(WebRequest request)
{ {
request.removeAttribute(RequestAttributeNames.CSV_IMPORT, RequestAttributes.SCOPE_SESSION); request.removeAttribute(RequestAttributeNames.CSV_IMPORT, RequestAttributes.SCOPE_SESSION);
......
...@@ -379,6 +379,7 @@ transactions.import.status=Status ...@@ -379,6 +379,7 @@ transactions.import.status=Status
transactions.import.status.pending=ausstehend transactions.import.status.pending=ausstehend
transactions.import.status.imported=importiert transactions.import.status.imported=importiert
transactions.import.status.skipped=übersprungen transactions.import.status.skipped=übersprungen
transactions.import.actions=Aktionen
repeating.button.add=Wiederholung hinzufügen repeating.button.add=Wiederholung hinzufügen
repeating.button.remove=Wiederholung entfernen repeating.button.remove=Wiederholung entfernen
......
...@@ -378,6 +378,7 @@ transactions.import.status=Status ...@@ -378,6 +378,7 @@ transactions.import.status=Status
transactions.import.status.pending=pending transactions.import.status.pending=pending
transactions.import.status.imported=imported transactions.import.status.imported=imported
transactions.import.status.skipped=skipped transactions.import.status.skipped=skipped
transactions.import.actions=Actions
repeating.button.add=Add repetition repeating.button.add=Add repetition
repeating.button.remove=Remove repetition repeating.button.remove=Remove repetition
......
...@@ -192,6 +192,7 @@ ...@@ -192,6 +192,7 @@
<td class="bold">${locale.getString("transaction.new.label.date")}</td> <td class="bold">${locale.getString("transaction.new.label.date")}</td>
<td class="bold">${locale.getString("transaction.new.label.name")}</td> <td class="bold">${locale.getString("transaction.new.label.name")}</td>
<td class="bold">${locale.getString("transaction.new.label.amount")}</td> <td class="bold">${locale.getString("transaction.new.label.amount")}</td>
<td class="bold">${locale.getString("transactions.import.actions")}</td>
</tr> </tr>
<#list csvTransactions as csvTransaction> <#list csvTransactions as csvTransaction>
...@@ -200,6 +201,9 @@ ...@@ -200,6 +201,9 @@
<td>${csvTransaction.getDate()}</td> <td>${csvTransaction.getDate()}</td>
<td>${csvTransaction.getName()}</td> <td>${csvTransaction.getName()}</td>
<td>${csvTransaction.getAmount()}</td> <td>${csvTransaction.getAmount()}</td>
<td>
<@header.buttonFlat url='/transactionImport/' + csvTransaction?index + '/skip' icon='block' localizationKey='' classes="no-padding text-default button-request-transaction-import-skip"/>
</td>
</tr> </tr>
</#list> </#list>
</table> </table>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment