--- a/client/src/lib/mixins.js	Tue Jul 13 12:24:45 2021 +0200
+++ b/client/src/lib/mixins.js	Tue Jul 13 13:00:41 2021 +0200
@@ -440,6 +440,17 @@
       if (text.includes("{date}")) {
         text = text.replace("{date}", new Date().toLocaleString(locale2));
       }
+      const shortDate = d => {
+        return (
+          (d.getDate() < 10 ? "0" : "") +
+          d.getDate() +
+          "." +
+          (d.getMonth() + 1 < 10 ? "0" : "") +
+          (d.getMonth() + 1) +
+          "." +
+          d.getFullYear()
+        );
+      };
       const hasVisibleSurvey =
         this.soundingInfo &&
         this.bottleneckForPrint &&
@@ -447,23 +458,18 @@
         this.openLayersMap()
           .getLayer("BOTTLENECKISOLINE")
           .getVisible();
+      if (text.includes("{surveydate}") && hasVisibleSurvey) {
+        const dateFromSurvey = new Date(this.selectedSurvey["date_info"]);
+        let dt = shortDate(dateFromSurvey);
+        text = text.replace("{surveydate}", dt.toLocaleString(locale2));
+      } else {
+        let dt = shortDate(new Date());
+        text = text.replace("{surveydate}", dt.toLocaleString(locale2));
+      }
       // get only day,month and year from the Date object
       if (text.includes("{date-minor}")) {
-        var date;
-        if (hasVisibleSurvey) {
-          date = new Date(this.selectedSurvey["date_info"]);
-        } else {
-          date = new Date();
-        }
-
-        var dt =
-          (date.getDate() < 10 ? "0" : "") +
-          date.getDate() +
-          "." +
-          (date.getMonth() + 1 < 10 ? "0" : "") +
-          (date.getMonth() + 1) +
-          "." +
-          date.getFullYear();
+        var date = new Date();
+        let dt = shortDate(date);
         text = text.replace("{date-minor}", dt.toLocaleString(locale2));
       }
       if (text.includes("{user}")) {