瀏覽代碼

Merge pull request #15164 from GordonSmith/HPCC-25991-QueryPriority

HPCC-25991 Add priority display to ECL Watch Queries List

Reviewed-By: Jeremy Clements <jeremy.clements@lexisnexisrisk.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 3 年之前
父節點
當前提交
255db88b0a
共有 2 個文件被更改,包括 16 次插入1 次删除
  1. 10 1
      esp/src/eclwatch/QuerySetQueryWidget.js
  2. 6 0
      esp/src/eclwatch/templates/QuerySetQueryWidget.html

+ 10 - 1
esp/src/eclwatch/QuerySetQueryWidget.js

@@ -397,6 +397,13 @@ define([
                             return "<a href='#' onClick='return false;' class='dgrid-row-url'>" + Id + "</a>";
                         }
                     },
+                    priority: {
+                        label: this.i18n.Priority,
+                        width: 80,
+                        formatter: function (priority, idx) {
+                            return priority === undefined ? "" : priority;
+                        }
+                    },
                     Name: {
                         label: this.i18n.Name
                     },
@@ -650,7 +657,9 @@ define([
             }
             var optionsForm = registry.byId(this.id + "OptionsForm");
             var optionsValues = optionsForm.getValues();
-            return lang.mixin(this.filter.toObject(), optionsValues);
+            const retVal = lang.mixin(this.filter.toObject(), optionsValues);
+            retVal.PriorityHigh = retVal.PriorityLow;
+            return retVal;
         },
 
         ensurePane: function (id, params, workunitTab) {

+ 6 - 0
esp/src/eclwatch/templates/QuerySetQueryWidget.html

@@ -34,6 +34,12 @@
                         <input id="${id}QueryName" title="${i18n.Name}:" name="QueryName" colspan="2"
                             data-dojo-props="trim: true, placeHolder: '${i18n.QueryNamePlaceholder}'"
                             data-dojo-type="dijit.form.TextBox" />
+                        <select id="${id}Priority" title="${i18n.Priority}:" name="PriorityLow" colspan="2" data-dojo-type="dijit.form.Select">
+                           <option value="" selected="selected">${i18n.None}</option>
+                           <option value="0">${i18n.Low}</option>
+                           <option value="1">${i18n.High}</option>
+                           <option value="2">${i18n.SLA}</option>
+                        </select>
                         <input id="${id}PublishedBy" title="${i18n.PublishedBy}:" name="PublishedBy" colspan="2"
                             data-dojo-props="trim: true, placeHolder: '${i18n.PublishedBy}'"
                             data-dojo-type="dijit.form.TextBox" />