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

#724 - fixed error if there are no rows

parent 8f03c897
No related branches found
No related tags found
No related merge requests found
#transaction-import-overview {
overflow: auto;
}
\ No newline at end of file
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
<#import "../helpers/validation.ftl" as validation> <#import "../helpers/validation.ftl" as validation>
<@header.globals/> <@header.globals/>
<@header.header "BudgetMaster - ${locale.getString('menu.transactions.import')}"/> <@header.header "BudgetMaster - ${locale.getString('menu.transactions.import')}"/>
<@header.style "transactionImport"/>
<#import "/spring.ftl" as s> <#import "/spring.ftl" as s>
</head> </head>
<@header.body> <@header.body>
...@@ -24,7 +25,7 @@ ...@@ -24,7 +25,7 @@
<div class="container"> <div class="container">
<#if !error?? && csvImport.getFileName()??> <#if !error?? && csvImport.getFileName()??>
<div class="row center-align"> <div class="row center-align">
<div class="col s12 m12 l8 offset-l2 headline-small text-green"> <div class="col s12 m12 l8 offset-l2 headline-small text-green truncate">
<i class="fas fa-file-csv"></i> ${csvImport.getFileName()} <i class="fas fa-file-csv"></i> ${csvImport.getFileName()}
</div> </div>
</div> </div>
...@@ -69,16 +70,16 @@ ...@@ -69,16 +70,16 @@
</div> </div>
<div class="row"> <div class="row">
<div class="input-field col s2 offset-s3"> <div class="input-field col s4 l2 offset-l3">
<input id="separator" type="text" name="separator" <@validation.validation "separator" "center-align"/> value="<#if csvImport??>${csvImport.separator()}</#if>"> <input id="separator" type="text" name="separator" <@validation.validation "separator" "center-align"/> value="<#if csvImport??>${csvImport.separator()}</#if>">
<label class="input-label" for="separator">${locale.getString("transactions.import.separator")}</label> <label class="input-label" for="separator">${locale.getString("transactions.import.separator")}</label>
</div> </div>
<div class="input-field col s2"> <div class="input-field col s4 l2">
<input id="encoding" type="text" name="encoding" <@validation.validation "encoding" "center-align"/> value="<#if csvImport??>${csvImport.encoding()?upper_case}</#if>"> <input id="encoding" type="text" name="encoding" <@validation.validation "encoding" "center-align"/> value="<#if csvImport??>${csvImport.encoding()?upper_case}</#if>">
<label class="input-label" for="encoding">${locale.getString("transactions.import.encoding")}</label> <label class="input-label" for="encoding">${locale.getString("transactions.import.encoding")}</label>
</div> </div>
<div class="input-field col s2"> <div class="input-field col s4 l2">
<input id="numberOfLinesToSkip" type="number" name="quantity" min="0" name="numberOfLinesToSkip" <@validation.validation "encoding" "center-align"/> value="<#if csvImport??>${csvImport.numberOfLinesToSkip()?c}</#if>"> <input id="numberOfLinesToSkip" type="number" name="numberOfLinesToSkip" min="0" name="numberOfLinesToSkip" <@validation.validation "numberOfLinesToSkip" "center-align"/> value="<#if csvImport??>${csvImport.numberOfLinesToSkip()?c}</#if>">
<label class="input-label" for="numberOfLinesToSkip">${locale.getString("transactions.import.numberOfLinesToSkip")}</label> <label class="input-label" for="numberOfLinesToSkip">${locale.getString("transactions.import.numberOfLinesToSkip")}</label>
</div> </div>
</div> </div>
...@@ -101,9 +102,12 @@ ...@@ -101,9 +102,12 @@
<div class="container"> <div class="container">
<table class="bordered centered"> <table class="bordered centered">
<tr> <tr>
<#list 1..csvRows[0].getColumns()?size as i> <#if csvRows?has_content>
<#assign numberOfColumns=csvRows[0].getColumns()?size/>
<#list 1..numberOfColumns as i>
<td class="bold">${locale.getString("transactions.import.column")} ${i?c}</td> <td class="bold">${locale.getString("transactions.import.column")} ${i?c}</td>
</#list> </#list>
</#if>
</tr> </tr>
<#list csvRows as cswRow> <#list csvRows as cswRow>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment