瀏覽代碼

HUE-2113 [oozie] Coordinator "next submission" shows overall endtime

Fixed JSON time
Added middle vertical alignment for table headers
Enrico Berti 11 年之前
父節點
當前提交
e933469

+ 4 - 3
apps/oozie/src/oozie/templates/dashboard/list_oozie_coordinators.mako

@@ -136,6 +136,7 @@ ${layout.menubar(section='coordinators', dashboard=True)}
     return {
       id: c.id,
       endTime: c.endTime,
+      nextMaterializedTime: c.nextMaterializedTime,
       status: c.status,
       statusClass: "label " + getStatusClass(c.status),
       isRunning: c.isRunning,
@@ -176,7 +177,7 @@ ${layout.menubar(section='coordinators', dashboard=True)}
         { "bSortable":false }
       ],
       "aaSorting":[
-        [ 5, "desc" ]
+        [ 0, "desc" ]
       ],
       "oLanguage":{
         "sEmptyTable":"${_('No data available')}",
@@ -215,7 +216,7 @@ ${layout.menubar(section='coordinators', dashboard=True)}
         null
       ],
       "aaSorting":[
-        [ 5, "desc" ]
+        [ 0, "desc" ]
       ],
       "oLanguage":{
         "sEmptyTable":"${_('No data available')}",
@@ -401,7 +402,7 @@ ${layout.menubar(section='coordinators', dashboard=True)}
               if (['RUNNING', 'PREP', 'WAITING', 'SUSPENDED', 'PREPSUSPENDED', 'PREPPAUSED', 'PAUSED', 'STARTED', 'FINISHING'].indexOf(coord.status) > -1) {
                 try {
                   runningTable.fnAddData([
-                    emptyStringIfNull(coord.endTime),
+                    emptyStringIfNull(coord.nextMaterializedTime),
                     '<span class="' + coord.statusClass + '">' + coord.status + '</span>',
                     coord.appName,
                     '<div class="progress"><div class="' + coord.progressClass + '" style="width:' + coord.progress + '%">' + coord.progress + '%</div></div>',

+ 2 - 1
apps/oozie/src/oozie/views/dashboard.py

@@ -746,7 +746,8 @@ def massaged_oozie_jobs_for_json(oozie_jobs, user, just_sla=False):
       massaged_job = {
         'id': job.id,
         'lastModTime': hasattr(job, 'lastModTime') and job.lastModTime and format_time(job.lastModTime) or None,
-        'kickoffTime': hasattr(job, 'kickoffTime') and job.kickoffTime or '',
+        'kickoffTime': hasattr(job, 'kickoffTime') and job.kickoffTime and format_time(job.kickoffTime) or '',
+        'nextMaterializedTime': hasattr(job, 'nextMaterializedTime') and job.nextMaterializedTime and format_time(job.nextMaterializedTime) or '',
         'timeOut': hasattr(job, 'timeOut') and job.timeOut or None,
         'endTime': job.endTime and format_time(job.endTime) or None,
         'status': job.status,

+ 7 - 0
desktop/core/static/css/hue3.css

@@ -597,6 +597,7 @@ table.display td.center {
   background: url('../art/datatables/sort_asc.png') no-repeat center left;
   border-top: 3px solid #FFFFFF !important;
   padding-left: 20px !important;
+  vertical-align: middle!important;
 }
 
 .sorting_desc {
@@ -604,6 +605,7 @@ table.display td.center {
   background: url('../art/datatables/sort_desc.png') no-repeat center left;
   border-top: 3px solid #FFFFFF !important;
   padding-left: 20px !important;
+  vertical-align: middle!important;
 }
 
 .sorting {
@@ -611,6 +613,11 @@ table.display td.center {
   background: url('../art/datatables/sort_both.png') no-repeat center left;
   border-top: 3px solid #FFFFFF !important;
   padding-left: 20px !important;
+  vertical-align: middle!important;
+}
+
+.sorting_disabled {
+  vertical-align: middle!important;
 }
 
 .sorting:hover, .sorting_asc:hover, .sorting_desc:hover {