applications.js in naf-2.1.0

- old
+ new

@@ -7,30 +7,21 @@
     "fnInitComplete" : function() {
       initPageSelect();
     },
     "bAutoWidth": false,
     "aoColumnDefs": [
-      { "bVisible": false, "aTargets": [ 14, 15 ] },    // turn off visibility
-      { "sClass": "center", "aTargets": [ 6, 7, 8, 9, 12, 13 ] }
+      { "sClass": "center", "aTargets": [ 6 ] }
     ],
     "aoColumns": [
-        { "sWidth": "2%"},      // Id
-        { "sWidth": "12%"},     // Title
-        { "sWidth": "7%"},      // Short Name
-        { "sWidth": "6%"},      // Script Type Name
-        null,                   // Application Run Group Name
-        { "sWidth": "9%"},      // Application Run Group Restriction Name
-        { "sWidth": "7%"},      // Application Run Group Limit
-        { "sWidth": "4%"},      // Enabled
-        { "sWidth": "4%"},      // Enqueue Backlogs
-        { "sWidth": "8%"},      // Run Time
-        { "sWidth": "10%"},     // Last Queued At
-        { "sWidth": "8%"},      // Affinities
-        { "sWidth": "8%"},      // Prerequisites
-        { "sWidth": "4%"},      // Actions
-        null,
-        null
+        { "sWidth": "3%"},      // Id
+        null,                   // Title
+        { "sWidth": "15%"},     // Short Name
+        { "sWidth": "10%"},     // Script Type Name
+        { "sWidth": "15%"},     // Application Schedules
+        { "sWidth": "15%"},     // Last Queued At
+        { "sWidth": "5%"}       // Actions
+
     ],
     "fnServerData": function ( sSource, aoData, fnCallback ) {
       _.each(jQuery('.datatable_variable').serializeArray(), function(dv) { aoData.push(dv); });
       jQuery.getJSON( sSource, aoData, function (json) {
         fnCallback(json);
@@ -75,21 +66,21 @@
   var row = jQuery('<a href="/job_system/applications/' + id + '">' + id + '</a>' );
   jQuery('td:nth-child(1)', nRow).empty().append(row);
 }
 
 function colorizationDeletedOrHidden(nRow, aData) {
-  if (aData[11] == 'true' || aData[12] == 'false' || aData[13] == '') {
+  if (aData[6] == 'true') {
     jQuery(nRow).addClass('deleted_or_hidden');
   }
 }
 
 function checkTimeFormat(nRow, aData) {
-  var l_q_a_array = jQuery(aData[10]).text().split(',');
+  var l_q_a_array = jQuery(aData[5]).text().split(',');
   var last_queued_at;
   if(jQuery('#time_format').val() == 'lexically') {
     last_queued_at = l_q_a_array[0];
   } else {
     last_queued_at = l_q_a_array[1];
   }
 
-  jQuery('td:nth-child(11)', nRow).empty().append(jQuery(aData[10]).text(last_queued_at));
+  jQuery('td:nth-child(6)', nRow).empty().append(jQuery(aData[5]).text(last_queued_at));
 }