[Sandbox-commits] r1496 - wit/js/components

26 May 2015

Author: jruchaud
Date: 2015-05-26 15:01:53 +0000 (Tue, 26 May 2015)
New Revision: 1496

Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1496

Log:
Fix router

Modified:
   wit/js/components/FilterBar.js
   wit/js/components/FilterLogs.js
   wit/js/components/LogsTable.js
   wit/js/components/Timeline.js

Modified: wit/js/components/FilterBar.js
===================================================================

--- wit/js/components/FilterBar.js	2015-05-26 14:47:48 UTC (rev 1495)
+++ wit/js/components/FilterBar.js	2015-05-26 15:01:53 UTC (rev 1496)
@@ -1,11 +1,12 @@
 "use strict";
 
 var React = require("react");
+var moment = require("moment");
+var db = require("../services/database.js");
 
 class FilterBar extends React.Component {
 
     componentDidMount() {
-        var moment = require("moment");
 
         var now = moment();
         now.add(1, "days");
@@ -19,9 +20,6 @@
     }
 
     search() {
-        var moment = require("moment");
-        var db = require("./js/services/database.js");
-
         var startDate = moment(this.refs.beginDate.getDOMNode().value),
             endDate = moment(this.refs.endDate.getDOMNode().value);
 

Modified: wit/js/components/FilterLogs.js
===================================================================
--- wit/js/components/FilterLogs.js	2015-05-26 14:47:48 UTC (rev 1495)
+++ wit/js/components/FilterLogs.js	2015-05-26 15:01:53 UTC (rev 1496)
@@ -2,29 +2,31 @@
 
 var React = require("react");
 var nonce = require("nonce")();
+var printer = require("../services/PrinterService");
+var Timeline = require("./Timeline");
+var moment = require("moment");
 
 class FilterLogs extends React.Component {
 
     constructor(props) {
         super(props);
-        this.printer = new Printer();
         this.state = {data: null, tags: {}};
     }
 
     onClipboardCSV() {
-        this.printer.clipboard(Printer.CSV);
+        printer.clipboard(printer.CSV);
     }
 
     onClipboardTXT() {
-        this.printer.clipboard(Printer.TXT, this.state);
+        printer.clipboard(printer.TXT, this.state);
     }
 
     onMailCSV() {
-        this.printer.mail(Printer.CSV);
+        printer.mail(printer.CSV);
     }
 
     onMailTXT() {
-        this.printer.mail(Printer.TXT, this.state);
+        printer.mail(printer.TXT, this.state);
     }
 
     onShowSummary() {
@@ -71,7 +73,6 @@
             tags = {};
 
         currentState.data.result.forEach(function(log) {
-            var moment = require("moment");
             var date = moment(log.startDate).format("MM/DD/YY");
             var diff = moment(moment(log.endDate).diff(log.startDate)).utcOffset(0);
 

Modified: wit/js/components/LogsTable.js
===================================================================
--- wit/js/components/LogsTable.js	2015-05-26 14:47:48 UTC (rev 1495)
+++ wit/js/components/LogsTable.js	2015-05-26 15:01:53 UTC (rev 1496)
@@ -2,6 +2,7 @@
 
 var React = require("react");
 var timer = require("../services/TimerService.js");
+var moment = require("moment");
 
 class LogsTable extends React.Component {
 
@@ -17,7 +18,6 @@
     }
 
     render() {
-        var moment = require("moment");
         var items = [];
 
         var classString = "";

Modified: wit/js/components/Timeline.js
===================================================================
--- wit/js/components/Timeline.js	2015-05-26 14:47:48 UTC (rev 1495)
+++ wit/js/components/Timeline.js	2015-05-26 15:01:53 UTC (rev 1496)
@@ -2,8 +2,9 @@
 
 var React = require("react");
 var sess = require("../services/SessionsService.js");
-
 var TimelineSession = require("./TimelineSession.js");
+var moment = require("moment");
+var nonce = require("nonce")();
 
 class Timeline extends React.Component {
 
@@ -13,7 +14,6 @@
     }
 
     componentDidMount() {
-        var moment = require("moment");
 
         var startDate;
         if (this.props.data.startDate) {
@@ -44,8 +44,6 @@
 
         // Create a wrapper for each window session
 
-        var moment = require("moment");
-
         var startDate;
         if (this.props.data.startDate) {
             startDate = moment(this.props.data.startDate);
@@ -57,8 +55,7 @@
         }
 
         var _normalize = this._normalize,
-            timeRange = endDate && endDate.diff(startDate),
-            nonce = require("nonce")();
+            timeRange = endDate && endDate.diff(startDate);
 
         items = items.concat(
             sessions.map(function(session) {
@@ -89,8 +86,6 @@
      * this function will remove the session part outside the scope
      */
     _normalize(session, startDate, endDate) {
-        var moment = require("moment");
-
         session.startDate = moment(session.startDate);
         session.endDate = moment(session.endDate);

    

[Sandbox-commits] r1496 - wit/js/components

jruchaud＠users.nuiton.org