nutella_framework 0.6.18 → 0.6.19

data/framework_components/roomcast-package-creator/src/app/app.js

@@ -21,6 +21,7 @@
             }
         });
     } else {
+        // for debugging purposes - works with tests outside of nutella
         window.nutella = NUTELLA.init('ltg.evl.uic.edu', 'wallcology', 'default', 'roomcast-package-creator', function(connected) {
             window.ReactMain = React.render( <Main /> , document.body);
         });

data/framework_components/roomcast-package-creator/src/app/components/ChannelsCatalogue.js

@@ -8,22 +8,14 @@ var ChannelsCatalogue = React.createClass({
         this.props.onSelectedChannel(ch);
     },
 
-    handleStyleRespectiveChannel: function() {
-        var selected = this.props.selectedChannel;
-        for(ref in this.refs) {
-            console.log(ref, selected);
-            if(this.refs[ref].props.id===selected.id) {
-                console.log(selected.imgNode);
-                break;
-            }
-        }
-    },
-
     render: function() {
 
         var channels = [];
         var chs = this.props.channels;
         var keys = Object.keys(chs).sort();
+        keys = keys.sort(function(a, b) {
+            return (+a) - (+b);
+        });
         for(var i = 0; i < keys.length; i++) {
             var key = keys[i];
 

data/framework_components/roomcast-package-creator/src/app/components/NutellaMixin.js

@@ -1,21 +1,56 @@
+var NUTELLA = require('nutella_lib');
 
 var NutellaMixin = {
 
-    getChannelsForRid: function(message, rid) {
-        var myChannelsId = [];
-        var myChannels = [];
-        message.forEach(function(f) {
-            for (var i in f.items) {
-                var item = f.items[i];
-                if (item.name === 'iPad1') {
-                    myChannelsId = item.channels;
-                    break;
-                }
-            }
-        });
-        myChannelsId.forEach(function(id) {
-            myChannels.push(CHANNELS[id]);
-        });
+    /**
+     * Stores a user interaction as a document in the MongoDB database.
+     * @param action name of the action fired
+     * @param info additional properties to be stored for the specific interaction
+     */
+    logAction: function(action, info) {
+        var query_parameters = NUTELLA.parseURLParameters();
+        var app_id = query_parameters.app_id;
+        var run_id = query_parameters.run_id;
+        var cookie = this.getCookie('roomcast_device');
+        if(cookie === '') {
+            cookie = (+new Date * Math.random()).toString(36).substring(0, 15);
+            this.setCookie('roomcast_device', cookie, 365);
+        }
+        var date = new Date();
+        var doc = {};
+        doc.action = action;
+        doc.app_id = app_id;
+        doc.run_id = run_id;
+        doc.device_id = cookie;
+        doc.time = {
+            timestamp: date,
+            year: date.getFullYear(),
+            month: date.getMonth() + 1,
+            day: date.getDate(),
+            time: date.getHours() + ":" +date.getMinutes() + ":" +date.getSeconds()
+        };
+        if(Object.keys(info).length !== 0) {
+            doc.info = info;
+        }
+        nutella.net.publish('roomcast-log-bot/store', doc);
+    },
+
+    setCookie: function(cname, cvalue, exdays) {
+        var d = new Date();
+        d.setTime(d.getTime() + (exdays*24*60*60*1000));
+        var expires = "expires="+d.toUTCString();
+        document.cookie = cname + "=" + cvalue + "; " + expires;
+    },
+
+    getCookie: function(cname) {
+        var name = cname + "=";
+        var ca = document.cookie.split(';');
+        for(var i=0; i<ca.length; i++) {
+            var c = ca[i];
+            while (c.charAt(0)==' ') c = c.substring(1);
+            if (c.indexOf(name) == 0) return c.substring(name.length,c.length);
+        }
+        return "";
     }
 
 };

data/framework_components/roomcast-package-creator/src/app/components/main.js

@@ -1,14 +1,18 @@
 var React = require('react'),
     mui = require('material-ui'),
-    RaisedButton = mui.RaisedButton;
+    RaisedButton = mui.RaisedButton,
+    NutellaMixin = require('./NutellaMixin');
 
 var ResourcesPanel = require('./ResourcesPanel.js');
 var ChannelsPanel = require('./ChannelsPanel');
 
 var Main = React.createClass({
 
+    mixins: [NutellaMixin],
+
     componentDidMount: function() {
         var self = this;
+        self._cookie = (+new Date * Math.random()).toString(36).substring(0, 15);
         // Get current channels catalogue
         nutella.net.request('channels/retrieve', 'all', function (response) {
             self.handleUpdatedChannelsCatalogue(response);
@@ -18,7 +22,13 @@ var Main = React.createClass({
                 self.handleUpdatedChannelsCatalogue(message);
             });
             nutella.net.subscribe('configs/updated', function (message, from) {
-                self.handleNewConfigs(message);
+                // workaround to manage sync between multiple parallell changes: reload page
+                // on all the interfaces other than the one which has saved the changes
+                if(self.getCookie('roomcast-id') !== self._cookie) {
+                    window.location.reload(true);
+                }
+                // reset local cookie
+                self._cookie = (+new Date * Math.random()).toString(36).substring(0, 15);
             });
         });
     },
@@ -91,6 +101,15 @@ var Main = React.createClass({
     handleSaveChanges: function() {
         var publish = true;
         this.saveLocalConfigs(publish);
+        // identify current device when message comes back
+        this._cookie = (+new Date * Math.random()).toString(36).substring(0, 15);
+        this.setCookie('roomcast-id', this._cookie, 365);
+
+        // #LOG action
+        this.logAction('savePackageCreator', {
+            configuration: this.state.configs,
+            channels_catalogue: this.state.channelsCatalogue
+        });
     },
 
     handleUndoChanges: function() {

data/framework_components/roomcast-package-creator/src/less/main.less

@@ -235,9 +235,16 @@ html, body {
   //line-height: 10px;
 }
 .mui-raised-button {
-  //height: 50%;
   .mui-raised-button-label {
-    font-size: 0.75vw !important;
+    @media (min-width: 1784px) {
+      font-size: 14px;
+    }
+    @media (min-width: 1643px) and (max-width: 1783px) {
+      font-size: 12px;
+    }
+    @media (max-width: 1642px) {
+      font-size: 10px;
+    }
   }
   .mui-raised-button-container {
     //height: 50%;