fix filename after saved month is loaded

mathisdt · Oct 31, 2024 · dae6f7b · dae6f7b
1 parent c74e3ac
commit dae6f7b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/src/main/java/org/zephyrsoft/optigemspoonfeeder/model/AccountMonth.java b/src/main/java/org/zephyrsoft/optigemspoonfeeder/model/AccountMonth.java
@@ -23,6 +23,10 @@ public class AccountMonth implements Comparable<AccountMonth> {
     private String account;
     private YearMonth yearMonth;
 
+    public String getAccountForFilename() {
+        return account.replaceAll("[^a-zA-Z0-9]", "_").replaceAll("__", "_");
+    }
+
     public String getFilename() {
         return account + "-" + YEAR_MONTH_FORMAT.format(yearMonth) + ".json";
     }

diff --git a/src/main/java/org/zephyrsoft/optigemspoonfeeder/ui/MainView.java b/src/main/java/org/zephyrsoft/optigemspoonfeeder/ui/MainView.java
@@ -315,6 +315,12 @@ private static List<YearMonth> availableMonths() {
     private void applyRulesToParsedData() {
         convertParsedData();
 
+        updateDownloadButtons();
+
+        updateFooter();
+    }
+
+    private void updateDownloadButtons() {
         buttons.removeAll();
 
         StreamResource streamBuchungen = new StreamResource(
@@ -336,8 +342,6 @@ private void applyRulesToParsedData() {
         downloadRestMt940.add(new Button("Rest (MT940)", new Icon(VaadinIcon.DOWNLOAD)));
 
         buttons.add(downloadBuchungen, downloadRestMt940);
-
-        updateFooter();
     }
 
     private void parseUploadedFile(InputStream inputStream, String filename) {
@@ -385,6 +389,9 @@ private void loadStoredMonth(AccountMonth accountMonth) {
             logArea.setText(accountMonth.getLabel() +" geladen\n" + result.getLogMessages());
             updateFooter();
             loadedMonth = accountMonth;
+            originalFilename = accountMonth.getAccountForFilename() + "_" + MONTH_FORMAT.format(accountMonth.getYearMonth()) + ".hibiscus";
+            timestamp = TIMESTAMP_FORMAT.format(LocalDateTime.now());
+            updateDownloadButtons();
 
             grid.removeAllColumns();
             grid.setItems(new ListDataProvider<>(result.getResults()));