6.1.20

CenturyLinkCloud · Jun 8, 2019 · 380ae10 · 380ae10
1 parent da13805
commit 380ae10
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/mdw-common/src/com/centurylink/mdw/dataaccess/reports/AggregateDataAccess.java b/mdw-common/src/com/centurylink/mdw/dataaccess/reports/AggregateDataAccess.java
@@ -155,7 +155,7 @@ protected TreeMap<Instant,List<T>> handleBreakdownResult(PreparedSelect select,
     }
 
     /**
-     * Converts back to server time from db time.
+     * Parse db-selected datetime to an Instant.
      */
     protected Instant parseDbSt(String st, TimeIncrement increment) throws ParseException {
         if (increment == TimeIncrement.minute || increment == TimeIncrement.hour) {
@@ -187,13 +187,13 @@ else if (increment == TimeIncrement.hour) {
         }
         else {
             if (increment == TimeIncrement.minute) {
-                return "time_format(" + col + ", '%Y-%m-%d %H:%i') as st";
+                return "time_format(date_sub(" + col + ", interval " + hoursDiff + " hour),'%Y-%m-%d %H:%i') as st";
             }
             else if (increment == TimeIncrement.hour) {
-                return "time_format(" + col + ", '%Y-%m-%d %H:00') as st";
+                return "time_format(date_sub(" + col + ", interval " + hoursDiff + " hour),'%Y-%m-%d %H:00') as st";
             }
             else {
-                return "date(" + col + ") as st";
+                return "time_format(date_sub(" + col + ", interval " + hoursDiff + " hour), '%Y-%m-%d') as st";
             }
         }
     }

diff --git a/mdw-hub/web/layout/process-nav.html b/mdw-hub/web/layout/process-nav.html
@@ -26,7 +26,7 @@
       Template
     </a>
   </li>
-  <li nav-link="/milestones/definition" ng-if="process.hasMilestones">
+  <li nav-link="/milestones/definition" ng-if="authUser.hasRole('Milestone Design') && process.hasMilestones">
     <a href="#/milestones/definitions/{{process.packageName}}/{{processVersion ? process.name + '/v' + process.version : process.name}}">
       Milestones Def.
     </a>

diff --git a/mdw-hub/web/workflow/milestoneItem.html b/mdw-hub/web/workflow/milestoneItem.html
@@ -9,7 +9,7 @@
         <div>
           {{item.process.packageName}}/
           <a ng-class="['mdw-item-link', 'mdw-item-nowrap', {'mdw-template': item.template}]" style="margin-left:-3px"
-             href="#/workflow/processes/{{item.id}}">
+             href="#/workflow/processes/{{item.processInstance.id}}">
             {{item.process.name}} {{item.process.version == '0' ? '' : 'v' + item.process.version}} &nbsp;{{item.processInstance.id}}</a>
         </div>
         <div class="mdw-item-sub">Started {{item.startDate}}<span ng-if="item.due">, &nbsp;Due <i class="mdw-item-highlight">{{item.due}}</i></span>

diff --git a/mdw/gradle.properties b/mdw/gradle.properties
@@ -1,4 +1,4 @@
-mdwVersion=6.1.20-SNAPSHOT
+mdwVersion=6.1.20
 mdwPrevTag=6.1.19
 # (previous tag for validating asset versions)
 

diff --git a/mdw/project.yaml b/mdw/project.yaml
@@ -1,6 +1,6 @@
 # paths are relative to the location of this file
 mdw:
-  version: 6.1.20-SNAPSHOT
+  version: 6.1.20
 
 asset:
   location: ../mdw-workflow/assets