Merge pull request #5444 from amitkumar3hitachi/BACKLOG-38977

[BACKLOG-38977] PUC scheduler perspective - modify column headers to …
pentaho · Nov 9, 2023 · a8af0e9 · a8af0e9
2 parents f402f63 + fb3ca9c
commit a8af0e9
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/user-console/src/main/java/org/pentaho/mantle/client/workspace/SchedulesPanel.java b/user-console/src/main/java/org/pentaho/mantle/client/workspace/SchedulesPanel.java
@@ -381,6 +381,14 @@ public String getValue( JsJob job ) {
     };
     nameColumn.setSortable( true );
 
+
+    TextColumn<JsJob> executableType = new TextColumn<JsJob>() {
+      public String getValue(JsJob job) {
+        return job.getScheduledExtn();
+      }
+    };
+    executableType.setSortable( true );
+
     HtmlColumn<JsJob> resourceColumn = new HtmlColumn<JsJob>() {
       @Override
       public String getStringValue( JsJob job ) {
@@ -509,6 +517,7 @@ public String getValue( JsJob job ) {
     // table.addColumn(idColumn, "ID");
     table.addColumn( nameColumn, Messages.getString( "scheduleName" ) );
     table.addColumn( scheduleColumn, Messages.getString( "recurrence" ) );
+    table.addColumn(executableType, Messages.getString( "executableType" ) );
     table.addColumn( resourceColumn, Messages.getString( "sourceFile" ) );
     table.addColumn( outputPathColumn, Messages.getString( "outputPath" ) );
 
@@ -525,17 +534,19 @@ public String getValue( JsJob job ) {
     table.addColumnStyleName( 3, "backgroundContentHeaderTableCell" );
     table.addColumnStyleName( 4, "backgroundContentHeaderTableCell" );
     table.addColumnStyleName( 5, "backgroundContentHeaderTableCell" );
+    table.addColumnStyleName( 6, "backgroundContentHeaderTableCell" );
     if ( isAdmin ) {
-      table.addColumnStyleName( 6, "backgroundContentHeaderTableCell" );
+      table.addColumnStyleName( 7, "backgroundContentHeaderTableCell" );
     }
-    table.addColumnStyleName( isAdmin ? 7 : 6, "backgroundContentHeaderTableCell" );
+    table.addColumnStyleName( isAdmin ? 8 : 7, "backgroundContentHeaderTableCell" );
 
     table.setColumnWidth( nameColumn, 160, Unit.PX );
     table.setColumnWidth( resourceColumn, 200, Unit.PX );
     table.setColumnWidth( outputPathColumn, 180, Unit.PX );
     table.setColumnWidth( scheduleColumn, 170, Unit.PX );
     table.setColumnWidth( lastFireColumn, 120, Unit.PX );
     table.setColumnWidth( nextFireColumn, 120, Unit.PX );
+    table.setColumnWidth( executableType, 120, Unit.PX );
     if ( isAdmin ) {
       table.setColumnWidth( userNameColumn, 100, Unit.PX );
     }