Some stylistic changes

Author: jerrywu64

esp/esp/program/modules/handlers/schedulingcheckmodule.py

@@ -64,19 +64,9 @@ def format_list(self, l, help_text=""): # needs verify
         output["headings"] = [] # no headings
 
         # might be redundant, but it makes sure things aren't in a weird format
-        body = []        
-        for row in l:
-            body.append(self._table_row([row]))
-        output["body"] = body
+        output["body"] = [self._table_row([row]) for row in l]
         return json.dumps(output)
 
-    def _table_headings(self, headings): # in case headings are a dict
-        #column headings
-        next_row = []
-        for h in headings:
-            next_row.append(str(h))
-        return next_row
-
     def _table_row(self, row):
         next_row = []
         for r in row:
@@ -89,25 +79,16 @@ def _table_row(self, row):
     def _format_list_table(self, d, headings, help_text=""): #needs verify
         output = {}
         output["help_text"] = help_text
-        output["headings"] = self._table_headings(headings)
-        body = []
-        for row in d:
-            ordered_row = [row[h] for h in headings]
-            body.append(self._table_row(ordered_row)) # maybe?
-        output["body"] = body
+        output["headings"] = map(str, headings)
+        output["body"] = [self._table_row([row[h] for h in headings]) for row in d]
         return output
 
     def _format_dict_table(self, d, headings, help_text=""): #needs verify
         headings = [""] + headings[:]
         output = {}
         output["help_text"] = help_text        
-        output["headings"] = self._table_headings(headings)
-        
-        body = []
-        for key, row in sorted(d.iteritems()):
-            ordered_row = [row[h] for h in headings if h]
-            body.append(self._table_row([key] + ordered_row)) #maybe
-        output["body"] = body
+        output["headings"] = map(str, headings)
+        output["body"] = [self._table_row([key] + [row[h] for h in headings if h]) for key, row in sorted(d.iteritems())]
         return output
 
 class SchedulingCheckRunner:

esp/public/media/scripts/program/modules/scheduling_checks.jsx

@@ -37,7 +37,7 @@ var SchedulingCheck = React.createClass({
       open: false,
       failed: false,
       timestamp: "never",
-      tableState: {
+      tableState: { // gets modified by functions in the definition of SelectTable
         greyed: {},
         sort: -1          
       }
@@ -96,23 +96,17 @@ var SchedulingCheck = React.createClass({
       var data = JSON.parse(this.state.data); // Might not work on old browsers
       var table;
       if (data.headings.length == 0) {
-        var settings = {
-          header: false
-        };
-      table = <SelectTable rows = {data.body} settings = {settings} saveState = {this.state.tableState} />;
+        table = <SelectTable rows = {data.body} header = {false} saveState = {this.state.tableState} />;
       } else {
         var columns = [];
         for (i = 0; i < data.headings.length; i++) {
-          if (!!data.headings[i]) {
+          if (data.headings[i]) {
             columns[i] = {key: String(i), label: data.headings[i]};
           } else {
             columns[i] = {key: String(i), label: " "};
           }
         }
-        var settings = {
-          header: true
-        };
-        table = <SelectTable rows = {data.body} columns = {columns} settings = {settings} saveState = {this.state.tableState} />;
+        table = <SelectTable rows = {data.body} columns = {columns} header = {true} saveState = {this.state.tableState} />;
       }
       body = <div>
         <div className="placeholder">
@@ -151,57 +145,61 @@ var RefreshButton = React.createClass({
 
 
 // Modified from react-json-table example code.
-// Required props: rows, saveState (with sort and greyed attributes), settings (with header attribute)
 var SelectTable = React.createClass({
+  
+  propTypes: {
+    rows: React.PropTypes.array.isRequired,
+    savestate: React.PropTypes.shape({
+      greyed: React.PropTypes.object.isRequired,
+      sort: React.PropTypes.any.isRequired
+    }).isRequired,
+    header: React.PropTypes.bool.isRequired,
+    columns: React.PropTypes.object
+  },
+    
   getInitialState: function(){
     // We will store the sorted column and whether each row is greyed out
-    return {sort: this.props.saveState.sort, greyed : this.props.saveState.greyed};
+    return {sort: this.props.saveState.sort, greyed: this.props.saveState.greyed};
   },  
   render: function(){
     var me = this,
         // clone the rows
         items = this.props.rows.slice()
     ;
-    // Sort the table
-    if( this.state.sort ){
-      items.sort( function( a, b ){
-         return a[ me.state.sort ] > b[ me.state.sort ] ? 1 : -1;
+    
+    items = _.sortBy(items, function( item ){
+         return item[ me.state.sort ];
       });
-    }
 
-    if (this.props.columns == undefined) {
-      return <JsonTable 
-        rows={items} 
-        settings={ this.getSettings() } 
-        onClickHeader={ this.onClickHeader }
-        onClickRow={ this.onClickRow }
-      />;
-    } else {
-      return <JsonTable 
-        rows={items} 
-        columns={this.props.columns}
-        settings={ this.getSettings() } 
-        onClickHeader={ this.onClickHeader }
-        onClickRow={ this.onClickRow }
-      />;
-    }
+    
+    return <JsonTable 
+      rows={items} 
+      columns={this.props.columns}
+      settings={ this.getSettings() } 
+      onClickHeader={ this.onClickHeader }
+      onClickRow={ this.onClickRow }
+    />;
   },
 
   getSettings: function(){
       var me = this;
       // We will add some classes to the selected rows and cells
       return {
         headerClass: function( current, key ){
-            if( me.state.sort == key )
+            if( me.state.sort == key ) {
               return current + ' headerSelected';
-            return current;
+            } else {
+              return current;
+            }
         },
         rowClass: function( current, item ){
-          if( me.state.greyed[item] )
+          if( me.state.greyed[item] ) {
             return current + ' rowGreyed';
-          return current;
+          } else {
+            return current;
+          }
         },
-        header: this.props.settings.header
+        header: this.props.header
       };
   },
 

esp/templates/elements/html

@@ -46,7 +46,6 @@
 
     <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/react/0.13.3/react.js"></script>
     <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/react/0.13.3/JSXTransformer.js"></script>
-    <script type="text/javascript" src="https://rawgit.com/arqex/react-json-table/master/build/react-json-table.min.js"></script>
     <script type="text/javascript" src="/media/scripts/lodash.compat.min.js"></script>
 
     {% block js1 %}

esp/templates/program/modules/schedulingcheckmodule/output.html

@@ -14,7 +14,9 @@
 }
 //-->
 </script>
+<script type="text/javascript" src="https://rawgit.com/arqex/react-json-table/6518983b5ecc0a314e50a4b7f26985c04069babd/build/react-json-table.min.js"></script>
 <script type="text/jsx" src="/media/scripts/program/modules/scheduling_checks.jsx"></script>
+
 {% endblock %}
 
 {% block stylesheets %}