added possibility to prevent duplicated collection of elements, see #169

asterics · Nov 3, 2022 · 2ef7b0f · 2ef7b0f
1 parent a49251c
commit 2ef7b0f
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 2 deletions.
diff --git a/app/lang/i18n.en.json b/app/lang/i18n.en.json
@@ -841,5 +841,6 @@
   "quotationMark": "quotation mark",
   "hyphen": "hyphen",
   "space": "space",
-  "readElementActionsInAdditionToLabel": "Read element actions in addition to label"
+  "readElementActionsInAdditionToLabel": "Read element actions in addition to label",
+  "preventCollectingTheSameCellSeveralTimesInARow": "Prevent collecting the same cell several times in a row"
 }
diff --git a/src/js/model/GridElementCollect.js b/src/js/model/GridElementCollect.js
@@ -8,7 +8,8 @@ class GridElementCollect extends GridElement.extend({
     mode: [String],
     singleLine: [Boolean],
     convertToLowercase: [Boolean],
-    textElemSizeFactor: [Number]
+    textElemSizeFactor: [Number],
+    preventDuplicatedCollect: [Boolean]
 }) {
     constructor(props) {
         props = props || {};

diff --git a/src/js/service/collectElementService.js b/src/js/service/collectElementService.js
@@ -29,6 +29,8 @@ let dictionaryKey = null;
 let autoCollectImage = true;
 let collectMode = GridElementCollect.MODE_AUTO;
 let convertToLowercase = true;
+let preventDuplicatedCollect = false;
+let lastCollectId = null;
 
 collectElementService.initWithElements = function (elements, dontAutoPredict) {
     registeredCollectElements = [];
@@ -51,6 +53,7 @@ collectElementService.initWithElements = function (elements, dontAutoPredict) {
             }, null);
             collectMode = copy.mode || collectMode;
             convertToLowercase = copy.convertToLowercase !== false;
+            preventDuplicatedCollect = copy.preventDuplicatedCollect;
             registeredCollectElements.push(copy);
         }
     });
@@ -275,6 +278,10 @@ function isImageMode(elementMode) {
 }
 
 $(window).on(constants.ELEMENT_EVENT_ID, function (event, element) {
+    if (lastCollectId === element.id && preventDuplicatedCollect) {
+        return;
+    }
+    lastCollectId = element.id;
     let label = i18nService.getTranslation(element.label);
     let image = element.image ? (element.image.data || element.image.url) : null;
 

diff --git a/src/vue-components/modals/editElementCollect.vue b/src/vue-components/modals/editElementCollect.vue
@@ -38,6 +38,12 @@
                 <label for="convertToLowercase">{{ $t('convertUppercaseKeyboardLettersToLowercase') }}</label>
             </div>
         </div>
+        <div class="row">
+            <div class="col-12">
+                <input v-if="gridElement" id="preventDuplicatedCollect" type="checkbox" v-model="gridElement.preventDuplicatedCollect"/>
+                <label for="preventDuplicatedCollect">{{ $t('preventCollectingTheSameCellSeveralTimesInARow') }}</label>
+            </div>
+        </div>
     </div>
 </template>