Merge pull request #17 from ljay79/develop

merge branch develop into master
ljay79 · Jun 29, 2017 · f90b285 · f90b285
2 parents 93f38bb + e696a78
commit f90b285
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 16 deletions.
diff --git a/Code.gs b/Code.gs
@@ -8,7 +8,8 @@
  * - add feature to insert list of tickets (issue overview) based on available Jira filters
  */
 
-var LOGGING = false;
+var BUILD = 0150;
+var LOGGING = true;
 
 /** 
  * Add a nice menu option for the users.

diff --git a/IssueTable.gs b/IssueTable.gs
@@ -109,7 +109,12 @@ function IssueTable(sheet, initRange, data) {
    */
   this.addSummary = function(summary) {
     range = sheet.getRange(initRange.getRow() + rowIndex++, initRange.getColumn(), 1, headers.length);
-    range.mergeAcross().setValue(summary);
+    //range.mergeAcross().setValue(summary);
+    range.clearContent()
+      .clearNote()
+      .clearFormat()
+      .getCell(1,1)
+      .setValue(summary);
 
     return this;
   };

diff --git a/dialogAbout.html b/dialogAbout.html
@@ -19,7 +19,7 @@
 
     <div class="block head">
       <span class="icon"><img src="https://s3.eu-central-1.amazonaws.com/jira-tools/symbol.png" width="50" height="50" /></span> 
-      <span class="title">Jira Sheet Tools v0.14.0</span>
+      <span class="title">Jira Sheet Tools v0.15.0</span>
     </div>
 
     <div class="block about">

diff --git a/dialogs.gs b/dialogs.gs
@@ -155,7 +155,6 @@ function insertIssuesFromFilter(jsonFormData) {
   var data = {
     jql: filter.jql, 
     fields: jsonFormData['columns'] || [], 
-    properties : ['due'],
     maxResults: 100, 
     validateQuery: 'strict'
   };

diff --git a/jiraCommon.gs b/jiraCommon.gs
@@ -15,7 +15,7 @@ var ISSUE_COLUMNS = {
   assignee: 'Assignee',
   creator: 'Creator',
   reporter: 'Reporter',
-  due: 'Due',
+  duedate: 'Due',
   /* --- */
   labels: 'Labels',
   project: 'Project',
@@ -309,16 +309,21 @@ function unifyIssueAttrib(attrib, data) {
       };
       break;
     case 'updated':
+    case 'created':
       resp = {
-        value: data.fields.updated || 'n/a',
-        date: new Date(getDateFromIso(data.fields.updated)) || new Date(),
-        format: "dd.mm.yyyy"
+        value: data.fields[attrib] || 'n/a',
+        date: new Date(getDateFromIso(data.fields[attrib])) || new Date(),
+        format: "dd.mm.yyyy hh:mm"
       };
       break;
     case 'duedate':
+      // very dirty - just cant get arround timezone issue when date is in format 'YYYY-MM-DD'
+      // @TODO: require proper generic solution for this
+      var _duedate = data.fields.duedate || 'n/a';
+      _duedate = (_duedate.length == 10) ? _duedate + 'T12:00:00' : _duedate;
       resp = {
-        value: data.fields.duedate || 'n/a',
-        date: new Date(getDateFromIso(data.fields.duedate)) || new Date(),
+        value: _duedate,
+        date: new Date(getDateFromIso(_duedate)) || new Date(),
         format: "dd.mm.yyyy"
       };
       break;

diff --git a/jsLib.gs b/jsLib.gs
@@ -59,7 +59,6 @@ function camelize(str) {
 
 /**
  * @desc Converts ISO 8601 date string into JS date object
- *       http://delete.me.uk/2005/03/iso8601.html
  * @param string {string}
  * @return {Date}
  */

diff --git a/storage.gs b/storage.gs
@@ -6,7 +6,7 @@ var jiraColumnDefault = [
   'status',
   'updated',
   'assignee',
-  'due',
+  'duedate',
   'project'
 ];
 
@@ -98,12 +98,16 @@ function getVar(key) {
  *
  */
 function initDefaults() {
+  var build         = getVar('BUILD') || 0;
   var isInitialized = getVar('defaults_initialized') || 'false';
-  if (isInitialized == 'true') return;
+  if (isInitialized == 'true' && build == BUILD) return;
 
-  // set default jira issue columns  
-  var columnDefaults = getVar('jiraColumnDefault');
-  columnDefaults = (columnDefaults != null) ? JSON.parse(columnDefaults) : jiraColumnDefault;
+  setVar('BUILD', BUILD);
+
+  // set default jira issue columns
+  //var columnDefaults = getVar('jiraColumnDefault');
+  //columnDefaults = (columnDefaults != null) ? JSON.parse(columnDefaults) : jiraColumnDefault;
+  columnDefaults = jiraColumnDefault; //@TODO: allow user to change default columns
   setVar('jiraColumnDefault', JSON.stringify(columnDefaults));
 
   // Jira onDemand or Server