Skip to content

Commit 7287888

Browse files
author
burdo
committed
prettify display
1 parent 52727ea commit 7287888

5 files changed

Lines changed: 28 additions & 0 deletions

File tree

src/main/java/de/kaleidox/workbench/flk/converter/FlkConverterController.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,14 @@
88
import org.springframework.stereotype.Controller;
99
import org.springframework.ui.Model;
1010
import org.springframework.web.bind.annotation.GetMapping;
11+
import org.springframework.web.bind.annotation.ModelAttribute;
1112
import org.springframework.web.bind.annotation.PathVariable;
1213
import org.springframework.web.bind.annotation.PostMapping;
1314
import org.springframework.web.bind.annotation.RequestMapping;
1415
import org.springframework.web.bind.annotation.RequestParam;
1516
import org.springframework.web.multipart.MultipartFile;
1617

18+
import java.util.List;
1719
import java.util.Objects;
1820

1921
@Controller
@@ -23,6 +25,11 @@ public class FlkConverterController {
2325
@Autowired FlkConverter converter;
2426
@Autowired ObjectMapper objectMapper;
2527

28+
@ModelAttribute("available")
29+
public List<String> available() {
30+
return storage.all().filter(str -> str.endsWith(".json")).toList();
31+
}
32+
2633
@GetMapping
2734
public String upload() {
2835
return "flkConverter/upload";

src/main/java/de/kaleidox/workbench/model/abstr/StorageService.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package de.kaleidox.workbench.model.abstr;
22

33
import java.io.InputStream;
4+
import java.util.stream.Stream;
45

56
public interface StorageService {
67
/**
@@ -23,4 +24,9 @@ public interface StorageService {
2324
* @return the data from storage
2425
*/
2526
InputStream load(String id);
27+
28+
/**
29+
* @return all existing data identifiers
30+
*/
31+
Stream<String> all();
2632
}

src/main/java/de/kaleidox/workbench/storage/TempFileStorageService.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@
1111
import java.io.FileInputStream;
1212
import java.io.FileOutputStream;
1313
import java.io.InputStream;
14+
import java.util.Arrays;
1415
import java.util.function.Predicate;
16+
import java.util.stream.Stream;
1517

1618
@Service
1719
public class TempFileStorageService implements StorageService {
@@ -45,4 +47,9 @@ public boolean exists(String id) {
4547
public InputStream load(String id) {
4648
return new FileInputStream(new File(baseDir, id));
4749
}
50+
51+
@Override
52+
public Stream<String> all() {
53+
return Arrays.stream(baseDir.list());
54+
}
4855
}

src/main/resources/templates/flkConverter/upload.html

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,12 @@
1616
</tr>
1717
</table>
1818
</form>
19+
<div class="ui-panel-2">
20+
<h2>Vorhandene Scans:</h2>
21+
<ul>
22+
<li th:each="id: ${available}"><a th:href="'/flk/'+${id}" th:text="${id}"></a></li>
23+
</ul>
24+
</div>
1925
</div>
2026
<div class="ui-footer" th:insert="~{/layout/footer}"></div>
2127
</body>

src/main/resources/templates/layout/menubar.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,6 @@
44
|
55
<a class="clean-link" th:href="@{/customers}">Kunden</a>
66
|
7+
<a class="clean-link" th:href="@{/flk}">Fluke</a>
8+
|
79
<a class="clean-link" th:href="@{/logout}">Logout</a>

0 commit comments

Comments
 (0)