[Sandbox-commits] r1251 - in wit/js: . components

24 Apr 2015

Author: smaisonneuve
Date: 2015-04-24 13:01:37 +0000 (Fri, 24 Apr 2015)
New Revision: 1251

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

Log:
[Wit] - Add user activity monitoring : adjust "empty slice"

Modified:
   wit/js/UserActivityService.js
   wit/js/components/Timeline.js

Modified: wit/js/UserActivityService.js
===================================================================

--- wit/js/UserActivityService.js	2015-04-24 09:24:55 UTC (rev 1250)
+++ wit/js/UserActivityService.js	2015-04-24 13:01:37 UTC (rev 1251)
@@ -12,14 +12,14 @@
     if (startDate) {
         m = moment(startDate);
         result = result.filter(function(s) {
-            return m.isBefore(s.startDate);
+            return m.isBefore(s.endDate);
         });
     }
     
     if (endDate) {
         m = moment(endDate);
         result = result.filter(function(s) {
-            return !s.endDate || m.isAfter(s.endDate); // if no endDate, it means that this is the current session
+            return m.isAfter(s.startDate);
         });
     }
     
@@ -125,4 +125,4 @@
 
 var getSessionByName = function (name) {
     return windowSessions.filter(function (s) { return s.name == name })[0];
-}
\ No newline at end of file
+};
\ No newline at end of file

Modified: wit/js/components/Timeline.js
===================================================================
--- wit/js/components/Timeline.js	2015-04-24 09:24:55 UTC (rev 1250)
+++ wit/js/components/Timeline.js	2015-04-24 13:01:37 UTC (rev 1251)
@@ -35,15 +35,19 @@
             sessions = this.state.sessions;
         
         // Build timeline
+
+        var items = [], style;
         
-        var style = {
-            width: (sessions[0].startDate.diff(startDate) / endDate.diff(startDate) * 100 ) +"%",
-        };
-        var items = [(
-            
-            <div className="slice" style={style}></div>
-            
-        )].concat(
+        if (sessions[0].startDate.isAfter(startDate)) {
+            var style = {
+                width: (sessions[0].startDate.diff(startDate) / endDate.diff(startDate) * 100 ) +"%",
+            };
+            var items = [(
+                <div className="slice" style={style}></div>
+            )];
+        }
+        
+        items = items.concat(
             sessions.map(function(session) {
                 style = {
                     background: session.color,
@@ -52,7 +56,7 @@
                 };
                 var title = session.name;
                 return (
-                        <div className="slice" style={style} title={title}>{title}</div>
+                    <div className="slice" style={style} title={title}>{title}</div>
                 );
             })
         );

    

[Sandbox-commits] r1251 - in wit/js: . components

smaisonneuve＠users.nuiton.org