Merge pull request #14 from conterra/bugfix_non-ui-workflow

Bugfix non UI workflow
conterra · Dec 4, 2023 · 038bfdd · 038bfdd
2 parents fb8212f + 0476eef
commit 038bfdd
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 8 deletions.
diff --git a/src/main/js/bundles/dn_printingenhanced/LayoutWidget.vue b/src/main/js/bundles/dn_printingenhanced/LayoutWidget.vue
@@ -118,6 +118,13 @@
                 v-if="visibleUiElements.scaleEnabled"
                 md12
             >
+                <div
+                    v-if="!scaleEnabled && !visibleUiElements.printPreviewCheckbox"
+                    aria-live="polite"
+                    class="ct-message ct-message--info mt-2"
+                >
+                    {{ i18n.helperTextScaleEnabled }}
+                </div>
                 <v-checkbox
                     v-model="scaleEnabledValue"
                     :label="i18n.scaleEnabled"

diff --git a/src/main/js/bundles/dn_printingenhanced/MapOnlyWidget.vue b/src/main/js/bundles/dn_printingenhanced/MapOnlyWidget.vue
@@ -135,6 +135,13 @@
                 v-if="visibleUiElements.scaleEnabled"
                 md12
             >
+                <div
+                    v-if="!scaleEnabled && !visibleUiElements.printPreviewCheckbox"
+                    aria-live="polite"
+                    class="ct-message ct-message--info mt-2"
+                >
+                    {{ i18n.helperTextScaleEnabled }}
+                </div>
                 <v-checkbox
                     v-model="scaleEnabledValue"
                     :label="i18n.scaleEnabled"
@@ -194,13 +201,6 @@
                     class="pa-0 ma-0"
                 />
             </v-flex>
-            <div
-                v-if="!scaleEnabled"
-                aria-live="polite"
-                class="ct-message ct-message--info mt-2"
-            >
-                {{ i18n.helperTextScaleEnabled }}
-            </div>
         </v-layout>
     </v-container>
 </template>

diff --git a/src/main/js/bundles/dn_printingenhanced/PrintingEnhancedWidget.vue b/src/main/js/bundles/dn_printingenhanced/PrintingEnhancedWidget.vue
@@ -219,6 +219,10 @@
                     type: Boolean,
                     default: true
                 },
+                printPreviewInitallyVisible:{
+                    type: Boolean,
+                    default: null
+                },
                 activeTab: {
                     type: Number,
                     default: 0
@@ -240,7 +244,10 @@
             },
             scaleEnabled: function(scaleEnabled) {
                 if (scaleEnabled === false) {
-                    this.enablePrintPreview=false;
+                    this.enablePrintPreview = false;
+                }
+                if (scaleEnabled && !this.visibleUiElements.printPreviewCheckbox) {
+                    this.enablePrintPreview = this.printPreviewInitallyVisible;
                 }
             }
         },
@@ -250,6 +257,9 @@
             } else {
                 this.activeTab = 0;
             }
+            if (!this.visibleUiElements.printPreviewCheckbox) {
+                this.printPreviewInitallyVisible = this.enablePrintPreview;
+            }
             this.$emit('startup');
         },
         methods: {