Changeset 6043 for SRUAggregator/trunk/src/main/resources/assets/js/main.jsx

Timestamp:

02/24/15 16:58:55 (9 years ago)

Author:

emanuel.dima@uni-tuebingen.de

Message:

22. alpha 21: downloading as text, csv, excel and tcf works

File:

• SRUAggregator/trunk/src/main/resources/assets/js/main.jsx (modified) (9 diffs)

SRUAggregator/trunk/src/main/resources/assets/js/main.jsx

@@ -3 +3 @@
 "use strict";
 
-var VERSION = "VERSION 2.0.0.α20";
+var VERSION = "VERSION 2.0.0.α21";
 var URLROOT = "/Aggregator-testing";
 
@@ -13 +13 @@
 var Main = React.createClass({
         componentWillMount: function() {
-                routeFromLocation(this);
+                routeFromLocation.bind(this);
         },
 
@@ -102 +102 @@
                         }
                         this.setState({navbarPageFn: pageFn});
-                        console.log("new page: " + document.location + ", name: " + pageFnName);
+                        // console.log("new page: " + document.location + ", name: " + pageFnName);
                 }
         },
@@ -193 +193 @@
                         success: function(json, textStatus, jqXHR) {
                                 this.setState({stats: json});
-                                console.log("stats:", json);
+                                // console.log("stats:", json);
                         }.bind(this),
                 });
@@ -294 +294 @@
 
         renderInstitution: function(isScan, inst) {
-                return  <div style={{marginBottom:30}} key={inst[0]}>
+                return  <div style={{marginTop:30}} key={inst[0]}>
                                         <h4>{inst[0]}</h4>
                                         <div style={{marginLeft:20}}> {_.pairs(inst[1]).map(this.renderEndpoint.bind(this, isScan)) }</div>
@@ -302 +302 @@
         renderStatistics: function(stats) {
                 return  <div className="container statistics" style={{marginTop:20}}>
-                                        <ul className='list-inline list-unstyled'>
-                                                { stats.maxConcurrentScanRequestsPerEndpoint ? 
-                                                        <li>max concurrent scan requests per endpoint:{" "}
-                                                                <kbd>{stats.maxConcurrentScanRequestsPerEndpoint}</kbd>,
-                                                        </li> : false
+                                        <div>
+                                                <div>Start date: {new Date(stats.date).toLocaleString()}</div>
+                                                { stats.isScan ? 
+                                                        <div>Max concurrent scan requests per endpoint:{" "}
+                                                                <kbd>{stats.maxConcurrentScanRequestsPerEndpoint}</kbd>
+                                                        </div> 
+                                                        : 
+                                                        <div>Max concurrent search requests per endpoint:{" "}
+                                                                <kbd>{stats.maxConcurrentSearchRequestsPerEndpoint}</kbd>
+                                                        </div>
                                                 }
-                                                { stats.maxConcurrentSearchRequestsPerEndpoint ? 
-                                                        <li>max concurrent search requests per endpoint:{" "}
-                                                                <kbd>{stats.maxConcurrentSearchRequestsPerEndpoint}</kbd>,
-                                                        </li> : false
-                                                }
-                                                <li>timeout:{" "}<kbd>{stats.timeout} seconds</kbd></li>
-                                        </ul>
+                                                <div>Timeout: {" "}<kbd>{stats.timeout} seconds</kbd></div>
+                                        </div>
                                         <div> { _.pairs(stats.institutions).map(this.renderInstitution.bind(this, stats.isScan)) } </div>
                                 </div>
@@ -508 +508 @@
 }
 
-var routeFromLocation = function(com) {
+var routeFromLocation = function() {
+        // console.log("routeFromLocation: " + document.location);
+        if (!this) throw "routeFromLocation must be bound to main";
         var path = window.location.pathname.split('/');
         if (path.length === 3) {
                 var p = path[2];
                 if (p === 'help') {
-                        com.toHelp(false);
+                        this.toHelp(false);
                 } else if (p === 'about') {
-                        com.toAbout(false);
+                        this.toAbout(false);
                 } else if (p === 'stats') {
-                        com.toStatistics(false);
+                        this.toStatistics(false);
                 } else {
-                        com.toAggregator(false);
+                        this.toAggregator(false);
                 }
         } else {
-                com.toAggregator(false);
+                this.toAggregator(false);
         }
 };
@@ -529 +531 @@
 React.render(<Footer />, document.getElementById('footer') );
 
-window.onpopstate = function(event) {
-        console.log("popped location: " + document.location + ", state: " + JSON.stringify(event.state));
-        routeFromLocation(main);
-};
-
-window.main = main;
+window.onpopstate = routeFromLocation.bind(main);
+
+routeFromLocation.bind(main)();
 
 })();
@@ -544 +543 @@
 
 
-
-
-
-
-
-
-
-
-
-
-
-