Merge pull request #394 from SCADA-LTS/develop-sdtabilit

Develop sdtabilit v0.0.8

.settings/org.eclipse.jdt.core.prefs

@@ -1,12 +1,12 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8

.settings/org.eclipse.wst.common.project.facet.core.xml

@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
-  <runtime name="Apache Tomcat v7.0"/>
-  <installed facet="jst.web" version="3.0"/>
-  <installed facet="wst.jsdt.web" version="1.0"/>
-  <installed facet="java" version="1.7"/>
-</faceted-project>
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <runtime name="Apache Tomcat v7.0"/>
+  <installed facet="jst.web" version="3.0"/>
+  <installed facet="wst.jsdt.web" version="1.0"/>
+  <installed facet="java" version="1.8"/>
+</faceted-project>

.travis.yml

@@ -36,18 +36,19 @@ before_script:
 - cd ../..
 language: java
 jdk:
-- openjdk7
+- openjdk8
 services:
 - docker
 - mysql
-# script: ant war && ant junit
+#script: ant war && ant junit
 script: ant war
 branches:
   only:
   - "/^PROC-.*$/"
   - "/^develop-sdtabilit.*$/"
   - "/^#179*$/"
   - "/^master-sdtabilit.*$/"
+  - "/^v*$/"
 notifications:
   email: false
 env:
@@ -58,17 +59,17 @@ env:
   - secure: KNfVmgjr2ZNsnvIfuhSkZ/kPrSTjn6WSDxEJt/3ioTCgeEGGvPL7UGonHHozZu3WzpzBVyUr60hXjb1nmb9dk6A3Dg05UPZmuS7NiHEA4Ub2zQKgefSbK0AJEhXSDg+bT16Hqxf1aZDaAEpMXGWTGLdpbKkGAW56UZu6LpOlOvoX9pFoSWAyzh1jKiYQsaKJ3eCncHKug5WqTVidOL/ENR6CAYyVLkgZ0yffwsCyVAnh14vri2lswPhPsPvMzYxtLQGkKkUOYkuPOZvBD7l5mp5Y4QLv86iKTFlOteim7yD+RpZZDFpb+3+OhRuj6jlBYWina33RKqBqjhhsayyYN/tYnPUefZhT+ALs8JfUaDXqMdgd7NQj8i5ZvrB+YsCTUVGrnPVbmEq8A4l/An5ushQpK5CrASiAC0K4dOBVT+U89QHtYWuE3ZOmSb518dlbH084ljypAj3JTQpUgRAAxn21VUMKb6QyIPsSPVEQ+zPQnaxBLhYVqafO7iX1tyvdr0mGhLZjXaaGwQu8Y/RoHdmRYcQAGn6zVFNuxWxTlr2OQ0fJ5l6/qBVyqZvqNirYa5hX8KtDu3dVMo5VOirIsoJTw75qTpGxYjhCNCb/woxtRvfX9xoT7tINWOxi2ucFfObSCsTv+BPeZeJiq7UDuFQYsQtWjNRp/iQNJ+rclpQ=
 after_script:
 # get tomcat7 to ./docker/app
-- wget http://www-us.apache.org/dist/tomcat/tomcat-7/v7.0.78/bin/apache-tomcat-7.0.78.tar.gz
+- wget http://www-us.apache.org/dist/tomcat/tomcat-7/v7.0.82/bin/apache-tomcat-7.0.82.tar.gz
 - mkdir ./docker/app
-- mv apache-tomcat-7.0.78.tar.gz ./docker/app
-- ls -l ./docker/app/apache-tomcat-7.0.78.tar.gz
+- mv apache-tomcat-7.0.82.tar.gz ./docker/app
+- ls -l ./docker/app/apache-tomcat-7.0.82.tar.gz
 - cd ./docker/app
-- echo `pwd` 
+- echo `pwd`
 - echo `ls -l`
-- tar -zxvf apache-tomcat-7.0.78.tar.gz
+- tar -zxvf apache-tomcat-7.0.82.tar.gz
 - ls -l
-- mv ./apache-tomcat-7.0.78/* ./
-- rm -rf ./apache-tomcat-7.0.78
+- mv ./apache-tomcat-7.0.82/* ./
+- rm -rf ./apache-tomcat-7.0.82
 - cp ../../ScadaBR.war ./webapps
 - cp ../../ScadaLTS-UI/war/ScadaLTS.war ./webapps
 - ls -l ./webapps/ScadaLTS.war
@@ -93,5 +94,4 @@ after_script:
 
 
 #- echo $TRAVIS_BUILD_DIR
-#- sshpass -e scp ./ScadaBR.war [email protected]:/home/test/ScadaBR.war
-#- sshpass -e scp ./ScadaLTS-UI/war/ScadaLTS.war [email protected]:/home/test/ScadaLTS.war
+#- sshpa

README.md

@@ -2,6 +2,9 @@
 
 [![Build Status](https://img.shields.io/travis/grzesiekb/json.svg?style=flat-square)](https://travis-ci.org/sdtabilit/Scada-LTS)
 [![GPL-2.0](https://img.shields.io/npm/l/gb-json.svg?style=flat-square)](https://github.com/sdtabilit/Scada-LTS/blob/master-sdtabilit/LICENSE)
+[![](https://images.microbadger.com/badges/version/dockergb/scadalts-dev.svg)](https://microbadger.com/images/dockergb/scadalts-dev "Get your own version badge on microbadger.com")
+[![](https://images.microbadger.com/badges/image/dockergb/scadalts-dev.svg)](https://microbadger.com/images/dockergb/scadalts-dev "Get your own image badge on microbadger.com")
+[![Stories in Ready](https://badge.waffle.io/SCADA-LTS/Scada-LTS.svg?label=ready&title=Ready)](http://waffle.io/SCADA-LTS/Scada-LTS)
 
 Scada-LTS is an Open Source, web-based, multi-platform solution for building your own SCADA (Supervisory Control and Data Acquisiton) system.
 

ScadaLTS-Simulation1/war/WebContent/.gitignore

@@ -0,0 +1,3 @@
+/cam.png
+/style.css.map
+/WEB-INF/

ScadaLTS-Simulation1/war/WebContent/config.js

@@ -0,0 +1,12 @@
+var viewConfiguration = {
+    mainTitle: "ScadaLTS View",
+    navTitle: "Navigation",
+    cardDescription: ["All day: ", "Enable/Disable", "Current Hour", "Last Hour", "Current Day"],
+    logoSrc: "resources/logo.png",
+    enableButtonDSxid: "DP_558690",
+    configLocationDSxid: "DP_558691",
+    /* weekEnableShedule [mon, tue, wed, th, fri, sat, sun] :: 0 is disable 1 is enable */
+    weekEnableShedule: [0, 1, 1, 1, 1, 0, 0],
+    /* weekEnableHours [minHour, maxHour] :: when time is beatween this values DS is enabled */
+    weekEnableHours: [9, 17]
+}

ScadaLTS-Simulation1/war/WebContent/data.js

@@ -0,0 +1,16 @@
+var cardsData = {
+    card: [
+        {
+            title: "Location 1",
+            dataPointXID: "DP_260255"
+        },
+        {
+            title: "Location 2",
+            dataPointXID: "DP_260255"
+        },
+        {
+            title: "Location 3",
+            dataPointXID: "DP_260255"            
+        }
+    ]
+}