position for duplicate

ThomasPohl · May 29, 2023 · 94e0226 · 94e0226
1 parent a621079
commit 94e0226
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -70,6 +70,11 @@ Use the available blocks to automatically interact with your spreadsheet.
 ### 0.0.4
 
 * (Thomas Pohl) Added "duplicate Sheet"
+
+### 0.0.5
+
+* (Thomas Pohl) Position for "suplicate sheet"
+
 <!--
     Placeholder for the next version (at the beginning of the line):
     ### **WORK IN PROGRESS**

diff --git a/admin/blocks/duplicateSheet.js b/admin/blocks/duplicateSheet.js
@@ -1,6 +1,7 @@
 Blockly.Words["google-spreadsheet_duplicate-sheet_duplicate-in"] = { en: "duplicate in ", de: "dupliziere in" }
 Blockly.Words["google-spreadsheet_duplicate-sheet_sheetName"] = { en: "the sheet with the name", de: "das Blatt mit dem Namen" };
 Blockly.Words["google-spreadsheet_duplicate-sheet_newSheetName"] = { en: "new name", de: "neuer Name" };
+Blockly.Words["google-spreadsheet_duplicate-sheet_newPosition"] = { en: "at position", de: "an Position" };
 
 
 
@@ -18,6 +19,11 @@ Blockly.Sendto.blocks["google-spreadsheetduplicateSheet"] =
 '             <field name="TEXT">text</field>' +
 '         </shadow>' +
 '     </value>' +
+'     <value name="NEW_POSITION">' +
+'         <shadow type="math_number">' +
+'             <field name="NUM">0</field>' +
+'         </shadow>' +
+'     </value>' +
 '</block>';
 
 
@@ -38,9 +44,8 @@ Blockly.Blocks["google-spreadsheet.duplicateSheet"] = {
         this.appendValueInput("NEW_SHEET_NAME")
             .appendField(Blockly.Translate("google-spreadsheet_duplicate-sheet_newSheetName"));
 
-        /* if (input && input.connection) {
-            input.connection._optional = true;
-        }*/
+            this.appendValueInput("NEW_POSITION")
+            .appendField(Blockly.Translate("google-spreadsheet_duplicate-sheet_newPosition"));
 
         this.setInputsInline(false);
         this.setPreviousStatement(true, null);
@@ -54,6 +59,10 @@ Blockly.JavaScript["google-spreadsheet.duplicateSheet"] = function (block) {
 var dropdown_instance = block.getFieldValue("INSTANCE");
 var source = Blockly.JavaScript.valueToCode(block, "SHEET_NAME", Blockly.JavaScript.ORDER_ATOMIC);
 var target = Blockly.JavaScript.valueToCode(block, "NEW_SHEET_NAME", Blockly.JavaScript.ORDER_ATOMIC);
+var index = Blockly.JavaScript.valueToCode(block, "NEW_POSITION", Blockly.JavaScript.ORDER_ATOMIC);
+if (!index){
+    index = -1;
+}
 
-return 'sendTo("google-spreadsheet' + dropdown_instance + '", "duplicateSheet", {"source": '+source+', "target": '+target+'}' + ");\n";
+return 'sendTo("google-spreadsheet' + dropdown_instance + '", "duplicateSheet", {"source": '+source+', "target": '+target+', "index":'+index+'}' + ");\n";
 };
diff --git a/build/main.js b/build/main.js
diff --git a/build/main.js.map b/build/main.js.map
diff --git a/io-package.json b/io-package.json
@@ -1,7 +1,7 @@
 {
     "common": {
         "name": "google-spreadsheet",
-        "version": "0.0.4",
+        "version": "0.0.5",
         "news": {
             "0.0.1": {
                 "en": "initial release",
@@ -54,6 +54,19 @@
                 "pl": "dodano „duplikat arkusza”",
                 "uk": "додано \"дублікат аркуша\"",
                 "zh-cn": "添加了“重复表”"
+            },
+            "0.0.5": {
+                "en": "added position for 'duplicate sheet'",
+                "de": "Position für „doppeltes Blatt“ hinzugefügt",
+                "ru": "добавлена позиция для «дубликата листа»",
+                "pt": "posição adicionada para 'folha duplicada'",
+                "nl": "positie toegevoegd voor 'blad dupliceren'",
+                "fr": "position ajoutée pour 'feuille en double'",
+                "it": "aggiunta posizione per 'foglio duplicato'",
+                "es": "posición añadida para 'hoja duplicada'",
+                "pl": "dodano pozycję dla „duplikatu arkusza”",
+                "uk": "додано позицію для «дублікату аркуша»",
+                "zh-cn": "为“重复表”添加位置"
             }
         },
         "titleLang": {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "iobroker.google-spreadsheet",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "description": "Append data to google spreadsheets",
   "author": {
     "name": "Thomas Pohl",

diff --git a/src/main.ts b/src/main.ts
@@ -230,14 +230,18 @@ class GoogleSpreadsheet extends utils.Adapter {
                 const sheet = spreadsheet.data.sheets
                     .find(sheet => sheet.properties && sheet.properties.title == messageData["source"]);
                 if (sheet && sheet.properties) {
+                    let insertIndex = messageData["index"];
+                    if (insertIndex==-1 || insertIndex == undefined){
+                        insertIndex = spreadsheet.data.sheets.length;
+                    }
                     sheets.spreadsheets.batchUpdate({
                         spreadsheetId: this.config.spreadsheetId,
                         requestBody: {
                             requests: [{
                                 duplicateSheet: {
                                     sourceSheetId: sheet.properties.sheetId,
                                     newSheetName: messageData["target"],
-                                    insertSheetIndex: spreadsheet.data.sheets.length
+                                    insertSheetIndex: insertIndex
                                 }
                             }]
                         }