v4.09

Fix vote export & export/import currency custom field to CSV/TSV

CHANGELOG.md

@@ -1,3 +1,12 @@
+# v4.09 2020-05-27 Wekan release
+
+This release fixes the following bugs:
+
+- [Fix vote export & export/import currency custom field to CSV/TSV](https://github.com/wekan/wekan/pull/3128).
+  Thanks to brymut.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
 # v4.08 2020-05-26 Wekan release
 
 This release adds the following new features:

Stackerfile.yml

@@ -1,5 +1,5 @@
 appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928
-appVersion: "v4.08.0"
+appVersion: "v4.09.0"
 files:
   userUploads:
     - README.md

i18n/de.i18n.json

@@ -256,8 +256,8 @@
   "current": "aktuell",
   "custom-field-delete-pop": "Dies wird das Feld aus allen Karten entfernen und den dazugehörigen Verlauf löschen. Die Aktion kann nicht rückgängig gemacht werden.",
   "custom-field-checkbox": "Kontrollkästchen",
-  "custom-field-currency": "Currency",
-  "custom-field-currency-option": "Currency Code",
+  "custom-field-currency": "Währung",
+  "custom-field-currency-option": "Währungszeichen",
   "custom-field-date": "Datum",
   "custom-field-dropdown": "Dropdownliste",
   "custom-field-dropdown-none": "(keiner)",

i18n/hi.i18n.json

@@ -17,14 +17,14 @@
   "act-completeChecklist": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
   "act-uncompleteChecklist": "uncompleted checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
   "act-addComment": "commented on card __card__: __comment__ at list __list__ at swimlane __swimlane__ at board __board__",
-  "act-editComment": "edited comment on card __card__: __comment__ at list __list__ at swimlane __swimlane__ at board __board__",
-  "act-deleteComment": "deleted comment on card __card__: __comment__ at list __list__ at swimlane __swimlane__ at board __board__",
+  "act-editComment": "कार्ड पर संपादित टिप्पणी __card__: __comment__ सूची में __list__ स्विमलेन में __swimlane__ बोर्ड पर __board__",
+  "act-deleteComment": "कार्ड पर हटाई गई टिप्पणी __card__: __comment__ सूची में __list__ स्विमलेन में __swimlane__ बोर्ड पर __board__",
   "act-createBoard": "created board __board__",
   "act-createSwimlane": "created swimlane __swimlane__ to board __board__",
   "act-createCard": "created card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
-  "act-createCustomField": "created custom field __customField__ at board __board__",
-  "act-deleteCustomField": "deleted custom field __customField__ at board __board__",
-  "act-setCustomField": "edited custom field __customField__: __customFieldValue__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+  "act-createCustomField": "बोर्ड पर कस्टम फ़ील्ड __customField__ __board__",
+  "act-deleteCustomField": "बोर्ड पर कस्टम फ़ील्ड __customField__ हटा दिया गया __board__",
+  "act-setCustomField": "कस्टम फ़ील्ड __customField__ संपादित करें: __customFieldValue__ कार्ड पर __card__ सूची में __list__ स्विमलेन __swimlane__ पर बोर्ड __board__",
   "act-createList": "added list __list__ to board __board__",
   "act-addBoardMember": "added member __member__ to board __board__",
   "act-archivedBoard": "Board __board__ moved to Archive",
@@ -64,7 +64,7 @@
   "activity-unchecked-item": "अचिह्नित %s अंदर में चिह्नांकन-सूची %s of %s",
   "activity-checklist-added": "संकलित चिह्नांकन-सूची तक %s",
   "activity-checklist-removed": "हटा दिया एक चिह्नांकन-सूची से %s",
-  "activity-checklist-completed": "completed checklist %s of %s",
+  "activity-checklist-completed": "पूरी जाँच सूची%sकी %s",
   "activity-checklist-uncompleted": "अपूर्ण चिह्नांकन-सूची %s of %s",
   "activity-checklist-item-added": "संकलित चिह्नांकन-सूची विषय तक '%s' अंदर में %s",
   "activity-checklist-item-removed": "हटा दिया एक चिह्नांकन-सूची विषय से '%s' अंदर में %s",
@@ -73,8 +73,8 @@
   "activity-unchecked-item-card": "अचिह्नित %s अंदर में चिह्नांकन-सूची %s",
   "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
   "activity-checklist-uncompleted-card": "अपूर्ण चिह्नांकन-सूची %s",
-  "activity-editComment": "edited comment %s",
-  "activity-deleteComment": "deleted comment %s",
+  "activity-editComment": "संपादित टिप्पणी",
+  "activity-deleteComment": "टिप्पणी हटा दी गई",
   "add-attachment": "संलग्न करें",
   "add-board": "बोर्ड जोड़ें",
   "add-card": "कार्ड जोड़ें",

i18n/pt-BR.i18n.json

@@ -807,6 +807,6 @@
   "last-activity": "Última atividade",
   "voting": "Votação",
   "archived": "Arquivado",
-  "delete-linked-card-before-this-card": "You can not delete this card before first deleting linked card that has",
-  "delete-linked-cards-before-this-list": "You can not delete this list before first deleting linked cards that are pointing to cards in this list"
+  "delete-linked-card-before-this-card": "Você não pode excluir este cartão antes de excluir primeiro o cartão vinculado que possui",
+  "delete-linked-cards-before-this-list": "Você não pode excluir esta lista antes de excluir primeiro os cartões vinculados que estão apontando para os cartões nesta lista"
 }

models/csvCreator.js

@@ -107,6 +107,13 @@ export class CsvCreator {
             options: headerRow[i].split('-')[3].split('/'),
             position: i,
           });
+        } else if (headerRow[i].split('-')[2] === 'currency') {
+          index.customFields.push({
+            name: headerRow[i].split('-')[1],
+            type: headerRow[i].split('-')[2],
+            currencyCode: headerRow[i].split('-')[3],
+            position: i,
+          });
         } else {
           index.customFields.push({
             name: headerRow[i].split('-')[1],
@@ -127,6 +134,10 @@ export class CsvCreator {
             return { _id: Random.id(6), name: option };
           }),
         };
+      } else if (customField.type === 'currency') {
+        settings = {
+          currencyCode: customField.currencyCode,
+        };
       } else {
         settings = {};
       }

models/export.js

@@ -85,10 +85,10 @@ if (Meteor.isServer) {
         ? exporter.buildCsv(params.query.delimiter)
         : exporter.buildCsv();
       res.writeHead(200, {
-        'Content-Length': body[0].length,
+        'Content-Length': body.length,
         'Content-Type': params.query.delimiter ? 'text/csv' : 'text/tsv',
       });
-      res.write(body[0]);
+      res.write(body);
       res.end();
     } else {
       res.writeHead(403);

models/exporter.js

@@ -37,7 +37,7 @@ export class Exporter {
     result.cards = Cards.find(byBoardNoLinked, noBoardId).fetch();
     result.swimlanes = Swimlanes.find(byBoard, noBoardId).fetch();
     result.customFields = CustomFields.find(
-      { boardIds: this.boardId },
+      { boardIds: this._boardId },
       { fields: { boardIds: 0 } },
     ).fetch();
     result.comments = CardComments.find(byBoard, noBoardId).fetch();
@@ -217,7 +217,6 @@ export class Exporter {
     const customFieldMap = {};
     let i = 0;
     result.customFields.forEach(customField => {
-      customFieldMap[customField._id] = i;
       customFieldMap[customField._id] = {
         position: i,
         type: customField.type,
@@ -225,11 +224,15 @@ export class Exporter {
       if (customField.type === 'dropdown') {
         let options = '';
         customField.settings.dropdownItems.forEach(item => {
-          options = options === '' ? item.name : `/${options + item.name}`;
+          options = options === '' ? item.name : `${`${options}/${item.name}`}`;
         });
         columnHeaders.push(
           `CustomField-${customField.name}-${customField.type}-${options}`,
         );
+      } else if (customField.type === 'currency') {
+        columnHeaders.push(
+          `CustomField-${customField.name}-${customField.type}-${customField.settings.currencyCode}`,
+        );
       } else {
         columnHeaders.push(
           `CustomField-${customField.name}-${customField.type}`,
@@ -322,7 +325,7 @@ export class Exporter {
       currentRow.push(
         card.dateLastActivity ? moment(card.dateLastActivity).format() : ' ',
       );
-      if (card.vote.question !== undefined) {
+      if (card.vote && card.vote.question !== '') {
         let positiveVoters = '';
         let negativeVoters = '';
         card.vote.positive.forEach(userId => {
@@ -350,23 +353,25 @@ export class Exporter {
       //Custom fields
       const customFieldValuesToPush = new Array(result.customFields.length);
       card.customFields.forEach(field => {
-        if (customFieldMap[field._id].type === 'date') {
-          customFieldValuesToPush[customFieldMap[field._id].position] = moment(
-            field.value,
-          ).format();
-        } else if (customFieldMap[field._id].type === 'dropdown') {
-          const dropdownOptions = result.customFields.find(
-            ({ _id }) => _id === field._id,
-          ).settings.dropdownItems;
-          const fieldValue = dropdownOptions.find(
-            ({ _id }) => _id === field.value,
-          ).name;
-          customFieldValuesToPush[
-            customFieldMap[field._id].position
-          ] = fieldValue;
-        } else {
-          customFieldValuesToPush[customFieldMap[field._id].position] =
-            field.value;
+        if (field.value !== null) {
+          if (customFieldMap[field._id].type === 'date') {
+            customFieldValuesToPush[
+              customFieldMap[field._id].position
+            ] = moment(field.value).format();
+          } else if (customFieldMap[field._id].type === 'dropdown') {
+            const dropdownOptions = result.customFields.find(
+              ({ _id }) => _id === field._id,
+            ).settings.dropdownItems;
+            const fieldValue = dropdownOptions.find(
+              ({ _id }) => _id === field.value,
+            ).name;
+            customFieldValuesToPush[
+              customFieldMap[field._id].position
+            ] = fieldValue;
+          } else {
+            customFieldValuesToPush[customFieldMap[field._id].position] =
+              field.value;
+          }
         }
       });
       for (
@@ -383,7 +388,7 @@ export class Exporter {
       stringifier.write(currentRow);
     });
     stringifier.end();
-    return cardRows;
+    return cardRows[0];
   }
 
   canExport(user) {

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "wekan",
-  "version": "v4.08.0",
+  "version": "v4.09.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "wekan",
-  "version": "v4.08.0",
+  "version": "v4.09.0",
   "description": "Open-Source kanban",
   "private": true,
   "scripts": {

public/api/wekan.html

@@ -1524,7 +1524,7 @@ var n=this.pipeline.run(e.tokenizer(t)),r=new e.Vector,i=[],o=this._fields.reduc
 	  	<ul class="toc-list-h1">
         
           <li>
-            <a href="#wekan-rest-api" class="toc-h1 toc-link" data-title="Wekan REST API v4.08">Wekan REST API v4.08</a>
+            <a href="#wekan-rest-api" class="toc-h1 toc-link" data-title="Wekan REST API v4.09">Wekan REST API v4.09</a>
             
           </li>
         
@@ -2022,7 +2022,7 @@ var n=this.pipeline.run(e.tokenizer(t)),r=new e.Vector,i=[],o=this._fields.reduc
     <div class="page-wrapper">
       <div class="dark-box"></div>
       <div class="content">
-        <h1 id="wekan-rest-api">Wekan REST API v4.08</h1>
+        <h1 id="wekan-rest-api">Wekan REST API v4.09</h1>
 <blockquote>
 <p>Scroll down for code samples, example requests and responses. Select a language for code samples from the tabs above or the mobile navigation menu.</p>
 </blockquote>

public/api/wekan.yml

@@ -1,7 +1,7 @@
 swagger: '2.0'
 info:
   title: Wekan REST API
-  version: v4.08
+  version: v4.09
   description: |
     The REST API allows you to control and extend Wekan with ease.
 

sandstorm-pkgdef.capnp

@@ -22,10 +22,10 @@ const pkgdef :Spk.PackageDefinition = (
     appTitle = (defaultText = "Wekan"),
     # The name of the app as it is displayed to the user.
 
-    appVersion = 408,
+    appVersion = 409,
     # Increment this for every release.
 
-    appMarketingVersion = (defaultText = "4.08.0~2020-05-26"),
+    appMarketingVersion = (defaultText = "4.09.0~2020-05-27"),
     # Human-readable presentation of the app version.
 
     minUpgradableAppVersion = 0,