Merge pull request #432 from mycontroller-org/development

Version 1.1.0 merge from development branch

README.adoc

@@ -19,27 +19,27 @@ Development: image:https://travis-ci.org/mycontroller-org/mycontroller.svg?branc
 
 == About
 
-*MyController.org* is automation controller for home, office or any place.
-Primarly this project started to support http://www.mysensors.org/[MySensors]. But later it expands support to other network also. Considered system resources in mind on development, as a outcome even we can run it on Raspberry PI (256 MB) very first model.
+*MyController.org* is an IoT automation controller for home, office or any place.
+Primarly this project was started to support http://www.mysensors.org/[MySensors]. Later it was expanded to support other networks also. MyController.org was designed to run with limited resources. For instance, it can run on the first generation Raspberry Pi.
 
 == Localization
-MyController.org supports multiple languages. If you have interest to add/translate your native language for MyController.org send a request on https://www.transifex.com/mycontrollerorg/multi-locale/[Transifex MyController.org locale project]
+MyController.org supports multiple languages. If you are interested in providing a translation for your native language, send a request via https://www.transifex.com/mycontrollerorg/multi-locale/[Transifex MyController.org locale project]
 
-== System Requirement
+== System Requirements
 
-MyController.org is a very lightweight server, It required very less resource, believe me ;)
+MyController.org is a very lightweight server. Its resource requirements are modest:
 
   * Disk        : ~100 MB (may require more space, when we store metrics data for long time)
   * Memory(RAM) : 256 MB
   * Java        : 1.8 or later
 
 ===== Supported Platforms (tested)
-MyController.org is java based application server. We can run it in any platform where Java support is available.
+MyController.org is a Java-based application server. It can run on any platform where Java support is available.
 
 - Linux
 - Windows
 - Orange PI
-- Raspberry PI (Oracle Java recommend)
+- Raspberry PI (Oracle Java recommended)
 
 == MyController and MySensors Setup
 
@@ -53,21 +53,21 @@ image::extra/images/MyController-MySensors-RF.png[MyController  and MySensors se
 
 ====== Configuration
 
-Extract downloaded bundle where exactly do you want to run. Configuration files located in `mycontroller/conf`
+Extract the downloaded bundle in the directory where you want it to run. The configuration files are located in `mycontroller/conf`
 
 File: `mycontroller.properties`
 
-*Temporary file*
+*Temporary files*
 ----
 mcc.tmp.location=tmp/ # <1>
 ----
-<1> You can change default location and file name. This file used as server temporery location. Used for the operation such as backup, restore, etc.,
+<1> You can change the default location and file name. This directory is used as a temporary location for operations such as backup, restore, etc.
 
 *Database Configuration*
 ----
 mcc.db.h2db.location=../conf/mycontroller # <1>
 ----
-<1> You can change default location and file name. File will be stored with the file extension `.h2.db`. Do not add file extension.
+<1> You can change the default location and file name. The database file will be stored with the extension `.h2.db`. Do not add file extension to this property.
 
 *Web server configuration*
 ----
@@ -80,10 +80,10 @@ mcc.web.ssl.keystore.password=mycontroller  # <5>
 mcc.web.ssl.keystore.type=JKS  # <5>
 ----
 
-<1> bind interface address. by default it will bind with all the available interface.
-<2> Enable/disable https. Only one protocol supported at a time. true - `https`, false - `http`.
+<1> Bind interface address. 0.0.0.0 means it will bind to all available interfaces.
+<2> Enable/disable https. Only one protocol is supported at a time. true - `https`, false - `http`.
 <3> Port number of `http/https` to access MyController.org server.
-<4> web files location, no need to touch this one.
+<4> Web files location, no need to touch this one.
 <5> If `https` is enabled these fields are mandatory.
 
 Default URL: `https://<ip>:8443` (ex: `https://localhost:8443`)
@@ -102,11 +102,11 @@ mcc.mqtt.broker.websocket.port=7080 # <4>
 mcc.mqtt.broker.persistent.store=../conf/moquette/moquette_store.mapdb # <5>
 ----
 
-<1> Enable/disable inbuilt MQTT broker. by default it will be enabled. `true`- enabled, `false` - disabled
-<2> bind interface address. by default it will bind with all the available interface.
+<1> Enable/disable builtin MQTT broker. By default it is enabled. `true`- enabled, `false` - disabled
+<2> Bind interface address for the MQTT broker. By default it will bind to all available interfaces.
 <3> MQTT broker port
-<4> websoicket port
-<5> internal use. no need to touch this one.
+<4> Websoicket port
+<5> Internal use. no need to touch this one.
 
 
 *Logger configuration*

dist/pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.mycontroller.standalone</groupId>
     <artifactId>mycontroller-standalone-parent</artifactId>
-    <version>1.0.0.Final</version>
+    <version>1.1.0.Final</version>
   </parent>
 
   <artifactId>mycontroller-dist</artifactId>
@@ -32,7 +32,7 @@
   <properties>
     <mc.dist.finalName>${project.artifactId}-standalone-${project.version}</mc.dist.finalName>
     <mc.dist.jar.finalName>${mc.dist.finalName}-single</mc.dist.jar.finalName>
-    <mc.gui.version>6</mc.gui.version>
+    <mc.gui.version>9</mc.gui.version>
   </properties>
 
   <dependencies>

dist/src/main/package/www/app.js

@@ -768,7 +768,8 @@ myControllerModule.filter('mcResourceRepresentation', function() {
     if(text === undefined){
       return undefined;
     }
-    return text.replace(/>>/g, '<i class="fa fa-chevron-right"></i>')
+    return text.replace(/>>>/g, '<i class="fa fa-forward"></i>')
+               .replace(/>>/g, '<i class="fa fa-chevron-right"></i>')
                .replace(/\[RG\]:/g, '<i class="pficon pficon-replicator fa-lg mc-margin-icon"></i> ')
                .replace(/\[G\]:/g, '<i class="fa fa-plug"></i> ')
                .replace(/\[N\]:/g, '<i class="fa fa-sitemap"></i> ')

dist/src/main/package/www/controllers/adf-widgets/adf-myc-sunrisetime/adf-myc-sunrise.js

@@ -53,6 +53,7 @@ angular.module('adf.widget.myc-sunrisetime', [])
           mycSunriseTime.sunsetTime = $filter('date')(response.sunsetTime, mchelper.cfg.timeFormatWithoutSeconds, mchelper.cfg.timezone);
           mycSunriseTime.latitude = response.latitude;
           mycSunriseTime.longitude = response.longitude;
+          mycSunriseTime.name = response.name;
           mycSunriseTime.isSyncing = false;
           if(mycSunriseTime.showLoading){
             mycSunriseTime.showLoading = false;

dist/src/main/package/www/controllers/adf-widgets/adf-myc-sunrisetime/view.html

@@ -23,6 +23,6 @@
 <div ng-hide="mycSunriseTime.showLoading">
   <div class="adf-mycsr">
     <div class="adf-mycsr-time"><i class="wi wi-sunrise"></i>{{mycSunriseTime.sunriseTime}}<i class="wi wi-sunset"></i>{{mycSunriseTime.sunsetTime}}</div>
-    <div class="adf-mycsr-location"><i class="fa fa-map-marker"></i>{{mycSunriseTime.latitude}}, {{mycSunriseTime.longitude}}</div>
+    <div class="adf-mycsr-location"><i class="fa fa-map-marker"></i>{{mycSunriseTime.name}}</div>
   </div>
 </div>

dist/src/main/package/www/controllers/gateways.js

@@ -296,6 +296,10 @@ myControllerModule.controller('GatewaysControllerAddEdit', function ($scope, Typ
       $scope.gateway.url='';
       $scope.gateway.authorizedUser='';
       $scope.gateway.pollFrequency='5';
+     }else if($scope.gateway.type === 'Weather Underground'){
+      $scope.gateway.apiKey='';
+      $scope.gateway.location='autoip';
+      $scope.gateway.pollFrequency='15';
      }
   };
 

dist/src/main/package/www/controllers/operations.js

@@ -242,6 +242,8 @@ myControllerModule.controller('OperationsControllerAddEdit', function ($scope, $
       return TypesFactory.getRuleDefinitions();
     }else if(resourceType === 'Timer'){
       return TypesFactory.getTimers();
+    }else if(resourceType === 'Forward payload'){
+      return TypesFactory.getForwardPayloads();
     }else if(resourceType === 'Value'){
       $scope.updateThresholdValueTypes($scope.item.resourceType);
       return null;

dist/src/main/package/www/languages/mc_locale_gui-ca_es.json

@@ -11,6 +11,7 @@
     "ACTIONS": "Accions",
     "ACTION_BOARD": "Tauler d'accions",
     "ACTIVE": "Actiu",
+    "ADD": "Add",
     "ADD_AN_ENTRY": "Afegir entrada",
     "ADD_EXTERNAL_SERVER": "Add external server",
     "ADD_FIRMWARE": "Agefir firmware",
@@ -320,6 +321,7 @@
     "LOADED": "Carregat",
     "LOADING": "Carregant...",
     "LOCATION": "Localització",
+    "LOCATION_IP": "Location IP",
     "LOCATION_NAME": "Location name",
     "LOGIN_MESSAGE": "Missatge de Login",
     "LOGS": "Logs",
@@ -334,6 +336,7 @@
     "MAX": "Max",
     "MAXIMUM_BLOCK_SIZE": "Mida màxima de bloc",
     "MEASUREMENT": "Measurement",
+    "MERGE_STATIONS": "Merge stations",
     "MESSAGE": "Misatge",
     "MESSAGE_CONTAINS": "Contingut del missatge",
     "MESSAGE_TYPE": "Tipus de missatge",
@@ -363,6 +366,7 @@
     "NETWORK": "Xarxa",
     "NETWORK_TYPE": "Tipus de xarxa",
     "NEVER": "Mai",
+    "NEW": "New",
     "NEW_DASHBOARD": "Nova dashboard",
     "NEW_PASSWORD": "Nou password",
     "NO": "No",

dist/src/main/package/www/languages/mc_locale_gui-cs_cz.json

@@ -11,6 +11,7 @@
     "ACTIONS": "Akce",
     "ACTION_BOARD": "Panel akcí",
     "ACTIVE": "Aktivní",
+    "ADD": "Add",
     "ADD_AN_ENTRY": "Přidat záznam",
     "ADD_EXTERNAL_SERVER": "Přidat externí server",
     "ADD_FIRMWARE": "Přidat firmware",
@@ -320,6 +321,7 @@
     "LOADED": "Nahráno",
     "LOADING": "Nahrávám...",
     "LOCATION": "Umístění",
+    "LOCATION_IP": "Location IP",
     "LOCATION_NAME": "Location name",
     "LOGIN_MESSAGE": "Přihlašovací zpráva",
     "LOGS": "Logy",
@@ -334,6 +336,7 @@
     "MAX": "Max",
     "MAXIMUM_BLOCK_SIZE": "Maximální velikost bloku",
     "MEASUREMENT": "Measurement",
+    "MERGE_STATIONS": "Merge stations",
     "MESSAGE": "Zpráva",
     "MESSAGE_CONTAINS": "Zpráva obsahuje",
     "MESSAGE_TYPE": "Typ zprávy",
@@ -363,6 +366,7 @@
     "NETWORK": "Síť",
     "NETWORK_TYPE": "Typ sítě",
     "NEVER": "Nikdy",
+    "NEW": "New",
     "NEW_DASHBOARD": "Nový panel",
     "NEW_PASSWORD": "Nové heslo",
     "NO": "Ne",