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

22 Apr 2015

Author: jruchaud
Date: 2015-04-22 19:39:12 +0000 (Wed, 22 Apr 2015)
New Revision: 1247

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

Log:
Continue to do the style on bootstrap for the moment

Modified:
   wit/index.html
   wit/js/components/ActionsBar.js
   wit/js/components/FilterBar.js
   wit/js/components/FilterLogs.js
   wit/js/components/Tags.js
   wit/package.json

Modified: wit/index.html
===================================================================

--- wit/index.html	2015-04-22 16:59:20 UTC (rev 1246)
+++ wit/index.html	2015-04-22 19:39:12 UTC (rev 1247)
@@ -35,7 +35,7 @@
                 <div class="nav navbar-header pull-right">
                     <ul class="nav pull-right">
                         <li class="pull-left"><a href="#">Timer</a></li>
-                        <li class="pull-left"><a href="#">Rapport</a></li>
+                        <li class="pull-left"><a href="#rapport">Rapport</a></li>
                         <li class="pull-left"><a href="#">Tags</a></li>
                         <li class="pull-left"><a href="#">Options</a></li>
                     </ul>

Modified: wit/js/components/ActionsBar.js
===================================================================
--- wit/js/components/ActionsBar.js	2015-04-22 16:59:20 UTC (rev 1246)
+++ wit/js/components/ActionsBar.js	2015-04-22 19:39:12 UTC (rev 1247)
@@ -10,15 +10,6 @@
         timer.stop();
     },
     
-    onRapport: function(e) {
-        var gui = require('nw.gui');
-        var new_win = gui.Window.open('index.html#rapport', {
-            position: 'center',
-            toolbar: true
-        });
-        //new_win.maximize();
-    },
-    
     render: function() {
         return (
            <div className="text-center">

Modified: wit/js/components/FilterBar.js
===================================================================
--- wit/js/components/FilterBar.js	2015-04-22 16:59:20 UTC (rev 1246)
+++ wit/js/components/FilterBar.js	2015-04-22 19:39:12 UTC (rev 1247)
@@ -2,15 +2,18 @@
 
 var FilterBar = React.createClass({
     
-    componentWillMount: function() {
+    componentDidMount: function() {
         var moment = require('moment');
         
         var now = moment();
         now.add(1, 'hours');
-        this.endDefaultDate = now.format("YYYY-MM-DDThh:mm");
+        var endDefaultDate = now.format("YYYY-MM-DDThh:mm");
 
         now.subtract(7, 'days');
-        this.startDefaultDate = now.format("YYYY-MM-DDThh:mm"); 
+        var startDefaultDate = now.format("YYYY-MM-DDThh:mm"); 
+        
+        React.findDOMNode(this.refs.beginDate).value = startDefaultDate;
+        React.findDOMNode(this.refs.endDate).value = endDefaultDate;
     },
     
     onSearch: function() {
@@ -31,11 +34,11 @@
     render: function() {
         
         return (
-            <div className="filter">
-                <input ref="beginDate" type="datetime-local" required value={this.startDefaultDate}></input>
-                <input ref="endDate" type="datetime-local" required value={this.endDefaultDate}></input>
-                <button onClick={this.onSearch}>Search</button>
-            </div>
+            <form class="form-inline">
+                <input ref="beginDate" type="datetime-local" className="form-control" required></input>
+                <input ref="endDate" type="datetime-local" className="form-control" required></input>
+                <button onClick={this.onSearch} className="btn btn-primary btn-block">Search</button>
+            </form>
         );
     }
 });

Modified: wit/js/components/FilterLogs.js
===================================================================
--- wit/js/components/FilterLogs.js	2015-04-22 16:59:20 UTC (rev 1246)
+++ wit/js/components/FilterLogs.js	2015-04-22 19:39:12 UTC (rev 1247)
@@ -6,18 +6,30 @@
         var moment = require('moment');
         
         var items = this.props.data.map(function(log) {
+            
+            var diff = moment(moment(log.endDate).diff(log.startDate)).utcOffset(0);
+            
             return (
                     <tr>
-                        <td>{moment(log.startDate).format("MM/DD/YY, h:mm:ss")}</td>
-                        <td>{moment(log.endDate).format("MM/DD/YY, h:mm:ss")}</td>
+                        <td>{moment(log.startDate).format("MM/DD/YY")}</td>
+                        <td>{diff.format("HH:mm:ss")}</td>
                         <td>{log.tags.join(",")}</td>
                     </tr>
                 );
             });
         
         return (
-            <table>
-                {items}
+            <table className="table">
+                <thead>
+                    <tr>
+                        <th>Date</th>
+                        <th>Duration</th>
+                        <th>Tags</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    {items}
+                </tbody>
             </table>
         );
     }

Modified: wit/js/components/Tags.js
===================================================================
--- wit/js/components/Tags.js	2015-04-22 16:59:20 UTC (rev 1246)
+++ wit/js/components/Tags.js	2015-04-22 19:39:12 UTC (rev 1247)
@@ -31,23 +31,30 @@
     render: function() {
         var self = this;
         
-        var items = this.state.getTags().map(function(item, index) {
-            return (
-                    <li className="list-group-item">
-                        <button type="button" className="close" aria-label="Close" onClick={self.onRemove} data-index={index}>
-                            <span aria-hidden="true">×</span>
+        var tags = timer.getTags();
+        
+        var rows = [];
+        for (var i=0; i < 5; i++) {
+            var tag = tags[i];
+            
+            rows.push(<li className="list-group-item">
+                        <button type="button" className="close" aria-label="Close">
+                            <span aria-hidden="true" onClick={self.onRemove} data-index={i}>×</span>
                         </button>
-                        {item}
+                      
+                        {tag ? tag : "empty"}
                     </li>
-                );
-            });
-        
+                 );
+        }
+                      
         return (
             <ul className="list-group">
-                {items}
+                {rows}
+            
+                <li className="list-group-item">
+                    <input className="form-control" onKeyDown={this.onKey} placeholder="enter tag" tabIndex="-1" autoComplete="off" autoCorrect="off" autoCapitalize="off" spellCheck="false" role="textbox" type="text"></input>
+                </li>            
             </ul>
         );
     }
 });
-
-//                <li className="input"><input id="inputTag" onKeyDown={this.onKey} tabIndex="-1" autoComplete="off" autoCorrect="off" autoCapitalize="off" spellCheck="false" role="textbox" type="text"></input></li> 

Modified: wit/package.json
===================================================================
--- wit/package.json	2015-04-22 16:59:20 UTC (rev 1246)
+++ wit/package.json	2015-04-22 19:39:12 UTC (rev 1247)
@@ -4,7 +4,7 @@
   "version": "1.0.0",
   "window": {
     "width": 480,
-    "height": 400,
+    "height": 450,
     "toolbar": true,
     "frame": true,
     "transparent": false

    

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

jruchaud＠users.nuiton.org