@@ -555,7 +577,7 @@
-
+
-
+
-
+
"/>" style="display:none" width="100%">
-
+
@@ -622,17 +649,17 @@
-
+
-
+
-
+
@@ -643,28 +670,28 @@
-
+
-
+
-
+
+
+
"/>" style="display:none" width="100%">
+
"/>" style="display:none" width="100%">
diff --git a/WebContent/WEB-INF/jsp/mailingLists.jsp b/WebContent/WEB-INF/jsp/mailingLists.jsp
index 7e7c9a5df1..902dd5e9f1 100644
--- a/WebContent/WEB-INF/jsp/mailingLists.jsp
+++ b/WebContent/WEB-INF/jsp/mailingLists.jsp
@@ -48,7 +48,11 @@
$set("xid", ml.xid);
$set("name", ml.name);
-
+ $set("dailyLimitSentEmailsNumber", ml.dailyLimitSentEmailsNumber);
+ $set("cronPattern", ml.cronPattern);
+ $set("collectInactiveEmails", ml.collectInactiveEmails);
+ $set("dailyLimitSentEmails", ml.dailyLimitSentEmails);
+
dwr.util.removeAllRows("mailingListEntriesTable");
var entry;
for (var i=0; i
-
+
-
+
-
+
-
+
diff --git a/WebContent/WEB-INF/tags/page.tag b/WebContent/WEB-INF/tags/page.tag
index 284c4bce43..3310c4719a 100644
--- a/WebContent/WEB-INF/tags/page.tag
+++ b/WebContent/WEB-INF/tags/page.tag
@@ -239,7 +239,7 @@
diff --git a/WebContent/images/phone.png b/WebContent/images/phone.png
new file mode 100644
index 0000000000..7eea803d73
Binary files /dev/null and b/WebContent/images/phone.png differ
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000000..bd595a7d5b
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,51 @@
+/*
+ *
+ * BETA FEATURE (not-stable, still under development)
+ * We advise to use ANT build instead of gradle.
+ *
+ * Scada-LTS gradle build configuration
+ * Based on the ANT "build.xml" file. This file provide the information
+ * where the source set is located, where are located the java libraries
+ * and use subproject tasks to include an NewUI contents inside Scada-LTS app.
+ */
+
+plugins {
+ id 'war'
+ id 'java'
+}
+
+repositories {
+ jcenter()
+}
+
+dependencies {
+ compile fileTree(include: ['*.jar'], dir:'WebContent/WEB-INF/lib')
+ compile fileTree(include: ['*.jar'], dir: System.getenv("CATALINA_HOME") + '/lib')
+}
+sourceSets {
+ main {
+ java {
+ srcDirs = ['src']
+ }
+ }
+}
+
+war {
+ dependsOn(':scadalts-ui:copyNewUiImages')
+ from 'WebContent'
+}
+
+task clearDockerDir(type: Delete) {
+ delete files("docker/volumes/webapps/ScadaBR.war")
+}
+task copyWarToDocker(type: Copy, dependsOn: clearDockerDir) {
+ from "build/libs/"
+ into "docker/volumes/webapps/"
+ include('Scada-LTS.war')
+ rename('Scada-LTS.war', "ScadaBR.war")
+}
+
+task installWebDependency(type: Exec) {
+ workingDir "./WebContent/resources"
+ commandLine "npm", "install"
+}
\ No newline at end of file
diff --git a/build.properties b/build.properties
deleted file mode 100644
index b470501d91..0000000000
--- a/build.properties
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# Mango - Open Source M2M - http://mango.serotoninsoftware.com
-# Copyright (C) 2006-2011 Serotonin Software Technologies Inc.
-# @author Matthew Lohbihler
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
diff --git a/db/createTables-derby.sql b/db/createTables-derby.sql
deleted file mode 100644
index 28fd8cc700..0000000000
--- a/db/createTables-derby.sql
+++ /dev/null
@@ -1,623 +0,0 @@
---
--- Mango - Open Source M2M - http://mango.serotoninsoftware.com
--- Copyright (C) 2006-2011 Serotonin Software Technologies Inc.
--- @author Matthew Lohbihler
---
--- This program is free software: you can redistribute it and/or modify
--- it under the terms of the GNU General Public License as published by
--- the Free Software Foundation, either version 3 of the License, or
--- (at your option) any later version.
---
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--- GNU General Public License for more details.
---
--- You should have received a copy of the GNU General Public License
--- along with this program. If not, see
-
-
-
-
-
- image/svg+xml
-
-
-
-
- Dec 2016 Jan 2017 Feb 2017 Mar 2017 Apr 2017 1st release test New Watch list Rest API Views Hierarchy Core UI UI
-
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000000..332fabbe5c
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,32 @@
+# Docker compose file to manage your deployed images.
+# Use MySQL server 5.7 and latest Scada-LTS local build.
+# Using attached webapps folder as developer you will be able to modify the static content from host os.
+# Attach shell to stop the tomcat instance and then you will be able to run in JPDA mode.
+version: '3'
+services:
+ database:
+ container_name: mysql
+ image: mysql/mysql-server:5.7
+ ports:
+ - "3306:3306"
+ environment:
+ - MYSQL_ROOT_PASSWORD=root
+ - MYSQL_USER=root
+ - MYSQL_PASSWORD=root
+ - MYSQL_DATABASE=scadalts
+ expose: ["3306"]
+ volumes:
+ - ./docker/volumes/databases:/home/
+ network_mode: host
+ tomcat:
+ image: scadalts/scadalts:2.5.0
+ build: .
+ ports:
+ - "8080:8080"
+ depends_on:
+ - database
+ expose: ["8080", "8000"]
+ volumes:
+ - ./docker/volumes/webapps:/usr/local/tomcat/webapps
+# - ./build/libs/Scada-LTS.war:/usr/local/tomcat/webapps/ScadaBR.war
+ network_mode: host
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 0000000000..ca025f4b2c
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,12 @@
+{
+ "requires": true,
+ "lockfileVersion": 1,
+ "dependencies": {
+ "prettier": {
+ "version": "2.2.1",
+ "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.2.1.tgz",
+ "integrity": "sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q==",
+ "dev": true
+ }
+ }
+}
diff --git a/scadalts-ui/.eslintrc.js b/scadalts-ui/.eslintrc.js
index e37caab6e4..286a0021c3 100644
--- a/scadalts-ui/.eslintrc.js
+++ b/scadalts-ui/.eslintrc.js
@@ -1,27 +1,22 @@
module.exports = {
- root: true,
- env: {
- node: true
- },
- 'extends': [
- 'plugin:vue/essential',
- 'eslint:recommended'
- ],
- rules: {
- 'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
- 'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off'
- },
- parserOptions: {
- parser: 'babel-eslint'
- },
- overrides: [
- {
- files: [
- '**/__tests__/*.{j,t}s?(x)'
- ],
- env: {
- mocha: true
- }
- }
- ]
-}
+ root: true,
+ env: {
+ node: true,
+ },
+ extends: ['plugin:vue/essential', 'eslint:recommended'],
+ rules: {
+ 'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
+ 'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
+ },
+ parserOptions: {
+ parser: 'babel-eslint',
+ },
+ overrides: [
+ {
+ files: ['**/__tests__/*.{j,t}s?(x)'],
+ env: {
+ mocha: true,
+ },
+ },
+ ],
+};
diff --git a/scadalts-ui/.prettierignore b/scadalts-ui/.prettierignore
new file mode 100644
index 0000000000..77738287f0
--- /dev/null
+++ b/scadalts-ui/.prettierignore
@@ -0,0 +1 @@
+dist/
\ No newline at end of file
diff --git a/scadalts-ui/.prettierrc.json b/scadalts-ui/.prettierrc.json
new file mode 100644
index 0000000000..a1d6fcfa23
--- /dev/null
+++ b/scadalts-ui/.prettierrc.json
@@ -0,0 +1,19 @@
+{
+ "arrowParens": "always",
+ "bracketSpacing": true,
+ "embeddedLanguageFormatting": "auto",
+ "htmlWhitespaceSensitivity": "css",
+ "insertPragma": false,
+ "jsxBracketSameLine": false,
+ "jsxSingleQuote": false,
+ "printWidth": 90,
+ "proseWrap": "preserve",
+ "quoteProps": "as-needed",
+ "requirePragma": false,
+ "semi": true,
+ "singleQuote": true,
+ "tabWidth": 2,
+ "trailingComma": "all",
+ "useTabs": true,
+ "vueIndentScriptAndStyle": false
+}
diff --git a/scadalts-ui/babel.config.js b/scadalts-ui/babel.config.js
index ba179669a1..a7722b54b6 100644
--- a/scadalts-ui/babel.config.js
+++ b/scadalts-ui/babel.config.js
@@ -1,5 +1,3 @@
module.exports = {
- presets: [
- '@vue/app'
- ]
-}
+ presets: ['@vue/app'],
+};
diff --git a/scadalts-ui/build-config.js b/scadalts-ui/build-config.js
index a7d8ca0ad5..233e4a65ba 100644
--- a/scadalts-ui/build-config.js
+++ b/scadalts-ui/build-config.js
@@ -1,71 +1,73 @@
/**
* This script get the latest release tag from Scada-LTS GitHub repository
* and update the tag property in package.json file. Run this script before
- * releasing the new Scada-LTS version for production.
- *
+ * releasing the new Scada-LTS version for production.
+ *
* To run this script type:
* 'npm run-script version update'
- *
+ *
* This tag is displayed in the new Scada-LTS SystemSettings view.
- * Also there on this page there is a UI version
+ * Also there on this page there is a UI version
* from the version property in the package.json file.
* Remember to increment this value!
*/
const saveFile = require('fs').writeFileSync;
-const https = require("https");
+const https = require('https');
const pkgJsonPath = require.main.paths[0].split('node_modules')[0] + 'package.json';
const json = require(pkgJsonPath);
// ----- PACKAGE.JSON VARIABLES ----- //
var tag = '0.1.0';
-var milestone = '2.4.0';
-var build = "0";
-var branch = "local"
+var milestone = '2.5.0';
+var build = '0';
+var branch = 'local';
// ----- ---------------------- ----- //
if (process.argv.length === 5) {
- milestone = process.argv[2];
- build = process.argv[3];
- branch = process.argv[4]
+ milestone = process.argv[2];
+ build = process.argv[3];
+ branch = process.argv[4];
}
if (!json.hasOwnProperty('scripts')) {
- json.scripts = {};
+ json.scripts = {};
}
var options = {
- host: 'api.github.com',
- path: '/repos/SCADA-LTS/Scada-LTS/releases/latest',
- headers: { 'User-Agent': 'Mozilla/5.0' }
-}
+ host: 'api.github.com',
+ path: '/repos/SCADA-LTS/Scada-LTS/releases/latest',
+ headers: { 'User-Agent': 'Mozilla/5.0' },
+};
var request = https.request(options, function (res) {
- var data = '';
- res.on('data', function (chunk) {
- data += chunk;
- });
- res.on('end', function () {
- let webJson = JSON.parse(data);
- if (!!webJson) {
- if(!!webJson.tag_name) {
- tag = webJson.tag_name.replace(/[^\d.-]/g, '');
- }
- } else {
- console.warn("WARNING!:\tFailed to fetch build version data!\n\t\tScada-LTS version may not be displayed properly!")
- console.log(webJson)
- console.log("DEBUG: Response data from request:\n",data)
- }
- json.tag = tag;
- json.milestone = milestone;
- json.build = build;
- json.branch = branch;
- console.log(json.tag)
- console.log(`${json.milestone}.${json.build}`)
- console.log(json.branch)
- saveFile(pkgJsonPath, JSON.stringify(json, null, 2));
- });
+ var data = '';
+ res.on('data', function (chunk) {
+ data += chunk;
+ });
+ res.on('end', function () {
+ let webJson = JSON.parse(data);
+ if (!!webJson) {
+ if (!!webJson.tag_name) {
+ tag = webJson.tag_name.replace(/[^\d.-]/g, '');
+ }
+ } else {
+ console.warn(
+ 'WARNING!:\tFailed to fetch build version data!\n\t\tScada-LTS version may not be displayed properly!',
+ );
+ console.log(webJson);
+ console.log('DEBUG: Response data from request:\n', data);
+ }
+ json.tag = tag;
+ json.milestone = milestone;
+ json.build = build;
+ json.branch = branch;
+ console.log(json.tag);
+ console.log(`${json.milestone}.${json.build}`);
+ console.log(json.branch);
+ saveFile(pkgJsonPath, JSON.stringify(json, null, 2));
+ });
});
request.on('error', function (e) {
- console.log(e.message);
+ console.log(e.message);
});
request.end();
diff --git a/scadalts-ui/build.gradle b/scadalts-ui/build.gradle
new file mode 100644
index 0000000000..dc6b7d3062
--- /dev/null
+++ b/scadalts-ui/build.gradle
@@ -0,0 +1,40 @@
+plugins {
+ id "com.moowork.node" version "1.2.0"
+}
+
+apply plugin: 'base'
+apply plugin: 'com.moowork.node'
+
+node {
+ version = "12.19.0"
+ download = false
+}
+
+task bundle(type: NpmTask, dependsOn: npmInstall) {
+ args = ['run', 'build']
+}
+
+task clearResources(type: Delete, dependsOn: bundle) {
+ delete files ("../WebContent/resources/js-ui")
+}
+
+task copyNewUiCss(type: Copy, dependsOn: clearResources) {
+ from "dist/css"
+ include "*.css"
+ into "../WebContent/resources/js-ui/app/css"
+}
+
+task copyNewUiJs(type: Copy, dependsOn: copyNewUiCss) {
+ from "dist/js/app.js" , "dist/js/chunk-vendors.js"
+ into "../WebContent/resources/js-ui/app/js"
+}
+
+task copyNewUiFonts(type: Copy, dependsOn: copyNewUiJs) {
+ from "dist/fonts"
+ into "../WebContent/resources/js-ui/app/fonts"
+}
+
+task copyNewUiImages(type: Copy, dependsOn: copyNewUiFonts) {
+ from "dist/resources"
+ into "../WebContent/resources"
+}
diff --git a/scadalts-ui/cypress.json b/scadalts-ui/cypress.json
index 5c635794bd..c2b2f536fb 100644
--- a/scadalts-ui/cypress.json
+++ b/scadalts-ui/cypress.json
@@ -1,3 +1,3 @@
{
- "baseUrl": "http://localhost:8080/ScadaBR"
+ "baseUrl": "http://localhost:8080/ScadaBR"
}
diff --git a/scadalts-ui/cypress/fixtures/example.json b/scadalts-ui/cypress/fixtures/example.json
index da18d9352a..0ff2d645bf 100644
--- a/scadalts-ui/cypress/fixtures/example.json
+++ b/scadalts-ui/cypress/fixtures/example.json
@@ -1,5 +1,5 @@
{
- "name": "Using fixtures to represent data",
- "email": "hello@cypress.io",
- "body": "Fixtures are a great way to mock data for responses to routes"
-}
\ No newline at end of file
+ "name": "Using fixtures to represent data",
+ "email": "hello@cypress.io",
+ "body": "Fixtures are a great way to mock data for responses to routes"
+}
diff --git a/scadalts-ui/cypress/integration/ScadaLTS_Views/alarms_notification.spec.js b/scadalts-ui/cypress/integration/ScadaLTS_Views/alarms_notification.spec.js
new file mode 100644
index 0000000000..92cedec6da
--- /dev/null
+++ b/scadalts-ui/cypress/integration/ScadaLTS_Views/alarms_notification.spec.js
@@ -0,0 +1,41 @@
+context('Test PLC Alarms Page Vue.JS page', () => {
+ beforeEach(() => {
+ cy.clearCookies();
+ cy.visit('/login.htm');
+ cy.get('input#username').type('admin').should('have.value', 'admin');
+ cy.get('input#password').type('admin').should('have.value', 'admin');
+ cy.get('.login-button > input').click();
+ cy.location('pathname').should('include', 'watch_list');
+ });
+
+ afterEach(() => {
+ cy.visit('/login.htm');
+ cy.get('a[href="logout.htm"]').click();
+ });
+
+ describe('Test PLC Alarms Notification page View', () => {
+ beforeEach(() => {
+ cy.get('a[href="logout.htm"]').click();
+ cy.visit('/login.htm');
+ cy.get('input#username').type('admin').should('have.value', 'admin');
+ cy.get('input#password').type('admin').should('have.value', 'admin');
+ cy.get('.login-button > input').click();
+ cy.get('.userName').should('contain', 'admin');
+ });
+
+ afterEach(() => {
+ cy.visit('/login.htm');
+ });
+
+ it('Is PLC Alarms Notification List accessible via URL', () => {
+ cy.visit('app.shtm#/alarm-notifications');
+ cy.get('h1').should('contain', 'Notification List');
+ });
+
+ it('Is PLC Alarms Notification List accessible via Button', () => {
+ cy.get('[href="app.shtm"] > .ptr').click();
+ cy.get('[href="#/alarm-notifications"]').click();
+ cy.get('h1').should('contain', 'Notification List');
+ });
+ });
+});
diff --git a/scadalts-ui/cypress/integration/ScadaLTS_Views/datasource_creation.spec.js b/scadalts-ui/cypress/integration/ScadaLTS_Views/datasource_creation.spec.js
index 4df1d59a1f..4d701e2ae5 100644
--- a/scadalts-ui/cypress/integration/ScadaLTS_Views/datasource_creation.spec.js
+++ b/scadalts-ui/cypress/integration/ScadaLTS_Views/datasource_creation.spec.js
@@ -1,26 +1,24 @@
-import {createVirtualDataSource, addVirtualDataPoint, login} from '../../utils/utils';
+import { createVirtualDataSource, addVirtualDataPoint, login } from '../../utils/utils';
context('Create Datasource', () => {
+ before(() => {
+ login('admin', 'admin');
+ });
- before(() => {
- login("admin", "admin")
- })
-
- describe("Create Test Datasource", function () {
-
- it('Create datasource with 10 numeric datapoints', function () {
- const count = 10;
- cy.visit('/data_sources.shtm')
- createVirtualDataSource(`Test-${new Date().toISOString()}`)
- for (let i = 0; i < count; i = i + 1) {
- addVirtualDataPoint(`0${i}-Test`, 'Numeric')
- }
- cy.get('#pointsList').children().should('have.length', count)
- cy.get('img.ptr#enableAllImg').click();
- cy.get('#pointsList').find('img[src="images/brick_go.png"]').should('have.length', count)
- cy.get('img.ptr#dsStatusImg').click();
- })
-
- })
-
-})
\ No newline at end of file
+ describe('Create Test Datasource', function () {
+ it('Create datasource with 10 numeric datapoints', function () {
+ const count = 10;
+ cy.visit('/data_sources.shtm');
+ createVirtualDataSource(`Test-${new Date().toISOString()}`);
+ for (let i = 0; i < count; i = i + 1) {
+ addVirtualDataPoint(`0${i}-Test`, 'Numeric');
+ }
+ cy.get('#pointsList').children().should('have.length', count);
+ cy.get('img.ptr#enableAllImg').click();
+ cy.get('#pointsList')
+ .find('img[src="images/brick_go.png"]')
+ .should('have.length', count);
+ cy.get('img.ptr#dsStatusImg').click();
+ });
+ });
+});
diff --git a/scadalts-ui/cypress/integration/ScadaLTS_Views/modern_charts.spec.js b/scadalts-ui/cypress/integration/ScadaLTS_Views/modern_charts.spec.js
index 7710ddd7ff..b20b041186 100644
--- a/scadalts-ui/cypress/integration/ScadaLTS_Views/modern_charts.spec.js
+++ b/scadalts-ui/cypress/integration/ScadaLTS_Views/modern_charts.spec.js
@@ -1,59 +1,56 @@
context('Verify Modern Watch List Page and Modern Charts', () => {
+ before(() => {
+ cy.clearCookies();
+ cy.visit('/login.htm');
+ cy.get('input#username').type('admin').should('have.value', 'admin');
+ cy.get('input#password').type('admin').should('have.value', 'admin');
+ cy.get('.login-button > input').click();
+ cy.location('pathname').should('include', 'watch_list');
+ });
- before(() => {
- cy.clearCookies()
- cy.visit('/login.htm')
- cy.get('input#username').type("admin").should('have.value', 'admin')
- cy.get('input#password').type("admin").should('have.value', 'admin')
- cy.get('.login-button > input').click()
- cy.location('pathname').should('include', 'watch_list')
- })
+ describe('Modern Watch List', function () {
+ it('Open Modern Watch List Page', function () {
+ cy.visit('/modern_watch_list.shtm');
+ cy.location('pathname').should('include', 'modern_watch_list.shtm');
+ });
+ it('Validate Modern Charts Vue component exist', function () {
+ cy.get('.smallTitle').should('contain', 'Modern Chart');
+ });
+ });
- describe("Modern Watch List", function () {
+ describe('Chart with 1 datapoint', function () {
+ it('Create chart', function () {
+ cy.request('/api/auth/admin/admin');
+ cy.get('#watchListSelect').select('Test_WL_1');
+ cy.get('i[class="glyphicon glyphicon-refresh"]').click();
+ cy.get('.hello').find('svg');
+ });
- it('Open Modern Watch List Page', function () {
- cy.visit('/modern_watch_list.shtm')
- cy.location('pathname').should('include', 'modern_watch_list.shtm')
- })
- it("Validate Modern Charts Vue component exist", function () {
- cy.get(".smallTitle").should('contain', 'Modern Chart')
- })
- })
+ it('Modify chart - Change live settings', function () {
+ cy.get('#live-sd').clear().type('5').should('have.value', '5');
+ cy.get('#live-rrs').select('week').should('have.value', 'week');
+ cy.get('#live-rr').select('5000').should('have.value', '5000');
+ cy.get('i[class="glyphicon glyphicon-refresh"]').click();
+ cy.get('.hello').find('svg');
+ });
- describe("Chart with 1 datapoint", function () {
-
- it('Create chart', function () {
- cy.request('/api/auth/admin/admin')
- cy.get('#watchListSelect').select("Test_WL_1");
- cy.get('i[class="glyphicon glyphicon-refresh"]').click()
- cy.get('.hello').find('svg')
- })
-
- it('Modify chart - Change live settings', function () {
- cy.get('#live-sd').clear().type('5').should('have.value', '5')
- cy.get('#live-rrs').select('week').should('have.value', 'week')
- cy.get('#live-rr').select('5000').should('have.value', '5000')
- cy.get('i[class="glyphicon glyphicon-refresh"]').click()
- cy.get('.hello').find('svg')
- })
+ it('Modify chart - Change static settings', function () {
+ cy.get('#static-btn-1').click();
+ cy.get('label[for="static-sd"]').should('contain', 'Start date');
+ cy.get('label[for="static-sd"]').should('be.visible');
+ cy.get('label[for="static-ed"]').should('contain', 'End date');
+ cy.get('label[for="static-ed"]').should('be.visible');
+ });
- it('Modify chart - Change static settings', function () {
- cy.get('#static-btn-1').click()
- cy.get('label[for="static-sd"]').should('contain', 'Start date')
- cy.get('label[for="static-sd"]').should('be.visible')
- cy.get('label[for="static-ed"]').should('contain', 'End date')
- cy.get('label[for="static-ed"]').should('be.visible')
- })
-
- it('Modify series - change series name', () => {
- cy.get('i[class="glyphicon glyphicon-cog"]').click()
- cy.get('.modal-body-block').should('be.visible')
- cy.get('.tab-pane > :nth-child(1) > div.col-xs-6 > .form-control').clear().type('Cypress Datapoint');
- cy.get('.active > a').should('contain', 'Cypress Datapoint')
- cy.get('.margin-top > :nth-child(3) > .btn').click()
- cy.get('tspan').should('contain', 'Cypress Datapoint')
- })
-
- })
-
-})
\ No newline at end of file
+ it('Modify series - change series name', () => {
+ cy.get('i[class="glyphicon glyphicon-cog"]').click();
+ cy.get('.modal-body-block').should('be.visible');
+ cy.get('.tab-pane > :nth-child(1) > div.col-xs-6 > .form-control')
+ .clear()
+ .type('Cypress Datapoint');
+ cy.get('.active > a').should('contain', 'Cypress Datapoint');
+ cy.get('.margin-top > :nth-child(3) > .btn').click();
+ cy.get('tspan').should('contain', 'Cypress Datapoint');
+ });
+ });
+});
diff --git a/scadalts-ui/cypress/integration/ScadaLTS_Views/system_settings.spec.js b/scadalts-ui/cypress/integration/ScadaLTS_Views/system_settings.spec.js
index 9ce0de2d20..771626bf78 100644
--- a/scadalts-ui/cypress/integration/ScadaLTS_Views/system_settings.spec.js
+++ b/scadalts-ui/cypress/integration/ScadaLTS_Views/system_settings.spec.js
@@ -1,119 +1,120 @@
-const { Context } = require("ag-grid-community");
-import {createVirtualDataSource, addVirtualDataPoint} from '../../utils/utils';
+const { Context } = require('ag-grid-community');
+import { createVirtualDataSource, addVirtualDataPoint } from '../../utils/utils';
context('Test System Settings Vue.JS page', () => {
-
- beforeEach(() => {
- cy.clearCookies()
- cy.visit('/login.htm')
- cy.get('input#username').type("admin").should('have.value', 'admin')
- cy.get('input#password').type("admin").should('have.value', 'admin')
- cy.get('.login-button > input').click()
- cy.location('pathname').should('include', 'watch_list')
- })
-
- afterEach(() => {
- cy.visit('/login.htm')
- cy.get('a[href="logout.htm"]').click()
- })
-
- describe("Open System Settings as non-admin user", () => {
- beforeEach(() => {
- cy.get('a[href="logout.htm"]').click()
- cy.visit('/login.htm')
- cy.get('input#username').type("nonadmin").should('have.value', 'nonadmin')
- cy.get('input#password').type("nonadmin").should('have.value', 'nonadmin')
- cy.get('.login-button > input').click()
- cy.get('.userName').should('contain', 'nonadmin')
- })
-
- it("Open System Settings via URL", () => {
- cy.visit('app.shtm#/system-settings')
- cy.get('.alert').should('contain', 'Not allowed to see that page')
- cy.visit('/login.htm')
- })
-
- it("Should not be able to navigate through menu", () => {
- cy.get('a[href="app.shtm"]').click()
- cy.get('#btn-sidebar').click()
- cy.get('.sidebar').should('be.visible')
- cy.get('.sidebar').should('not.contain', 'System Settings')
- cy.visit('/login.htm')
-
- })
- })
-
- describe("Open System Settings as admin user", () => {
- it("Open System Settings via URL", () => {
- cy.visit('app.shtm#/system-settings')
- cy.reload();
- cy.get('.alert').should('not.contain', 'Not allowed to see that page')
- })
-
- it("Should be able to navigate through menu", () => {
- cy.get('a[href="app.shtm"]').click()
- cy.get('#btn-sidebar').click()
- cy.get('.sidebar').should('be.visible')
- cy.get('.sidebar > a[href="#/system-settings"]').should('be.visible')
- cy.get('.sidebar > a[href="#/system-settings"]').click()
- cy.get('.alert').should('not.contain', 'Not allowed to see that page')
- cy.visit('/login.htm')
- })
- })
-
-})
+ beforeEach(() => {
+ cy.clearCookies();
+ cy.visit('/login.htm');
+ cy.get('input#username').type('admin').should('have.value', 'admin');
+ cy.get('input#password').type('admin').should('have.value', 'admin');
+ cy.get('.login-button > input').click();
+ cy.location('pathname').should('include', 'watch_list');
+ });
+
+ afterEach(() => {
+ cy.visit('/login.htm');
+ cy.get('a[href="logout.htm"]').click();
+ });
+
+ describe('Open System Settings as non-admin user', () => {
+ beforeEach(() => {
+ cy.get('a[href="logout.htm"]').click();
+ cy.visit('/login.htm');
+ cy.get('input#username').type('nonadmin').should('have.value', 'nonadmin');
+ cy.get('input#password').type('nonadmin').should('have.value', 'nonadmin');
+ cy.get('.login-button > input').click();
+ cy.get('.userName').should('contain', 'nonadmin');
+ });
+
+ it('Open System Settings via URL', () => {
+ cy.visit('app.shtm#/system-settings');
+ cy.get('.alert').should('contain', 'Not allowed to see that page');
+ cy.visit('/login.htm');
+ });
+
+ it('Should not be able to navigate through menu', () => {
+ cy.get('a[href="app.shtm"]').click();
+ cy.get('#btn-sidebar').click();
+ cy.get('.sidebar').should('be.visible');
+ cy.get('.sidebar').should('not.contain', 'System Settings');
+ cy.visit('/login.htm');
+ });
+ });
+
+ describe('Open System Settings as admin user', () => {
+ it('Open System Settings via URL', () => {
+ cy.visit('app.shtm#/system-settings');
+ cy.reload();
+ cy.get('.alert').should('not.contain', 'Not allowed to see that page');
+ });
+
+ it('Should be able to navigate through menu', () => {
+ cy.get('a[href="app.shtm"]').click();
+ cy.get('#btn-sidebar').click();
+ cy.get('.sidebar').should('be.visible');
+ cy.get('.sidebar > a[href="#/system-settings"]').should('be.visible');
+ cy.get('.sidebar > a[href="#/system-settings"]').click();
+ cy.get('.alert').should('not.contain', 'Not allowed to see that page');
+ cy.visit('/login.htm');
+ });
+ });
+});
context('Test System Settings Components functionality', () => {
-
- beforeEach(() => {
- cy.clearCookies()
- cy.visit('/login.htm')
- cy.get('input#username').type("admin").should('have.value', 'admin')
- cy.get('input#password').type("admin").should('have.value', 'admin')
- cy.get('.login-button > input').click()
- cy.location('pathname').should('include', 'watch_list')
- })
-
- describe("Test Default Logging Type Setting", () => {
-
- beforeEach(() => {
- cy.visit('app.shtm#/system-settings')
- })
-
- it("Should be visible", () => {
- cy.get('#default-logging-type-setting').should('be.visible');
- cy.get('#default-logging-type-setting > .align-items-center > .col-xs-12').should('contain', 'Default Data Point logging type');
- })
-
- it("Save do not log value", () => {
- let name = `Test_SystemSettings-${new Date().getTime()}`;
- name = name.substring(0,30);
- cy.get('.col-xs-12 > .form-control').select("Do not log");
- cy.get('.floated-right').click();
- cy.get('.btn-success').click();
-
- createVirtualDataSource(name);
- addVirtualDataPoint(`DP_${name}`, "Numeric")
-
- cy.get(':nth-child(5) > img[src="images/icon_comp_edit.png"]').click();
- cy.get('select#loggingType option[selected="selected"]').should('contain', 'Do not log');
-
- })
-
- it("Save do not log value", () => {
- let name = `Test_SystemSettings2-${new Date().getTime()}`;
- name = name.substring(0,30);
- cy.get('.col-xs-12 > .form-control').select("When point value changes");
- cy.get('.floated-right').click();
- cy.get('.btn-success').click();
-
- createVirtualDataSource(name);
- addVirtualDataPoint(`DP_${name}`, "Numeric")
-
- cy.get(':nth-child(5) > img[src="images/icon_comp_edit.png"]').click();
- cy.get('select#loggingType option[selected="selected"]').should('contain', 'When point value changes');
-
- })
-
- })
-})
\ No newline at end of file
+ beforeEach(() => {
+ cy.clearCookies();
+ cy.visit('/login.htm');
+ cy.get('input#username').type('admin').should('have.value', 'admin');
+ cy.get('input#password').type('admin').should('have.value', 'admin');
+ cy.get('.login-button > input').click();
+ cy.location('pathname').should('include', 'watch_list');
+ });
+
+ describe('Test Default Logging Type Setting', () => {
+ beforeEach(() => {
+ cy.visit('app.shtm#/system-settings');
+ });
+
+ it('Should be visible', () => {
+ cy.get('#default-logging-type-setting').should('be.visible');
+ cy.get('#default-logging-type-setting > .align-items-center > .col-xs-12').should(
+ 'contain',
+ 'Default Data Point logging type',
+ );
+ });
+
+ it('Save do not log value', () => {
+ let name = `Test_SystemSettings-${new Date().getTime()}`;
+ name = name.substring(0, 30);
+ cy.get('.col-xs-12 > .form-control').select('Do not log');
+ cy.get('.floated-right').click();
+ cy.get('.btn-success').click();
+
+ createVirtualDataSource(name);
+ addVirtualDataPoint(`DP_${name}`, 'Numeric');
+
+ cy.get(':nth-child(5) > img[src="images/icon_comp_edit.png"]').click();
+ cy.get('select#loggingType option[selected="selected"]').should(
+ 'contain',
+ 'Do not log',
+ );
+ });
+
+ it('Save do not log value', () => {
+ let name = `Test_SystemSettings2-${new Date().getTime()}`;
+ name = name.substring(0, 30);
+ cy.get('.col-xs-12 > .form-control').select('When point value changes');
+ cy.get('.floated-right').click();
+ cy.get('.btn-success').click();
+
+ createVirtualDataSource(name);
+ addVirtualDataPoint(`DP_${name}`, 'Numeric');
+
+ cy.get(':nth-child(5) > img[src="images/icon_comp_edit.png"]').click();
+ cy.get('select#loggingType option[selected="selected"]').should(
+ 'contain',
+ 'When point value changes',
+ );
+ });
+ });
+});
diff --git a/scadalts-ui/cypress/integration/ScadaLTS_Views/watch_list.spec.js b/scadalts-ui/cypress/integration/ScadaLTS_Views/watch_list.spec.js
index b6077f5608..cdea961c76 100644
--- a/scadalts-ui/cypress/integration/ScadaLTS_Views/watch_list.spec.js
+++ b/scadalts-ui/cypress/integration/ScadaLTS_Views/watch_list.spec.js
@@ -1,43 +1,41 @@
context('Create WatchList', () => {
+ function createWatchList(name, count) {
+ cy.visit('/watch_list.shtm');
+ cy.get('img.ptr[src="images/add.png"]').last().click();
+ cy.get('#watchListSelect').select('(unnamed)');
+ cy.get('#wlEditImg')
+ .trigger('mouseover')
+ .get('#newWatchListName')
+ .type(`{selectall}${name}`);
+ cy.get('#saveWatchListNameLink').click();
- function createWatchList(name, count) {
- cy.visit('/watch_list.shtm');
- cy.get('img.ptr[src="images/add.png"]').last().click();
- cy.get('#watchListSelect').select("(unnamed)");
- cy.get('#wlEditImg').trigger('mouseover').get('#newWatchListName').type(`{selectall}${name}`);
- cy.get('#saveWatchListNameLink').click();
-
- let pointList = cy.get(".dojoTreeNodeLabelTitle");
- pointList.get('img[src="images/bullet_go.png"]').each(($el, index, $list) => {
- if (count > 0) {
- cy.wrap($el).click()
- count = count - 1
- }
- })
+ let pointList = cy.get('.dojoTreeNodeLabelTitle');
+ pointList.get('img[src="images/bullet_go.png"]').each(($el, index, $list) => {
+ if (count > 0) {
+ cy.wrap($el).click();
+ count = count - 1;
+ }
+ });
+ }
- }
+ function login(username, password) {
+ cy.visit('/login.htm');
+ cy.get('input#username').type(username);
+ cy.get('input#password').type(password);
+ cy.get('.login-button > input').click();
+ }
- function login(username, password) {
- cy.visit('/login.htm')
- cy.get('input#username').type(username)
- cy.get('input#password').type(password)
- cy.get('.login-button > input').click()
- }
+ beforeEach(() => {
+ login('admin', 'admin');
+ });
- beforeEach(() => {
- login("admin", "admin")
- })
-
- describe("Create WatchList", function () {
-
- let watchListState = [1, 5, 10];
- watchListState.forEach(element => {
- it(`Create Watch List with ${element} numeric datapoints`, function() {
- createWatchList(`Test_WL_${element}`, element);
- cy.get('#watchListTable').children().should('have.length', element)
- })
- });
-
- })
-
-})
\ No newline at end of file
+ describe('Create WatchList', function () {
+ let watchListState = [1, 5, 10];
+ watchListState.forEach((element) => {
+ it(`Create Watch List with ${element} numeric datapoints`, function () {
+ createWatchList(`Test_WL_${element}`, element);
+ cy.get('#watchListTable').children().should('have.length', element);
+ });
+ });
+ });
+});
diff --git a/scadalts-ui/cypress/plugins/index.js b/scadalts-ui/cypress/plugins/index.js
index aa9918d215..3a4b6deb18 100644
--- a/scadalts-ui/cypress/plugins/index.js
+++ b/scadalts-ui/cypress/plugins/index.js
@@ -16,6 +16,6 @@
* @type {Cypress.PluginConfig}
*/
module.exports = (on, config) => {
- // `on` is used to hook into various events Cypress emits
- // `config` is the resolved Cypress config
-}
+ // `on` is used to hook into various events Cypress emits
+ // `config` is the resolved Cypress config
+};
diff --git a/scadalts-ui/cypress/support/index.js b/scadalts-ui/cypress/support/index.js
index d68db96df2..37a498fb5b 100644
--- a/scadalts-ui/cypress/support/index.js
+++ b/scadalts-ui/cypress/support/index.js
@@ -14,7 +14,7 @@
// ***********************************************************
// Import commands.js using ES2015 syntax:
-import './commands'
+import './commands';
// Alternatively you can use CommonJS syntax:
// require('./commands')
diff --git a/scadalts-ui/cypress/utils/utils.js b/scadalts-ui/cypress/utils/utils.js
index 75573d4f3d..74288be23b 100644
--- a/scadalts-ui/cypress/utils/utils.js
+++ b/scadalts-ui/cypress/utils/utils.js
@@ -1,46 +1,46 @@
export function createVirtualDataSource(name) {
- cy.visit('data_sources.shtm');
- cy.get("#dataSourceTypes").select('Virtual Data Source').should('have.value', '1');
- cy.get('img.ptr[src="images/icon_ds_add.png"]').first().click();
- cy.get('.smallTitle').should('contain', 'Virtual data source properties')
- cy.get('#dataSourceName').type(name)
- cy.get('#updatePeriods').type("{backspace}1").should('have.value', '1');
- cy.get('img.ptr[src="images/save.png"]').first().click();
- cy.get('#dataSourceMessage').should('contain', 'Data source has been saved')
- // cy.debug('DataSource created!')
+ cy.visit('data_sources.shtm');
+ cy.get('#dataSourceTypes').select('Virtual Data Source').should('have.value', '1');
+ cy.get('img.ptr[src="images/icon_ds_add.png"]').first().click();
+ cy.get('.smallTitle').should('contain', 'Virtual data source properties');
+ cy.get('#dataSourceName').type(name);
+ cy.get('#updatePeriods').type('{backspace}1').should('have.value', '1');
+ cy.get('img.ptr[src="images/save.png"]').first().click();
+ cy.get('#dataSourceMessage').should('contain', 'Data source has been saved');
+ // cy.debug('DataSource created!')
}
- /**
- *
- * @param {*} name DataPoint name
- * @param {*} type [Multistate = 2| Numeric = 3]
- */
+/**
+ *
+ * @param {*} name DataPoint name
+ * @param {*} type [Multistate = 2| Numeric = 3]
+ */
export function addVirtualDataPoint(name, type) {
- cy.get('img.ptr[src="images/icon_comp_add.png"]').click();
- cy.get('input#name').type(name)
- cy.get('input#settable').click()
- cy.get('select#dataTypeId').select(type)
- if (type === 'Numeric') {
- cy.wait(500)
- cy.get('select#changeTypeId').select('Random')
- cy.get('#divCH6').children().first().next().find('input').type("{backspace}20")
- cy.get('#divCH6').children().first().next().next().find('input').type("2")
- } else if (type === 'Multistate') {
- cy.get('select#changeTypeId').select('8')
- cy.get('input#randomMultistate').type("1")
- for (let x = 1; x <= 5; x = x + 1) {
- cy.get('img.ptr[src="images/add.png"]').click()
- }
- cy.get('select#randomMultistateChange.startValue').select('1')
- }
- cy.get('img.ptr#pointSaveImg').click()
- cy.get('#pointMessage').should('contain', 'Point details saved')
- // cy.debug(`DataPoint ${name} created!`)
+ cy.get('img.ptr[src="images/icon_comp_add.png"]').click();
+ cy.get('input#name').type(name);
+ cy.get('input#settable').click();
+ cy.get('select#dataTypeId').select(type);
+ if (type === 'Numeric') {
+ cy.wait(500);
+ cy.get('select#changeTypeId').select('Random');
+ cy.get('#divCH6').children().first().next().find('input').type('{backspace}20');
+ cy.get('#divCH6').children().first().next().next().find('input').type('2');
+ } else if (type === 'Multistate') {
+ cy.get('select#changeTypeId').select('8');
+ cy.get('input#randomMultistate').type('1');
+ for (let x = 1; x <= 5; x = x + 1) {
+ cy.get('img.ptr[src="images/add.png"]').click();
+ }
+ cy.get('select#randomMultistateChange.startValue').select('1');
+ }
+ cy.get('img.ptr#pointSaveImg').click();
+ cy.get('#pointMessage').should('contain', 'Point details saved');
+ // cy.debug(`DataPoint ${name} created!`)
}
export function login(username, password) {
- cy.visit('/login.htm')
- cy.get('input#username').type(username)
- cy.get('input#password').type(password)
- cy.get('.login-button > input').click()
-}
\ No newline at end of file
+ cy.visit('/login.htm');
+ cy.get('input#username').type(username);
+ cy.get('input#password').type(password);
+ cy.get('.login-button > input').click();
+}
diff --git a/scadalts-ui/jest.config.js b/scadalts-ui/jest.config.js
index 0f95791488..344335ae39 100644
--- a/scadalts-ui/jest.config.js
+++ b/scadalts-ui/jest.config.js
@@ -1,3 +1,3 @@
module.exports = {
- preset: '@vue/cli-plugin-unit-jest'
-}
+ preset: '@vue/cli-plugin-unit-jest',
+};
diff --git a/scadalts-ui/package.json b/scadalts-ui/package.json
index e68839e6b6..343289d8bf 100644
--- a/scadalts-ui/package.json
+++ b/scadalts-ui/package.json
@@ -1,71 +1,77 @@
{
- "name": "scadalts-ui",
- "version": "0.1.0",
- "tag": "2.3.2",
- "milestone": "2.4.0",
- "build": "1",
- "branch": "local",
- "private": true,
- "scripts": {
- "serve": "vue-cli-service serve --port 3000",
- "build": "vue-cli-service build",
- "test:unit": "vue-cli-service test:unit",
- "test:e2e": "vue-cli-service test:e2e",
- "test:cypress": "./node_modules/.bin/cypress run",
- "cypress": "./node_modules/.bin/cypress open",
- "lint": "vue-cli-service lint",
- "i18n:report": "vue-cli-service i18n:report --src './src/**/*.?(js|vue)' --locales './src/locales/**/*.json'",
- "build-config": "node build-config"
- },
- "dependencies": {
- "@amcharts/amcharts4": "4.8.9",
- "@fortawesome/fontawesome-svg-core": "1.2.29",
- "@fortawesome/free-solid-svg-icons": "5.13.1",
- "@fortawesome/vue-fontawesome": "0.1.10",
- "@min-gb/vuejs-components": "0.0.7",
- "ag-grid": "18.1.2",
- "ag-grid-community": "21.2.2",
- "ag-grid-vue": "21.2.2",
- "ajv": "6.5.2",
- "axios": "0.19.0",
- "bootstrap": "3.4.1",
- "core-js": "2.6.5",
- "css-loader": "3.2.0",
- "moment": "2.22.2",
- "uiv": "0.27.0",
- "util": "0.12.3",
- "verte": "0.0.12",
- "vue": "2.6.10",
- "vue-color-picker-wheel": "0.4.3",
- "vue-cookie": "1.1.4",
- "vue-i18n": "8.17.3",
- "vue-jsoneditor": "1.0.13",
- "vue-loader": "15.7.1",
- "vue-lodash": "2.0.2",
- "vue-property-decorator": "7.3.0",
- "vue-router": "3.0.1",
- "vue-underscore": "0.1.4",
- "vuejs-datepicker": "1.6.2",
- "vuejs-logger": "1.5.3",
- "vuex": "3.0.1"
- },
- "devDependencies": {
- "@intlify/vue-i18n-loader": "1.0.0",
- "@vue/cli-plugin-babel": "3.11.0",
- "@vue/cli-plugin-e2e-cypress": "3.11.0",
- "@vue/cli-plugin-eslint": "3.11.0",
- "@vue/cli-plugin-unit-mocha": "3.11.0",
- "@vue/cli-service": "4.3.1",
- "@vue/test-utils": "1.0.3",
- "babel-eslint": "10.0.1",
- "chai": "4.1.2",
- "cypress": "4.0.1",
- "eslint": "5.16.0",
- "eslint-plugin-vue": "5.0.0",
- "http-proxy-middleware": "0.20.0",
- "sass": "1.18.0",
- "sass-loader": "7.1.0",
- "vue-cli-plugin-i18n": "1.0.1",
- "vue-template-compiler": "2.6.10"
- }
+ "name": "scadalts-ui",
+ "version": "0.2.0",
+ "tag": "2.3.2",
+ "milestone": "2.5.0",
+ "build": "1",
+ "branch": "local",
+ "private": true,
+ "scripts": {
+ "serve": "vue-cli-service serve --port 3000",
+ "build": "vue-cli-service build",
+ "prettier": "npx prettier --write .",
+ "test:unit": "vue-cli-service test:unit",
+ "test:e2e": "vue-cli-service test:e2e",
+ "test:cypress": "./node_modules/.bin/cypress run",
+ "cypress": "./node_modules/.bin/cypress open",
+ "lint": "vue-cli-service lint",
+ "i18n:report": "vue-cli-service i18n:report --src './src/**/*.?(js|vue)' --locales './src/locales/**/*.json'",
+ "build-config": "node build-config"
+ },
+ "dependencies": {
+ "@amcharts/amcharts4": "4.8.9",
+ "@fortawesome/fontawesome-svg-core": "^1.2.29",
+ "@fortawesome/free-solid-svg-icons": "^5.13.1",
+ "@fortawesome/vue-fontawesome": "^0.1.10",
+ "@mdi/font": "^3.6.95",
+ "@min-gb/vuejs-components": "0.0.7",
+ "ag-grid": "18.1.2",
+ "ag-grid-community": "21.2.2",
+ "ag-grid-vue": "21.2.2",
+ "ajv": "6.5.2",
+ "axios": "^0.21.1",
+ "bootstrap": "3.4.1",
+ "core-js": "2.6.5",
+ "css-loader": "3.2.0",
+ "moment": "2.22.2",
+ "roboto-fontface": "*",
+ "uiv": "^0.27.0",
+ "util": "^0.12.3",
+ "vue": "2.6.10",
+ "vue-color-picker-wheel": "0.4.3",
+ "vue-cookie": "1.1.4",
+ "vue-i18n": "8.17.3",
+ "vue-jsoneditor": "1.0.13",
+ "vue-loader": "15.7.1",
+ "vue-lodash": "2.0.2",
+ "vue-property-decorator": "7.3.0",
+ "vue-router": "3.0.1",
+ "vue-underscore": "0.1.4",
+ "vuejs-datepicker": "1.6.2",
+ "vuejs-logger": "1.5.3",
+ "vuetify": "^2.2.11",
+ "vuex": "3.0.1"
+ },
+ "devDependencies": {
+ "@intlify/vue-i18n-loader": "^1.0.0",
+ "@vue/cli-plugin-babel": "3.11.0",
+ "@vue/cli-plugin-e2e-cypress": "3.11.0",
+ "@vue/cli-plugin-eslint": "3.11.0",
+ "@vue/cli-plugin-unit-mocha": "3.11.0",
+ "@vue/cli-service": "^4.3.1",
+ "@vue/test-utils": "^1.0.3",
+ "babel-eslint": "10.0.1",
+ "chai": "4.1.2",
+ "cypress": "^4.0.1",
+ "eslint": "5.16.0",
+ "eslint-plugin-vue": "5.0.0",
+ "http-proxy-middleware": "^0.20.0",
+ "prettier": "^2.2.1",
+ "sass": "^1.19.0",
+ "sass-loader": "^8.0.0",
+ "vue-cli-plugin-i18n": "^1.0.1",
+ "vue-cli-plugin-vuetify": "~2.0.8",
+ "vue-template-compiler": "2.6.10",
+ "vuetify-loader": "^1.3.0"
+ }
}
diff --git a/scadalts-ui/postcss.config.js b/scadalts-ui/postcss.config.js
index 961986e2b1..38e0dc85ce 100644
--- a/scadalts-ui/postcss.config.js
+++ b/scadalts-ui/postcss.config.js
@@ -1,5 +1,5 @@
module.exports = {
- plugins: {
- autoprefixer: {}
- }
-}
+ plugins: {
+ autoprefixer: {},
+ },
+};
diff --git a/scadalts-ui/prettierrc.json b/scadalts-ui/prettierrc.json
new file mode 100644
index 0000000000..404bd2d4ea
--- /dev/null
+++ b/scadalts-ui/prettierrc.json
@@ -0,0 +1,19 @@
+{
+ "arrowParens": "always",
+ "bracketSpacing": true,
+ "embeddedLanguageFormatting": "auto",
+ "htmlWhitespaceSensitivity": "css",
+ "insertPragma": false,
+ "jsxBracketSameLine": false,
+ "jsxSingleQuote": false,
+ "printWidth": 90,
+ "proseWrap": "preserve",
+ "quoteProps": "as-needed",
+ "requirePragma": false,
+ "semi": true,
+ "singleQuote": true,
+ "tabWidth": 2,
+ "trailingComma": "es5",
+ "useTabs": true,
+ "vueIndentScriptAndStyle": false
+}
diff --git a/scadalts-ui/public/index.html b/scadalts-ui/public/index.html
index 1b79b958a6..e876690c74 100644
--- a/scadalts-ui/public/index.html
+++ b/scadalts-ui/public/index.html
@@ -1,17 +1,20 @@
-
- scadalts-ui
-
-
-
- We're sorry but scadalts-ui doesn't work properly without JavaScript enabled. Please enable it to continue.
-
-
-
-
+
+ scadalts-ui
+
+
+
+ We're sorry but scadalts-ui doesn't work properly without JavaScript enabled.
+ Please enable it to continue.
+
+
+
+
diff --git a/scadalts-ui/src/README.md b/scadalts-ui/src/README.md
index 20460266cc..0d5643f2d7 100644
--- a/scadalts-ui/src/README.md
+++ b/scadalts-ui/src/README.md
@@ -1,19 +1,23 @@
# Scada-LTS User Interface
+
## Vue.js subproject for Views and Components
## Description
-User Interface subproject to display ScadaLTS content.
+User Interface subproject to display ScadaLTS content.
## Usage
- To start a developmnent server type inside this directory: `npm run-script serve`
-- To run unit test type: `npm run-script test:unit`
-- To run E2E cypress tests type: `npm run-script test:e2e`
+- To run unit test type: `npm run-script test:unit`
+- To run E2E cypress tests type: `npm run-script test:e2e`
- To run Cypress testing framework type: `npm run-script cypress`
+- To build the fornt-end application type: `npm run-script prettier && npm run-script build`
+ _This code runs prettier and then builds the application to dist directory_
## Creators
+
Developers from Scada-LTS project:
+
- @grzesiekb
- @radek2s
-
diff --git a/scadalts-ui/src/apps/App.vue b/scadalts-ui/src/apps/App.vue
index da1de85be0..98652dc9bc 100644
--- a/scadalts-ui/src/apps/App.vue
+++ b/scadalts-ui/src/apps/App.vue
@@ -1,218 +1,126 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+ mdi-bell
+
+ Alarms
+
+
+
+ mdi-bell-sleep
+
+ Historical Alarms
+
+
+
+ mdi-alert-decagram
+
+ {{ $t('plcalarms.notification') }}
+
+
+
+ mdi-tune
+
+ {{ $t('systemsettings.title') }}
+
+
+
+ mdi-information
+
+ About
+
+
+
+ mdi-bank
+
+ Old UI
+
+
+
-
-
-
-
-
+
+
+ Scada-LTS
+ version 2.5.0
+
+
+
+
+
+ mdi-account
+
+
+
+
+ mdi-account
+ Admin
+ admin@user.com
+
+ Edit profile
+ mdi-account-box
+
+
+ Logout
+ mdi-logout
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/scadalts-ui/src/components/HelloWorld.vue b/scadalts-ui/src/components/HelloWorld.vue
index 96fb6b2c1b..13e3e6d694 100644
--- a/scadalts-ui/src/components/HelloWorld.vue
+++ b/scadalts-ui/src/components/HelloWorld.vue
@@ -1,60 +1,119 @@
-
-
{{ msg }}
-
- For a guide and recipes on how to configure / customize this project,vue-cli documentation .
-
-
Installed CLI Plugins
-
-
Essential Links
-
-
Ecosystem
-
-
+
{{ msg }}
+
+ For a guide and recipes on how to configure / customize this project,vue-cli documentation .
+
+
Installed CLI Plugins
+
+
Essential Links
+
+
Ecosystem
+
+
diff --git a/scadalts-ui/src/components/Test.vue b/scadalts-ui/src/components/Test.vue
index c78d261ec0..e2430e4975 100644
--- a/scadalts-ui/src/components/Test.vue
+++ b/scadalts-ui/src/components/Test.vue
@@ -1,19 +1,17 @@
-
+
-
-
diff --git a/scadalts-ui/src/components/amcharts/BaseChart.js b/scadalts-ui/src/components/amcharts/BaseChart.js
index 506b19d872..ace7b5aa97 100644
--- a/scadalts-ui/src/components/amcharts/BaseChart.js
+++ b/scadalts-ui/src/components/amcharts/BaseChart.js
@@ -2,579 +2,649 @@
* @fileoverview BaseChart Class Definition.
* @author Radoslaw Jajko
* @version 1.0.0
- *
+ *
* @requires am4core
* @requires am4charts
* @requires Axios
*/
-import * as am4core from "@amcharts/amcharts4/core";
-import * as am4charts from "@amcharts/amcharts4/charts";
-import Axios from "axios";
+import * as am4core from '@amcharts/amcharts4/core';
+import * as am4charts from '@amcharts/amcharts4/charts';
+import Axios from 'axios';
/**
* BaseChart class allows to create many of am4chart chart types. Base chart is based on line chart
- * but it could be extended by child classes to handle more complex chart definitions.
+ * but it could be extended by child classes to handle more complex chart definitions.
* @class
*/
export default class BaseChart {
-
- //xcopy .\dist\static C:\services\tomcat7.0\webapps\ScadaLTS\resources\new-ui\ /E /K /Y
- /**
- *
- * @param {any} chartReference Id of DOM element where this char will be initialized
- * @param {String} chartType [ XYChart | PieChart | GaugeChart | JsonChart] available chart types
- * @param {String} colors Hex value of base chart color.
- * @param {String} [domain] Protocol, domain and the address of the API interface
- * @param {Object} [jsonConfig] Json Chart configuration
- * @param {String} [jsonChart] [ XYChart | PieChart | GaugeChart] available chart types
- */
- constructor(chartReference, chartType, colors, domain = '.', jsonConfig = undefined, jsonChart = undefined) {
- if (chartType === "XYChart") {
- this.chart = am4core.create(chartReference, am4charts.XYChart)
- } else if (chartType === "PieChart") {
- this.chart = am4core.create(chartReference, am4charts.PieChart);
- } else if (chartType === "GaugeChart") {
- this.chart = am4core.create(chartReference, am4charts.GaugeChart);
- } else if (chartType === "JsonChart") {
- if (jsonChart === "XYChart") {
- this.chart = am4core.createFromConfig(jsonConfig, chartReference, am4charts.XYChart);
- } else if (jsonChart === "PieChart") {
- this.chart = am4core.createFromConfig(jsonConfig, chartReference, am4charts.PieChart);
- } else if (jsonChart === "GaugeChart") {
- this.chart = am4core.createFromConfig(jsonConfig, chartReference, am4charts.GaugeChart);
- }
- }
- this.pointPastValues = new Map();
- this.pointCurrentValue = new Map();
- this.liveUpdatePointValues = new Map();
- this.lastUpdate = 0;
- this.lastTimestamp = new Date().getTime();
- this.liveUpdateInterval = 5000;
- this.domain = domain;
- if(jsonConfig != undefined) {
- let colorPallete = [
- am4core.color("#39B54A"),
- am4core.color("#69FF7D"),
- am4core.color("#166921"),
- am4core.color("#690C24"),
- am4core.color("#B53859"),
- am4core.color("#734FC1"),
- am4core.color("#824F1B"),
- am4core.color("#69421B"),
- ];
- if (colors !== undefined && colors !== null) {
- colors = colors.split(",");
- if (colors.length > 0) {
- for (let i = colors.length - 1; i >= 0; i--) {
- colorPallete.unshift(am4core.color(colors[i].trim()));
- }
- }
- }
- this.chart.colors.list = colorPallete;
- }
- this.yAxesCount = 0;
- }
-
- /**
- * Main method to display chart
- * Before launch: Load data from API
- */
- showChart() {
- this.setupChart()
- }
-
- /**
- * Download from API DataPoint values from specific time period.
- * Override this method in children classes to prepare data for displaying in charts
- *
- * @param {Number} pointId Data Point ID number
- * @param {Number} [startTimestamp] Default get values from 1 hour ago
- * @param {Number} [endTimestamp] Default get values till now
- */
- loadData(pointId, startTimestamp, endTimestamp, exportId) {
- if (startTimestamp === undefined || startTimestamp === null) {
- startTimestamp = new Date().getTime() - 3600000;
- endTimestamp = new Date().getTime();
- } else if ((startTimestamp !== undefined && startTimestamp !== null) && (endTimestamp === undefined || endTimestamp === null)) {
- startTimestamp = BaseChart.convertDate(startTimestamp);
- endTimestamp = new Date().getTime();
- if (isNaN(startTimestamp)) {
- console.warn("Parameter start-date is not valid!\nConnecting to API with default values");
- startTimestamp = new Date().getTime() - 3600000;
- }
- } else if ((startTimestamp !== undefined && startTimestamp !== null) && (endTimestamp !== undefined && endTimestamp !== null)) {
- startTimestamp = new Date(startTimestamp).getTime();
- endTimestamp = new Date(endTimestamp).getTime();
- if (isNaN(startTimestamp) || isNaN(endTimestamp)) {
- console.warn("Parameter [start-date | end-date] are not valid!\nConnecting to API with default values")
- startTimestamp = new Date().getTime() - 3600000;
- endTimestamp = new Date().getTime();
- }
- }
- let url;
- if (exportId) {
- url = `${this.domain}/api/point_value/getValuesFromTimePeriod/xid/${pointId}/${startTimestamp}/${endTimestamp}`
- } else {
- url = `${this.domain}/api/point_value/getValuesFromTimePeriod/${pointId}/${startTimestamp}/${endTimestamp}`
- }
- return new Promise((resolve, reject) => {
- try {
- Axios.get(url, { timeout: 5000, useCredentails: true, credentials: 'same-origin' }).then(response => {
- resolve(response.data);
- }).catch(webError => {
- reject(webError)
- })
- } catch (error) {
- reject(error)
- }
- })
- }
-
- /**
- * Start LiveChart Interval
- *
- * @param {Number} refreshRate How often send request for a new data.
- */
- startLiveUpdate(refreshRate, exportId) {
- this.liveUpdateInterval = setInterval(() => {
- // this.loadLiveData()
- this.refreshPointValues(exportId);
- }, refreshRate);
- }
-
- /**
- * Connect with API and parse new data for chart
- * @deprecated
- */
- loadLiveData() {
- for (let [k, v] of this.pointCurrentValue) {
- Axios.get(`${this.domain}/api/point_value/getValue/id/${k}`, { timeout: 5000, useCredentails: true, credentials: 'same-origin' }).then(response => {
- if (isNaN(response.data.value)) {
- response.data.value == "true" ? response.data.value = 1 : response.data.value = 0;
- }
- let point = { "name": response.data.name, "value": response.data.value };
- if (this.liveUpdatePointValues.get(response.data.ts) == undefined) {
- this.liveUpdatePointValues.set(response.data.ts, [point]);
- } else {
- this.liveUpdatePointValues.get(response.data.ts).push(point);
- }
- })
- }
- this.chart.addData(BaseChart.prepareChartData(BaseChart.sortMapKeys(this.liveUpdatePointValues)))
- if (this.liveUpdatePointValues != undefined) {
- this.liveUpdatePointValues.clear();
- }
- }
-
- /**
- * Get data point data from REST API.
- *
- * @param {Number} pointId ID of data point.
- */
- getPointValue(pointId) {
- return new Promise((resolve, reject) => {
- try {
- Axios.get(`${this.domain}/api/point_value/getValue/id/${pointId}`, { timeout: 5000, useCredentails: true, credentials: 'same-origin' }).then(resp => {
- resolve(resp.data);
- }).catch(webError => {
- reject(webError)
- });
- } catch (error) {
- reject(error)
- }
- })
- }
-
- /**
- * Get data point data from REST API.
- *
- * @param {Number} pointXid Export ID of data point.
- */
- getPointValueXid(pointXid) {
- return new Promise((resolve, reject) => {
- try {
- Axios.get(`${this.domain}/api/point_value/getValue/${pointXid}`, { timeout: 5000, useCredentails: true, credentials: 'same-origin' }).then(resp => {
- resolve(resp.data);
- }).catch(webError => {
- reject(webError)
- });
- } catch (error) {
- reject(error)
- }
- })
- }
-
- /**
- *
- * @param {String} pointId PointExportID or PointID
- * @param {Number} startTimestamp LastUpdateTime
- * @param {Boolean} exportId Using XID or ID
- */
- getPeriodicUpdate(pointId, startTimestamp, exportId) {
- let endTimestamp = new Date().getTime();
- let url;
- if (exportId) {
- url = `${this.domain}/api/point_value/getValuesFromTimePeriod/xid/${pointId}/${startTimestamp}/${endTimestamp}`
- } else {
- url = `${this.domain}/api/point_value/getValuesFromTimePeriod/${pointId}/${startTimestamp}/${endTimestamp}`
- }
- return new Promise((resolve, reject) => {
- try {
- Axios.get(url, { timeout: 5000, useCredentails: true, credentials: 'same-origin' }).then(response => {
- resolve(response.data);
- }).catch(webError => {
- reject(webError)
- })
- } catch (error) {
- reject(error)
- }
- })
- }
-
- /**
- * Stategy how to parse data received from API server.
- *
- * @param {Object} pointValue Object of recived point data value.
- * @param {String} pointName Name of datapoint.
- * @param {Map} referencedArray Map of values to which we want to save data. [pointPastValues or liveUpdatePoints]
- */
- addValue(pointValue, pointName, referencedArray) {
- if (isNaN(pointValue.value)) {
- pointValue.value == "true" ? pointValue.value = 1 : pointValue.value = 0;
- }
- let point = { "name": pointName, "value": pointValue.value };
- if (referencedArray.get(pointValue.ts) == undefined) {
- referencedArray.set(pointValue.ts, [point]);
- } else {
- referencedArray.get(pointValue.ts).push(point);
- }
- }
-
- /**
- * For each defined point get current value and update chart when all request has been recived.
- */
- refreshPointValues(exportId) {
- let pointData = [];
- for (let [k, v] of this.pointCurrentValue) {
- pointData.push(this.getPeriodicUpdate(k, this.lastTimestamp, exportId).then(data => {
- data.values.forEach(e => {
- this.addValue(e, data.name, this.liveUpdatePointValues)
- })
- }))
- }
- Promise.all(pointData).then(() => {
- let lastData = BaseChart.prepareChartData(this.liveUpdatePointValues);
- if (lastData.length > 0) {
- if (lastData[lastData.length - 1].date > this.lastUpdate) {
- this.chart.addData(lastData, 1);
- this.lastTimestamp = new Date().getTime();
- this.lastUpdate = lastData[lastData.length - 1].date;
- this.liveUpdatePointValues.clear();
- if (lastData != undefined) {
- // console.debug(lastData);
- // lastData.clear();
- }
- }
- }
- });
- }
-
- /**
- * Clear all data associated with this chart.
- */
- stopLiveUpdate() {
- clearInterval(this.liveUpdateInterval);
- this.pointCurrentValue.clear();
- this.pointPastValues.clear();
- this.liveUpdatePointValues.clear();
- }
-
- /**
- * When all point data has been downloaded, add this to chart data.
- */
- setupChart() {
- this.chart.data = BaseChart.prepareChartData(BaseChart.sortMapKeys(this.pointPastValues));
- this.createAxisX("DateAxis", null);
- this.createAxisY();
- this.createScrollBarsAndLegend();
- this.createExportMenu();
- for (let [k, v] of this.pointCurrentValue) {
- this.createSeries("StepLine", "date", v.name, v.name)
- }
- }
-
-
- /**
- * Prepare series for chart.
- *
- * @param {String} seriesType [ Column | Pie | Line | StepLine ] types
- * @param {String} seriesValueX Category name or "date" field in data.
- * @param {String} seriesValueY Which values disply in series
- * @param {String} seriesName Name of this series.
- * @param {string} suffix Additional suffix for series units. [square meteters etc.]
- */
- createSeries(seriesType, seriesValueX, seriesValueY, seriesName, suffix = "") {
- let series;
- if (seriesType === "Column") {
- series = this.chart.series.push(new am4charts.ColumnSeries());
- } else if (seriesType === "Line") {
- series = this.chart.series.push(new am4charts.LineSeries());
- } else if (seriesType === "StepLine") {
- series = this.chart.series.push(new am4charts.StepLineSeries());
- series.startLocation = 0.5;
- } else if (seriesType === "Pie") {
- series = this.chart.series.push(new am4charts.PieSeries());
- }
-
- if (seriesType === "Column") {
- series.dataFields.categoryX = seriesValueX;
- series.dataFields.valueY = seriesValueY;
- series.columns.template.tooltipText = "{valueY.value}";
- series.columns.template.tooltipY = 0;
- series.columns.template.strokeOpacity = 0;
- } else if (seriesType === "Pie") {
- series.dataFields.value = seriesValueY;
- series.dataFields.category = seriesValueX;
- series.slices.template.strokeWidth = 2;
- series.slices.template.strokeOpacity = 1;
- } else {
- series.dataFields.dateX = seriesValueX;
- series.dataFields.valueY = seriesValueY;
- if (suffix.trim().startsWith("[")) {
- suffix = `[${suffix}]`;
- }
- series.tooltipText = "{name}: [bold]{valueY}[/] " + suffix;
- series.tooltip.background.cornerRadius = 20;
- series.tooltip.background.strokeOpacity = 0;
- series.tooltip.pointerOrientation = "vertical";
- series.tooltip.label.minWidth = 40;
- series.tooltip.label.minHeight = 40;
- series.tooltip.label.textAlign = "middle";
- series.tooltip.label.textValign = "middle";
- series.strokeWidth = 3;
- series.fillOpacity = 0.3;
- series.minBulletDistance = 15;
- let bullet = series.bullets.push(new am4charts.CircleBullet());
- bullet.circle.strokeWidth = 2;
- bullet.circle.radius = 5;
- bullet.circle.fill = am4core.color("#fff");
- }
-
- series.name = seriesName;
-
- if (this.chart.scrollbarX) {
- this.chart.scrollbarX.series.push(series);
- }
-
- return series;
-
- }
-
- /**
- * Create X data Axis for chart
- * @param {String} axisType [ValueAxis | DateAxis | CategoryAxis] Specified types for different chart axes
- * @param {String} category When Category Axis has been chosen set the name of category to display.
- */
- createAxisX(axisType, category) {
- let axis;
- if (axisType === "ValueAxis") {
- axis = this.chart.xAxes.push(new am4charts.ValueAxis());
- axis.min = 0;
- axis.max = 100;
- axis.renderer.grid.template.strokeOpacity = 0.3;
- } else if (axisType === "DateAxis") {
- axis = this.chart.xAxes.push(new am4charts.DateAxis());
- axis.dateFormats.setKey("second", "HH:mm:ss")
- axis.dateFormats.setKey("minute", "HH:mm:ss")
- axis.dateFormats.setKey("hour", "HH:mm")
- axis.dateFormats.setKey("day", "MMM dd")
- axis.periodChangeDateFormats.setKey("hour", "[bold]dd MMM HH:mm[/]");
- axis.periodChangeDateFormats.setKey("day", "[bold]MMM[/] dd");
- axis.periodChangeDateFormats.setKey("month", "[bold]yyyy[/] MMM");
- } else if (axisType === "CategoryAxis") {
- axis = this.chart.xAxes.push(new am4charts.CategoryAxis());
- axis.dataFields.category = category;
- axis.renderer.grid.template.location = 0;
- axis.renderer.minGridDistance = 30;
- axis.renderer.labels.template.horizontalCenter = "right";
- axis.renderer.labels.template.verticalCenter = "middle";
- axis.renderer.labels.template.rotation = 315;
- axis.tooltip.disabled = true;
- axis.renderer.minHeight = 110;
- }
- }
-
- /**
- * Create Y Value Axis for chart
- * @param {Map} textLabels Map with key value pair. In keys are values to be converted into label text
- * @return yAxis definition.
- */
- createAxisY(textLabels) {
- let axis;
- axis = this.chart.yAxes.push(new am4charts.ValueAxis());
- axis.tooltip.disabled = false;
- axis.renderer.opposite = Boolean(this.yAxesCount % 2);
-
- //TextRender
- if (textLabels !== undefined) {
- if (textLabels.size > 0) {
- axis.renderer.labels.template.adapter.add("text", function (text) {
- if (textLabels.get(text) !== undefined) {
- return textLabels.get(text);
- } else {
- return "";
- }
- })
- }
- }
- this.yAxesCount = this.yAxesCount + 1;
- return axis;
- }
-
- /**
- * Add single line range gudided by label to chart.
- * @param value Value of line for yAxis
- * @param color Color of this line
- * @param label Label for this line (eg. 'average count')
- */
- addRangeValue(value, color, label) {
- if (color === undefined || color === "") {
- color = "#FF150A";
- }
- if (label === undefined) {
- label = "";
- }
- let range = this.chart.yAxes.getIndex(0).axisRanges.create();
- range.value = value;
- range.grid.stroke = am4core.color(color);
- range.grid.strokeWidth = 2;
- range.grid.strokeOpacity = 1;
- range.label.inside = true;
- range.label.text = label;
- range.label.fill = range.grid.stroke;
- range.label.verticalCenter = "bottom";
- }
-
- /**
- * Create specific elements of chart.
- *
- * @param {Boolean} [scrollbarX=true] Show scrollbar for xAxes
- * @param {Boolean} [scrollbarY=false] Show scrollbar for yAxes
- * @param {Boolean} [legend=true] Show chart legend
- * @param {Boolean} [cursor=true] Show cursor over the chart
- */
- createScrollBarsAndLegend(scrollbarX = true, scrollbarY = false, legend = true, cursor = true) {
- if (scrollbarX) {
- this.chart.scrollbarX = new am4charts.XYChartScrollbar();
- this.chart.scrollbarX.parent = this.chart.bottomAxesContainer;
- }
- if (scrollbarY) {
- this.chart.scrollbarY = new am4core.Scrollbar();
- this.chart.scrollbarY.parent = this.chart.leftAxesContainer;
- }
- if (legend) {
- this.chart.legend = new am4charts.Legend();
- }
- if (cursor) {
- this.chart.cursor = new am4charts.XYCursor();
- this.chart.cursor.behavior = "panXY";
- }
- }
-
- /**
- * Add export possibility to chart. Save chart as an image or export chart data to *.csv or *.xlsx format.
- *
- * @param {Boolean} [enabled = true] is Export menu enabled in this chart.
- * @param {String} [filePrefix = "Scada_Chart"] File name to which save exported chart data.
- */
- createExportMenu(enabled = true, filePrefix = "Scada_Chart") {
- if (enabled) {
- this.chart.exporting.menu = new am4core.ExportMenu();
- this.chart.exporting.menu.align = "right"
- this.chart.exporting.menu.vetricalAlign = "top"
- this.chart.exporting.filePrefix = filePrefix + "_" + String(new Date().getTime());
- }
- }
-
- /**
- * Improving perfromance of chart. Display only a points every "step" pixels omitting this between.
- * It is useful for charts presenting huge amount of data. For example charts displaying values from one month period.
- *
- * @param {Number} step - Ommit all line point if they are closer than "step" pixels to the last point drawn
- */
- static setPolylineStep(step) {
- am4core.options.minPolylineStep = step;
- }
-
- /**
- * Order values stored inside Map by keys (key == timestamp)
- *
- * @param {Map} map Scada Data Point Values Map
- */
- static sortMapKeys(map) {
- var sortByKeys = (a, b) => a[0] > b[0] ? 1 : -1
- return new Map([...map].sort(sortByKeys))
- }
-
- /**
- *
- * @param {Map} map Sorted keys in chronological order TimeValueMap
- */
- static prepareChartData(map) {
- let data = []; // [{date:, :}]
- map.forEach(function (value, key) {
- let jsonString = '{ "date":' + key
- value.forEach(e => {
- if (!isNaN(Number(e.value))) {
- jsonString = jsonString + ', "' + e.name + '":' + e.value;
- }
- })
- jsonString = jsonString + '}';
- data.push(JSON.parse(jsonString));
- });
- return data;
- }
-
- /**
- * Util for converting from text time to specific timestamp
- *
- * @param {String} dateText Text based time period (date format or written format)
- * @returns Calculated timestamp
- */
- static convertDate(dateText) {
- let date = new Date(dateText);
- if (date == "Invalid Date") {
- date = dateText.split("-");
- if (date.length === 2) {
- let dateNow = new Date();
- let multiplier = 1;
- switch (date[1]) {
- case "hour":
- case "hours":
- multiplier = 1000 * 3600;
- break;
- case "day":
- case "days":
- multiplier = 1000 * 3600 * 24;
- break;
- case "week":
- case "weeks":
- multiplier = 1000 * 3600 * 24 * 7;
- break;
- case "month":
- case "months":
- multiplier = 1000 * 3600 * 24 * 31;
- break;
- }
- return dateNow.getTime() - Number(date[0]) * multiplier;
- } else {
- console.warn("Not vaild date. Use for example ['1-day' | '2-months' | '3-days']\nReturning default value!")
- return dateNow.getTime() - 3600000;
- }
- } else {
- return date.getTime();
- }
- }
-
-
-}
\ No newline at end of file
+ //xcopy .\dist\static C:\services\tomcat7.0\webapps\ScadaLTS\resources\new-ui\ /E /K /Y
+ /**
+ *
+ * @param {any} chartReference Id of DOM element where this char will be initialized
+ * @param {String} chartType [ XYChart | PieChart | GaugeChart | JsonChart] available chart types
+ * @param {String} colors Hex value of base chart color.
+ * @param {String} [domain] Protocol, domain and the address of the API interface
+ * @param {Object} [jsonConfig] Json Chart configuration
+ * @param {String} [jsonChart] [ XYChart | PieChart | GaugeChart] available chart types
+ */
+ constructor(
+ chartReference,
+ chartType,
+ colors,
+ domain = '.',
+ jsonConfig = undefined,
+ jsonChart = undefined,
+ ) {
+ if (chartType === 'XYChart') {
+ this.chart = am4core.create(chartReference, am4charts.XYChart);
+ } else if (chartType === 'PieChart') {
+ this.chart = am4core.create(chartReference, am4charts.PieChart);
+ } else if (chartType === 'GaugeChart') {
+ this.chart = am4core.create(chartReference, am4charts.GaugeChart);
+ } else if (chartType === 'JsonChart') {
+ if (jsonChart === 'XYChart') {
+ this.chart = am4core.createFromConfig(
+ jsonConfig,
+ chartReference,
+ am4charts.XYChart,
+ );
+ } else if (jsonChart === 'PieChart') {
+ this.chart = am4core.createFromConfig(
+ jsonConfig,
+ chartReference,
+ am4charts.PieChart,
+ );
+ } else if (jsonChart === 'GaugeChart') {
+ this.chart = am4core.createFromConfig(
+ jsonConfig,
+ chartReference,
+ am4charts.GaugeChart,
+ );
+ }
+ }
+ this.pointPastValues = new Map();
+ this.pointCurrentValue = new Map();
+ this.liveUpdatePointValues = new Map();
+ this.lastUpdate = 0;
+ this.lastTimestamp = new Date().getTime();
+ this.liveUpdateInterval = 5000;
+ this.domain = domain;
+ if (jsonConfig != undefined) {
+ let colorPallete = [
+ am4core.color('#39B54A'),
+ am4core.color('#69FF7D'),
+ am4core.color('#166921'),
+ am4core.color('#690C24'),
+ am4core.color('#B53859'),
+ am4core.color('#734FC1'),
+ am4core.color('#824F1B'),
+ am4core.color('#69421B'),
+ ];
+ if (colors !== undefined && colors !== null) {
+ colors = colors.split(',');
+ if (colors.length > 0) {
+ for (let i = colors.length - 1; i >= 0; i--) {
+ colorPallete.unshift(am4core.color(colors[i].trim()));
+ }
+ }
+ }
+ this.chart.colors.list = colorPallete;
+ }
+ this.yAxesCount = 0;
+ }
+
+ /**
+ * Main method to display chart
+ * Before launch: Load data from API
+ */
+ showChart() {
+ this.setupChart();
+ }
+
+ /**
+ * Download from API DataPoint values from specific time period.
+ * Override this method in children classes to prepare data for displaying in charts
+ *
+ * @param {Number} pointId Data Point ID number
+ * @param {Number} [startTimestamp] Default get values from 1 hour ago
+ * @param {Number} [endTimestamp] Default get values till now
+ */
+ loadData(pointId, startTimestamp, endTimestamp, exportId) {
+ if (startTimestamp === undefined || startTimestamp === null) {
+ startTimestamp = new Date().getTime() - 3600000;
+ endTimestamp = new Date().getTime();
+ } else if (
+ startTimestamp !== undefined &&
+ startTimestamp !== null &&
+ (endTimestamp === undefined || endTimestamp === null)
+ ) {
+ startTimestamp = BaseChart.convertDate(startTimestamp);
+ endTimestamp = new Date().getTime();
+ if (isNaN(startTimestamp)) {
+ console.warn(
+ 'Parameter start-date is not valid!\nConnecting to API with default values',
+ );
+ startTimestamp = new Date().getTime() - 3600000;
+ }
+ } else if (
+ startTimestamp !== undefined &&
+ startTimestamp !== null &&
+ endTimestamp !== undefined &&
+ endTimestamp !== null
+ ) {
+ startTimestamp = new Date(startTimestamp).getTime();
+ endTimestamp = new Date(endTimestamp).getTime();
+ if (isNaN(startTimestamp) || isNaN(endTimestamp)) {
+ console.warn(
+ 'Parameter [start-date | end-date] are not valid!\nConnecting to API with default values',
+ );
+ startTimestamp = new Date().getTime() - 3600000;
+ endTimestamp = new Date().getTime();
+ }
+ }
+ let url;
+ if (exportId) {
+ url = `${this.domain}/api/point_value/getValuesFromTimePeriod/xid/${pointId}/${startTimestamp}/${endTimestamp}`;
+ } else {
+ url = `${this.domain}/api/point_value/getValuesFromTimePeriod/${pointId}/${startTimestamp}/${endTimestamp}`;
+ }
+ return new Promise((resolve, reject) => {
+ try {
+ Axios.get(url, {
+ timeout: 5000,
+ useCredentails: true,
+ credentials: 'same-origin',
+ })
+ .then((response) => {
+ resolve(response.data);
+ })
+ .catch((webError) => {
+ reject(webError);
+ });
+ } catch (error) {
+ reject(error);
+ }
+ });
+ }
+
+ /**
+ * Start LiveChart Interval
+ *
+ * @param {Number} refreshRate How often send request for a new data.
+ */
+ startLiveUpdate(refreshRate, exportId) {
+ this.liveUpdateInterval = setInterval(() => {
+ // this.loadLiveData()
+ this.refreshPointValues(exportId);
+ }, refreshRate);
+ }
+
+ /**
+ * Connect with API and parse new data for chart
+ * @deprecated
+ */
+ loadLiveData() {
+ for (let [k, v] of this.pointCurrentValue) {
+ Axios.get(`${this.domain}/api/point_value/getValue/id/${k}`, {
+ timeout: 5000,
+ useCredentails: true,
+ credentials: 'same-origin',
+ }).then((response) => {
+ if (isNaN(response.data.value)) {
+ response.data.value == 'true'
+ ? (response.data.value = 1)
+ : (response.data.value = 0);
+ }
+ let point = { name: response.data.name, value: response.data.value };
+ if (this.liveUpdatePointValues.get(response.data.ts) == undefined) {
+ this.liveUpdatePointValues.set(response.data.ts, [point]);
+ } else {
+ this.liveUpdatePointValues.get(response.data.ts).push(point);
+ }
+ });
+ }
+ this.chart.addData(
+ BaseChart.prepareChartData(BaseChart.sortMapKeys(this.liveUpdatePointValues)),
+ );
+ if (this.liveUpdatePointValues != undefined) {
+ this.liveUpdatePointValues.clear();
+ }
+ }
+
+ /**
+ * Get data point data from REST API.
+ *
+ * @param {Number} pointId ID of data point.
+ */
+ getPointValue(pointId) {
+ return new Promise((resolve, reject) => {
+ try {
+ Axios.get(`${this.domain}/api/point_value/getValue/id/${pointId}`, {
+ timeout: 5000,
+ useCredentails: true,
+ credentials: 'same-origin',
+ })
+ .then((resp) => {
+ resolve(resp.data);
+ })
+ .catch((webError) => {
+ reject(webError);
+ });
+ } catch (error) {
+ reject(error);
+ }
+ });
+ }
+
+ /**
+ * Get data point data from REST API.
+ *
+ * @param {Number} pointXid Export ID of data point.
+ */
+ getPointValueXid(pointXid) {
+ return new Promise((resolve, reject) => {
+ try {
+ Axios.get(`${this.domain}/api/point_value/getValue/${pointXid}`, {
+ timeout: 5000,
+ useCredentails: true,
+ credentials: 'same-origin',
+ })
+ .then((resp) => {
+ resolve(resp.data);
+ })
+ .catch((webError) => {
+ reject(webError);
+ });
+ } catch (error) {
+ reject(error);
+ }
+ });
+ }
+
+ /**
+ *
+ * @param {String} pointId PointExportID or PointID
+ * @param {Number} startTimestamp LastUpdateTime
+ * @param {Boolean} exportId Using XID or ID
+ */
+ getPeriodicUpdate(pointId, startTimestamp, exportId) {
+ let endTimestamp = new Date().getTime();
+ let url;
+ if (exportId) {
+ url = `${this.domain}/api/point_value/getValuesFromTimePeriod/xid/${pointId}/${startTimestamp}/${endTimestamp}`;
+ } else {
+ url = `${this.domain}/api/point_value/getValuesFromTimePeriod/${pointId}/${startTimestamp}/${endTimestamp}`;
+ }
+ return new Promise((resolve, reject) => {
+ try {
+ Axios.get(url, {
+ timeout: 5000,
+ useCredentails: true,
+ credentials: 'same-origin',
+ })
+ .then((response) => {
+ resolve(response.data);
+ })
+ .catch((webError) => {
+ reject(webError);
+ });
+ } catch (error) {
+ reject(error);
+ }
+ });
+ }
+
+ /**
+ * Stategy how to parse data received from API server.
+ *
+ * @param {Object} pointValue Object of recived point data value.
+ * @param {String} pointName Name of datapoint.
+ * @param {Map} referencedArray Map of values to which we want to save data. [pointPastValues or liveUpdatePoints]
+ */
+ addValue(pointValue, pointName, referencedArray) {
+ if (isNaN(pointValue.value)) {
+ pointValue.value == 'true' ? (pointValue.value = 1) : (pointValue.value = 0);
+ }
+ let point = { name: pointName, value: pointValue.value };
+ if (referencedArray.get(pointValue.ts) == undefined) {
+ referencedArray.set(pointValue.ts, [point]);
+ } else {
+ referencedArray.get(pointValue.ts).push(point);
+ }
+ }
+
+ /**
+ * For each defined point get current value and update chart when all request has been recived.
+ */
+ refreshPointValues(exportId) {
+ let pointData = [];
+ for (let [k, v] of this.pointCurrentValue) {
+ pointData.push(
+ this.getPeriodicUpdate(k, this.lastTimestamp, exportId).then((data) => {
+ data.values.forEach((e) => {
+ this.addValue(e, data.name, this.liveUpdatePointValues);
+ });
+ }),
+ );
+ }
+ Promise.all(pointData).then(() => {
+ let lastData = BaseChart.prepareChartData(this.liveUpdatePointValues);
+ if (lastData.length > 0) {
+ if (lastData[lastData.length - 1].date > this.lastUpdate) {
+ this.chart.addData(lastData, 1);
+ this.lastTimestamp = new Date().getTime();
+ this.lastUpdate = lastData[lastData.length - 1].date;
+ this.liveUpdatePointValues.clear();
+ if (lastData != undefined) {
+ // console.debug(lastData);
+ // lastData.clear();
+ }
+ }
+ }
+ });
+ }
+
+ /**
+ * Clear all data associated with this chart.
+ */
+ stopLiveUpdate() {
+ clearInterval(this.liveUpdateInterval);
+ this.pointCurrentValue.clear();
+ this.pointPastValues.clear();
+ this.liveUpdatePointValues.clear();
+ }
+
+ /**
+ * When all point data has been downloaded, add this to chart data.
+ */
+ setupChart() {
+ this.chart.data = BaseChart.prepareChartData(
+ BaseChart.sortMapKeys(this.pointPastValues),
+ );
+ this.createAxisX('DateAxis', null);
+ this.createAxisY();
+ this.createScrollBarsAndLegend();
+ this.createExportMenu();
+ for (let [k, v] of this.pointCurrentValue) {
+ this.createSeries('StepLine', 'date', v.name, v.name);
+ }
+ }
+
+ /**
+ * Prepare series for chart.
+ *
+ * @param {String} seriesType [ Column | Pie | Line | StepLine ] types
+ * @param {String} seriesValueX Category name or "date" field in data.
+ * @param {String} seriesValueY Which values disply in series
+ * @param {String} seriesName Name of this series.
+ * @param {string} suffix Additional suffix for series units. [square meteters etc.]
+ */
+ createSeries(seriesType, seriesValueX, seriesValueY, seriesName, suffix = '') {
+ let series;
+ if (seriesType === 'Column') {
+ series = this.chart.series.push(new am4charts.ColumnSeries());
+ } else if (seriesType === 'Line') {
+ series = this.chart.series.push(new am4charts.LineSeries());
+ } else if (seriesType === 'StepLine') {
+ series = this.chart.series.push(new am4charts.StepLineSeries());
+ series.startLocation = 0.5;
+ } else if (seriesType === 'Pie') {
+ series = this.chart.series.push(new am4charts.PieSeries());
+ }
+
+ if (seriesType === 'Column') {
+ series.dataFields.categoryX = seriesValueX;
+ series.dataFields.valueY = seriesValueY;
+ series.columns.template.tooltipText = '{valueY.value}';
+ series.columns.template.tooltipY = 0;
+ series.columns.template.strokeOpacity = 0;
+ } else if (seriesType === 'Pie') {
+ series.dataFields.value = seriesValueY;
+ series.dataFields.category = seriesValueX;
+ series.slices.template.strokeWidth = 2;
+ series.slices.template.strokeOpacity = 1;
+ } else {
+ series.dataFields.dateX = seriesValueX;
+ series.dataFields.valueY = seriesValueY;
+ if (suffix.trim().startsWith('[')) {
+ suffix = `[${suffix}]`;
+ }
+ series.tooltipText = '{name}: [bold]{valueY}[/] ' + suffix;
+ series.tooltip.background.cornerRadius = 20;
+ series.tooltip.background.strokeOpacity = 0;
+ series.tooltip.pointerOrientation = 'vertical';
+ series.tooltip.label.minWidth = 40;
+ series.tooltip.label.minHeight = 40;
+ series.tooltip.label.textAlign = 'middle';
+ series.tooltip.label.textValign = 'middle';
+ series.strokeWidth = 3;
+ series.fillOpacity = 0.3;
+ series.minBulletDistance = 15;
+ let bullet = series.bullets.push(new am4charts.CircleBullet());
+ bullet.circle.strokeWidth = 2;
+ bullet.circle.radius = 5;
+ bullet.circle.fill = am4core.color('#fff');
+ }
+
+ series.name = seriesName;
+
+ if (this.chart.scrollbarX) {
+ this.chart.scrollbarX.series.push(series);
+ }
+
+ return series;
+ }
+
+ /**
+ * Create X data Axis for chart
+ * @param {String} axisType [ValueAxis | DateAxis | CategoryAxis] Specified types for different chart axes
+ * @param {String} category When Category Axis has been chosen set the name of category to display.
+ */
+ createAxisX(axisType, category) {
+ let axis;
+ if (axisType === 'ValueAxis') {
+ axis = this.chart.xAxes.push(new am4charts.ValueAxis());
+ axis.min = 0;
+ axis.max = 100;
+ axis.renderer.grid.template.strokeOpacity = 0.3;
+ } else if (axisType === 'DateAxis') {
+ axis = this.chart.xAxes.push(new am4charts.DateAxis());
+ axis.dateFormats.setKey('second', 'HH:mm:ss');
+ axis.dateFormats.setKey('minute', 'HH:mm:ss');
+ axis.dateFormats.setKey('hour', 'HH:mm');
+ axis.dateFormats.setKey('day', 'MMM dd');
+ axis.periodChangeDateFormats.setKey('hour', '[bold]dd MMM HH:mm[/]');
+ axis.periodChangeDateFormats.setKey('day', '[bold]MMM[/] dd');
+ axis.periodChangeDateFormats.setKey('month', '[bold]yyyy[/] MMM');
+ } else if (axisType === 'CategoryAxis') {
+ axis = this.chart.xAxes.push(new am4charts.CategoryAxis());
+ axis.dataFields.category = category;
+ axis.renderer.grid.template.location = 0;
+ axis.renderer.minGridDistance = 30;
+ axis.renderer.labels.template.horizontalCenter = 'right';
+ axis.renderer.labels.template.verticalCenter = 'middle';
+ axis.renderer.labels.template.rotation = 315;
+ axis.tooltip.disabled = true;
+ axis.renderer.minHeight = 110;
+ }
+ }
+
+ /**
+ * Create Y Value Axis for chart
+ * @param {Map} textLabels Map with key value pair. In keys are values to be converted into label text
+ * @return yAxis definition.
+ */
+ createAxisY(textLabels) {
+ let axis;
+ axis = this.chart.yAxes.push(new am4charts.ValueAxis());
+ axis.tooltip.disabled = false;
+ axis.renderer.opposite = Boolean(this.yAxesCount % 2);
+
+ //TextRender
+ if (textLabels !== undefined) {
+ if (textLabels.size > 0) {
+ axis.renderer.labels.template.adapter.add('text', function (text) {
+ if (textLabels.get(text) !== undefined) {
+ return textLabels.get(text);
+ } else {
+ return '';
+ }
+ });
+ }
+ }
+ this.yAxesCount = this.yAxesCount + 1;
+ return axis;
+ }
+
+ /**
+ * Add single line range gudided by label to chart.
+ * @param value Value of line for yAxis
+ * @param color Color of this line
+ * @param label Label for this line (eg. 'average count')
+ */
+ addRangeValue(value, color, label) {
+ if (color === undefined || color === '') {
+ color = '#FF150A';
+ }
+ if (label === undefined) {
+ label = '';
+ }
+ let range = this.chart.yAxes.getIndex(0).axisRanges.create();
+ range.value = value;
+ range.grid.stroke = am4core.color(color);
+ range.grid.strokeWidth = 2;
+ range.grid.strokeOpacity = 1;
+ range.label.inside = true;
+ range.label.text = label;
+ range.label.fill = range.grid.stroke;
+ range.label.verticalCenter = 'bottom';
+ }
+
+ /**
+ * Create specific elements of chart.
+ *
+ * @param {Boolean} [scrollbarX=true] Show scrollbar for xAxes
+ * @param {Boolean} [scrollbarY=false] Show scrollbar for yAxes
+ * @param {Boolean} [legend=true] Show chart legend
+ * @param {Boolean} [cursor=true] Show cursor over the chart
+ */
+ createScrollBarsAndLegend(
+ scrollbarX = true,
+ scrollbarY = false,
+ legend = true,
+ cursor = true,
+ ) {
+ if (scrollbarX) {
+ this.chart.scrollbarX = new am4charts.XYChartScrollbar();
+ this.chart.scrollbarX.parent = this.chart.bottomAxesContainer;
+ }
+ if (scrollbarY) {
+ this.chart.scrollbarY = new am4core.Scrollbar();
+ this.chart.scrollbarY.parent = this.chart.leftAxesContainer;
+ }
+ if (legend) {
+ this.chart.legend = new am4charts.Legend();
+ }
+ if (cursor) {
+ this.chart.cursor = new am4charts.XYCursor();
+ this.chart.cursor.behavior = 'panXY';
+ }
+ }
+
+ /**
+ * Add export possibility to chart. Save chart as an image or export chart data to *.csv or *.xlsx format.
+ *
+ * @param {Boolean} [enabled = true] is Export menu enabled in this chart.
+ * @param {String} [filePrefix = "Scada_Chart"] File name to which save exported chart data.
+ */
+ createExportMenu(enabled = true, filePrefix = 'Scada_Chart') {
+ if (enabled) {
+ this.chart.exporting.menu = new am4core.ExportMenu();
+ this.chart.exporting.menu.align = 'right';
+ this.chart.exporting.menu.vetricalAlign = 'top';
+ this.chart.exporting.filePrefix = filePrefix + '_' + String(new Date().getTime());
+ }
+ }
+
+ /**
+ * Improving perfromance of chart. Display only a points every "step" pixels omitting this between.
+ * It is useful for charts presenting huge amount of data. For example charts displaying values from one month period.
+ *
+ * @param {Number} step - Ommit all line point if they are closer than "step" pixels to the last point drawn
+ */
+ static setPolylineStep(step) {
+ am4core.options.minPolylineStep = step;
+ }
+
+ /**
+ * Order values stored inside Map by keys (key == timestamp)
+ *
+ * @param {Map} map Scada Data Point Values Map
+ */
+ static sortMapKeys(map) {
+ var sortByKeys = (a, b) => (a[0] > b[0] ? 1 : -1);
+ return new Map([...map].sort(sortByKeys));
+ }
+
+ /**
+ *
+ * @param {Map} map Sorted keys in chronological order TimeValueMap
+ */
+ static prepareChartData(map) {
+ let data = []; // [{date:, :}]
+ map.forEach(function (value, key) {
+ let jsonString = '{ "date":' + key;
+ value.forEach((e) => {
+ if (!isNaN(Number(e.value))) {
+ jsonString = jsonString + ', "' + e.name + '":' + e.value;
+ }
+ });
+ jsonString = jsonString + '}';
+ data.push(JSON.parse(jsonString));
+ });
+ return data;
+ }
+
+ /**
+ * Util for converting from text time to specific timestamp
+ *
+ * @param {String} dateText Text based time period (date format or written format)
+ * @returns Calculated timestamp
+ */
+ static convertDate(dateText) {
+ let date = new Date(dateText);
+ if (date == 'Invalid Date') {
+ date = dateText.split('-');
+ if (date.length === 2) {
+ let dateNow = new Date();
+ let multiplier = 1;
+ switch (date[1]) {
+ case 'hour':
+ case 'hours':
+ multiplier = 1000 * 3600;
+ break;
+ case 'day':
+ case 'days':
+ multiplier = 1000 * 3600 * 24;
+ break;
+ case 'week':
+ case 'weeks':
+ multiplier = 1000 * 3600 * 24 * 7;
+ break;
+ case 'month':
+ case 'months':
+ multiplier = 1000 * 3600 * 24 * 31;
+ break;
+ }
+ return dateNow.getTime() - Number(date[0]) * multiplier;
+ } else {
+ console.warn(
+ "Not vaild date. Use for example ['1-day' | '2-months' | '3-days']\nReturning default value!",
+ );
+ return dateNow.getTime() - 3600000;
+ }
+ } else {
+ return date.getTime();
+ }
+ }
+}
diff --git a/scadalts-ui/src/components/amcharts/JsonChart.js b/scadalts-ui/src/components/amcharts/JsonChart.js
index 34b3e78148..4f6cd446da 100644
--- a/scadalts-ui/src/components/amcharts/JsonChart.js
+++ b/scadalts-ui/src/components/amcharts/JsonChart.js
@@ -1,90 +1,84 @@
-import * as am4core from "@amcharts/amcharts4/core";
-import * as am4charts from "@amcharts/amcharts4/charts";
-import am4themes_animated from "@amcharts/amcharts4/themes/animated";
+import * as am4core from '@amcharts/amcharts4/core';
+import * as am4charts from '@amcharts/amcharts4/charts';
+import am4themes_animated from '@amcharts/amcharts4/themes/animated';
import BaseChart from './BaseChart';
am4core.useTheme(am4themes_animated);
export default class JsonChart extends BaseChart {
-
- constructor(chartReference, color, domain = ".", jsonConfig) {
- super(chartReference, "JsonChart", color, ".", jsonConfig, "XYChart");
- }
+ constructor(chartReference, color, domain = '.', jsonConfig) {
+ super(chartReference, 'JsonChart', color, '.', jsonConfig, 'XYChart');
+ }
- loadData(pointId, startTimestamp, endTimestamp, exportId) {
- return new Promise((resolve, reject) => {
- super
- .loadData(pointId, startTimestamp, endTimestamp, exportId)
- .then((data) => {
- if (this.pointCurrentValue.get(pointId) == undefined) {
- this.pointCurrentValue.set(pointId, {
- name: data.name,
- suffix: data.textRenderer.suffix,
- type: data.type,
- labels: new Map(),
- });
- }
- if (data.type === "Multistate") {
- let customLabels = data.textRenderer.multistateValues;
- if (
- data.textRenderer.typeName === "textRendererMultistate" &&
- customLabels !== undefined
- ) {
- let labelsMap = new Map();
- for (let i = 0; i < customLabels.length; i++) {
- labelsMap.set(
- String(customLabels[i].key),
- customLabels[i].text
- );
- }
- this.pointCurrentValue.get(pointId).labels = labelsMap;
- }
- }
- if (data.type === "Binary") {
- if (data.textRenderer.typeName === "textRendererBinary") {
- let labelsMap = new Map();
- labelsMap.set("0", data.textRenderer.zeroLabel);
- labelsMap.set("1", data.textRenderer.oneLabel);
- this.pointCurrentValue.get(pointId).labels = labelsMap;
- }
- }
- data.values.forEach((e) => {
- this.addValue(e, data.name, this.pointPastValues);
- });
- resolve("done");
- });
- });
- }
+ loadData(pointId, startTimestamp, endTimestamp, exportId) {
+ return new Promise((resolve, reject) => {
+ super.loadData(pointId, startTimestamp, endTimestamp, exportId).then((data) => {
+ if (this.pointCurrentValue.get(pointId) == undefined) {
+ this.pointCurrentValue.set(pointId, {
+ name: data.name,
+ suffix: data.textRenderer.suffix,
+ type: data.type,
+ labels: new Map(),
+ });
+ }
+ if (data.type === 'Multistate') {
+ let customLabels = data.textRenderer.multistateValues;
+ if (
+ data.textRenderer.typeName === 'textRendererMultistate' &&
+ customLabels !== undefined
+ ) {
+ let labelsMap = new Map();
+ for (let i = 0; i < customLabels.length; i++) {
+ labelsMap.set(String(customLabels[i].key), customLabels[i].text);
+ }
+ this.pointCurrentValue.get(pointId).labels = labelsMap;
+ }
+ }
+ if (data.type === 'Binary') {
+ if (data.textRenderer.typeName === 'textRendererBinary') {
+ let labelsMap = new Map();
+ labelsMap.set('0', data.textRenderer.zeroLabel);
+ labelsMap.set('1', data.textRenderer.oneLabel);
+ this.pointCurrentValue.get(pointId).labels = labelsMap;
+ }
+ }
+ data.values.forEach((e) => {
+ this.addValue(e, data.name, this.pointPastValues);
+ });
+ resolve('done');
+ });
+ });
+ }
- setupChart(chartType) {
- if (chartType === "compare") {
- this.chart.data = this.prepareCompareChartData(
- BaseChart.sortMapKeys(this.pointPastValues)
- );
- } else {
- this.chart.data = BaseChart.prepareChartData(
- BaseChart.sortMapKeys(this.pointPastValues)
- );
- }
- }
- prepareCompareChartData(map) {
- let data = []; //date|date2:, :
- let baseKey = undefined;
- map.forEach(function (value, key) {
- let jsonString;
- value.forEach((e) => {
- if (baseKey === undefined) {
- baseKey = e.name;
- }
- if (baseKey === e.name) {
- jsonString = `{"date":${key}, "${e.name}":${e.value}}`;
- } else {
- jsonString = `{"date2":${key}, "${e.name}":${e.value}}`;
- }
- data.push(JSON.parse(jsonString));
- });
- });
- return data;
- }
+ setupChart(chartType) {
+ if (chartType === 'compare') {
+ this.chart.data = this.prepareCompareChartData(
+ BaseChart.sortMapKeys(this.pointPastValues),
+ );
+ } else {
+ this.chart.data = BaseChart.prepareChartData(
+ BaseChart.sortMapKeys(this.pointPastValues),
+ );
+ }
+ }
+ prepareCompareChartData(map) {
+ let data = []; //date|date2:, :
+ let baseKey = undefined;
+ map.forEach(function (value, key) {
+ let jsonString;
+ value.forEach((e) => {
+ if (baseKey === undefined) {
+ baseKey = e.name;
+ }
+ if (baseKey === e.name) {
+ jsonString = `{"date":${key}, "${e.name}":${e.value}}`;
+ } else {
+ jsonString = `{"date2":${key}, "${e.name}":${e.value}}`;
+ }
+ data.push(JSON.parse(jsonString));
+ });
+ });
+ return data;
+ }
}
diff --git a/scadalts-ui/src/components/amcharts/LineChartComponent.vue b/scadalts-ui/src/components/amcharts/LineChartComponent.vue
index f29f59fa76..d90029c03b 100644
--- a/scadalts-ui/src/components/amcharts/LineChartComponent.vue
+++ b/scadalts-ui/src/components/amcharts/LineChartComponent.vue
@@ -1,221 +1,222 @@
-
-
{{label}}
-
-
-
- Reload
-
-
+
{{ label }}
+
+
+
+ Reload
+
+
\ No newline at end of file
+
diff --git a/scadalts-ui/src/components/amcharts/StepLineChartComponent.vue b/scadalts-ui/src/components/amcharts/StepLineChartComponent.vue
index 49b1c06bf9..26e54c0f3b 100644
--- a/scadalts-ui/src/components/amcharts/StepLineChartComponent.vue
+++ b/scadalts-ui/src/components/amcharts/StepLineChartComponent.vue
@@ -1,243 +1,228 @@
-
-
{{label}}
-
-
-
- Reload
-
-
- Debug
-
-
+
{{ label }}
+
+
+
+ Reload
+
+
+ Debug
+
+
\ No newline at end of file
+
diff --git a/scadalts-ui/src/components/amcharts/readme.md b/scadalts-ui/src/components/amcharts/readme.md
index 865d454fa4..222d5e13c4 100644
--- a/scadalts-ui/src/components/amcharts/readme.md
+++ b/scadalts-ui/src/components/amcharts/readme.md
@@ -1,16 +1,24 @@
# Modern Charts Components
-## February 2020 - Version 1.0.2
-ScadaLTS modern charts components it is a set of new VueJS v2.0 components designed for GraphicalView in ScadaLTS. It is based on [am4chart](https://www.amcharts.com/) library. It generates charts using JavaScript from user-side which is a new approach to charts in Scada (they were generated via server-side scripts and libraries). It is more browser load than it was before, but server application becomes lighter and gains performance.
+
+## February 2020 - Version 1.0.2
+
+ScadaLTS modern charts components it is a set of new VueJS v2.0 components designed for GraphicalView in ScadaLTS. It is based on [am4chart](https://www.amcharts.com/) library. It generates charts using JavaScript from user-side which is a new approach to charts in Scada (they were generated via server-side scripts and libraries). It is more browser load than it was before, but server application becomes lighter and gains performance.
## Types of charts:
-- __\__ Line Series Chart
-- __\__ Step Line Series Chart
+
+- **\** Line Series Chart
+- **\** Step Line Series Chart
## Usage:
+
New charts could be added to ScadaLTS Graphical View by adding a new HTML component with specific content. Each chart has to be initialized by using this listed above Extended HTML Tags. Each of this tag take a specific properties required to set up specific chart. Chart is generated inside this tag which has default size 750x500px.
-***
+
+---
+
### Quick start:
-Create simple line chart for specific [ numeric | multistate | binary ] data point.
+
+Create simple line chart for specific [ numeric | multistate | binary ] data point.
+
```
```
@@ -24,73 +32,108 @@ or
That's it!\
It has rendered line chart for specific point from last hour with default parameters. So if you want to monitor the state of the point from last hour it is the simplest way how to do it. This chart could be zoomed in and out using scrollbar at the bottom of the component. Values of data point in time are represented by white dots on the chart.
-But it is still just a chart like this old ones... What if we really want to monitor status of this point __in real-time__? No problem just add next properties.
-***
+But it is still just a chart like this old ones... What if we really want to monitor status of this point **in real-time**? No problem just add next properties.
+
+---
+
### Live Data
+
```
```
-__Now we've got live chart!__\
-It is refreshed every 10s (10000 ms) and when a data point will change state to different value this new one will be added to chart and the oldest one will be deleted from out chart. Now we can monitor state of datapoint in real-time with chosen by us refresh rate. For critical data, we can monitor the status of the point with a high frequency of queries to server (more real-time data but more resource consuming) and for non-critical data we can refresh chart after a few seconds.
-But what if we want to display chart for __multiple data points?__
-***
+**Now we've got live chart!**\
+It is refreshed every 10s (10000 ms) and when a data point will change state to different value this new one will be added to chart and the oldest one will be deleted from out chart. Now we can monitor state of datapoint in real-time with chosen by us refresh rate. For critical data, we can monitor the status of the point with a high frequency of queries to server (more real-time data but more resource consuming) and for non-critical data we can refresh chart after a few seconds.
+
+But what if we want to display chart for **multiple data points?**
+
+---
+
### Multiple points
-Just add next data point after comma in _'point-id'_ property.
+
+Just add next data point after comma in _'point-id'_ property.
+
```
```
+
-Now we have chart for 3 data points with values from last 1 hour. This components do not have limitations for a count of points displayed on the one chart, but I hope that you have an intuition that 30 point on a single chart is not a wise move.
+Now we have chart for 3 data points with values from last 1 hour. This components do not have limitations for a count of points displayed on the one chart, but I hope that you have an intuition that 30 point on a single chart is not a wise move.
+
+Can we display **older values** than last one hour?
+
+---
-Can we display __older values__ than last one hour?
-***
### Specified time period
+
Yes! Just add a new property to our tag.
+
```
```
-As you can see it's a piece of cake. Just type inside 'start-date' property, time period from which you want to see the data. You can use a every combination of numbers with specific time period __[ hour(s) | day(s) | weak(s) | month(s) ]__. (eg. '2-days', '1-week', '3-months' etc.) But it is not everything! It is dynamic calculated time from now but we can also use a specific date. If we want see data from beginning of the previous year just type in date _(eg. '2019/02/01' to see data beginning from 1-st February 2019)_. It could be useful to limit displayed data.
-To display values from specified period just add __'end-date'__ parameter.
+As you can see it's a piece of cake. Just type inside 'start-date' property, time period from which you want to see the data. You can use a every combination of numbers with specific time period **[ hour(s) | day(s) | weak(s) | month(s) ]**. (eg. '2-days', '1-week', '3-months' etc.) But it is not everything! It is dynamic calculated time from now but we can also use a specific date. If we want see data from beginning of the previous year just type in date _(eg. '2019/02/01' to see data beginning from 1-st February 2019)_. It could be useful to limit displayed data.
+
+To display values from specified period just add **'end-date'** parameter.
+
```
```
+
And it still works with multiple data points. It's great! Isn't it? \
-But what if I want to add a horizontal line to chart to create for example warning level, which of it is exceeded it could be dangerous?
-***
+But what if I want to add a horizontal line to chart to create for example warning level, which of it is exceeded it could be dangerous?
+
+---
+
### Level range line
+
Ok let's consider this one:
+
```
```
-Now we have created horizontal line for our chart which indicates boiling level for water. Thanks to that we can quickly observe that temperature of water inside tank is boiling. It is useful even inside ScadaLTS.
-Wait a moment! We decided which color this horizontal line would have. Could we do the same with chart lines?
-***
+Now we have created horizontal line for our chart which indicates boiling level for water. Thanks to that we can quickly observe that temperature of water inside tank is boiling. It is useful even inside ScadaLTS.
+
+Wait a moment! We decided which color this horizontal line would have. Could we do the same with chart lines?
+
+---
+
### Chart Colors
-For example we have got 3 sensors. This default green colors are too similar. Can we set up a different color set for our charts. Just add this parameter:
+
+For example we have got 3 sensors. This default green colors are too similar. Can we set up a different color set for our charts. Just add this parameter:
+
```
```
-Now we have got defined 3 custom colors for our charts. We can give just a one color value and the rest will be retrieved from this default values. What is the most important... __USE HEXADECIMAL COLOR CODE VALUES__\
-Pretty colorful Modern Charts. But we still have the same size for them... Yes, yes it also could be changed.
-***
+
+Now we have got defined 3 custom colors for our charts. We can give just a one color value and the rest will be retrieved from this default values. What is the most important... **USE HEXADECIMAL COLOR CODE VALUES**\
+Pretty colorful Modern Charts. But we still have the same size for them... Yes, yes it also could be changed.
+
+---
+
### Chart Size
+
```
```
-HD Chart? Why not! Values for attributes are given in Pixels (px). That is useful when we have defined a multiple chart instances on one GraphicalView. We can easily calculate the position of the next chart.
+
+HD Chart? Why not! Values for attributes are given in Pixels (px). That is useful when we have defined a multiple chart instances on one GraphicalView. We can easily calculate the position of the next chart.
### Labels
+
```
```
That would be enough from the basics... It is time for more complex tasks.
-***
+
+---
+
### Multiple charts
-To generate multiple charts on View page just use unique identifiers.
+
+To generate multiple charts on View page just use unique identifiers.
+
```
@@ -98,12 +141,15 @@ To generate multiple charts on View page just use unique identifiers.
```
+
## Modern Chart documentation:
-Available properties in one place for all chart types. Charts _(excluding Gauge Charts)_ could be exported to external file in graphical or text way. You can export to *.png, *.jpg, *.csv, *.json files.
-Properties properties for Step Line, Line charts
+Available properties in one place for all chart types. Charts _(excluding Gauge Charts)_ could be exported to external file in graphical or text way. You can export to _.png, _.jpg, _.csv, _.json files.
+
+Properties properties for Step Line, Line charts
+
- point-id
- point-xid
- label
@@ -123,9 +169,10 @@ Properties properties for Step Line, Line charts
# Author
-- [Radosław Jajko](https://github.com/radek2s): __rjajko@softq.pl__
+- [Radosław Jajko](https://github.com/radek2s): **rjajko@softq.pl**
### Notes:
- More image examples can be find here:
-[Watch List Example Images](../../assets/doc/watch_list/)
\ No newline at end of file
+More image examples can be find here:
+
+[Watch List Example Images](../../assets/doc/watch_list/)
diff --git a/scadalts-ui/src/components/forms/SMSDomain.vue b/scadalts-ui/src/components/forms/SMSDomain.vue
index 3353a86c1b..0123f0185b 100644
--- a/scadalts-ui/src/components/forms/SMSDomain.vue
+++ b/scadalts-ui/src/components/forms/SMSDomain.vue
@@ -1,20 +1,31 @@
-
+
+
+
+
+ Save
+ Save
+
+
diff --git a/scadalts-ui/src/components/forms/SleepAndReactivationDS.vue b/scadalts-ui/src/components/forms/SleepAndReactivationDS.vue
index be798ba077..967d110cd6 100644
--- a/scadalts-ui/src/components/forms/SleepAndReactivationDS.vue
+++ b/scadalts-ui/src/components/forms/SleepAndReactivationDS.vue
@@ -1,52 +1,106 @@
/* eslint-disable no-console */
-
+
diff --git a/scadalts-ui/src/components/graphical_views/AlarmsComponent.vue b/scadalts-ui/src/components/graphical_views/AlarmsComponent.vue
index f0c98138d5..e2583098ad 100644
--- a/scadalts-ui/src/components/graphical_views/AlarmsComponent.vue
+++ b/scadalts-ui/src/components/graphical_views/AlarmsComponent.vue
@@ -1,276 +1,318 @@
-
+
+
+ To refresh {{ toRefresh }}
+
+ Select All
+
+
-
- To refresh {{toRefresh}}
-
- Select All
-
-
+
+
+
-
-
-
-
-
-
-
- Acknowledge Störung/Alarms
-
-
+
+ Acknowledge Störung/Alarms
+
+
diff --git a/scadalts-ui/src/components/graphical_views/IsAlive.vue b/scadalts-ui/src/components/graphical_views/IsAlive.vue
index 481668369e..e656b6e480 100644
--- a/scadalts-ui/src/components/graphical_views/IsAlive.vue
+++ b/scadalts-ui/src/components/graphical_views/IsAlive.vue
@@ -1,119 +1,128 @@
/* eslint-disable no-console */
-
-
-
Error - time of the latest server response:
- {{timeFromServerEpoch | moment}}
-
-
Warning - time of the latest server
- response:
- {{timeFromServerEpoch | moment}}
-
-
{{label}}
-
-
- Time from web browser: {{timeInWebEpoch | moment}}
- Time of the latest server response: {{timeFromServerEpoch |
- moment}}
- Refresh time: {{timeRefresh}} [ms]
- Time before warning: {{timeWarningEpoch}} [ms]
- Time before error: {{timeErrorEpoch}} [ms]
-
-
-
+
Error - time of the latest server response:
+ {{ timeFromServerEpoch | moment }}
+
+
Warning - time of the latest server response:
+ {{ timeFromServerEpoch | moment }}
+
+
{{ label }}
+
+
+
+ Time from web browser: {{ timeInWebEpoch | moment }}
+
+
+ Time of the latest server response:
+ {{ timeFromServerEpoch | moment }}
+
+ Refresh time: {{ timeRefresh }} [ms]
+ Time before warning: {{ timeWarningEpoch }} [ms]
+ Time before error: {{ timeErrorEpoch }} [ms]
+
+
+
-
+
diff --git a/scadalts-ui/src/components/graphical_views/RefreshView.vue b/scadalts-ui/src/components/graphical_views/RefreshView.vue
index ef23c81f6e..d8a6b36650 100644
--- a/scadalts-ui/src/components/graphical_views/RefreshView.vue
+++ b/scadalts-ui/src/components/graphical_views/RefreshView.vue
@@ -1,65 +1,63 @@
/* eslint-disable no-console */
-
-
+
-
+
diff --git a/scadalts-ui/src/components/graphical_views/SimpleComponentSVG.vue b/scadalts-ui/src/components/graphical_views/SimpleComponentSVG.vue
index badb2672ab..78cade4d7d 100644
--- a/scadalts-ui/src/components/graphical_views/SimpleComponentSVG.vue
+++ b/scadalts-ui/src/components/graphical_views/SimpleComponentSVG.vue
@@ -1,47 +1,56 @@
/* eslint-disable no-console */
-
-
{{label}}
-
- {{value}}
-
-
+
{{ label }}
+
+ {{ value }}
+
+
-
+
diff --git a/scadalts-ui/src/components/graphical_views/cmp/CMP.vue b/scadalts-ui/src/components/graphical_views/cmp/CMP.vue
index c7fcb14bb2..ee04226eef 100644
--- a/scadalts-ui/src/components/graphical_views/cmp/CMP.vue
+++ b/scadalts-ui/src/components/graphical_views/cmp/CMP.vue
@@ -1,576 +1,653 @@
/* eslint-disable no-console */
-
-
-
-
-
-
{{insideState}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ×
-
-
-
-
-
-
- {{item.name}}
- Don't need confirmation
-
-
-
-
-
- {{item.name}}
-
-
-
-
- Confirm
- changes
-
-
-
- v0.0.6
- History
-
-
-
-
-
-
-
-
-
+
+
+
+
+
{{ insideState }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ×
+
+
+
+
+
+
+ {{ item.name }}
+ Don't need confirmation
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+ Confirm changes
+
+
+
+ v0.0.6
+ History
+
+
+
+
+
+
+
+
+
-
diff --git a/scadalts-ui/src/components/graphical_views/cmp/HistoryCMP.vue b/scadalts-ui/src/components/graphical_views/cmp/HistoryCMP.vue
index 1dd33ce2ff..3dc548d782 100644
--- a/scadalts-ui/src/components/graphical_views/cmp/HistoryCMP.vue
+++ b/scadalts-ui/src/components/graphical_views/cmp/HistoryCMP.vue
@@ -1,62 +1,73 @@
-
+
diff --git a/scadalts-ui/src/components/point_hierarchy/ExportImportPointHierarchy.vue b/scadalts-ui/src/components/point_hierarchy/ExportImportPointHierarchy.vue
index e741dac55c..afca90d999 100644
--- a/scadalts-ui/src/components/point_hierarchy/ExportImportPointHierarchy.vue
+++ b/scadalts-ui/src/components/point_hierarchy/ExportImportPointHierarchy.vue
@@ -1,28 +1,41 @@
/* eslint-disable */
-
-
-
-
-
-
-
-
Export
-
Import
-
-
{{base.status}} CANCELED
-
-
{{base.statusGroup}}
-
-
- canceled
- {{base.progressImport.group.percent}}%
-
-
-
{{base.statusDetail}}
-
-
-
-
-
-
-
-
-
- Import time: {{timer.timeImport | moment }}
-
-
-
-
- To be imported: {{base.counterToParse}}
-
-
-
-
- To be created: {{toCreate.xidFolderToCreate.length}}
-
-
- Created: {{toCreate.xidFolderCreated.length}}
-
-
-
-
- Folders to be moved: {{toMoveFolder.xidFolderToMoveTo.length}}
-
-
- Moved folders: {{toMoveFolder.xidFolderMoved.length}}
-
-
-
-
- Points to be moved: {{Object.keys(toMovePoints.xidPointsMoveFromTo).length}}
-
-
- Moved points: {{toMovePoints.xidPointMoved.length}}
-
-
-
-
- Folder to be deleted: {{toDeleteFolder.xidFolderToDelete.length}}
-
-
- Deleted: {{toDeleteFolder.xidFolderDeleted.length}}
-
-
-
-
- Folder names to be changed: {{toChangeNameFolder.xidFolderToNameChange.length}}
-
-
- Names changed: {{toChangeNameFolder.xidFolderNameChanged.length}}
-
-
-
-
- Errors: {{base.xidErrors.length}} Check console
-
-
-
-
-
-
Cancel
-
-
-
+
diff --git a/scadalts-ui/src/components/utils.js b/scadalts-ui/src/components/utils.js
index 8de985e95f..55b2b969c3 100644
--- a/scadalts-ui/src/components/utils.js
+++ b/scadalts-ui/src/components/utils.js
@@ -1,5 +1,5 @@
-const functionTest = function test(a,b) {
- return a+b;
-}
+const functionTest = function test(a, b) {
+ return a + b;
+};
module.ft = functionTest;
diff --git a/scadalts-ui/src/components/watch_list/WatchListChartWidget.vue b/scadalts-ui/src/components/watch_list/WatchListChartWidget.vue
index 0f956cec95..bbf05c76c7 100644
--- a/scadalts-ui/src/components/watch_list/WatchListChartWidget.vue
+++ b/scadalts-ui/src/components/watch_list/WatchListChartWidget.vue
@@ -1,82 +1,82 @@
-
+
\ No newline at end of file
+
diff --git a/scadalts-ui/src/components/watch_list/WatchListJsonChart.vue b/scadalts-ui/src/components/watch_list/WatchListJsonChart.vue
index a08128feeb..3111e5927e 100644
--- a/scadalts-ui/src/components/watch_list/WatchListJsonChart.vue
+++ b/scadalts-ui/src/components/watch_list/WatchListJsonChart.vue
@@ -1,411 +1,396 @@
-
-
-
-
- {{ $t('modernwatchlist.chart.panel.live') }}
- {{ $t("modernwatchlist.chart.panel.static") }}
- {{ $t("modernwatchlist.chart.panel.compare") }}
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ {{ $t('modernwatchlist.chart.panel.live') }}
+ {{ $t('modernwatchlist.chart.panel.static') }}
+ {{ $t('modernwatchlist.chart.panel.compare') }}
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
+
diff --git a/scadalts-ui/src/components/watch_list/components/ChartSeriesSettingsComponent.vue b/scadalts-ui/src/components/watch_list/components/ChartSeriesSettingsComponent.vue
index b42b3e8471..4c9fbdce25 100644
--- a/scadalts-ui/src/components/watch_list/components/ChartSeriesSettingsComponent.vue
+++ b/scadalts-ui/src/components/watch_list/components/ChartSeriesSettingsComponent.vue
@@ -1,299 +1,295 @@
-
-
-
-
-
-
-
-
-
-
-
- {{$t("modernwatchlist.chartseries.aggregation.all")}}
-
-
- {{$t("modernwatchlist.chartseries.aggregation.aggregate")}}
-
-
-
-
-
-
-
-
-
-
-
-
{{$t("modernwatchlist.chartseries.name")}}
-
-
-
-
{{$t("modernwatchlist.chartseries.series")}}
-
- {{$t("modernwatchlist.chartseries.series.line")}}
- {{$t("modernwatchlist.chartseries.series.stepline")}}
-
-
-
{{$t("modernwatchlist.chartseries.yaxis")}}
-
- 1
- 2
- {{$t("modernwatchlist.chartseries.yaxis.logarithmic")}}
- {{$t("modernwatchlist.chartseries.yaxis.binary")}}
-
-
-
{{$t("modernwatchlist.chartseries.xaxis")}}
-
- 1
- 2
-
-
-
{{$t("modernwatchlist.chartseries.stroke.color")}}
-
-
-
-
{{$t("modernwatchlist.chartseries.stroke.width")}}
-
-
-
-
{{$t("modernwatchlist.chartseries.stroke.tension")}}
-
-
-
-
{{$t("modernwatchlist.chartseries.fill.color")}}
-
-
-
-
{{$t("modernwatchlist.chartseries.fill.opacity")}}
-
-
-
-
{{$t("modernwatchlist.chartseries.bullets")}}
-
- {{$t("modernwatchlist.chartseries.show")}}
- {{$t("modernwatchlist.chartseries.hide")}}
-
-
-
-
-
-
- {{$t("modernwatchlist.chartseries.close")}}
-
-
- {{$t("modernwatchlist.chartseries.restore")}}
-
-
- {{$t("modernwatchlist.chartseries.save")}}
-
-
-
-
-
-
+
+
+
+
+ {{ $t('modernwatchlist.chartseries.title') }}
+
+
+
+ {{ $t('modernwatchlist.chartseries.aggregation.label') }}
+
+
+
+ {{
+ $t('modernwatchlist.chartseries.aggregation.all')
+ }}
+ {{
+ $t('modernwatchlist.chartseries.aggregation.aggregate')
+ }}
+
+
+
+
+
+
+
+ {{ s.name }}
+
+
+
+
+
+
+
+
+
+
+ {{
+ $t('modernwatchlist.chartseries.series.line')
+ }}
+ {{
+ $t('modernwatchlist.chartseries.series.stepline')
+ }}
+
+
+
+
+
+ {{ $t('modernwatchlist.chartseries.xaxis') }}
+
+
+
+ 1
+ 2
+
+
+
+
+
+
+
+ {{ $t('modernwatchlist.chartseries.yaxis') }}
+
+
+
+ 1
+ 2
+ {{
+ $t('modernwatchlist.chartseries.yaxis.logarithmic')
+ }}
+ {{
+ $t('modernwatchlist.chartseries.yaxis.binary')
+ }}
+
+
+
+
+
+
+
+ {{ $t('modernwatchlist.chartseries.stroke.color') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t('modernwatchlist.chartseries.fill.color') }}
+
+
+
+ Toggle color selector
+
+
+
+
+
+
+
+ {{ $t('modernwatchlist.chartseries.bullets') }}
+
+
+
+ {{
+ $t('modernwatchlist.chartseries.show')
+ }}
+ {{
+ $t('modernwatchlist.chartseries.hide')
+ }}
+
+
+
+
+
+
+
+
+
+
+ {{
+ $t('modernwatchlist.chartseries.close')
+ }}
+ {{
+ $t('modernwatchlist.chartseries.restore')
+ }}
+ {{
+ $t('modernwatchlist.chartseries.save')
+ }}
+
+
+
+
+
\ No newline at end of file
+
diff --git a/scadalts-ui/src/components/watch_list/components/ChartSettingsCompareComponent.vue b/scadalts-ui/src/components/watch_list/components/ChartSettingsCompareComponent.vue
index 53b69f7615..2541c772d1 100644
--- a/scadalts-ui/src/components/watch_list/components/ChartSettingsCompareComponent.vue
+++ b/scadalts-ui/src/components/watch_list/components/ChartSettingsCompareComponent.vue
@@ -1,385 +1,376 @@
-
-
-
-
-
- {{ p.name }}: {{ p.xid }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ p.name }}: {{ p.xid }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+ {{ p.name }}: {{ p.xid }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ p.name }}: {{ p.xid }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
diff --git a/scadalts-ui/src/components/watch_list/components/ChartSettingsLiveComponent.vue b/scadalts-ui/src/components/watch_list/components/ChartSettingsLiveComponent.vue
index e4aa8ada25..ad643c71f4 100644
--- a/scadalts-ui/src/components/watch_list/components/ChartSettingsLiveComponent.vue
+++ b/scadalts-ui/src/components/watch_list/components/ChartSettingsLiveComponent.vue
@@ -1,119 +1,149 @@
-
-
-
-
-
-
- {{ option.text }}
-
-
-
-
-
-
- {{ option.text }}
-
-
-
-
+
+
+
+
+
+ {{ option.text }}
+
+
+
+
+
+
+ {{ option.text }}
+
+
+
+
-
\ No newline at end of file
+
diff --git a/scadalts-ui/src/components/watch_list/components/ChartSettingsStaticComponent.vue b/scadalts-ui/src/components/watch_list/components/ChartSettingsStaticComponent.vue
index 3760ce13e9..db0c982bdd 100644
--- a/scadalts-ui/src/components/watch_list/components/ChartSettingsStaticComponent.vue
+++ b/scadalts-ui/src/components/watch_list/components/ChartSettingsStaticComponent.vue
@@ -1,181 +1,171 @@
-
-
-
{{$t('modernwatchlist.settings.date.start')}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
{{$t('modernwatchlist.settings.date.end')}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
{{
+ $t('modernwatchlist.settings.date.start')
+ }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{{
+ $t('modernwatchlist.settings.date.end')
+ }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
\ No newline at end of file
+
diff --git a/scadalts-ui/src/components/watch_list/configuration.js b/scadalts-ui/src/components/watch_list/configuration.js
index 759fcb478a..7947078185 100644
--- a/scadalts-ui/src/components/watch_list/configuration.js
+++ b/scadalts-ui/src/components/watch_list/configuration.js
@@ -1,124 +1,133 @@
const CHART_CONFIGURATION_TEMPLATE = {
- legend: {},
- cursor: {},
- scrollbarX: { type: "Scrollbar" },
- xAxes: [{
- id: "dateAxis1",
- type: "DateAxis",
- dataFields: {
- value: "date",
- },
- dateFormats: {
- second: "HH:mm:ss",
- minute: "HH:mm:ss",
- hour: "HH:mm",
- day: "MMM dd",
- },
- groupData: true,
- groupCount: 500,
- }, {
- id: "dateAxis2",
- type: "DateAxis",
- dataFields: {
- value: "date2",
- },
- dateFormats: {
- second: "HH:mm:ss",
- minute: "HH:mm:ss",
- hour: "HH:mm",
- day: "MMM dd",
- },
- }],
- yAxes: [{
- id: "valueAxis1",
- type: "ValueAxis",
- dataFields: {
- value: "01",
- },
- }, {
- id: "valueAxis2",
- type: "ValueAxis",
- syncWithAxis: "valueAxis1",
- dataFields: {
- value: "01",
- },
- }, {
- id: "logAxis",
- type: "ValueAxis",
- logarithmic: true,
- dataFields: {
- value: "01",
- },
- }, {
- id: "binAxis",
- type: "ValueAxis",
- dataFields: {
- value: "01",
- },
- syncWithAxis: "valueAxis1",
- renderer: {
- opposite: true,
- },
- }],
- series: [],
- exporting: {
- menu: {
- align: "right",
- verticalAlign: "top"
- },
- filePrefix: "Scada_Chart_" + String(new Date().getTime())
- },
-}
+ legend: {},
+ cursor: {},
+ scrollbarX: { type: 'Scrollbar' },
+ xAxes: [
+ {
+ id: 'dateAxis1',
+ type: 'DateAxis',
+ dataFields: {
+ value: 'date',
+ },
+ dateFormats: {
+ second: 'HH:mm:ss',
+ minute: 'HH:mm:ss',
+ hour: 'HH:mm',
+ day: 'MMM dd',
+ },
+ groupData: true,
+ groupCount: 500,
+ },
+ {
+ id: 'dateAxis2',
+ type: 'DateAxis',
+ dataFields: {
+ value: 'date2',
+ },
+ dateFormats: {
+ second: 'HH:mm:ss',
+ minute: 'HH:mm:ss',
+ hour: 'HH:mm',
+ day: 'MMM dd',
+ },
+ },
+ ],
+ yAxes: [
+ {
+ id: 'valueAxis1',
+ type: 'ValueAxis',
+ dataFields: {
+ value: '01',
+ },
+ },
+ {
+ id: 'valueAxis2',
+ type: 'ValueAxis',
+ syncWithAxis: 'valueAxis1',
+ dataFields: {
+ value: '01',
+ },
+ },
+ {
+ id: 'logAxis',
+ type: 'ValueAxis',
+ logarithmic: true,
+ dataFields: {
+ value: '01',
+ },
+ },
+ {
+ id: 'binAxis',
+ type: 'ValueAxis',
+ dataFields: {
+ value: '01',
+ },
+ syncWithAxis: 'valueAxis1',
+ renderer: {
+ opposite: true,
+ },
+ },
+ ],
+ series: [],
+ exporting: {
+ menu: {
+ align: 'right',
+ verticalAlign: 'top',
+ },
+ filePrefix: 'Scada_Chart_' + String(new Date().getTime()),
+ },
+};
const CHART_SERIES_TEMPLATE = {
- id: undefined,
- name: undefined,
- type: undefined,
- stroke: undefined,
- fill: undefined,
- yAxis: undefined,
- tooltipText: undefined,
- strokeWidth: 3,
- fillOpacity: 0,
- xAxis: "dateAxis1",
- minBulletDistance: 15,
- tensionX: 1,
- startLocation: 0.5,
- dataFields: {
- dateX: "date",
- valueY: undefined
- },
- tooltip: {
- pointerOrientation: "vertical",
- background: {
- fill: "#F00",
- cornerRadius: 20,
- strokeOpacity: 0,
- },
- label: {
- minWidth: 40,
- minHeight: 40,
- textAlign: "middle",
- textValign: "middle",
- }
- },
- bullets: [{
- type: "CircleBullet",
- circle: {
- radius: 0,
- strokeWidth: 2,
- }
-
- }]
-}
+ id: undefined,
+ name: undefined,
+ type: undefined,
+ stroke: undefined,
+ fill: undefined,
+ yAxis: undefined,
+ tooltipText: undefined,
+ strokeWidth: 3,
+ fillOpacity: 0,
+ xAxis: 'dateAxis1',
+ minBulletDistance: 15,
+ tensionX: 1,
+ startLocation: 0.5,
+ dataFields: {
+ dateX: 'date',
+ valueY: undefined,
+ },
+ tooltip: {
+ pointerOrientation: 'vertical',
+ background: {
+ fill: '#F00',
+ cornerRadius: 20,
+ strokeOpacity: 0,
+ },
+ label: {
+ minWidth: 40,
+ minHeight: 40,
+ textAlign: 'middle',
+ textValign: 'middle',
+ },
+ },
+ bullets: [
+ {
+ type: 'CircleBullet',
+ circle: {
+ radius: 0,
+ strokeWidth: 2,
+ },
+ },
+ ],
+};
const CHART_DEFAULT_COLORS = [
- "#39B54A",
- "#69FF7D",
- "#166921",
- "#690C24",
- "#B53859",
- "#734FC1",
-]
+ '#39B54A',
+ '#69FF7D',
+ '#166921',
+ '#690C24',
+ '#B53859',
+ '#734FC1',
+];
-export { CHART_CONFIGURATION_TEMPLATE, CHART_SERIES_TEMPLATE, CHART_DEFAULT_COLORS };
\ No newline at end of file
+export { CHART_CONFIGURATION_TEMPLATE, CHART_SERIES_TEMPLATE, CHART_DEFAULT_COLORS };
diff --git a/scadalts-ui/src/components/watch_list/readme.md b/scadalts-ui/src/components/watch_list/readme.md
index 1bb0f8b066..088d29cd32 100644
--- a/scadalts-ui/src/components/watch_list/readme.md
+++ b/scadalts-ui/src/components/watch_list/readme.md
@@ -1,60 +1,72 @@
# Modern Watch List View
+
Created by _Radek Jajko_ [rjajko@softq.pl](mail:rjajko@softq.pl)
Updated for Scada-LTS version 2.4.0.
-Modern Wach list is a new View for ScadaLTS working next to the classic WatchList page.
-It base on WachList data and genereate a Modern Charts using AmChart4 library. Modern Watch List Chart is a new vue.js component that works only on watchlist page. You can find settings button to modify chart behaviour and apperance.
+Modern Wach list is a new View for ScadaLTS working next to the classic WatchList page.
+It base on WachList data and genereate a Modern Charts using AmChart4 library. Modern Watch List Chart is a new vue.js component that works only on watchlist page. You can find settings button to modify chart behaviour and apperance.
## Functionality:
+
This widget can display following charts.
+
### Live chart
+
Render real-time data based on the selected WatchList.
Select time range to be displayed on the chart from last hour or even from the whole month!
-Remember only about huge amount of data - the more data to rednder the more performance it requires. When a new data has been saved to datapoint user will be able to see that value after a few seconds on the chart.
+Remember only about huge amount of data - the more data to rednder the more performance it requires. When a new data has been saved to datapoint user will be able to see that value after a few seconds on the chart.
### Static chart
+
Display data from specific WatchList time range.
Usefull function when user define mulitpe watch lists with monthly summarization. User easly select specific range using intuitive datepicker component.
-### Compare chart __*(NEW!)*__
+### Compare chart **_(NEW!)_**
+
Compare two specific datapoints on one chart.
Using that mode user will be able to select datapoint values from specific time period and
-then compare this points to another datapoint from different time range. Time range is selected by datepicker component as it was in Static Chart.
+then compare this points to another datapoint from different time range. Time range is selected by datepicker component as it was in Static Chart.
**CONFIGURATION**
To configure "Compare Chart" correctly you must change the X-Axis of the 2-nd datapoint to 2-nd axis and make sure that Aggregation function is disabled (_"All Data" button selected_).
**TROUBLESHOOTING**
When changing from different chart types (eg. from "Compare" to "Static") remember to change
-all datapoint series X-Axis to 1-st Axis. In case of blank chart in this Compare mode make sure that aggegation is disabled or try to assign the X-Axes again.
+all datapoint series X-Axis to 1-st Axis. In case of blank chart in this Compare mode make sure that aggegation is disabled or try to assign the X-Axes again.
## Chart series configuration:
+
Since Scada-LTS version 2.4.0 ModernWatchList Chart has seperate configuration for each datapoint series. Each one can be configured individually. Example configurable elements are descripted below:
-- __Name__ - Display name of that series (it do not change the DP name it is only a label)
-- __Series Type__ - _Line_ or _Step Line_ series line type.
-- __Y-Axis__ - Type of Y-Axis (eg. Logarithmic, Binary...).
-- __X-Axis__ - Required when comparing two datapoints
-- __Stroke color__ - Color of the series line.
-- __Stroke width__ - Width of the series line.
-- __Stroke tension__ - "Smooth" of the line (values from 0-1)
-- __Fill color__ - Color below the series line.
-- __Fill opacity__ - Opacity for color below the series line.
-- __Bullets__ - Display or Hide
+- **Name** - Display name of that series (it do not change the DP name it is only a label)
+- **Series Type** - _Line_ or _Step Line_ series line type.
+- **Y-Axis** - Type of Y-Axis (eg. Logarithmic, Binary...).
+- **X-Axis** - Required when comparing two datapoints
+- **Stroke color** - Color of the series line.
+- **Stroke width** - Width of the series line.
+- **Stroke tension** - "Smooth" of the line (values from 0-1)
+- **Fill color** - Color below the series line.
+- **Fill opacity** - Opacity for color below the series line.
+- **Bullets** - Display or Hide
## Version change
+
### v2.0.0
+
- Rewritten from strach vue.js component dedicated for WatchList instead of embedding default "Scada-LTS modern chart component".
- Improved performance due to aggregation function
- More customization functions (fill, width, color and more)
- Multiple line series types on one chart
- Comparing two datapoint on a single chart
- Reloading chart while changing the active watchlist.
+
### v1.0.0
-- Created Modern Watch List Chart component.
+
+- Created Modern Watch List Chart component.
## Notice
-This is completly independed component. If you want to create a ModernChart on View page see [ModerChart Documentation](../amcharts/readme.md)
\ No newline at end of file
+
+This is completly independed component. If you want to create a ModernChart on View page see [ModerChart Documentation](../amcharts/readme.md)
diff --git a/scadalts-ui/src/i18n.js b/scadalts-ui/src/i18n.js
index 2b285c50ae..b3e58daee1 100644
--- a/scadalts-ui/src/i18n.js
+++ b/scadalts-ui/src/i18n.js
@@ -1,23 +1,23 @@
-import Vue from 'vue'
-import VueI18n from 'vue-i18n'
+import Vue from 'vue';
+import VueI18n from 'vue-i18n';
-Vue.use(VueI18n)
+Vue.use(VueI18n);
-function loadLocaleMessages () {
- const locales = require.context('./locales', true, /[A-Za-z0-9-_,\s]+\.json$/i)
- const messages = {}
- locales.keys().forEach(key => {
- const matched = key.match(/([A-Za-z0-9-_]+)\./i)
- if (matched && matched.length > 1) {
- const locale = matched[1]
- messages[locale] = locales(key)
- }
- })
- return messages
+function loadLocaleMessages() {
+ const locales = require.context('./locales', true, /[A-Za-z0-9-_,\s]+\.json$/i);
+ const messages = {};
+ locales.keys().forEach((key) => {
+ const matched = key.match(/([A-Za-z0-9-_]+)\./i);
+ if (matched && matched.length > 1) {
+ const locale = matched[1];
+ messages[locale] = locales(key);
+ }
+ });
+ return messages;
}
export default new VueI18n({
- locale: process.env.VUE_APP_I18N_LOCALE || 'en',
- fallbackLocale: process.env.VUE_APP_I18N_FALLBACK_LOCALE || 'en',
- messages: loadLocaleMessages()
-})
+ locale: process.env.VUE_APP_I18N_LOCALE || 'en',
+ fallbackLocale: process.env.VUE_APP_I18N_FALLBACK_LOCALE || 'en',
+ messages: loadLocaleMessages(),
+});
diff --git a/scadalts-ui/src/locales/de.json b/scadalts-ui/src/locales/de.json
index a7890a9180..a9b6d6c2bc 100644
--- a/scadalts-ui/src/locales/de.json
+++ b/scadalts-ui/src/locales/de.json
@@ -1,141 +1,157 @@
{
- "uiv.enable": "Aktiviert",
- "uiv.disable": "Behindert",
- "uiv.modal.cancel": "Stornieren",
- "plcalarms.fault.inactive":"Störung ist gegangen",
- "plcalarms.fault.active":"Störung kommt",
- "plcalarms.fault.acknowledge": "Fault acknowledge",
- "plcalarms.alarm.inactive":"Alarm ist gegangen",
- "plcalarms.alarm.active":"Alarm ausgelöst",
- "plcalarms.alarm.acknowledge": "Alarm acknowledge",
- "about": "Dies ist eine Über-Seite (i18n test) locales",
- "systemsettings.title": "Systemeinstellungen",
- "systemsettings.info.title": "System Konfiguration",
- "systemsettings.info.systemtime": "Scada-LTS-Betriebszeit",
- "systemsettings.info.uiversion" : "Version der Benutzeroberfläche",
- "systemsettings.info.tag" : "Scada-LTS neueste GitHub-Version",
- "systemsettings.info.milestone" : "Scada-LTS Build-Version",
- "systemsettings.info.branch" : "Build aus GitHub-Zweig",
- "systemsettings.info.instance": "Instance description",
- "systemsettings.info.language": "Sprache",
- "systemsettings.event.title": "Alarmprioritäten des Systems",
- "systemsettings.event.system": "System startup",
- "systemsettings.audit.title":"Alarm Prioritäten des Audits",
- "systemsettings.http.title": "Http",
- "systemsettings.http.proxy.useProxy": "Proxy",
- "systemsettings.http.proxy.enable": "Aktivieren proxy",
- "systemsettings.http.proxy.disable": "Deaktivieren proxy",
- "systemsettings.http.proxy.host": "Proxy host",
- "systemsettings.http.proxy.port": "Proxy port",
- "systemsettings.http.proxy.username": "Benutzername",
- "systemsettings.http.proxy.password": "Password",
- "systemsettings.database.title" : "Datenbankinformationen",
- "systemsettings.database" : "Using Database",
- "systemsettings.database.mysql" : "MySQL",
- "systemsettings.database.derby" : "Derby",
- "systemsettings.database.size" : "Größe der Datenbank",
- "systemsettings.database.file" : "Datendateigröße",
- "systemsettings.database.total" : "Gesamte Größe",
- "systemsettings.database.histroy" : "Gespeicherte Zeitstempel",
- "systemsettings.database.top" : "Meistgesehene Datenpunkte",
- "systemsettings.database.event" : "Gespeicherte Ereignisse",
- "systemsettings.database.schemaVersion" : "Datenbankschema-Version",
- "systemsettings.email.title": "Email",
- "systemsettings.email.host": "SMTP host",
- "systemsettings.email.port": "SMTP port",
- "systemsettings.email.address": "'Von' Adresse",
- "systemsettings.email.name": "'Von' Name",
- "systemsettings.email.auth": "Genehmigung",
- "systemsettings.email.auth.enable": "Aktivieren Genehmigung",
- "systemsettings.email.auth.disable": "Deaktivieren Genehmigung",
- "systemsettings.email.username": "Benutzername",
- "systemsettings.email.password": "Passwort",
- "systemsettings.email.tls": "TLS",
- "systemsettings.email.tls.enable": "Aktivieren TLS",
- "systemsettings.email.tls.disable": "Deaktivieren TLS",
- "systemsettings.email.contentType": "Content type",
- "systemsettings.email.contenttype.htmltext": "HTML and text",
- "systemsettings.email.contenttype.html": "HTML only",
- "systemsettings.email.contenttype.text": "Text only",
- "systemsettings.misc.title" : "Verschiedenes",
- "systemsettings.misc.uiPerformance" : "Aktualisierungsgeschwindigkeit der Benutzeroberfläche",
- "systemsettings.misc.performance.high" : "Schnell",
- "systemsettings.misc.performance.medium" : "Normal",
- "systemsettings.misc.performance.low" : "Langsam",
- "systemsettings.misc.purge.events" : "Lösche alle Ereignisse",
- "systemsettings.misc.purge.reports" : "Lösche alle erstellten Reports älter als",
- "systemsettings.misc.purge.future" : "Discard point values future dated more than",
- "systemsettings.misc.eventPurgePeriodType": "Typ des Bereinigungsereigniszeitraums",
- "systemsettings.misc.eventPurgePeriods": "Ereigniszeit löschen",
- "systemsettings.misc.reportPurgePeriodType": "Typ des Bereinigungsberichtszeitraums",
- "systemsettings.misc.reportPurgePeriods": "Berichtszeit bereinigen",
- "systemsettings.misc.futureDateLimitPeriodType": "Typ des zukünftigen Datumsbegrenzungszeitraums",
- "systemsettings.misc.futureDateLimitPeriods": "Zukünftiges Datumslimit",
- "systemsettings.scadaconf.title": "Scada-LTS-Umgebungseinstellungen",
- "systemsettings.scadaconf.apiReplaceAlertOnView": "Ersetzen Sie die angezeigte Warnung",
- "systemsettings.scadaconf.cacheEnable": "Event cache",
- "systemsettings.scadaconf.startUpdateUnsilencedAlarmLevel": "Starten Sie die Aktualisierung der nicht stummgeschalteten Alarmstufe",
- "systemsettings.scadaconf.startUpdateEventDetectors": "Starten Sie Update Event Detectors",
- "systemsettings.scadaconf.startUpdatePendingEvents": "Starten Sie die Aktualisierung ausstehender Ereignisse",
- "systemsettings.scadaconf.millisSecondsPeriodUpdateUnsilencedAlarmLevel": "Periodenaktualisierung für nicht gedämpfte Alarmstufe",
- "systemsettings.scadaconf.millisSecondsPeriodUpdateEventDetectors": "Periodenaktualisierung für Ereignisdetektoren",
- "systemsettings.scadaconf.millisSecondsPeriodUpdatePendingEvents": "Periodenaktualisierung für Penging-Ereignisse",
- "systemsettings.scadaconf.croneUpdateCachePointHierarchy": "Periodenaktualisierung für Punkthierarchie (crone)",
- "systemsettings.scadaconf.croneUpdateDataSourcesPoints": "Periodenaktualisierung für Datenquellenpunkte (crone)",
- "systemsettings.scadaconf.useCacheDataSourcePointsWhenSystemIsReady": "Verwenden Sie Cache-Datenquellenpunkte, wenn das System bereit ist",
- "systemsettings.scadaconf.useAcl": "Verwenden Sie die Zugriffssteuerungsliste",
- "systemsettings.scadaconf.aclServer": "Zugriffskontrolllistenserver",
- "systemsettings.scadaconf.doNotCreateEventsForEmailError": "Erstellen Sie keine Ereignisse für E-Mail-Fehler",
- "systemsettings.scadaconf.httpRetriverSleepCheckToReactivationWhenStart": "HTTP Retriver - Schlafprüfung zur Reaktivierung beim Start",
- "systemsettings.scadaconf.httpRetriverDoNotAllowEnableReactivation": "HTTP-Retriver - Reaktivierung nicht aktivieren",
- "systemsettings.notification.fail": "Etwas ist schief gelaufen!",
- "systemsettings.notification.purgedata": "Daten erfolgreich gelöscht!",
- "systemsettings.notification.send.email": "E-Mail wurde gesendet an ",
- "systemsettings.notification.save.systeminfo": "Systeminfo-Einstellungen gespeichert!",
- "systemsettings.notification.save.email": "E-Mail-Einstellungen gespeichert!",
- "systemsettings.notification.save.http": "HTTP-Einstellungen gespeichert!",
- "systemsettings.notification.save.misc": "Andere Einstellungen gespeichert!",
- "systemsettings.notification.save.systemevent": "System Event Types Settings saved!",
- "systemsettings.notification.save.auditevent": "Audit Event Types Settings saved!",
- "systemsettings.notification.save.database": "Database changed!",
- "systemsettings.alert.purgedata.title": "Daten löschen?",
- "systemsettings.alert.purgedata": "Durch diesen Vorgang werden Datenpunktverlaufsinhalte dauerhaft gelöscht. Fortsetzen?",
- "systemsettings.tooltip.derbydatabase": "Die Derby-Datenbank ist in dieser ScadaLTS-Version nicht verfügbar!",
- "systemsettings.tooltip.purgedata": "Löschen Sie die Zustimmung zum historischen Datenpunkt",
- "systemsettings.tooltip.scadaconf": "Scada-LTS-Konfiguration aus Datei 'env.properties' geladen",
- "systemsettings.tooltip.sendtestemail": "Senden Sie eine Testnachricht mit der zuletzt gespeicherten Konfiguration an Ihre eigene E-Mail-Adresse.",
- "systemsettings.label.save": "Speichern",
- "systemsettings.label.saveall": "Alle Änderungen speichern",
- "systemsettings.label.restoreall": "Alles wiederherstellen",
- "systemsettings.label.restore": "Wiederherstellen",
- "systemsettings.label.summary": "Zusammenfassung",
- "event.system.startup":"Mango gestartet",
- "event.system.shutdown":"Mango beendet",
- "event.system.maxAlarmChanged":"Höchste Alarm Priorit hat sich geändert",
- "event.system.userLogin":"Benutzer angemeldet",
- "event.system.compound":"Fehler bei der Ereignisverknüpfung",
- "event.system.setPoint":"Fehler beim Setzen eines Datenpunktes",
- "event.system.email":"Email konnte nicht gesendet werden",
- "event.system.pointLink":"Fehler bei der Datenpunktverkn pfund",
- "event.system.process":"Process event handler failure",
- "event.audit.dataSource": "Datenquelle",
- "event.audit.dataPoint": "Datenpunkt",
- "event.audit.pointEventDetector": "Point event detector",
- "event.audit.compoundEventDetector": "Compound event detector",
- "event.audit.scheduledEvent": "Scheduled event",
- "event.audit.eventHandler": "Event handler",
- "event.audit.pointLink": "Point link",
- "event.audit.maintenanceEvent": "Maintenance event",
- "alarmlevels.none": "Keine(r)",
- "alarmlevels.information": "Information",
- "alarmlevels.urgent": "Dringend",
- "alarmlevels.critical": "Kritisch",
- "alarmlevels.lifesafety": "Labensgefahr",
- "timeperiod.seconds": "second(s)",
- "timeperiod.minutes": "Minute(n)",
- "timeperiod.hours": "Stunde(n)",
- "timeperiod.days": "Tag(e)",
- "timeperiod.weeks": "Woche(n)",
- "timeperiod.months": "Monat(e)",
- "timeperiod.years": "Jahr(e)"
+ "uiv.enable": "Aktiviert",
+ "uiv.disable": "Behindert",
+ "uiv.modal.cancel": "Stornieren",
+ "plcalarms.fault.inactive": "Störung ist gegangen",
+ "plcalarms.fault.active": "Störung kommt",
+ "plcalarms.fault.acknowledge": "Fault acknowledge",
+ "plcalarms.alarm.inactive": "Alarm ist gegangen",
+ "plcalarms.alarm.active": "Alarm ausgelöst",
+ "plcalarms.alarm.acknowledge": "Alarm acknowledge",
+ "plcalarms.notification": "Alarmbenachrichtigungen",
+ "plcalarms.notification.title": "Benachrichtigungsliste für SPS-Alarme",
+ "plcalarms.notification.select.mailinglist": "Mailingliste auswählen",
+ "plcalarms.notification.select.mailinglist.hint.1": "Benachrichtigen Sie Benutzer über die Mailingliste",
+ "plcalarms.notification.select.mailinglist.hint.2": "Vergleichen Sie die Konfiguration, indem Sie eine zweite Liste auswählen",
+ "plcalarms.notification.settings.title": "Einstellungen",
+ "plcalarms.notification.settings.ped.title": "Vorlage für den Punktereignisdetektor",
+ "plcalarms.notification.settings.ped.alias": "Alias für Punktereignisdetektor",
+ "plcalarms.notification.settings.ped.alarmLevel": "Alarmstufe",
+ "plcalarms.notification.settings.ped.duration": "Dauer, um das Ereignis zu erhöhen",
+ "plcalarms.notification.settings.ped.duration.type": "Dauer Typ",
+ "plcalarms.notification.settings.ped.binary": "Binärzustand",
+ "plcalarms.notification.settings.eh.title": "Event-Handler-Vorlage",
+ "plcalarms.notification.settings.eh.xid": "Export-ID des Ereignishandlers",
+ "plcalarms.notification.settings.eh.alias": "Event-Handler-Alias",
+ "plcalarms.notification.settings.eh.disable": "Beim Erstellen deaktivieren",
+ "about": "Dies ist eine Über-Seite (i18n test) locales",
+ "systemsettings.title": "Systemeinstellungen",
+ "systemsettings.info.title": "System Konfiguration",
+ "systemsettings.info.systemtime": "Scada-LTS-Betriebszeit",
+ "systemsettings.info.uiversion": "Version der Benutzeroberfläche",
+ "systemsettings.info.tag": "Scada-LTS neueste GitHub-Version",
+ "systemsettings.info.milestone": "Scada-LTS Build-Version",
+ "systemsettings.info.branch": "Build aus GitHub-Zweig",
+ "systemsettings.info.instance": "Instance description",
+ "systemsettings.info.language": "Sprache",
+ "systemsettings.event.title": "Alarmprioritäten des Systems",
+ "systemsettings.event.system": "System startup",
+ "systemsettings.audit.title": "Alarm Prioritäten des Audits",
+ "systemsettings.http.title": "Http",
+ "systemsettings.http.proxy.useProxy": "Proxy",
+ "systemsettings.http.proxy.enable": "Aktivieren proxy",
+ "systemsettings.http.proxy.disable": "Deaktivieren proxy",
+ "systemsettings.http.proxy.host": "Proxy host",
+ "systemsettings.http.proxy.port": "Proxy port",
+ "systemsettings.http.proxy.username": "Benutzername",
+ "systemsettings.http.proxy.password": "Password",
+ "systemsettings.database.title": "Datenbankinformationen",
+ "systemsettings.database": "Using Database",
+ "systemsettings.database.mysql": "MySQL",
+ "systemsettings.database.derby": "Derby",
+ "systemsettings.database.size": "Größe der Datenbank",
+ "systemsettings.database.file": "Datendateigröße",
+ "systemsettings.database.total": "Gesamte Größe",
+ "systemsettings.database.histroy": "Gespeicherte Zeitstempel",
+ "systemsettings.database.top": "Meistgesehene Datenpunkte",
+ "systemsettings.database.event": "Gespeicherte Ereignisse",
+ "systemsettings.database.schemaVersion": "Datenbankschema-Version",
+ "systemsettings.email.title": "Email",
+ "systemsettings.email.host": "SMTP host",
+ "systemsettings.email.port": "SMTP port",
+ "systemsettings.email.address": "'Von' Adresse",
+ "systemsettings.email.name": "'Von' Name",
+ "systemsettings.email.auth": "Genehmigung",
+ "systemsettings.email.auth.enable": "Aktivieren Genehmigung",
+ "systemsettings.email.auth.disable": "Deaktivieren Genehmigung",
+ "systemsettings.email.username": "Benutzername",
+ "systemsettings.email.password": "Passwort",
+ "systemsettings.email.tls": "TLS",
+ "systemsettings.email.tls.enable": "Aktivieren TLS",
+ "systemsettings.email.tls.disable": "Deaktivieren TLS",
+ "systemsettings.email.contentType": "Content type",
+ "systemsettings.email.contenttype.htmltext": "HTML and text",
+ "systemsettings.email.contenttype.html": "HTML only",
+ "systemsettings.email.contenttype.text": "Text only",
+ "systemsettings.misc.title": "Verschiedenes",
+ "systemsettings.misc.uiPerformance": "Aktualisierungsgeschwindigkeit der Benutzeroberfläche",
+ "systemsettings.misc.performance.high": "Schnell",
+ "systemsettings.misc.performance.medium": "Normal",
+ "systemsettings.misc.performance.low": "Langsam",
+ "systemsettings.misc.purge.events": "Lösche alle Ereignisse",
+ "systemsettings.misc.purge.reports": "Lösche alle erstellten Reports älter als",
+ "systemsettings.misc.purge.future": "Discard point values future dated more than",
+ "systemsettings.misc.eventPurgePeriodType": "Typ des Bereinigungsereigniszeitraums",
+ "systemsettings.misc.eventPurgePeriods": "Ereigniszeit löschen",
+ "systemsettings.misc.reportPurgePeriodType": "Typ des Bereinigungsberichtszeitraums",
+ "systemsettings.misc.reportPurgePeriods": "Berichtszeit bereinigen",
+ "systemsettings.misc.futureDateLimitPeriodType": "Typ des zukünftigen Datumsbegrenzungszeitraums",
+ "systemsettings.misc.futureDateLimitPeriods": "Zukünftiges Datumslimit",
+ "systemsettings.scadaconf.title": "Scada-LTS-Umgebungseinstellungen",
+ "systemsettings.scadaconf.apiReplaceAlertOnView": "Ersetzen Sie die angezeigte Warnung",
+ "systemsettings.scadaconf.cacheEnable": "Event cache",
+ "systemsettings.scadaconf.startUpdateUnsilencedAlarmLevel": "Starten Sie die Aktualisierung der nicht stummgeschalteten Alarmstufe",
+ "systemsettings.scadaconf.startUpdateEventDetectors": "Starten Sie Update Event Detectors",
+ "systemsettings.scadaconf.startUpdatePendingEvents": "Starten Sie die Aktualisierung ausstehender Ereignisse",
+ "systemsettings.scadaconf.millisSecondsPeriodUpdateUnsilencedAlarmLevel": "Periodenaktualisierung für nicht gedämpfte Alarmstufe",
+ "systemsettings.scadaconf.millisSecondsPeriodUpdateEventDetectors": "Periodenaktualisierung für Ereignisdetektoren",
+ "systemsettings.scadaconf.millisSecondsPeriodUpdatePendingEvents": "Periodenaktualisierung für Penging-Ereignisse",
+ "systemsettings.scadaconf.croneUpdateCachePointHierarchy": "Periodenaktualisierung für Punkthierarchie (crone)",
+ "systemsettings.scadaconf.croneUpdateDataSourcesPoints": "Periodenaktualisierung für Datenquellenpunkte (crone)",
+ "systemsettings.scadaconf.useCacheDataSourcePointsWhenSystemIsReady": "Verwenden Sie Cache-Datenquellenpunkte, wenn das System bereit ist",
+ "systemsettings.scadaconf.useAcl": "Verwenden Sie die Zugriffssteuerungsliste",
+ "systemsettings.scadaconf.aclServer": "Zugriffskontrolllistenserver",
+ "systemsettings.scadaconf.doNotCreateEventsForEmailError": "Erstellen Sie keine Ereignisse für E-Mail-Fehler",
+ "systemsettings.scadaconf.httpRetriverSleepCheckToReactivationWhenStart": "HTTP Retriver - Schlafprüfung zur Reaktivierung beim Start",
+ "systemsettings.scadaconf.httpRetriverDoNotAllowEnableReactivation": "HTTP-Retriver - Reaktivierung nicht aktivieren",
+ "systemsettings.notification.fail": "Etwas ist schief gelaufen!",
+ "systemsettings.notification.purgedata": "Daten erfolgreich gelöscht!",
+ "systemsettings.notification.send.email": "E-Mail wurde gesendet an ",
+ "systemsettings.notification.save.systeminfo": "Systeminfo-Einstellungen gespeichert!",
+ "systemsettings.notification.save.email": "E-Mail-Einstellungen gespeichert!",
+ "systemsettings.notification.save.http": "HTTP-Einstellungen gespeichert!",
+ "systemsettings.notification.save.misc": "Andere Einstellungen gespeichert!",
+ "systemsettings.notification.save.systemevent": "System Event Types Settings saved!",
+ "systemsettings.notification.save.auditevent": "Audit Event Types Settings saved!",
+ "systemsettings.notification.save.database": "Database changed!",
+ "systemsettings.alert.purgedata.title": "Daten löschen?",
+ "systemsettings.alert.purgedata": "Durch diesen Vorgang werden Datenpunktverlaufsinhalte dauerhaft gelöscht. Fortsetzen?",
+ "systemsettings.tooltip.derbydatabase": "Die Derby-Datenbank ist in dieser ScadaLTS-Version nicht verfügbar!",
+ "systemsettings.tooltip.purgedata": "Löschen Sie die Zustimmung zum historischen Datenpunkt",
+ "systemsettings.tooltip.scadaconf": "Scada-LTS-Konfiguration aus Datei 'env.properties' geladen",
+ "systemsettings.tooltip.sendtestemail": "Senden Sie eine Testnachricht mit der zuletzt gespeicherten Konfiguration an Ihre eigene E-Mail-Adresse.",
+ "systemsettings.label.save": "Speichern",
+ "systemsettings.label.saveall": "Alle Änderungen speichern",
+ "systemsettings.label.restoreall": "Alles wiederherstellen",
+ "systemsettings.label.restore": "Wiederherstellen",
+ "systemsettings.label.summary": "Zusammenfassung",
+ "event.system.startup": "Mango gestartet",
+ "event.system.shutdown": "Mango beendet",
+ "event.system.maxAlarmChanged": "Höchste Alarm Priorit hat sich geändert",
+ "event.system.userLogin": "Benutzer angemeldet",
+ "event.system.compound": "Fehler bei der Ereignisverknüpfung",
+ "event.system.setPoint": "Fehler beim Setzen eines Datenpunktes",
+ "event.system.email": "Email konnte nicht gesendet werden",
+ "event.system.pointLink": "Fehler bei der Datenpunktverkn pfund",
+ "event.system.process": "Process event handler failure",
+ "event.audit.dataSource": "Datenquelle",
+ "event.audit.dataPoint": "Datenpunkt",
+ "event.audit.pointEventDetector": "Point event detector",
+ "event.audit.compoundEventDetector": "Compound event detector",
+ "event.audit.scheduledEvent": "Scheduled event",
+ "event.audit.eventHandler": "Event handler",
+ "event.audit.pointLink": "Point link",
+ "event.audit.maintenanceEvent": "Maintenance event",
+ "alarmlevels.none": "Keine(r)",
+ "alarmlevels.information": "Information",
+ "alarmlevels.urgent": "Dringend",
+ "alarmlevels.critical": "Kritisch",
+ "alarmlevels.lifesafety": "Labensgefahr",
+ "timeperiod.seconds": "second(s)",
+ "timeperiod.minutes": "Minute(n)",
+ "timeperiod.hours": "Stunde(n)",
+ "timeperiod.days": "Tag(e)",
+ "timeperiod.weeks": "Woche(n)",
+ "timeperiod.months": "Monat(e)",
+ "timeperiod.years": "Jahr(e)"
}
diff --git a/scadalts-ui/src/locales/en.json b/scadalts-ui/src/locales/en.json
index 7215322aec..885be579fb 100644
--- a/scadalts-ui/src/locales/en.json
+++ b/scadalts-ui/src/locales/en.json
@@ -1,193 +1,217 @@
{
- "uiv.enable": "Enable",
- "uiv.disable": "Disable",
- "uiv.modal.ok": "OK",
- "uiv.modal.cancel": "Cancel",
- "plcalarms.fault.inactive":"Fault has gone",
- "plcalarms.fault.active":"Fault comes",
- "plcalarms.fault.acknowledge": "Fault acknowledge",
- "plcalarms.alarm.inactive":"Alarm is gone",
- "plcalarms.alarm.active":"Alarm triggered",
- "plcalarms.alarm.acknowledge": "Alarm acknowledge",
- "modernwatchlist.chart.panel.live": "Live",
- "modernwatchlist.chart.panel.live.tooltip": "Display chart with live update for each Data Point",
- "modernwatchlist.chart.panel.static": "Static",
- "modernwatchlist.chart.panel.static.tooltip": "Display static chart from a specific time period.",
- "modernwatchlist.chart.panel.compare": "Compare",
- "modernwatchlist.chart.panel.compare.tooltip": "Compare two Data Points charts on the same chart.",
- "modernwatchlist.chart.panel.apply.tooltip": "Apply changes to the Chart",
- "modernwatchlist.chartseries.aggregation.all": "All Data",
- "modernwatchlist.chartseries.aggregation.aggregate": "Aggregate Data",
- "modernwatchlist.chartseries.name": "Name:",
- "modernwatchlist.chartseries.series": "Series Type:",
- "modernwatchlist.chartseries.series.stepline": "Step Line Series",
- "modernwatchlist.chartseries.series.line": "Line Series",
- "modernwatchlist.chartseries.yaxis": "Y-Axis:",
- "modernwatchlist.chartseries.yaxis.logarithmic": "Logarithmic",
- "modernwatchlist.chartseries.yaxis.binary": "Binary",
- "modernwatchlist.chartseries.xaxis": "X-Axis:",
- "modernwatchlist.chartseries.stroke.color": "Stroke color:",
- "modernwatchlist.chartseries.stroke.width": "Stroke width:",
- "modernwatchlist.chartseries.stroke.tension": "Stroke tension:",
- "modernwatchlist.chartseries.fill.color": "Fill color:",
- "modernwatchlist.chartseries.fill.opacity": "Fill opacity:",
- "modernwatchlist.chartseries.bullets": "Bullets",
- "modernwatchlist.chartseries.show": "Show",
- "modernwatchlist.chartseries.hide": "Hide",
- "modernwatchlist.chartseries.close": "Close",
- "modernwatchlist.chartseries.restore": "Restore",
- "modernwatchlist.chartseries.save": "Save",
- "modernwatchlist.settings.live.time.label": "Values from last...",
- "modernwatchlist.settings.live.time.hour": "Hour(s)",
- "modernwatchlist.settings.live.time.day": "Day(s)",
- "modernwatchlist.settings.live.time.week": "Week(s)",
- "modernwatchlist.settings.live.time.month": "Month(s)",
- "modernwatchlist.settings.live.performance.1": "Update every 1 second",
- "modernwatchlist.settings.live.performance.2": "Update every 2 seconds",
- "modernwatchlist.settings.live.performance.5": "Update every 5 seconds",
- "modernwatchlist.settings.live.performance.10": "Update every 10 seconds",
- "modernwatchlist.settings.live.performance.30": "Update every 30 seconds",
- "modernwatchlist.settings.live.performance.60": "Update every 60 seconds",
- "modernwatchlist.settings.compare.point1.tooltip": "Select first datapoint to compare and assign this to 1-st x-axis.",
- "modernwatchlist.settings.compare.point2.tooltip": "Remember to assign this datapoint to 2nd X-Axis in 'More Settings' menu!",
- "modernwatchlist.settings.date.start": "Start date",
- "modernwatchlist.settings.date.end": "End date",
- "about": "This is an about page (i18n test) locales",
- "systemsettings.title": "System settings",
- "systemsettings.info.title": "System Information",
- "systemsettings.info.systemtime": "Scada-LTS uptime",
- "systemsettings.info.uiversion" : "User Interface version",
- "systemsettings.info.tag" : "Scada-LTS latest GitHub release",
- "systemsettings.info.milestone" : "Scada-LTS build version",
- "systemsettings.info.branch" : "Build from GitHub branch",
- "systemsettings.info.instance": "Instance description",
- "systemsettings.info.language": "System language",
- "systemsettings.event.title": "System event alarm levels",
- "systemsettings.event.system": "System startup",
- "systemsettings.audit.title":"Audit event alarm levels",
- "systemsettings.http.title": "Http settings",
- "systemsettings.http.proxy.useProxy": "Proxy",
- "systemsettings.http.proxy.enable": "Enable proxy",
- "systemsettings.http.proxy.disable": "Disable proxy",
- "systemsettings.http.proxy.host": "Proxy host",
- "systemsettings.http.proxy.port": "Proxy port",
- "systemsettings.http.proxy.username": "Proxy username",
- "systemsettings.http.proxy.password": "Proxy password",
- "systemsettings.database.title" : "Database Information",
- "systemsettings.database" : "Using Database",
- "systemsettings.database.mysql" : "MySQL",
- "systemsettings.database.derby" : "Derby",
- "systemsettings.database.size" : "Database size",
- "systemsettings.database.file" : "Filedata size",
- "systemsettings.database.total" : "Total size",
- "systemsettings.database.histroy" : "History count",
- "systemsettings.database.top" : "Top points",
- "systemsettings.database.event" : "Event count",
- "systemsettings.database.schemaVersion" : "Database schema version",
- "systemsettings.email.title": "Email settings",
- "systemsettings.email.host": "SMTP host",
- "systemsettings.email.port": "SMTP port",
- "systemsettings.email.address": "'From' address",
- "systemsettings.email.name": "'From' name",
- "systemsettings.email.auth": "Authorization",
- "systemsettings.email.auth.enable": "Use authorization",
- "systemsettings.email.auth.disable": "Disable authorization",
- "systemsettings.email.username": "Username",
- "systemsettings.email.password": "Password",
- "systemsettings.email.tls": "TLS",
- "systemsettings.email.tls.enable": "Enable TLS",
- "systemsettings.email.tls.disable": "Disable TLS",
- "systemsettings.email.contentType": "Content type",
- "systemsettings.email.contenttype.htmltext": "HTML and text",
- "systemsettings.email.contenttype.html": "HTML only",
- "systemsettings.email.contenttype.text": "Text only",
- "systemsettings.misc.title" : "Other settings",
- "systemsettings.misc.uiPerformance" : "UI performance",
- "systemsettings.misc.performance.high" : "High",
- "systemsettings.misc.performance.medium" : "Medium",
- "systemsettings.misc.performance.low" : "Low",
- "systemsettings.misc.purge.events" : "Purge events older than",
- "systemsettings.misc.purge.reports" : "Purge report instances older than",
- "systemsettings.misc.purge.future" : "Discard point values future dated more than",
- "systemsettings.misc.eventPurgePeriodType": "Purge event period type",
- "systemsettings.misc.eventPurgePeriods": "Purge event time",
- "systemsettings.misc.reportPurgePeriodType": "Purge report period type",
- "systemsettings.misc.reportPurgePeriods": "Purge report time",
- "systemsettings.misc.futureDateLimitPeriodType": "Future date limit period type",
- "systemsettings.misc.futureDateLimitPeriods": "Future date limit",
- "systemsettings.scadaconf.title": "Scada-LTS environment settings",
- "systemsettings.scadaconf.apiReplaceAlertOnView": "Replace alert on view",
- "systemsettings.scadaconf.cacheEnable": "Event cache",
- "systemsettings.scadaconf.startUpdateUnsilencedAlarmLevel": "Start update unsilenced alarm level",
- "systemsettings.scadaconf.startUpdateEventDetectors": "Start update event detectors",
- "systemsettings.scadaconf.startUpdatePendingEvents": "Start update pending events",
- "systemsettings.scadaconf.millisSecondsPeriodUpdateUnsilencedAlarmLevel": "Period update for unsilenced alarm level (ms)",
- "systemsettings.scadaconf.millisSecondsPeriodUpdateEventDetectors": "Period update for event detectors (ms)",
- "systemsettings.scadaconf.millisSecondsPeriodUpdatePendingEvents": "Period update for penging events (ms)",
- "systemsettings.scadaconf.croneUpdateCachePointHierarchy": "Period update for point hierarchy (crone)",
- "systemsettings.scadaconf.croneUpdateDataSourcesPoints": "Period update for data sources points (crone)",
- "systemsettings.scadaconf.useCacheDataSourcePointsWhenSystemIsReady": "Use cache data sources points when the system is ready",
- "systemsettings.scadaconf.useAcl": "Use Access Control List",
- "systemsettings.scadaconf.aclServer": "Access Control List server",
- "systemsettings.scadaconf.doNotCreateEventsForEmailError": "Do not create Events for email error",
- "systemsettings.scadaconf.httpRetriverSleepCheckToReactivationWhenStart": "HTTP Retriver - sleep check to reactivation when start",
- "systemsettings.scadaconf.httpRetriverDoNotAllowEnableReactivation": "HTTP Retriver - do not allow to enable reactivation",
- "systemsettings.loggingtype.title": "Default Data Point logging type",
- "systemsettings.loggingtype.value": "Logging type:",
- "systemsettings.notification.fail": "Something went wrong!",
- "systemsettings.notification.purgedata": "Successfully cleared data!",
- "systemsettings.notification.send.email": "Email has been sent to ",
- "systemsettings.notification.save.systeminfo": "System info settings saved!",
- "systemsettings.notification.save.email": "Email settings saved!",
- "systemsettings.notification.save.http": "Http settings saved!",
- "systemsettings.notification.save.misc": "Other settings saved!",
- "systemsettings.notification.save.systemevent": "System Event Types settings saved!",
- "systemsettings.notification.save.auditevent": "Audit Event Types settings saved!",
- "systemsettings.notification.save.database": "Database changed!",
- "systemsettings.notification.save.logging": "Default logging type saved!",
- "systemsettings.alert.purgedata.title": "Purge data?",
- "systemsettings.alert.purgedata": "This operation will permanently delete datapoint history content. Continue?",
- "systemsettings.tooltip.derbydatabase": "Derby database is unavailable in this ScadaLTS version!",
- "systemsettings.tooltip.purgedata": "Delete historical datapoint concent",
- "systemsettings.tooltip.sendtestemail": "Send a test message with last saved configuration to your own email address.",
- "systemsettings.tooltip.scadaconf": "Scada-LTS configuration loaded from 'env.properties' file. Modify file and restart application server to apply changes",
- "systemsettings.label.save": "Save",
- "systemsettings.label.saveall": "Save all changes",
- "systemsettings.label.restoreall": "Restore All",
- "systemsettings.label.restore": "Restore",
- "systemsettings.label.summary": "Summary",
- "event.system.startup":"System startup",
- "event.system.shutdown":"System shutdown",
- "event.system.maxAlarmChanged":"Maximum alarm level changed",
- "event.system.userLogin":"User login",
- "event.system.compound":"Compound detector failure",
- "event.system.setPoint":"Set point event handler failure",
- "event.system.email":"Email send failure",
- "event.system.pointLink":"Point link failure",
- "event.system.process":"Process event handler failure",
- "event.audit.dataSource": "Data source",
- "event.audit.dataPoint": "Data point",
- "event.audit.pointEventDetector": "Point event detector",
- "event.audit.compoundEventDetector": "Compound event detector",
- "event.audit.scheduledEvent": "Scheduled event",
- "event.audit.eventHandler": "Event handler",
- "event.audit.pointLink": "Point link",
- "event.audit.maintenanceEvent": "Maintenance event",
- "alarmlevels.none": "None",
- "alarmlevels.information": "Information",
- "alarmlevels.urgent": "Urgent",
- "alarmlevels.critical": "Critical",
- "alarmlevels.lifesafety": "Life safety",
- "timeperiod.seconds": "second(s)",
- "timeperiod.minutes": "minute(s)",
- "timeperiod.hours": "hour(s)",
- "timeperiod.days": "day(s)",
- "timeperiod.weeks": "week(s)",
- "timeperiod.months": "month(s)",
- "timeperiod.years": "year(s)",
- "pointEdit.logging.type.change": "When point value changes",
- "pointEdit.logging.type.all": "All data",
- "pointEdit.logging.type.never": "Do not log",
- "pointEdit.logging.type.interval": "Interval",
- "pointEdit.logging.type.tsChange": "When point timestamp changes"
+ "uiv.enable": "Enable",
+ "uiv.disable": "Disable",
+ "uiv.modal.ok": "OK",
+ "uiv.modal.cancel": "Cancel",
+ "plcalarms.fault.inactive": "Fault has gone",
+ "plcalarms.fault.active": "Fault comes",
+ "plcalarms.fault.acknowledge": "Fault acknowledge",
+ "plcalarms.alarm.inactive": "Alarm is gone",
+ "plcalarms.alarm.active": "Alarm triggered",
+ "plcalarms.alarm.acknowledge": "Alarm acknowledge",
+ "plcalarms.notification": "Alarms Notifications",
+ "plcalarms.notification.title": "PLC Alarms Notification List",
+ "plcalarms.notification.select.mailinglist": "Select mailing list",
+ "plcalarms.notification.select.mailinglist.hint.1": "Notify users using mailing list",
+ "plcalarms.notification.select.mailinglist.hint.2": "Compare configuration",
+ "plcalarms.notification.settings.title": "Settings",
+ "plcalarms.notification.settings.ped.title": "Point Event Detector template",
+ "plcalarms.notification.settings.ped.alias": "Point Event Detector Alias",
+ "plcalarms.notification.settings.ped.alarmLevel": "Alarm Level",
+ "plcalarms.notification.settings.ped.duration": "Duration to rise the event",
+ "plcalarms.notification.settings.ped.duration.type": "Duration type",
+ "plcalarms.notification.settings.ped.binary": "Binary state",
+ "plcalarms.notification.settings.eh.title": "Event Handler template",
+ "plcalarms.notification.settings.eh.xid": "Event Handler Export ID",
+ "plcalarms.notification.settings.eh.alias": "Event Handler Alias",
+ "plcalarms.notification.settings.eh.disable": "Disable when created",
+ "plcalarms.notification.save": "Saved Successfully",
+ "plcalarms.notification.help": "PLC Alarms Notification list is a page to create a specific EventHandler type for Alarm ( AL ) or Warning ( ST ) datapoints in Scada-LTS. Using notification sheme defined for specific mailing list user is able to recive notification via selected channel (SMS or Email).",
+ "modernwatchlist.chart.panel.live": "Live",
+ "modernwatchlist.chart.panel.live.tooltip": "Display chart with live update for each Data Point",
+ "modernwatchlist.chart.panel.static": "Static",
+ "modernwatchlist.chart.panel.static.tooltip": "Display static chart from a specific time period.",
+ "modernwatchlist.chart.panel.compare": "Compare",
+ "modernwatchlist.chart.panel.compare.tooltip": "Compare two Data Points charts on the same chart.",
+ "modernwatchlist.chart.panel.apply.tooltip": "Apply changes to the Chart",
+ "modernwatchlist.chartseries.title": "Chart settings",
+ "modernwatchlist.chartseries.aggregation.label": "Display data:",
+ "modernwatchlist.chartseries.aggregation.all": "All Data",
+ "modernwatchlist.chartseries.aggregation.aggregate": "Aggregate Data",
+ "modernwatchlist.chartseries.aggregation.count": "Aggregate data if there are more data than...",
+ "modernwatchlist.chartseries.name": "Name:",
+ "modernwatchlist.chartseries.series": "Series Type:",
+ "modernwatchlist.chartseries.series.stepline": "Step Line Series",
+ "modernwatchlist.chartseries.series.line": "Line Series",
+ "modernwatchlist.chartseries.yaxis": "Y-Axis:",
+ "modernwatchlist.chartseries.yaxis.logarithmic": "Logarithmic",
+ "modernwatchlist.chartseries.yaxis.binary": "Binary",
+ "modernwatchlist.chartseries.xaxis": "X-Axis:",
+ "modernwatchlist.chartseries.stroke.color": "Stroke color:",
+ "modernwatchlist.chartseries.stroke.width": "Stroke width:",
+ "modernwatchlist.chartseries.stroke.tension": "Stroke tension:",
+ "modernwatchlist.chartseries.fill.color": "Fill color:",
+ "modernwatchlist.chartseries.fill.opacity": "Fill opacity:",
+ "modernwatchlist.chartseries.bullets": "Bullets",
+ "modernwatchlist.chartseries.show": "Show",
+ "modernwatchlist.chartseries.hide": "Hide",
+ "modernwatchlist.chartseries.close": "Close",
+ "modernwatchlist.chartseries.restore": "Restore",
+ "modernwatchlist.chartseries.save": "Save",
+ "modernwatchlist.settings.live.time.label": "Values from last...",
+ "modernwatchlist.settings.live.time.hour": "Hour(s)",
+ "modernwatchlist.settings.live.time.day": "Day(s)",
+ "modernwatchlist.settings.live.time.week": "Week(s)",
+ "modernwatchlist.settings.live.time.month": "Month(s)",
+ "modernwatchlist.settings.live.performance.1": "Update every 1 second",
+ "modernwatchlist.settings.live.performance.2": "Update every 2 seconds",
+ "modernwatchlist.settings.live.performance.5": "Update every 5 seconds",
+ "modernwatchlist.settings.live.performance.10": "Update every 10 seconds",
+ "modernwatchlist.settings.live.performance.30": "Update every 30 seconds",
+ "modernwatchlist.settings.live.performance.60": "Update every 60 seconds",
+ "modernwatchlist.settings.compare.point1.tooltip": "Select first datapoint to compare and assign this to 1-st x-axis.",
+ "modernwatchlist.settings.compare.point2.tooltip": "Remember to assign this datapoint to 2nd X-Axis in 'More Settings' menu!",
+ "modernwatchlist.settings.date.start": "Start date",
+ "modernwatchlist.settings.date.end": "End date",
+ "about": "This is an about page (i18n test) locales",
+ "systemsettings.title": "System settings",
+ "systemsettings.info.title": "System Information",
+ "systemsettings.info.systemtime": "Scada-LTS uptime",
+ "systemsettings.info.uiversion": "User Interface version",
+ "systemsettings.info.tag": "Scada-LTS latest GitHub release",
+ "systemsettings.info.milestone": "Scada-LTS build version",
+ "systemsettings.info.branch": "Build from GitHub branch",
+ "systemsettings.info.instance": "Instance description",
+ "systemsettings.info.language": "System language",
+ "systemsettings.event.title": "System event alarm levels",
+ "systemsettings.event.system": "System startup",
+ "systemsettings.audit.title": "Audit event alarm levels",
+ "systemsettings.http.title": "Http settings",
+ "systemsettings.http.proxy.useProxy": "Proxy",
+ "systemsettings.http.proxy.enable": "Enable proxy",
+ "systemsettings.http.proxy.disable": "Disable proxy",
+ "systemsettings.http.proxy.host": "Proxy host",
+ "systemsettings.http.proxy.port": "Proxy port",
+ "systemsettings.http.proxy.username": "Proxy username",
+ "systemsettings.http.proxy.password": "Proxy password",
+ "systemsettings.database.title": "Database Information",
+ "systemsettings.database": "Using Database",
+ "systemsettings.database.mysql": "MySQL",
+ "systemsettings.database.derby": "Derby",
+ "systemsettings.database.size": "Database size",
+ "systemsettings.database.file": "Filedata size",
+ "systemsettings.database.total": "Total size",
+ "systemsettings.database.histroy": "History count",
+ "systemsettings.database.top": "Top points",
+ "systemsettings.database.event": "Event count",
+ "systemsettings.database.schemaVersion": "Database schema version",
+ "systemsettings.email.title": "Email settings",
+ "systemsettings.email.host": "SMTP host",
+ "systemsettings.email.port": "SMTP port",
+ "systemsettings.email.address": "'From' address",
+ "systemsettings.email.name": "'From' name",
+ "systemsettings.email.auth": "Authorization",
+ "systemsettings.email.auth.enable": "Use authorization",
+ "systemsettings.email.auth.disable": "Disable authorization",
+ "systemsettings.email.username": "Username",
+ "systemsettings.email.password": "Password",
+ "systemsettings.email.tls": "TLS",
+ "systemsettings.email.tls.enable": "Enable TLS",
+ "systemsettings.email.tls.disable": "Disable TLS",
+ "systemsettings.email.contentType": "Content type",
+ "systemsettings.email.contenttype.htmltext": "HTML and text",
+ "systemsettings.email.contenttype.html": "HTML only",
+ "systemsettings.email.contenttype.text": "Text only",
+ "systemsettings.misc.title": "Other settings",
+ "systemsettings.misc.uiPerformance": "UI performance",
+ "systemsettings.misc.performance.high": "High",
+ "systemsettings.misc.performance.medium": "Medium",
+ "systemsettings.misc.performance.low": "Low",
+ "systemsettings.misc.purge.events": "Purge events older than",
+ "systemsettings.misc.purge.reports": "Purge report instances older than",
+ "systemsettings.misc.purge.future": "Discard point values future dated more than",
+ "systemsettings.misc.eventPurgePeriodType": "Purge event period type",
+ "systemsettings.misc.eventPurgePeriods": "Purge event time",
+ "systemsettings.misc.reportPurgePeriodType": "Purge report period type",
+ "systemsettings.misc.reportPurgePeriods": "Purge report time",
+ "systemsettings.misc.futureDateLimitPeriodType": "Future date limit period type",
+ "systemsettings.misc.futureDateLimitPeriods": "Future date limit",
+ "systemsettings.smsdomain.title": "SMS Domain",
+ "systemsettings.smsdomain.label": "SMS-Gateway server address",
+ "systemsettings.scadaconf.title": "Scada-LTS environment settings",
+ "systemsettings.scadaconf.apiReplaceAlertOnView": "Replace alert on view",
+ "systemsettings.scadaconf.cacheEnable": "Event cache",
+ "systemsettings.scadaconf.startUpdateUnsilencedAlarmLevel": "Start update unsilenced alarm level",
+ "systemsettings.scadaconf.startUpdateEventDetectors": "Start update event detectors",
+ "systemsettings.scadaconf.startUpdatePendingEvents": "Start update pending events",
+ "systemsettings.scadaconf.millisSecondsPeriodUpdateUnsilencedAlarmLevel": "Period update for unsilenced alarm level (ms)",
+ "systemsettings.scadaconf.millisSecondsPeriodUpdateEventDetectors": "Period update for event detectors (ms)",
+ "systemsettings.scadaconf.millisSecondsPeriodUpdatePendingEvents": "Period update for penging events (ms)",
+ "systemsettings.scadaconf.croneUpdateCachePointHierarchy": "Period update for point hierarchy (crone)",
+ "systemsettings.scadaconf.croneUpdateDataSourcesPoints": "Period update for data sources points (crone)",
+ "systemsettings.scadaconf.useCacheDataSourcePointsWhenSystemIsReady": "Use cache data sources points when the system is ready",
+ "systemsettings.scadaconf.useAcl": "Use Access Control List",
+ "systemsettings.scadaconf.aclServer": "Access Control List server",
+ "systemsettings.scadaconf.doNotCreateEventsForEmailError": "Do not create Events for email error",
+ "systemsettings.scadaconf.httpRetriverSleepCheckToReactivationWhenStart": "HTTP Retriver - sleep check to reactivation when start",
+ "systemsettings.scadaconf.httpRetriverDoNotAllowEnableReactivation": "HTTP Retriver - do not allow to enable reactivation",
+ "systemsettings.loggingtype.title": "Default Data Point logging type",
+ "systemsettings.loggingtype.value": "Logging type:",
+ "systemsettings.notification.fail": "Something went wrong!",
+ "systemsettings.notification.purgedata": "Successfully cleared data!",
+ "systemsettings.notification.send.email": "Email has been sent to ",
+ "systemsettings.notification.save.systeminfo": "System info settings saved!",
+ "systemsettings.notification.save.email": "Email settings saved!",
+ "systemsettings.notification.save.http": "Http settings saved!",
+ "systemsettings.notification.save.misc": "Other settings saved!",
+ "systemsettings.notification.save.smsdomain": "SMS Domain saved!",
+ "systemsettings.notification.save.systemevent": "System Event Types settings saved!",
+ "systemsettings.notification.save.auditevent": "Audit Event Types settings saved!",
+ "systemsettings.notification.save.database": "Database changed!",
+ "systemsettings.notification.save.logging": "Default logging type saved!",
+ "systemsettings.alert.purgedata.title": "Purge data?",
+ "systemsettings.alert.purgedata": "This operation will permanently delete datapoint history content. Continue?",
+ "systemsettings.tooltip.derbydatabase": "Derby database is unavailable in this ScadaLTS version!",
+ "systemsettings.tooltip.purgedata": "Delete historical datapoint concent",
+ "systemsettings.tooltip.sendtestemail": "Send a test message with last saved configuration to your own email address.",
+ "systemsettings.tooltip.scadaconf": "Scada-LTS configuration loaded from 'env.properties' file. Modify file and restart application server to apply changes",
+ "systemsettings.label.save": "Save",
+ "systemsettings.label.saveall": "Save all changes",
+ "systemsettings.label.restoreall": "Restore All",
+ "systemsettings.label.restore": "Restore",
+ "systemsettings.label.summary": "Summary",
+ "event.system.startup": "System startup",
+ "event.system.shutdown": "System shutdown",
+ "event.system.maxAlarmChanged": "Maximum alarm level changed",
+ "event.system.userLogin": "User login",
+ "event.system.compound": "Compound detector failure",
+ "event.system.setPoint": "Set point event handler failure",
+ "event.system.email": "Email send failure",
+ "event.system.pointLink": "Point link failure",
+ "event.system.process": "Process event handler failure",
+ "event.audit.dataSource": "Data source",
+ "event.audit.dataPoint": "Data point",
+ "event.audit.pointEventDetector": "Point event detector",
+ "event.audit.compoundEventDetector": "Compound event detector",
+ "event.audit.scheduledEvent": "Scheduled event",
+ "event.audit.eventHandler": "Event handler",
+ "event.audit.pointLink": "Point link",
+ "event.audit.maintenanceEvent": "Maintenance event",
+ "alarmlevels.none": "None",
+ "alarmlevels.information": "Information",
+ "alarmlevels.urgent": "Urgent",
+ "alarmlevels.critical": "Critical",
+ "alarmlevels.lifesafety": "Life safety",
+ "timeperiod.seconds": "second(s)",
+ "timeperiod.minutes": "minute(s)",
+ "timeperiod.hours": "hour(s)",
+ "timeperiod.days": "day(s)",
+ "timeperiod.weeks": "week(s)",
+ "timeperiod.months": "month(s)",
+ "timeperiod.years": "year(s)",
+ "pointEdit.logging.type.change": "When point value changes",
+ "pointEdit.logging.type.all": "All data",
+ "pointEdit.logging.type.never": "Do not log",
+ "pointEdit.logging.type.interval": "Interval",
+ "pointEdit.logging.type.tsChange": "When point timestamp changes"
}
diff --git a/scadalts-ui/src/main.js b/scadalts-ui/src/main.js
index a4164b294f..27fc03e04b 100644
--- a/scadalts-ui/src/main.js
+++ b/scadalts-ui/src/main.js
@@ -1,244 +1,325 @@
-import 'bootstrap/dist/css/bootstrap.min.css'
-
-import Vue from 'vue'
-import App from './apps/App.vue'
-import router from './router'
-import store from './store'
-import * as uiv from 'uiv'
-import VueCookie from 'vue-cookie'
-import VueLogger from 'vuejs-logger'
-
-import Test from './components/Test'
-import IsAlive from './components/graphical_views/IsAlive'
-import CMP from './components/graphical_views/cmp/CMP'
-import SimpleComponentSVG from './components/graphical_views/SimpleComponentSVG'
-import ExportImportPointHierarchy from './components/point_hierarchy/ExportImportPointHierarchy'
-import SleepAndReactivationDS from './components/forms/SleepAndReactivationDS'
-import WatchListChartWidget from './components/watch_list/WatchListChartWidget'
-import VueLodash from 'vue-lodash'
-
-import StepLineChartComponent from './components/amcharts/StepLineChartComponent'
-import LineChartComponent from './components/amcharts/LineChartComponent'
-
-import Verte from 'verte';
-import 'verte/dist/verte.css';
-
-import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'
-import { library } from '@fortawesome/fontawesome-svg-core'
-import {faCoffee, faTimes, faBars, faBell, faFileMedicalAlt, faInfo, faListAlt, faCogs} from '@fortawesome/free-solid-svg-icons'
-import i18n from './i18n'
-import LiveAlarms from './components/graphical_views/AlarmsComponent'
-import RefreshView from "@/components/graphical_views/RefreshView"
-import SMSDomain from "@/components/forms/SMSDomain"
-
-library.add(faCoffee, faTimes, faBars, faBell, faFileMedicalAlt, faInfo, faListAlt, faCogs)
-
-Vue.component('font-awesome-icon', FontAwesomeIcon)
-Vue.component(Verte.name, Verte);
+import 'bootstrap/dist/css/bootstrap.min.css';
+
+import Vue from 'vue';
+import App from './apps/App.vue';
+import router from './router';
+import store from './store';
+import * as uiv from 'uiv';
+import VueCookie from 'vue-cookie';
+import VueLogger from 'vuejs-logger';
+
+import Test from './components/Test';
+import IsAlive from './components/graphical_views/IsAlive';
+import CMP from './components/graphical_views/cmp/CMP';
+import SimpleComponentSVG from './components/graphical_views/SimpleComponentSVG';
+import ExportImportPointHierarchy from './components/point_hierarchy/ExportImportPointHierarchy';
+import SleepAndReactivationDS from './components/forms/SleepAndReactivationDS';
+import WatchListChartWidget from './components/watch_list/WatchListChartWidget';
+import VueLodash from 'vue-lodash';
+
+import StepLineChartComponent from './components/amcharts/StepLineChartComponent';
+import LineChartComponent from './components/amcharts/LineChartComponent';
+
+import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome';
+import { library } from '@fortawesome/fontawesome-svg-core';
+import {
+ faCoffee,
+ faTimes,
+ faBars,
+ faBell,
+ faFileMedicalAlt,
+ faInfo,
+ faListAlt,
+ faCogs,
+} from '@fortawesome/free-solid-svg-icons';
+import i18n from './i18n';
+import LiveAlarms from './components/graphical_views/AlarmsComponent';
+import RefreshView from '@/components/graphical_views/RefreshView';
+import SMSDomain from '@/components/forms/SMSDomain';
+import vuetify from './plugins/vuetify';
+import 'roboto-fontface/css/roboto/roboto-fontface.css';
+import '@mdi/font/css/materialdesignicons.css';
+
+library.add(
+ faCoffee,
+ faTimes,
+ faBars,
+ faBell,
+ faFileMedicalAlt,
+ faInfo,
+ faListAlt,
+ faCogs,
+);
+
+Vue.component('font-awesome-icon', FontAwesomeIcon);
const isProduction = process.env.NODE_ENV === 'production';
const options = {
- isEnabled: true,
- logLevel: isProduction ? 'error' : 'debug',
- stringifyArguments: false,
- showLogLevel: true,
- showMethodName: true,
- separator: '|',
- showConsoleColors: true
+ isEnabled: true,
+ logLevel: isProduction ? 'error' : 'debug',
+ stringifyArguments: false,
+ showLogLevel: true,
+ showMethodName: true,
+ separator: '|',
+ showConsoleColors: true,
};
Vue.use(VueLogger, options);
-const optionsLodash = { name: 'lodash' }
+const optionsLodash = { name: 'lodash' };
-Vue.use(VueLodash, optionsLodash)
+Vue.use(VueLodash, optionsLodash);
-Vue.use(uiv)
-Vue.use(VueCookie)
+Vue.use(uiv);
+Vue.use(VueCookie);
-Vue.config.devtools = true
+Vue.config.devtools = true;
new Vue({
- router,
- store,
- i18n,
- render: h => h(App)
-}).$mount('#app')
+ router,
+ store,
+ i18n,
+ vuetify,
+ render: (h) => h(App),
+}).$mount('#app');
if (window.document.getElementById('app-test') != undefined) {
- new Vue({
- render: h => h(Test,
- {
- props:
- { plabel: window.document.getElementById('app-test').getAttribute('plabel') }
- })
- }).$mount('#app-test')
+ new Vue({
+ render: (h) =>
+ h(Test, {
+ props: {
+ plabel: window.document.getElementById('app-test').getAttribute('plabel'),
+ },
+ }),
+ }).$mount('#app-test');
}
if (window.document.getElementById('app-isalive') != undefined) {
- new Vue({
- store,
- render: h => h(IsAlive,
- {
- props:
- {
- plabel: window.document.getElementById('app-isalive').getAttribute('plabel'),
- ptimeWarning: window.document.getElementById('app-isalive').getAttribute('ptime-warning'),
- ptimeError: window.document.getElementById('app-isalive').getAttribute('ptime-error'),
- ptimeRefresh: window.document.getElementById('app-isalive').getAttribute('ptime-refresh'),
- }
- })
- }).$mount('#app-isalive')
+ new Vue({
+ store,
+ render: (h) =>
+ h(IsAlive, {
+ props: {
+ plabel: window.document.getElementById('app-isalive').getAttribute('plabel'),
+ ptimeWarning: window.document
+ .getElementById('app-isalive')
+ .getAttribute('ptime-warning'),
+ ptimeError: window.document
+ .getElementById('app-isalive')
+ .getAttribute('ptime-error'),
+ ptimeRefresh: window.document
+ .getElementById('app-isalive')
+ .getAttribute('ptime-refresh'),
+ },
+ }),
+ }).$mount('#app-isalive');
}
for (let i = 0; i < 20; i++) {
- const cmpId = `app-cmp-${i}`
- if (window.document.getElementById(cmpId) != undefined) {
- new Vue({
- render: h => h(CMP,
- {
- store,
- props:
- {
- pLabel: window.document.getElementById(cmpId).getAttribute('plabel'),
- pTimeRefresh: window.document.getElementById(cmpId).getAttribute('ptimeRefresh'),
- pConfig: window.document.getElementById(cmpId).getAttribute('pconfig'),
- pxIdViewAndIdCmp: window.document.getElementById(cmpId).getAttribute('pxIdViewAndIdCmp')
- }
- })
- }).$mount('#' + cmpId)
- }
+ const cmpId = `app-cmp-${i}`;
+ if (window.document.getElementById(cmpId) != undefined) {
+ new Vue({
+ render: (h) =>
+ h(CMP, {
+ store,
+ props: {
+ pLabel: window.document.getElementById(cmpId).getAttribute('plabel'),
+ pTimeRefresh: window.document
+ .getElementById(cmpId)
+ .getAttribute('ptimeRefresh'),
+ pConfig: window.document.getElementById(cmpId).getAttribute('pconfig'),
+ pxIdViewAndIdCmp: window.document
+ .getElementById(cmpId)
+ .getAttribute('pxIdViewAndIdCmp'),
+ },
+ }),
+ }).$mount('#' + cmpId);
+ }
}
if (window.document.getElementById('simple-component-svg') != undefined) {
- new Vue({
- render: h => h(SimpleComponentSVG, {
- props:
- {
- pxidPoint: window.document.getElementById('simple-component-svg').getAttribute('pxidPoint'),
- ptimeRefresh: window.document.getElementById('simple-component-svg').getAttribute('ptimeRefresh'),
- plabel: window.document.getElementById('simple-component-svg').getAttribute('plabel'),
- pvalue: window.document.getElementById('simple-component-svg').getAttribute('pvalue')
- }
- })
- }).$mount('#simple-component-svg')
+ new Vue({
+ render: (h) =>
+ h(SimpleComponentSVG, {
+ props: {
+ pxidPoint: window.document
+ .getElementById('simple-component-svg')
+ .getAttribute('pxidPoint'),
+ ptimeRefresh: window.document
+ .getElementById('simple-component-svg')
+ .getAttribute('ptimeRefresh'),
+ plabel: window.document
+ .getElementById('simple-component-svg')
+ .getAttribute('plabel'),
+ pvalue: window.document
+ .getElementById('simple-component-svg')
+ .getAttribute('pvalue'),
+ },
+ }),
+ }).$mount('#simple-component-svg');
}
if (window.document.getElementById('sleep-reactivation-ds') != undefined) {
- new Vue({
- render: h => h(SleepAndReactivationDS)
- }).$mount('#sleep-reactivation-ds')
+ new Vue({
+ render: (h) => h(SleepAndReactivationDS),
+ }).$mount('#sleep-reactivation-ds');
}
if (window.document.getElementById('sms-domain') != undefined) {
- new Vue({
- render: h => h(SMSDomain)
- }).$mount('#sms-domain')
+ new Vue({
+ render: (h) => h(SMSDomain),
+ }).$mount('#sms-domain');
}
-
if (window.document.getElementById('export-import-ph') != undefined) {
- new Vue({
- render: h => h(ExportImportPointHierarchy)
- }).$mount('#export-import-ph')
+ new Vue({
+ render: (h) => h(ExportImportPointHierarchy),
+ }).$mount('#export-import-ph');
}
if (window.document.getElementById('example-chart-cmp') != undefined) {
- new Vue({
- store,
- i18n,
- render: h => h(WatchListChartWidget)
- }).$mount('#example-chart-cmp')
+ new Vue({
+ store,
+ vuetify,
+ i18n,
+ render: (h) => h(WatchListChartWidget),
+ }).$mount('#example-chart-cmp');
}
for (let x = 0; x < 10; x++) {
- const chartId = `chart-step-line-${x}`
- if (window.document.getElementById(chartId) != undefined) {
- new Vue({
- render: h => h(StepLineChartComponent, {
- props:
- {
- pointId: window.document.getElementById(chartId).getAttribute('point-id'),
- pointXid: window.document.getElementById(chartId).getAttribute('point-xid'),
- color: window.document.getElementById(chartId).getAttribute('color'),
- label: window.document.getElementById(chartId).getAttribute('label'),
- startDate: window.document.getElementById(chartId).getAttribute('start-date'),
- endDate: window.document.getElementById(chartId).getAttribute('end-date'),
- refreshRate: window.document.getElementById(chartId).getAttribute('refresh-rate'),
- width: window.document.getElementById(chartId).getAttribute('width'),
- height: window.document.getElementById(chartId).getAttribute('height'),
- polylineStep: window.document.getElementById(chartId).getAttribute('polyline-step'),
- rangeValue: window.document.getElementById(chartId).getAttribute('range-value'),
- rangeColor: window.document.getElementById(chartId).getAttribute('range-color'),
- rangeLabel: window.document.getElementById(chartId).getAttribute('range-label'),
- showScrollbarX: window.document.getElementById(chartId).getAttribute('show-scrollbar-x'),
- showScrollbarY: window.document.getElementById(chartId).getAttribute('show-scrollbar-y'),
- showLegend: window.document.getElementById(chartId).getAttribute('show-legned'),
- }
- })
- }).$mount(`#${chartId}`)
- }
+ const chartId = `chart-step-line-${x}`;
+ if (window.document.getElementById(chartId) != undefined) {
+ new Vue({
+ render: (h) =>
+ h(StepLineChartComponent, {
+ props: {
+ pointId: window.document.getElementById(chartId).getAttribute('point-id'),
+ pointXid: window.document.getElementById(chartId).getAttribute('point-xid'),
+ color: window.document.getElementById(chartId).getAttribute('color'),
+ label: window.document.getElementById(chartId).getAttribute('label'),
+ startDate: window.document.getElementById(chartId).getAttribute('start-date'),
+ endDate: window.document.getElementById(chartId).getAttribute('end-date'),
+ refreshRate: window.document
+ .getElementById(chartId)
+ .getAttribute('refresh-rate'),
+ width: window.document.getElementById(chartId).getAttribute('width'),
+ height: window.document.getElementById(chartId).getAttribute('height'),
+ polylineStep: window.document
+ .getElementById(chartId)
+ .getAttribute('polyline-step'),
+ rangeValue: window.document
+ .getElementById(chartId)
+ .getAttribute('range-value'),
+ rangeColor: window.document
+ .getElementById(chartId)
+ .getAttribute('range-color'),
+ rangeLabel: window.document
+ .getElementById(chartId)
+ .getAttribute('range-label'),
+ showScrollbarX: window.document
+ .getElementById(chartId)
+ .getAttribute('show-scrollbar-x'),
+ showScrollbarY: window.document
+ .getElementById(chartId)
+ .getAttribute('show-scrollbar-y'),
+ showLegend: window.document
+ .getElementById(chartId)
+ .getAttribute('show-legned'),
+ },
+ }),
+ }).$mount(`#${chartId}`);
+ }
}
for (let x = 0; x < 10; x++) {
- const chartId = `chart-line-${x}`
- if (window.document.getElementById(chartId) != undefined) {
- new Vue({
- render: h => h(LineChartComponent, {
- props:
- {
- pointId: window.document.getElementById(chartId).getAttribute('point-id'),
- pointXid: window.document.getElementById(chartId).getAttribute('point-xid'),
- color: window.document.getElementById(chartId).getAttribute('color'),
- label: window.document.getElementById(chartId).getAttribute('label'),
- startDate: window.document.getElementById(chartId).getAttribute('start-date'),
- endDate: window.document.getElementById(chartId).getAttribute('end-date'),
- refreshRate: window.document.getElementById(chartId).getAttribute('refresh-rate'),
- width: window.document.getElementById(chartId).getAttribute('width'),
- height: window.document.getElementById(chartId).getAttribute('height'),
- polylineStep: window.document.getElementById(chartId).getAttribute('polyline-step'),
- rangeValue: window.document.getElementById(chartId).getAttribute('range-value'),
- rangeColor: window.document.getElementById(chartId).getAttribute('range-color'),
- rangeLabel: window.document.getElementById(chartId).getAttribute('range-label'),
- showScrollbarX: window.document.getElementById(chartId).getAttribute('show-scrollbar-x'),
- showScrollbarY: window.document.getElementById(chartId).getAttribute('show-scrollbar-y'),
- showLegend: window.document.getElementById(chartId).getAttribute('show-legned'),
- }
- })
- }).$mount(`#${chartId}`)
- }
+ const chartId = `chart-line-${x}`;
+ if (window.document.getElementById(chartId) != undefined) {
+ new Vue({
+ render: (h) =>
+ h(LineChartComponent, {
+ props: {
+ pointId: window.document.getElementById(chartId).getAttribute('point-id'),
+ pointXid: window.document.getElementById(chartId).getAttribute('point-xid'),
+ color: window.document.getElementById(chartId).getAttribute('color'),
+ label: window.document.getElementById(chartId).getAttribute('label'),
+ startDate: window.document.getElementById(chartId).getAttribute('start-date'),
+ endDate: window.document.getElementById(chartId).getAttribute('end-date'),
+ refreshRate: window.document
+ .getElementById(chartId)
+ .getAttribute('refresh-rate'),
+ width: window.document.getElementById(chartId).getAttribute('width'),
+ height: window.document.getElementById(chartId).getAttribute('height'),
+ polylineStep: window.document
+ .getElementById(chartId)
+ .getAttribute('polyline-step'),
+ rangeValue: window.document
+ .getElementById(chartId)
+ .getAttribute('range-value'),
+ rangeColor: window.document
+ .getElementById(chartId)
+ .getAttribute('range-color'),
+ rangeLabel: window.document
+ .getElementById(chartId)
+ .getAttribute('range-label'),
+ showScrollbarX: window.document
+ .getElementById(chartId)
+ .getAttribute('show-scrollbar-x'),
+ showScrollbarY: window.document
+ .getElementById(chartId)
+ .getAttribute('show-scrollbar-y'),
+ showLegend: window.document
+ .getElementById(chartId)
+ .getAttribute('show-legned'),
+ },
+ }),
+ }).$mount(`#${chartId}`);
+ }
}
if (window.document.getElementById('refresh-view') != undefined) {
- new Vue({
- store,
- render: h => h(RefreshView, {
- props: {
- ptimeToCheckRefresh: window.document.getElementById('refresh-view').getAttribute('ptimeToCheckRefresh'),
- pviewId: window.document.getElementById('refresh-view').getAttribute('pviewId')
- }
- })
- }).$mount('#refresh-view')
+ new Vue({
+ store,
+ render: (h) =>
+ h(RefreshView, {
+ props: {
+ ptimeToCheckRefresh: window.document
+ .getElementById('refresh-view')
+ .getAttribute('ptimeToCheckRefresh'),
+ pviewId: window.document.getElementById('refresh-view').getAttribute('pviewId'),
+ },
+ }),
+ }).$mount('#refresh-view');
}
if (window.document.getElementById('live-alarms') != undefined) {
-
- console.log(`test+ ${window.document.getElementById('live-alarms').getAttribute('show-acknowledge-btn')}`)
-
- new Vue({
- store,
- render: h => h(LiveAlarms, {
- props:
- {
- pShowAcknowledgeBtn: window.document.getElementById('live-alarms').getAttribute('show-acknowledge-btn'),
- pShowMainToolbar: window.document.getElementById('live-alarms').getAttribute('show-main-toolbar'),
- pShowSelectToAcknowledge: window.document.getElementById('live-alarms').getAttribute('show-select-to-acknowledge'),
- pShowPagination: window.document.getElementById('live-alarms').getAttribute('show-pagination'),
- pMaximumNumbersOfRows: window.document.getElementById('live-alarms').getAttribute('max-number-of-rows')
- }
- })
- }).$mount('#live-alarms')
-
+ console.log(
+ `test+ ${window.document
+ .getElementById('live-alarms')
+ .getAttribute('show-acknowledge-btn')}`,
+ );
+
+ new Vue({
+ store,
+ render: (h) =>
+ h(LiveAlarms, {
+ props: {
+ pShowAcknowledgeBtn: window.document
+ .getElementById('live-alarms')
+ .getAttribute('show-acknowledge-btn'),
+ pShowMainToolbar: window.document
+ .getElementById('live-alarms')
+ .getAttribute('show-main-toolbar'),
+ pShowSelectToAcknowledge: window.document
+ .getElementById('live-alarms')
+ .getAttribute('show-select-to-acknowledge'),
+ pShowPagination: window.document
+ .getElementById('live-alarms')
+ .getAttribute('show-pagination'),
+ pMaximumNumbersOfRows: window.document
+ .getElementById('live-alarms')
+ .getAttribute('max-number-of-rows'),
+ },
+ }),
+ }).$mount('#live-alarms');
}
-
diff --git a/scadalts-ui/src/plugins/vuetify.js b/scadalts-ui/src/plugins/vuetify.js
new file mode 100644
index 0000000000..e15a81ec3a
--- /dev/null
+++ b/scadalts-ui/src/plugins/vuetify.js
@@ -0,0 +1,23 @@
+import Vue from 'vue';
+import Vuetify from 'vuetify/lib/framework';
+
+Vue.use(Vuetify);
+
+export default new Vuetify({
+ theme: {
+ options: {
+ customProperties: true,
+ },
+ themes: {
+ light: {
+ primary: '#458E23',
+ secondary: '#404041',
+ accent: '#8F248A',
+ error: '#FF5252',
+ info: '#2196F3',
+ success: '#4CAF50',
+ warning: '#FFC107',
+ },
+ },
+ },
+});
diff --git a/scadalts-ui/src/router.js b/scadalts-ui/src/router.js
index 0ab22a23cb..e50e57addb 100644
--- a/scadalts-ui/src/router.js
+++ b/scadalts-ui/src/router.js
@@ -1,85 +1,118 @@
-import Vue from 'vue'
-import Router from 'vue-router'
-import Alarms from './views/Alarms'
-import About from './views/About'
-import HistoricalAlarms from "./views/HistoricalAlarms"
-import SystemSettings from "./views/SystemSettings"
+import Vue from 'vue';
+import Router from 'vue-router';
+import Alarms from './views/Alarms';
+import About from './views/About';
+import HistoricalAlarms from './views/HistoricalAlarms';
+import SystemSettings from './views/SystemSettings';
+import AlarmNotifications from './views/AlarmNotifications';
-Vue.use(Router)
+Vue.use(Router);
export default new Router({
- mode: 'hash',
- base: process.env.BASE_URL,
- routes: [
- {
- path: '/',
- name: 'home',
- component: Alarms
- },
- {
- path: '/about',
- name: 'about',
- component: About
- },
- {
- path: '/alarms',
- name: 'alarms',
- component: Alarms
- },
- {
- path: '/historical-alarms',
- name: 'historical-alarms',
- component: HistoricalAlarms
- },
- {
- path: '/system-settings',
- name: 'system-settings',
- component: SystemSettings
- },
- {
- path: '/example-ph',
- name: 'example-ph',
- component: () => import(/* webpackChunkName: "ph" */ './views/components/ExampleExportImportPointHierarchy.vue')
- },
- {
- path: '/example-test',
- name: 'example-test',
- component: () => import(/* webpackChunkName: "test-component" */ './views/components/ExampleTest.vue')
- },
- {
- path: '/example-isalive',
- name: 'example-isalive',
- component: () => import(/* webpackChunkName: "isalive-component" */ './views/components/ExampleIsAlive.vue')
- },
- {
- path: '/example-simple-component-svg',
- name: 'example-simple-component-svg',
- component: () => import(/* webpackChunkName: "simple-component-svg" */ './views/components/ExampleSimpleComponentSVG.vue')
- },
- {
- path: '/example-sleep-and-reactivation-ds',
- name: 'example-sleep-and-reactivation-ds',
- component: () => import(/* webpackChunkName: "sleep-and-reactivation-ds-component" */ './views/components/ExampleSleepAndReactivationDS.vue')
- },
- {
- path: '/example-cmp',
- name: 'example-cmp',
- component: () => import(/* webpackChunkName: "cmp-component" */ './views/components/ExampleCmp.vue')
- },
- {
- path: '/example-chart-cmp',
- name: 'example-chart-cmp',
- component: () => import(/* webpackChunkName: "example-chart-cmp" */ './views/components/ExampleChartCmp.vue')
- },
- {
- path: '/example-step-line-chart-cmp',
- name: 'example-step-line-chart-cmp',
- component: () => import(/* webpackChunkName: "step-line-chart-component" */ './views/components/ExampleStepLineChartCmp.vue')
- },
- {
- path: '/example-live-alarms',
- name: 'example-live-alarms',
- component: () => import(/* webpackChunkName: "live-alarms-component" */ './views/components/ExampleLiveAlarms.vue')
- },
- ]
-})
+ mode: 'hash',
+ base: process.env.BASE_URL,
+ routes: [
+ {
+ path: '/',
+ name: 'home',
+ component: Alarms,
+ },
+ {
+ path: '/about',
+ name: 'about',
+ component: About,
+ },
+ {
+ path: '/alarms',
+ name: 'alarms',
+ component: Alarms,
+ },
+ {
+ path: '/historical-alarms',
+ name: 'historical-alarms',
+ component: HistoricalAlarms,
+ },
+ {
+ path: '/system-settings',
+ name: 'system-settings',
+ component: SystemSettings,
+ },
+ {
+ path: '/alarm-notifications',
+ name: 'alarm-notifications',
+ component: AlarmNotifications,
+ },
+ {
+ path: '/example-ph',
+ name: 'example-ph',
+ component: () =>
+ import(
+ /* webpackChunkName: "ph" */ './views/components/ExampleExportImportPointHierarchy.vue'
+ ),
+ },
+ {
+ path: '/example-test',
+ name: 'example-test',
+ component: () =>
+ import(
+ /* webpackChunkName: "test-component" */ './views/components/ExampleTest.vue'
+ ),
+ },
+ {
+ path: '/example-isalive',
+ name: 'example-isalive',
+ component: () =>
+ import(
+ /* webpackChunkName: "isalive-component" */ './views/components/ExampleIsAlive.vue'
+ ),
+ },
+ {
+ path: '/example-simple-component-svg',
+ name: 'example-simple-component-svg',
+ component: () =>
+ import(
+ /* webpackChunkName: "simple-component-svg" */ './views/components/ExampleSimpleComponentSVG.vue'
+ ),
+ },
+ {
+ path: '/example-sleep-and-reactivation-ds',
+ name: 'example-sleep-and-reactivation-ds',
+ component: () =>
+ import(
+ /* webpackChunkName: "sleep-and-reactivation-ds-component" */ './views/components/ExampleSleepAndReactivationDS.vue'
+ ),
+ },
+ {
+ path: '/example-cmp',
+ name: 'example-cmp',
+ component: () =>
+ import(
+ /* webpackChunkName: "cmp-component" */ './views/components/ExampleCmp.vue'
+ ),
+ },
+ {
+ path: '/example-chart-cmp',
+ name: 'example-chart-cmp',
+ component: () =>
+ import(
+ /* webpackChunkName: "example-chart-cmp" */ './views/components/ExampleChartCmp.vue'
+ ),
+ },
+ {
+ path: '/example-step-line-chart-cmp',
+ name: 'example-step-line-chart-cmp',
+ component: () =>
+ import(
+ /* webpackChunkName: "step-line-chart-component" */ './views/components/ExampleStepLineChartCmp.vue'
+ ),
+ },
+ {
+ path: '/example-live-alarms',
+ name: 'example-live-alarms',
+ component: () =>
+ import(
+ /* webpackChunkName: "live-alarms-component" */ './views/components/ExampleLiveAlarms.vue'
+ ),
+ },
+ ],
+});
diff --git a/scadalts-ui/src/store/alarms/index.js b/scadalts-ui/src/store/alarms/index.js
index 7b7e0de950..8448f96471 100644
--- a/scadalts-ui/src/store/alarms/index.js
+++ b/scadalts-ui/src/store/alarms/index.js
@@ -2,123 +2,145 @@
* @author grzegorz.bylica@abilit.eu
*/
-import axios from "axios"
+import axios from 'axios';
-const TIMEOUT_API_ALARMS = 5000
+const TIMEOUT_API_ALARMS = 5000;
const storeAlarms = {
- state: {
- msgErr: ''
- },
- mutations: {
- ERR(state, msgErr) {
- state.msgErr = msgErr
- }
- },
- actions: {
- getLiveAlarms({commit}, {offset, limit}) {
- return new Promise((resolve, reject) => {
- ///api/alarms/live/{offset}/{limit}
- axios.get(`./api/alarms/live/${offset}/${limit}`).then(res => {
- console.log(`axios:res:${JSON.stringify(res)}`)
- resolve(res.data)
- }).catch((err) => {
- commit('ERR', err)
- reject()
- })
- })
- },
- getHistoryAlarms({commit}, {dateDay, filterRLike, offset, limit}) {
- return new Promise((resolve, reject) => {
- const execute = `./api/alarms/history/${dateDay}/${filterRLike}/${offset}/${limit}`
- console.log(execute)
- axios.get(execute).then(res => {
- resolve(res.data)
- }).catch((err) => {
- commit('ERR', err)
- reject()
- })
- })
- },
- setAcknowledge({commit}, {id}) {
- return new Promise((resolve, reject) => {
- axios.post(`./api/alarms/acknowledge/${id}`).then(res => {
- resolve(res.data)
- }).catch((err) => {
- commit('ERR', err)
- reject()
- })
- })
- },
- fakeGetLiveAlarms({commit}, {offset, limit}) {
- return new Promise(function (resolve) {
- setTimeout(function() {
- resolve(
- [{
- "id:": 111,
- "activation-time": "2020-03-10 07:13:34",
- "inactivation-time": "",
- "name": "Be ST ALG_StoAllg1.0 Durchflussmessung Drosselkammer Störung Steuersicherung ausgelöst",
- "level": "5",
- }, {
- "id:": 112,
- "activation-time": "2020-03-10 07:13:24",
- "inactivation-time": "",
- "name": "Be AL GM01 gas alarm",
- "level": "4"
- }, {
- "id:": 113,
- "activation-time": "2020-03-10 07:13:24",
- "inactivation-time": "2020-03-10 06:33:54",
- "name": "Se AL GM02 gas alarm",
- "level": "4"
- }, {
- "id:": 114,
- "activation-time": "2020-02-10 05:13:24",
- "inactivation-time": "2020-03-10 06:30:54",
- "name": "Bx AL GM03 gas alarm",
- "level": "4"
- }
- ]
- )}, 500)
- });
- },
+ state: {
+ msgErr: '',
+ },
+ mutations: {
+ ERR(state, msgErr) {
+ state.msgErr = msgErr;
+ },
+ },
+ actions: {
+ getLiveAlarms({ commit }, { offset, limit }) {
+ return new Promise((resolve, reject) => {
+ ///api/alarms/live/{offset}/{limit}
+ axios
+ .get(`./api/alarms/live/${offset}/${limit}`)
+ .then((res) => {
+ console.log(`axios:res:${JSON.stringify(res)}`);
+ resolve(res.data);
+ })
+ .catch((err) => {
+ commit('ERR', err);
+ reject();
+ });
+ });
+ },
+ getHistoryAlarms({ commit }, { dateDay, filterRLike, offset, limit }) {
+ return new Promise((resolve, reject) => {
+ const execute = `./api/alarms/history/${dateDay}/${filterRLike}/${offset}/${limit}`;
+ console.log(execute);
+ axios
+ .get(execute)
+ .then((res) => {
+ resolve(res.data);
+ })
+ .catch((err) => {
+ commit('ERR', err);
+ reject();
+ });
+ });
+ },
+ setAcknowledge({ commit }, { id }) {
+ return new Promise((resolve, reject) => {
+ axios
+ .post(`./api/alarms/acknowledge/${id}`)
+ .then((res) => {
+ resolve(res.data);
+ })
+ .catch((err) => {
+ commit('ERR', err);
+ reject();
+ });
+ });
+ },
+ fakeGetLiveAlarms({ commit }, { offset, limit }) {
+ return new Promise(function (resolve) {
+ setTimeout(function () {
+ resolve([
+ {
+ 'id:': 111,
+ 'activation-time': '2020-03-10 07:13:34',
+ 'inactivation-time': '',
+ name:
+ 'Be ST ALG_StoAllg1.0 Durchflussmessung Drosselkammer Störung Steuersicherung ausgelöst',
+ level: '5',
+ },
+ {
+ 'id:': 112,
+ 'activation-time': '2020-03-10 07:13:24',
+ 'inactivation-time': '',
+ name: 'Be AL GM01 gas alarm',
+ level: '4',
+ },
+ {
+ 'id:': 113,
+ 'activation-time': '2020-03-10 07:13:24',
+ 'inactivation-time': '2020-03-10 06:33:54',
+ name: 'Se AL GM02 gas alarm',
+ level: '4',
+ },
+ {
+ 'id:': 114,
+ 'activation-time': '2020-02-10 05:13:24',
+ 'inactivation-time': '2020-03-10 06:30:54',
+ name: 'Bx AL GM03 gas alarm',
+ level: '4',
+ },
+ ]);
+ }, 500);
+ });
+ },
- fakeGetHistoryAlarms({commit}, {dateDay, filterRLike, offset, limit}) {
- //console.log(`dataDay:${dateDay} ${typeof dateDay} filterRLike:${filterRLike} ${typeof filterRLike} offset:${offset} ${typeof offset} limit:${limit} ${typeof limit}`)
- return new Promise(function (resolve) {
- setTimeout(
- resolve( [{
- "time": "2020-03-10 07:13:24",
- "name": "Be ST ALG_StoAllg1.0 Durchflussmessung Drosselkammer Störung Steuersicherung ausgelöst",
- "description": "Störung kommt"
- }, {
- "time": "2020-03-10 07:13:42",
- "name": "Be ST ALG_StoAllg1.0 Durchflussmessung Drosselkammer Störung Steuersicherung ausgelöst",
- "description": "Störung ist gegangen"
- }, {
- "time": "2020-03-10 07:13:24",
- "name": "Be AL GM01 gas alarm",
- "description": "Alarm ausgelöst"
- }, {
- "time": "2020-03-10 07:13:42",
- "name": "Be AL GM01 gas alarm",
- "description": "ist gegangen"
- }
- ]))
- })
- },
- fakeAcknowledge({commit}, {id}) {
- return new Promise(function (resolve) {
- setTimeout(resolve({
- "id": 111,
- "request": "OK",
- "error": "none"
- }))
- })
- }
- },
- getters: {
- msgError: state => state.msgErr
- }
-}
-export default storeAlarms
+ fakeGetHistoryAlarms({ commit }, { dateDay, filterRLike, offset, limit }) {
+ //console.log(`dataDay:${dateDay} ${typeof dateDay} filterRLike:${filterRLike} ${typeof filterRLike} offset:${offset} ${typeof offset} limit:${limit} ${typeof limit}`)
+ return new Promise(function (resolve) {
+ setTimeout(
+ resolve([
+ {
+ time: '2020-03-10 07:13:24',
+ name:
+ 'Be ST ALG_StoAllg1.0 Durchflussmessung Drosselkammer Störung Steuersicherung ausgelöst',
+ description: 'Störung kommt',
+ },
+ {
+ time: '2020-03-10 07:13:42',
+ name:
+ 'Be ST ALG_StoAllg1.0 Durchflussmessung Drosselkammer Störung Steuersicherung ausgelöst',
+ description: 'Störung ist gegangen',
+ },
+ {
+ time: '2020-03-10 07:13:24',
+ name: 'Be AL GM01 gas alarm',
+ description: 'Alarm ausgelöst',
+ },
+ {
+ time: '2020-03-10 07:13:42',
+ name: 'Be AL GM01 gas alarm',
+ description: 'ist gegangen',
+ },
+ ]),
+ );
+ });
+ },
+ fakeAcknowledge({ commit }, { id }) {
+ return new Promise(function (resolve) {
+ setTimeout(
+ resolve({
+ id: 111,
+ request: 'OK',
+ error: 'none',
+ }),
+ );
+ });
+ },
+ },
+ getters: {
+ msgError: (state) => state.msgErr,
+ },
+};
+export default storeAlarms;
diff --git a/scadalts-ui/src/store/alarms/notifications.js b/scadalts-ui/src/store/alarms/notifications.js
new file mode 100644
index 0000000000..2772a9d441
--- /dev/null
+++ b/scadalts-ui/src/store/alarms/notifications.js
@@ -0,0 +1,167 @@
+/**
+ * PLC Sms and Email Notification Vuex Store
+ *
+ * Vue bussines logic for SMS and Email notification page.
+ *
+ * @author Radoslaw Jajko
+ * @since 2.5.0
+ *
+ */
+const storeAlarmsNotifications = {
+ state: {
+ pedTemplate: {
+ xid: 'PED-PLC',
+ alias: 'PlcEventDetector',
+ alarmLevel: 1,
+ duration: 5,
+ durationType: 1,
+ binaryState: true,
+ },
+ ehTemplate: {
+ id: -1,
+ xid: `PLC`,
+ alias: `PLC-EventHandler`,
+ disabled: false,
+ activeRecipients: null,
+ sendEscalation: false,
+ escalationDelayType: 1,
+ escalationDelay: 0,
+ escalationRecipients: null,
+ sendInactive: false,
+ inactiveOverride: false,
+ inactiveRecipients: null,
+ },
+ },
+
+ mutations: {},
+
+ actions: {
+ getPlcDataPoints({ dispatch }, datasourceId) {
+ return dispatch('requestGet', `/datapoint/${datasourceId}/getAllPlc`);
+ },
+
+ //Event Handlers
+ getPlcEventHandlers({ dispatch }) {
+ return dispatch('requestGet', '/eventHandler/getAllPlc');
+ },
+
+ getPlcEventHandlerById({ dispatch }, eventHandlerId) {
+ return dispatch('requestGet', `/eventHandler/get/id/${eventHandlerId}`);
+ },
+
+ deleteEventHandler({ dispatch }, eventHandlerId) {
+ return dispatch('requestDelete', `/eventHandler/delete/id/${eventHandlerId}`);
+ },
+
+ //Mailing Lists
+ getAllMailingLists({ dispatch }) {
+ return dispatch('requestGet', '/mailingList/getAll');
+ },
+
+ //Event detectors
+ createPointEventDetector({ state, dispatch }, datapointId) {
+ let requestData = JSON.parse(JSON.stringify(state.pedTemplate));
+
+ requestData.xid = requestData.xid + `_${datapointId}`;
+ requestData.alias = requestData.alias + `_${datapointId}`;
+
+ return dispatch('requestPost', {
+ url: `/eventDetector/set/binary/state/${datapointId}`,
+ data: requestData,
+ });
+ },
+
+ deleteEventDetector({ dispatch }, payload) {
+ return dispatch(
+ 'requestDelete',
+ `/eventDetector/delete/${payload.dpId}/${payload.edId}`,
+ );
+ },
+
+ deleteMailingListFromEventHandler(context, payload) {
+ payload.eventHandler.activeRecipients = payload.eventHandler.activeRecipients.filter(
+ (e) => {
+ return e.referenceId !== payload.activeMailingList;
+ },
+ );
+ return payload.eventHandler;
+ },
+
+ addMailingListToEventHandler(context, payload) {
+ if (!payload.eventHandler.activeRecipients) {
+ payload.eventHandler.activeRecipients = [];
+ }
+ let mailingList = {
+ recipientType: 1,
+ referenceId: payload.activeMailingList,
+ referenceAddress: null,
+ };
+ payload.eventHandler.activeRecipients.push(mailingList);
+ console.log(payload.eventHandler);
+ return payload.eventHandler;
+ },
+
+ async updateEventHandler({ dispatch }, payload) {
+ let eventHandler = await dispatch('getPlcEventHandlerById', payload.ehId);
+
+ if (payload.method === 'add') {
+ eventHandler = await dispatch('addMailingListToEventHandler', {
+ eventHandler: eventHandler,
+ activeMailingList: payload.activeMailingList,
+ });
+ } else if (payload.method === 'delete') {
+ eventHandler = await dispatch('deleteMailingListFromEventHandler', {
+ eventHandler: eventHandler,
+ activeMailingList: payload.activeMailingList,
+ });
+ }
+
+ if (eventHandler.activeRecipients.length === 0) {
+ let ehStatus = await dispatch('deleteEventHandler', eventHandler.id);
+ return ehStatus;
+ } else {
+ return dispatch('requestPut', {
+ url: `/eventHandler/update/1/${payload.typeRef1}/${payload.typeRef2}`,
+ data: eventHandler,
+ });
+ }
+ },
+
+ async createEventHandler({ state, dispatch }, payload) {
+ let pedId = await dispatch('createPointEventDetector', payload.datapointId);
+ let edId = pedId.id;
+ let dpId = payload.datapointId;
+ let mlId = payload.mailingListId;
+
+ let requestData = JSON.parse(JSON.stringify(state.ehTemplate));
+ let type = payload.handlerType === 2 ? 'mail' : 'sms';
+
+ requestData.xid = 'EH_' + requestData.xid + `_${type}_${dpId}_${edId}_${mlId}`;
+ requestData.alias = requestData.alias + `_${type}_${dpId}_${edId}_${mlId}`;
+
+ let recipientList = [
+ {
+ recipientType: 1,
+ referenceId: mlId,
+ referenceAddress: null,
+ },
+ ];
+
+ requestData.activeRecipients = recipientList;
+ let eventHandler;
+
+ try {
+ eventHandler = await dispatch('requestPost', {
+ url: `/eventHandler/set/1/${dpId}/${edId}/${payload.handlerType}`,
+ data: requestData,
+ });
+ } catch (error) {
+ throw 'POST request failed!';
+ }
+ return { edId, ehId: eventHandler.id };
+ },
+ },
+
+ getters: {},
+};
+export default storeAlarmsNotifications;
diff --git a/scadalts-ui/src/store/amcharts/index.js b/scadalts-ui/src/store/amcharts/index.js
index 11360806a0..9ef8fba82d 100644
--- a/scadalts-ui/src/store/amcharts/index.js
+++ b/scadalts-ui/src/store/amcharts/index.js
@@ -1,77 +1,96 @@
-import Axios from 'axios'
+import Axios from 'axios';
-import BaseChart from "../../components/amcharts/BaseChart"
+import BaseChart from '../../components/amcharts/BaseChart';
/**
- *
+ *
*/
//TODO: Prepare Vuex store to manage state of ModernCharts
const modernCharts = {
- modules: {
-
- },
- state: {
- domain: '.',
- timeout: 2000
- },
- mutations: {
-
- },
- actions: {
- loadData({ state, dispatch }, pointId, startTimestamp, endTimestamp) {
- const url = `${state.domain}/api/point_value/getValuesFromTimePeriod`;
- let timestamp = validateInputData(startTimestamp, endTimestamp)
- return new Promise((resolve, reject) => {
- try {
- Axios.get(`${url}/${pointId}/${timestamp.start}/${timestamp.end}`, {
- timeout: state.timeout,
- useCredentails: true,
- credentials: 'same-origin'
- }).then(response => {
- resolve(response.data);
- }).catch(webError => { reject(webError) })
- } catch (error) { reject(error) }
- })
- },
- getPointValueById({ dispatch }, pointId) {
- const url = `${state.domain}/api/point_value/getValue/id`;
- return new Promise((resolve, reject) => {
- try {
- Axios.get(`${url}/${pointId}`, {
- timeout: state.timeout,
- useCredentails: true,
- credentials: 'same-origin'
- }).then(resp => {
- resolve(resp.data);
- }).catch(webError => { reject(webError) });
- } catch (error) { reject(error) }
- })
- }
- },
- getters: {
-
- }
-}
+ modules: {},
+ state: {
+ domain: '.',
+ timeout: 2000,
+ },
+ mutations: {},
+ actions: {
+ loadData({ state, dispatch }, pointId, startTimestamp, endTimestamp) {
+ const url = `${state.domain}/api/point_value/getValuesFromTimePeriod`;
+ let timestamp = validateInputData(startTimestamp, endTimestamp);
+ return new Promise((resolve, reject) => {
+ try {
+ Axios.get(`${url}/${pointId}/${timestamp.start}/${timestamp.end}`, {
+ timeout: state.timeout,
+ useCredentails: true,
+ credentials: 'same-origin',
+ })
+ .then((response) => {
+ resolve(response.data);
+ })
+ .catch((webError) => {
+ reject(webError);
+ });
+ } catch (error) {
+ reject(error);
+ }
+ });
+ },
+ getPointValueById({ dispatch }, pointId) {
+ const url = `${state.domain}/api/point_value/getValue/id`;
+ return new Promise((resolve, reject) => {
+ try {
+ Axios.get(`${url}/${pointId}`, {
+ timeout: state.timeout,
+ useCredentails: true,
+ credentials: 'same-origin',
+ })
+ .then((resp) => {
+ resolve(resp.data);
+ })
+ .catch((webError) => {
+ reject(webError);
+ });
+ } catch (error) {
+ reject(error);
+ }
+ });
+ },
+ },
+ getters: {},
+};
function validateInputData(startTimestamp, endTimestamp) {
- if (startTimestamp === undefined || startTimestamp === null) {
- startTimestamp = new Date().getTime() - 3600000;
- endTimestamp = new Date().getTime();
- } else if ((startTimestamp !== undefined && startTimestamp !== null) && (endTimestamp === undefined || endTimestamp === null)) {
- startTimestamp = BaseChart.convertDate(startTimestamp);
- endTimestamp = new Date().getTime();
- if (isNaN(startTimestamp)) {
- console.warn("Parameter start-date is not valid!\nConnecting to API with default values");
- startTimestamp = new Date().getTime() - 3600000;
- }
- } else if ((startTimestamp !== undefined && startTimestamp !== null) && (endTimestamp !== undefined && endTimestamp !== null)) {
- startTimestamp = new Date(startTimestamp).getTime();
- endTimestamp = new Date(endTimestamp).getTime();
- if (isNaN(startTimestamp) || isNaN(endTimestamp)) {
- console.warn("Parameter [start-date | end-date] are not valid!\nConnecting to API with default values")
- startTimestamp = new Date().getTime() - 3600000;
- endTimestamp = new Date().getTime();
- }
- }
- return { "start": startTimestamp, "end": endTimestamp };
+ if (startTimestamp === undefined || startTimestamp === null) {
+ startTimestamp = new Date().getTime() - 3600000;
+ endTimestamp = new Date().getTime();
+ } else if (
+ startTimestamp !== undefined &&
+ startTimestamp !== null &&
+ (endTimestamp === undefined || endTimestamp === null)
+ ) {
+ startTimestamp = BaseChart.convertDate(startTimestamp);
+ endTimestamp = new Date().getTime();
+ if (isNaN(startTimestamp)) {
+ console.warn(
+ 'Parameter start-date is not valid!\nConnecting to API with default values',
+ );
+ startTimestamp = new Date().getTime() - 3600000;
+ }
+ } else if (
+ startTimestamp !== undefined &&
+ startTimestamp !== null &&
+ endTimestamp !== undefined &&
+ endTimestamp !== null
+ ) {
+ startTimestamp = new Date(startTimestamp).getTime();
+ endTimestamp = new Date(endTimestamp).getTime();
+ if (isNaN(startTimestamp) || isNaN(endTimestamp)) {
+ console.warn(
+ 'Parameter [start-date | end-date] are not valid!\nConnecting to API with default values',
+ );
+ startTimestamp = new Date().getTime() - 3600000;
+ endTimestamp = new Date().getTime();
+ }
+ }
+ return { start: startTimestamp, end: endTimestamp };
}
-export default modernCharts
\ No newline at end of file
+export default modernCharts;
diff --git a/scadalts-ui/src/store/amcharts/storeStepLine.js b/scadalts-ui/src/store/amcharts/storeStepLine.js
index ca454bdb77..a15e8d1344 100644
--- a/scadalts-ui/src/store/amcharts/storeStepLine.js
+++ b/scadalts-ui/src/store/amcharts/storeStepLine.js
@@ -1,15 +1,7 @@
const storeStepLine = {
- state: {
-
- },
- mutations: {
-
- },
- actions: {
-
- },
- getters: {
-
- }
-}
-export default storeStepLine
\ No newline at end of file
+ state: {},
+ mutations: {},
+ actions: {},
+ getters: {},
+};
+export default storeStepLine;
diff --git a/scadalts-ui/src/store/dataSource/index.js b/scadalts-ui/src/store/dataSource/index.js
index b4757fbed3..956f060238 100644
--- a/scadalts-ui/src/store/dataSource/index.js
+++ b/scadalts-ui/src/store/dataSource/index.js
@@ -1,15 +1,56 @@
-const ds = {
- state: {
-
- },
- mutations: {
+import Axios from 'axios';
- },
- actions: {
-
- },
- getters: {
+const ds = {
+ state: {
+ datasourcesApiUrl: './api/datasource',
+ requestOptions: {
+ timeout: 5000,
+ useCredentials: true,
+ credentials: 'same-origin',
+ },
+ },
+ mutations: {},
+ actions: {
+ getAllDataSources(context) {
+ return new Promise((resolve, reject) => {
+ Axios.get(
+ `${context.state.datasourcesApiUrl}/getAll`,
+ context.state.requestOptions,
+ )
+ .then((r) => {
+ if (r.status === 200) {
+ resolve(r.data);
+ } else {
+ reject(false);
+ }
+ })
+ .catch((error) => {
+ console.error(error);
+ reject(false);
+ });
+ });
+ },
- }
-}
-export default ds
+ getAllPlcDataSources(context) {
+ return new Promise((resolve, reject) => {
+ Axios.get(
+ `${context.state.datasourcesApiUrl}/getAllPlc`,
+ context.state.requestOptions,
+ )
+ .then((r) => {
+ if (r.status === 200) {
+ resolve(r.data);
+ } else {
+ reject(false);
+ }
+ })
+ .catch((error) => {
+ console.error(error);
+ reject(false);
+ });
+ });
+ },
+ },
+ getters: {},
+};
+export default ds;
diff --git a/scadalts-ui/src/store/graphicView/index.js b/scadalts-ui/src/store/graphicView/index.js
index 46b325e061..be3e8b42e9 100644
--- a/scadalts-ui/src/store/graphicView/index.js
+++ b/scadalts-ui/src/store/graphicView/index.js
@@ -2,28 +2,19 @@
* @author grzegorz.bylica@abilit.eu
*/
-import storeIsAlive from './storeIsAlive'
-import storeHistoryCMP from './storeHisotryCMP'
-import storeRefreshViews from './storeRefreshViews'
+import storeIsAlive from './storeIsAlive';
+import storeHistoryCMP from './storeHisotryCMP';
+import storeRefreshViews from './storeRefreshViews';
const gv = {
- modules: {
- storeIsAlive,
- storeHistoryCMP,
- storeRefreshViews
- },
- state: {
-
-
- },
- mutations: {
-
- },
- actions: {
-
- },
- getters: {
-
- }
-}
-export default gv
+ modules: {
+ storeIsAlive,
+ storeHistoryCMP,
+ storeRefreshViews,
+ },
+ state: {},
+ mutations: {},
+ actions: {},
+ getters: {},
+};
+export default gv;
diff --git a/scadalts-ui/src/store/graphicView/storeHisotryCMP.js b/scadalts-ui/src/store/graphicView/storeHisotryCMP.js
index 1f1be1bbf6..f2a055c148 100644
--- a/scadalts-ui/src/store/graphicView/storeHisotryCMP.js
+++ b/scadalts-ui/src/store/graphicView/storeHisotryCMP.js
@@ -2,33 +2,37 @@
* @author grzegorz.bylica@abilit.eu
*/
-import axios from 'axios'
+import axios from 'axios';
-const TIMEOUT_API_HIS_CMP = 5000
+const TIMEOUT_API_HIS_CMP = 5000;
const storeHistoryCMP = {
- state: {
- msgErr: ''
- },
- mutations: {
- ERR (state, msgErr) {
- state.msgErr = msgErr
- }
- },
- actions: {
- getHisotryCMP ({commit}, xIdViewAndIdCmp) {
- return new Promise((resolve, reject) => {
- axios.get(`./api/cmp/history/${xIdViewAndIdCmp}`, {timeout: TIMEOUT_API_HIS_CMP}).then(res => {
- resolve(res)
- }).catch((err) => {
- commit('ERR', err)
- reject()
- })
- })
- },
-
- },
- getters: {
- msgErrorHistoryCMP: state => state.msgErr
- }
-}
-export default storeHistoryCMP
+ state: {
+ msgErr: '',
+ },
+ mutations: {
+ ERR(state, msgErr) {
+ state.msgErr = msgErr;
+ },
+ },
+ actions: {
+ getHisotryCMP({ commit }, xIdViewAndIdCmp) {
+ return new Promise((resolve, reject) => {
+ axios
+ .get(`./api/cmp/history/${xIdViewAndIdCmp}`, {
+ timeout: TIMEOUT_API_HIS_CMP,
+ })
+ .then((res) => {
+ resolve(res);
+ })
+ .catch((err) => {
+ commit('ERR', err);
+ reject();
+ });
+ });
+ },
+ },
+ getters: {
+ msgErrorHistoryCMP: (state) => state.msgErr,
+ },
+};
+export default storeHistoryCMP;
diff --git a/scadalts-ui/src/store/graphicView/storeIsAlive.js b/scadalts-ui/src/store/graphicView/storeIsAlive.js
index 304025828a..6bb501230f 100644
--- a/scadalts-ui/src/store/graphicView/storeIsAlive.js
+++ b/scadalts-ui/src/store/graphicView/storeIsAlive.js
@@ -1,99 +1,103 @@
-
/**
* @author grzegorz.bylica@abilit.eu
*/
-import axios from 'axios'
+import axios from 'axios';
const storeIsAlive = {
- state: {
- warning: false,
- success: false,
- danger: true,
- timeWarningEpoch: 5000, // default 5000 [ms]
- timeErrorEpoch: 1000, // default 10000 [ms]
- timeRefreshEpoch: 2000, // default 2000 [ms]
- timeServerEpoch: -1, // -1 not initiate
- timeInWebEpoch: -1, // -1 not initiate
- msgErr: '',
- lastTimeCheck:-1,
- },
- mutations: {
- SET_INIT(state, t ) {
- state.warning = false
- state.success = false
- state.danger = true
- state.timeWarningEpoch = t.tw
- state.timeErrorEpoch = t.te
- state.timeRefreshEpoch = t.tr
-
- },
- CHECK_IS_ALIVE(state, timeFromServer) {
- state.lastTimeCheck = timeFromServer
- },
- ERR(state, msgErr) {
- state.msgErr = msgErr
- }
- },
- actions: {
- calculateStateIsAlive({commit, state}, timeFromServer) {
- return new Promise((resolve) => {
- state.timeServerEpoch = timeFromServer
- state.timeInWebEpoch = Date.now() / 1000
- // console.log(`time in web: ${state.timeInWebEpoch}`)
- // console.log(`time from server: ${state.timeServerEpoch}`)
- // console.log(`difference: ${(state.timeInWebEpoch - state.timeServerEpoch)*1000}`)
- // console.log(`time warning: ${state.timeWarningEpoch}`)
- // console.log(`time err: ${state.timeErrorEpoch}`)
+ state: {
+ warning: false,
+ success: false,
+ danger: true,
+ timeWarningEpoch: 5000, // default 5000 [ms]
+ timeErrorEpoch: 1000, // default 10000 [ms]
+ timeRefreshEpoch: 2000, // default 2000 [ms]
+ timeServerEpoch: -1, // -1 not initiate
+ timeInWebEpoch: -1, // -1 not initiate
+ msgErr: '',
+ lastTimeCheck: -1,
+ },
+ mutations: {
+ SET_INIT(state, t) {
+ state.warning = false;
+ state.success = false;
+ state.danger = true;
+ state.timeWarningEpoch = t.tw;
+ state.timeErrorEpoch = t.te;
+ state.timeRefreshEpoch = t.tr;
+ },
+ CHECK_IS_ALIVE(state, timeFromServer) {
+ state.lastTimeCheck = timeFromServer;
+ },
+ ERR(state, msgErr) {
+ state.msgErr = msgErr;
+ },
+ },
+ actions: {
+ calculateStateIsAlive({ commit, state }, timeFromServer) {
+ return new Promise((resolve) => {
+ state.timeServerEpoch = timeFromServer;
+ state.timeInWebEpoch = Date.now() / 1000;
+ // console.log(`time in web: ${state.timeInWebEpoch}`)
+ // console.log(`time from server: ${state.timeServerEpoch}`)
+ // console.log(`difference: ${(state.timeInWebEpoch - state.timeServerEpoch)*1000}`)
+ // console.log(`time warning: ${state.timeWarningEpoch}`)
+ // console.log(`time err: ${state.timeErrorEpoch}`)
- state.danger = ((state.timeInWebEpoch - state.timeServerEpoch) * 1000) >= (state.timeErrorEpoch)
- if (state.danger) {
- state.warning = false
- state.success = false
- } else {
- state.warning = ((state.timeInWebEpoch - state.timeServerEpoch) * 1000) >= state.timeWarningEpoch
- if (state.warning) {
- state.danger = false
- state.success = false
- } else {
- state.danger = false
- state.warning = false
- state.success = true
- }
- }
+ state.danger =
+ (state.timeInWebEpoch - state.timeServerEpoch) * 1000 >= state.timeErrorEpoch;
+ if (state.danger) {
+ state.warning = false;
+ state.success = false;
+ } else {
+ state.warning =
+ (state.timeInWebEpoch - state.timeServerEpoch) * 1000 >=
+ state.timeWarningEpoch;
+ if (state.warning) {
+ state.danger = false;
+ state.success = false;
+ } else {
+ state.danger = false;
+ state.warning = false;
+ state.success = true;
+ }
+ }
- commit('CHECK_IS_ALIVE', timeFromServer)
- resolve();
- })
- },
- isAlive({state,commit,dispatch}) {
- return new Promise((resolve, reject) => {
- axios.get(`./api/is_alive/time`, {timeout: state.timeRefreshEpoch}).then(res => {
- dispatch('calculateStateIsAlive',res.data).then(()=>{
- resolve(res)
- })
- }).catch((err) => {
- dispatch('calculateStateIsAlive',state.timeServerEpoch).then(()=>{
- commit('ERR',err)
- reject(err)
- })
- })
- })
- },
- setInitIsAlive({commit}, times) {
- commit('SET_INIT', times)
- }
- },
- getters: {
- warningIsAlive: state => state.warning,
- successIsAlive: state => state.success,
- dangerIsAlive: state => state.danger,
- timeWarningEpochIsAlive: state => state.timeWarningEpoch,
- timeErrorEpochIsAlive: state => state.timeErrorEpoch,
- timeRefreshIsAlive: state => state.timeRefreshEpoch,
- timeFromServerIsAlive: state => state.timeServerEpoch,
- timeInWebIsAlive: state => state.timeInWebEpoch,
- msgErrorIsAlive: state => state.msgErr
- }
-}
-export default storeIsAlive
+ commit('CHECK_IS_ALIVE', timeFromServer);
+ resolve();
+ });
+ },
+ isAlive({ state, commit, dispatch }) {
+ return new Promise((resolve, reject) => {
+ axios
+ .get(`./api/is_alive/time`, { timeout: state.timeRefreshEpoch })
+ .then((res) => {
+ dispatch('calculateStateIsAlive', res.data).then(() => {
+ resolve(res);
+ });
+ })
+ .catch((err) => {
+ dispatch('calculateStateIsAlive', state.timeServerEpoch).then(() => {
+ commit('ERR', err);
+ reject(err);
+ });
+ });
+ });
+ },
+ setInitIsAlive({ commit }, times) {
+ commit('SET_INIT', times);
+ },
+ },
+ getters: {
+ warningIsAlive: (state) => state.warning,
+ successIsAlive: (state) => state.success,
+ dangerIsAlive: (state) => state.danger,
+ timeWarningEpochIsAlive: (state) => state.timeWarningEpoch,
+ timeErrorEpochIsAlive: (state) => state.timeErrorEpoch,
+ timeRefreshIsAlive: (state) => state.timeRefreshEpoch,
+ timeFromServerIsAlive: (state) => state.timeServerEpoch,
+ timeInWebIsAlive: (state) => state.timeInWebEpoch,
+ msgErrorIsAlive: (state) => state.msgErr,
+ },
+};
+export default storeIsAlive;
diff --git a/scadalts-ui/src/store/graphicView/storeRefreshViews.js b/scadalts-ui/src/store/graphicView/storeRefreshViews.js
index 7cc86ada5e..ffb02f5a11 100644
--- a/scadalts-ui/src/store/graphicView/storeRefreshViews.js
+++ b/scadalts-ui/src/store/graphicView/storeRefreshViews.js
@@ -1,33 +1,37 @@
-
/**
* @author grzegorz.bylica@abilit.eu
*/
-import axios from 'axios'
+import axios from 'axios';
const storeRefreshViews = {
- state: {
- msgErr: '',
- },
- mutations: {
- ERR(state, msgErr) {
- state.msgErr = msgErr
- }
- },
- actions: {
- checkViewModificationTime({commit, state}, id) {
- return new Promise((resolve, reject) => {
- axios.get(`./api/view/getModificationTime/${id}`, {timeout: state.timeRefreshEpoch}).then(res => {
- resolve(res)
- }).catch((err) => {
- commit('ERR',err)
- reject(err)
- })
- })
- }
- },
- getters: {
- msgErrorRefreshViews: state => state.msgErr
- }
-}
-export default storeRefreshViews
+ state: {
+ msgErr: '',
+ },
+ mutations: {
+ ERR(state, msgErr) {
+ state.msgErr = msgErr;
+ },
+ },
+ actions: {
+ checkViewModificationTime({ commit, state }, id) {
+ return new Promise((resolve, reject) => {
+ axios
+ .get(`./api/view/getModificationTime/${id}`, {
+ timeout: state.timeRefreshEpoch,
+ })
+ .then((res) => {
+ resolve(res);
+ })
+ .catch((err) => {
+ commit('ERR', err);
+ reject(err);
+ });
+ });
+ },
+ },
+ getters: {
+ msgErrorRefreshViews: (state) => state.msgErr,
+ },
+};
+export default storeRefreshViews;
diff --git a/scadalts-ui/src/store/index.js b/scadalts-ui/src/store/index.js
index 81186ce389..4a899919fd 100644
--- a/scadalts-ui/src/store/index.js
+++ b/scadalts-ui/src/store/index.js
@@ -1,70 +1,176 @@
-import Vue from 'vue'
-import Vuex from 'vuex'
-import dataSource from "./dataSource"
-import graphicView from "./graphicView"
-import pointHierarchy from "./pointHierarchy"
-import amcharts from './amcharts'
-import alarms from './alarms'
-import systemSettings from './systemSettings'
-import axios from "axios";
+import Vue from 'vue';
+import Vuex from 'vuex';
+import dataSource from './dataSource';
+import graphicView from './graphicView';
+import pointHierarchy from './pointHierarchy';
+import amcharts from './amcharts';
+import alarms from './alarms';
+import storeAlarmsNotifications from './alarms/notifications';
+import systemSettings from './systemSettings';
+import axios from 'axios';
-Vue.use(Vuex)
+Vue.use(Vuex);
-const myLoggerForVuexMutation = store => {
- store.subscribe((mutation, state) => { })
-}
+const myLoggerForVuexMutation = (store) => {
+ store.subscribe((mutation, state) => {});
+};
export default new Vuex.Store({
- modules: {
- dataSource,
- graphicView,
- pointHierarchy,
- amcharts,
- alarms,
- systemSettings
- },
- state: {
- packageVersion: process.env.PACKAGE_VERSION || '0',
- packageTag: process.env.PACKAGE_TAG || '0',
- scadaLtsMilestone: process.env.SCADA_LTS_MILESTONE || '0',
- scadaLtsBuild: process.env.SCADA_LTS_BUILD || '0',
- scadaLtsBranch: process.env.SCADA_LTS_BRANCH || 'local',
- },
- mutations: {
+ modules: {
+ dataSource,
+ graphicView,
+ pointHierarchy,
+ amcharts,
+ alarms,
+ systemSettings,
+ storeAlarmsNotifications,
+ },
+ state: {
+ packageVersion: process.env.PACKAGE_VERSION || '0',
+ packageTag: process.env.PACKAGE_TAG || '0',
+ scadaLtsMilestone: process.env.SCADA_LTS_MILESTONE || '0',
+ scadaLtsBuild: process.env.SCADA_LTS_BUILD || '0',
+ scadaLtsBranch: process.env.SCADA_LTS_BRANCH || 'local',
+ applicationUrl: './api',
+ applicationDebug: false,
+ requestConfig: {
+ timeout: 5000,
+ useCredentials: true,
+ credentials: 'same-origin',
+ },
+ },
+ mutations: {},
+ actions: {
+ getUserRole() {
+ return new Promise((resolve, reject) => {
+ axios
+ .get('./api/auth/isRoleAdmin', {
+ timeout: 5000,
+ useCredentials: true,
+ credentials: 'same-origin',
+ })
+ .then((resp) => {
+ resolve(resp.data);
+ })
+ .catch((error) => {
+ console.error(error);
+ reject(error);
+ });
+ });
+ },
- },
- actions: {
- getUserRole() {
- return new Promise((resolve, reject) => {
- axios.get("./api/auth/isRoleAdmin",
- {timeout: 5000, useCredentials: true, credentials: 'same-origin'}).then(resp => {
- resolve(resp.data);
- }).catch(error => {
- console.error(error);
- reject(error);
- })
- })
- }
+ /**
+ * HTTP Request GET method to fetch data from the REST API
+ *
+ * @param {*} param0 - Vuex Store variables
+ * @param {*} requestUrl - URL to specific resource of the Application
+ */
+ requestGet({ state }, requestUrl) {
+ return new Promise((resolve, reject) => {
+ axios
+ .get(state.applicationUrl + requestUrl, state.requestConfig)
+ .then((r) => {
+ if (r.status === 200) {
+ resolve(r.data);
+ } else {
+ reject(false);
+ }
+ })
+ .catch((error) => {
+ console.error(error);
+ reject(false);
+ });
+ });
+ },
- },
- getters: {
- appVersion: (state) => {
- return state.packageVersion
- },
- appTag: (state) => {
- return state.packageTag
- },
- appMilestone: (state) => {
- return state.scadaLtsMilestone
- },
- appBuild: (state) => {
- return state.scadaLtsBuild
- },
- appBranch: (state) => {
- return state.scadaLtsBranch
- }
- },
- plugins: [
- myLoggerForVuexMutation
- ]
-})
+ /**
+ * HTTP Request POST method to push data to the REST API
+ *
+ * @param {*} param0 - Vuex Store variables
+ * @param {*} payload - {url, data} JS object with request data.
+ */
+ requestPost({ state }, payload) {
+ return new Promise((resolve, reject) => {
+ axios
+ .post(state.applicationUrl + payload.url, payload.data, state.requestConfig)
+ .then((r) => {
+ if (r.status === 201 || r.status === 200) {
+ resolve(r.data);
+ } else {
+ reject(false);
+ }
+ })
+ .catch((error) => {
+ console.error(error);
+ reject(false);
+ });
+ });
+ },
+
+ /**
+ * HTTP Request GET method to fetch data from the REST API
+ *
+ * @param {*} param0 - Vuex Store variables
+ * @param {*} requestUrl - URL to specific resource of the Application
+ */
+ requestDelete({ state }, requestUrl) {
+ return new Promise((resolve, reject) => {
+ axios
+ .delete(state.applicationUrl + requestUrl, state.requestConfig)
+ .then((r) => {
+ if (r.status === 200) {
+ resolve(r.data);
+ } else {
+ reject(false);
+ }
+ })
+ .catch((error) => {
+ console.error(error);
+ reject(false);
+ });
+ });
+ },
+
+ /**
+ * HTTP Request PUT method to update data by the REST API
+ *
+ * @param {*} param0 - Vuex Store variables
+ * @param {*} payload - {url, data} JS object with request data.
+ */
+ requestPut({ state }, payload) {
+ return new Promise((resolve, reject) => {
+ axios
+ .put(state.applicationUrl + payload.url, payload.data, state.requestConfig)
+ .then((r) => {
+ if (r.status === 201 || r.status === 200) {
+ resolve(r.data);
+ } else {
+ reject(false);
+ }
+ })
+ .catch((error) => {
+ console.error(error);
+ reject(false);
+ });
+ });
+ },
+ },
+ getters: {
+ appVersion: (state) => {
+ return state.packageVersion;
+ },
+ appTag: (state) => {
+ return state.packageTag;
+ },
+ appMilestone: (state) => {
+ return state.scadaLtsMilestone;
+ },
+ appBuild: (state) => {
+ return state.scadaLtsBuild;
+ },
+ appBranch: (state) => {
+ return state.scadaLtsBranch;
+ },
+ },
+ plugins: [myLoggerForVuexMutation],
+});
diff --git a/scadalts-ui/src/store/pointHierarchy/index.js b/scadalts-ui/src/store/pointHierarchy/index.js
index 43e4ecb698..bfa8d814db 100644
--- a/scadalts-ui/src/store/pointHierarchy/index.js
+++ b/scadalts-ui/src/store/pointHierarchy/index.js
@@ -1,15 +1,7 @@
const gv = {
- state: {
-
- },
- mutations: {
-
- },
- actions: {
-
- },
- getters: {
-
- }
-}
-export default gv
+ state: {},
+ mutations: {},
+ actions: {},
+ getters: {},
+};
+export default gv;
diff --git a/scadalts-ui/src/store/systemSettings/index.js b/scadalts-ui/src/store/systemSettings/index.js
index d03529f947..9f47c809c1 100644
--- a/scadalts-ui/src/store/systemSettings/index.js
+++ b/scadalts-ui/src/store/systemSettings/index.js
@@ -1,406 +1,588 @@
/**
* @author Radoslaw Jajko
- *
+ *
*/
-import axios from "axios";
+import axios from 'axios';
const storeSystemSettings = {
- state: {
- systemSettingsApiUrl: './api/systemSettings',
- requestOptions: { timeout: 5000, useCredentials: true, credentials: 'same-origin' },
- databaseType: undefined,
- databaseInfo: undefined,
- systemEventTypes: undefined,
- auditEventTypes: undefined,
- systemInfoSettings: undefined,
- emailSettings: undefined,
- httpSettings: undefined,
- miscSettings: undefined,
- systemStartupTime: undefined,
- schemaVersion: undefined,
- scadaConfig: undefined,
- defaultLoggingType: undefined,
- },
- mutations: {
- setDatabaseType(state, databaseType) {
- state.databaseType = databaseType;
- },
- setDatabaseInfo(state, databaseInfo) {
- state.databaseInfo = databaseInfo;
- },
- setSystemEventTypes(state, systemEventTypes) {
- state.systemEventTypes = systemEventTypes;
- },
- setAuditEventTypes(state, auditEventTypes) {
- state.auditEventTypes = auditEventTypes;
- },
- setSystemInfoSettings(state, systemInfoSettings) {
- state.systemInfoSettings = systemInfoSettings;
- },
- setEmailSettings(state, emailSettings) {
- state.emailSettings = emailSettings;
- },
- setHttpSettings(state, httpSettings) {
- state.httpSettings = httpSettings;
- },
- setMiscSettings(state, miscSettings) {
- state.miscSettings = miscSettings;
- },
- setSystemStartupTime(state, startupTime) {
- state.systemStartupTime = new Date(Number(startupTime));
- },
- setSchemaVersion(state, schemaVersion) {
- state.schemaVersion = schemaVersion;
- },
- setScadaConfig(state, scadaConfig) {
- state.scadaConfig = scadaConfig;
- },
- setDefaultLoggingType(state, defaultLoggingType) {
- state.defaultLoggingType = defaultLoggingType;
- }
- },
- actions: {
- getDatabaseType(context) {
- return new Promise((resolve, reject) => {
- axios.get(`${context.state.systemSettingsApiUrl}/getDatabaseType`, context.state.requestOptions).then(response => {
- if (response.status == 200) {
- context.commit("setDatabaseType", response.data)
- resolve(response.data)
- }
- reject(false)
- }).catch(err => {
- console.error(err)
- reject(false)
- })
- })
- },
- saveDatabaseType(context, databaseType) {
- return new Promise((resolve, reject) => {
- axios.get(`${context.state.systemSettingsApiUrl}/saveDatabaseType/${databaseType}`).then(response => {
- if (response.status == 200) { resolve(true) }
- resolve(false)
- }).catch(err => {
- reject()
- })
- })
- },
- getSchemaVersion(context) {
- return new Promise((resolve, reject) => {
- axios.get(`${context.state.systemSettingsApiUrl}/getSchemaVersion`,
- { timeout: 5000, useCredentials: true, credentials: 'same-origin' }).then(response => {
- if (response.status == 200) {
- context.commit('setSchemaVersion', response.data.schemaVersion);
- }
- resolve(true)
- }).catch(err => {
- reject(err)
- })
- })
- },
- getSystemInfoSettings(context) {
- return new Promise((resolve, reject) => {
- axios.get(`${context.state.systemSettingsApiUrl}/getSystemInfo`, context.state.requestOptions).then(response => {
- if (response.status == 200) {
- context.commit('setSystemInfoSettings', response.data)
- resolve(response.data)
- }
- reject(false)
- }).catch(err => {
- console.error(err);
- reject(false)
- })
- })
- },
- getSystemStartupTime(context) {
- return new Promise((resolve, reject) => {
- axios.get(`${context.state.systemSettingsApiUrl}/getStartupTime`,
- { timeout: 5000, useCredentials: true, credentials: 'same-origin' }).then(response => {
- if (response.status == 200) {
- context.commit('setSystemStartupTime', response.data.startupTime);
- }
- resolve(true)
- }).catch(err => {
- reject(err)
- })
- })
- },
- getAllSettings(context) {
- return new Promise((resolve, reject) => {
- axios.get(`${context.state.systemSettingsApiUrl}/getSettings`,
- { timeout: 5000, useCredentials: true, credentials: 'same-origin' }).then(response => {
- if (response.status == 200) {
- context.commit('setDatabaseType', response.data.databaseType);
- context.commit('setSystemEventTypes', response.data.systemEventTypes);
- context.commit('setAuditEventTypes', response.data.auditEventTypes);
- context.commit('setSystemInfoSettings', response.data.systemInfoSettings);
- context.commit('setEmailSettings', response.data.emailSettings);
- context.commit('setHttpSettings', response.data.httpSettings);
- context.commit('setMiscSettings', response.data.miscSettings);
- context.commit('setScadaConfig', response.data.scadaConfig);
- }
- resolve(true)
- }).catch(err => {
- reject(err)
- })
- })
- },
- getAuditEventTypes(context) {
- return new Promise((resolve, reject) => {
- axios.get(`${context.state.systemSettingsApiUrl}/getAuditEventAlarmLevels`, context.state.requestOptions).then(response => {
- if (response.status == 200) {
- context.commit('setAuditEventTypes', response.data)
- resolve(response.data)
- }
- reject(false)
- }).catch(err => {
- console.error(err);
- reject(false)
- })
- })
- },
- getSystemEventTypes(context) {
- return new Promise((resolve, reject) => {
- axios.get(`${context.state.systemSettingsApiUrl}/getSystemEventAlarmLevels`, context.state.requestOptions).then(response => {
- if (response.status == 200) {
- context.commit('setSystemEventTypes', response.data)
- resolve(response.data)
- }
- reject(false)
- }).catch(err => {
- console.error(err);
- reject(false)
- })
- })
- },
- getEmailSettings(context) {
- return new Promise((resolve, reject) => {
- axios.get(`${context.state.systemSettingsApiUrl}/getEmail`, context.state.requestOptions).then(response => {
- if (response.status == 200) {
- context.commit('setEmailSettings', response.data)
- resolve(response.data)
- }
- reject(false)
- }).catch(err => {
- console.error(err);
- reject(false)
- })
- })
- },
- getHttpSettings(context) {
- return new Promise((resolve, reject) => {
- axios.get(`${context.state.systemSettingsApiUrl}/getHttp`, context.state.requestOptions).then(response => {
- if (response.status == 200) {
- context.commit('setHttpSettings', response.data)
- resolve(response.data)
- }
- reject(false)
- }).catch(err => {
- console.error(err);
- reject(false)
- })
- })
- },
- getMiscSettings(context) {
- return new Promise((resolve, reject) => {
- axios.get(`${context.state.systemSettingsApiUrl}/getMisc`, context.state.requestOptions).then(response => {
- if (response.status == 200) {
- context.commit('setMiscSettings', response.data)
- resolve(response.data)
- }
- reject(false)
- }).catch(err => {
- console.error(err);
- reject(false)
- })
- })
- },
- getScadaConfiguration(context) {
- return new Promise((resolve, reject) => {
- axios.get(`${context.state.systemSettingsApiUrl}/getScadaConfig`, context.state.requestOptions).then(response => {
- if (response.status == 200) {
- context.commit('setScadaConfig', response.data)
- resolve(response.data)
- }
- reject(false)
- }).catch(err => {
- console.error(err);
- reject(false)
- })
- })
- },
- getDatabaseSize(context) {
- return new Promise((resolve, reject) => {
- axios.get(`${context.state.systemSettingsApiUrl}/getDatabaseSize`,
- { timeout: 5000, useCredentials: true, credentials: 'same-origin' }).then(response => {
- if (response.status == 200) {
- context.commit('setDatabaseInfo', response.data);
- }
- resolve(true)
- }).catch(err => {
- reject(err)
- })
- })
- },
- saveEmailSettings(context) {
- return new Promise((resolve, reject) => {
- axios.post(`${context.state.systemSettingsApiUrl}/saveEmail`, context.state.emailSettings,
- { timeout: 5000, useCredentials: true, credentials: 'same-origin' }).then(response => {
- if (response.status == 200) {
- resolve(true)
- } else {
- reject(false)
- }
- }).catch(err => {
- reject(err)
- })
- })
- },
- saveMiscSettings(context) {
- return new Promise((resolve, reject) => {
- axios.post(`${context.state.systemSettingsApiUrl}/saveMisc`, context.state.miscSettings,
- { timeout: 5000, useCredentials: true, credentials: 'same-origin' }).then(response => {
- if (response.status == 200) {
- resolve(true)
- } else {
- reject(false)
- }
- }).catch(err => {
- reject(err)
- })
- })
- },
- saveHttpSettings(context) {
- return new Promise((resolve, reject) => {
- axios.post(`${context.state.systemSettingsApiUrl}/saveHttp`, context.state.httpSettings,
- { timeout: 5000, useCredentials: true, credentials: 'same-origin' }).then(response => {
- if (response.status == 200) {
- resolve(true)
- } else {
- reject(false)
- }
- }).catch(err => {
- reject(err)
- })
- })
- },
- saveSystemEventTypes(context) {
- return new Promise((resolve, reject) => {
- axios.post(`${context.state.systemSettingsApiUrl}/saveSystemEventAlarmLevels`, context.state.systemEventTypes,
- { timeout: 5000, useCredentials: true, credentials: 'same-origin' }).then(response => {
- if (response.status == 200) {
- resolve(true)
- } else {
- reject(false)
- }
- }).catch(err => {
- reject(err)
- })
- })
- },
- saveAuditEventTypes(context) {
- return new Promise((resolve, reject) => {
- axios.post(`${context.state.systemSettingsApiUrl}/saveAuditEventAlarmLevels`, context.state.auditEventTypes,
- { timeout: 5000, useCredentials: true, credentials: 'same-origin' }).then(response => {
- if (response.status == 200) {
- resolve(true)
- } else {
- reject(false)
- }
- }).catch(err => {
- reject(err)
- })
- })
- },
- sendTestEmail(context) {
- return new Promise((resolve, reject) => {
- axios.get(`${context.state.systemSettingsApiUrl}/sendTestEmail`,
- { timeout: 5000, useCredentials: true, credentials: 'same-origin' }).then(response => {
- if (response.status == 200) {
- resolve(response.data)
- } else {
- reject(false)
- }
- }).catch(err => {
- reject(err)
- })
- })
- },
- purgeData(context) {
- return new Promise((resolve, reject) => {
- axios.get(`${context.state.systemSettingsApiUrl}/purgeData`,
- { timeout: 5000, useCredentials: true, credentials: 'same-origin' }).then(response => {
- if (response.status == 200) {
- resolve(true)
- } else {
- reject(false)
- }
- }).catch(err => {
- reject(err)
- })
- })
- },
- saveSystemInfoSettings(context) {
- return new Promise((resolve, reject) => {
- axios.post(`${context.state.systemSettingsApiUrl}/saveSystemInfo`, context.state.systemInfoSettings,
- { timeout: 5000, useCredentials: true, credentials: 'same-origin' }).then(response => {
- if (response.status == 200) {
- resolve(true)
- } else {
- reject(false)
- }
- }).catch(err => {
- reject(err)
- })
- })
- },
- saveDefaultLoggingType(context) {
- return new Promise((resolve, reject) => {
- axios.post(`${context.state.systemSettingsApiUrl}/saveDefaultLoggingType/${context.state.defaultLoggingType}`,
- { timeout: 5000, useCredentials: true, credentials: 'same-origin' }).then(response => {
- if (response.status === 200) {
- resolve(true)
- } else {
- reject(false)
- }
- }).catch(err => {
- reject(err)
- })
- })
- },
- getDefaultLoggingType(context) {
- return new Promise((resolve, reject) => {
- axios.get(`${context.state.systemSettingsApiUrl}/getDefaultLoggingType`, context.state.requestOptions).then(response => {
- if (response.status === 200) {
- console.debug(response.data);
- context.commit('setDefaultLoggingType', response.data.defaultLoggingType)
- resolve(response.data.defaultLoggingType)
- }
- reject(false)
- }).catch(err => {
- console.error(err);
- reject(false)
- })
- })
- },
- configurationEqual(ctx, objects) {
- return new Promise((resolve, reject) => {
- const keys1 = Object.keys(objects.object1);
- const keys2 = Object.keys(objects.object2);
- if (keys1.length !== keys2.length) {
- resolve(false)
- }
- for (let key of keys1) {
- if (objects.object1[key] !== objects.object2[key]) {
- resolve(false)
- }
- }
- resolve(true)
- })
- },
- },
- getters: {
-
- }
-}
-export default storeSystemSettings
\ No newline at end of file
+ state: {
+ systemSettingsApiUrl: './api/systemSettings',
+ requestOptions: {
+ timeout: 5000,
+ useCredentials: true,
+ credentials: 'same-origin',
+ },
+ databaseType: undefined,
+ databaseInfo: undefined,
+ systemEventTypes: undefined,
+ auditEventTypes: undefined,
+ systemInfoSettings: undefined,
+ emailSettings: undefined,
+ httpSettings: undefined,
+ miscSettings: undefined,
+ smsDomainSettings: undefined,
+ systemStartupTime: undefined,
+ schemaVersion: undefined,
+ scadaConfig: undefined,
+ defaultLoggingType: undefined,
+ },
+ mutations: {
+ setDatabaseType(state, databaseType) {
+ state.databaseType = databaseType;
+ },
+ setDatabaseInfo(state, databaseInfo) {
+ state.databaseInfo = databaseInfo;
+ state.databaseInfo.topPoints = state.databaseInfo.topPoints.slice(0, 10);
+ },
+ setSystemEventTypes(state, systemEventTypes) {
+ state.systemEventTypes = systemEventTypes;
+ },
+ setAuditEventTypes(state, auditEventTypes) {
+ state.auditEventTypes = auditEventTypes;
+ },
+ setSystemInfoSettings(state, systemInfoSettings) {
+ state.systemInfoSettings = systemInfoSettings;
+ },
+ setEmailSettings(state, emailSettings) {
+ state.emailSettings = emailSettings;
+ },
+ setHttpSettings(state, httpSettings) {
+ state.httpSettings = httpSettings;
+ },
+ setMiscSettings(state, miscSettings) {
+ state.miscSettings = miscSettings;
+ },
+ setSmsDomainSettings(state, smsDomainSettings) {
+ state.smsDomainSettings = smsDomainSettings;
+ },
+ setSystemStartupTime(state, startupTime) {
+ state.systemStartupTime = new Date(Number(startupTime));
+ },
+ setSchemaVersion(state, schemaVersion) {
+ state.schemaVersion = schemaVersion;
+ },
+ setScadaConfig(state, scadaConfig) {
+ state.scadaConfig = scadaConfig;
+ },
+ setDefaultLoggingType(state, defaultLoggingType) {
+ state.defaultLoggingType = defaultLoggingType;
+ },
+ },
+ actions: {
+ getDatabaseType(context) {
+ return new Promise((resolve, reject) => {
+ axios
+ .get(
+ `${context.state.systemSettingsApiUrl}/getDatabaseType`,
+ context.state.requestOptions,
+ )
+ .then((response) => {
+ if (response.status == 200) {
+ context.commit('setDatabaseType', response.data);
+ resolve(response.data);
+ }
+ reject(false);
+ })
+ .catch((err) => {
+ console.error(err);
+ reject(false);
+ });
+ });
+ },
+ saveDatabaseType(context, databaseType) {
+ return new Promise((resolve, reject) => {
+ axios
+ .get(`${context.state.systemSettingsApiUrl}/saveDatabaseType/${databaseType}`)
+ .then((response) => {
+ if (response.status == 200) {
+ resolve(true);
+ }
+ resolve(false);
+ })
+ .catch((err) => {
+ reject();
+ });
+ });
+ },
+ getSchemaVersion(context) {
+ return new Promise((resolve, reject) => {
+ axios
+ .get(`${context.state.systemSettingsApiUrl}/getSchemaVersion`, {
+ timeout: 5000,
+ useCredentials: true,
+ credentials: 'same-origin',
+ })
+ .then((response) => {
+ if (response.status == 200) {
+ context.commit('setSchemaVersion', response.data.schemaVersion);
+ }
+ resolve(true);
+ })
+ .catch((err) => {
+ reject(err);
+ });
+ });
+ },
+ getSystemInfoSettings(context) {
+ return new Promise((resolve, reject) => {
+ axios
+ .get(
+ `${context.state.systemSettingsApiUrl}/getSystemInfo`,
+ context.state.requestOptions,
+ )
+ .then((response) => {
+ if (response.status == 200) {
+ context.commit('setSystemInfoSettings', response.data);
+ resolve(response.data);
+ }
+ reject(false);
+ })
+ .catch((err) => {
+ console.error(err);
+ reject(false);
+ });
+ });
+ },
+ getSystemStartupTime(context) {
+ return new Promise((resolve, reject) => {
+ axios
+ .get(`${context.state.systemSettingsApiUrl}/getStartupTime`, {
+ timeout: 5000,
+ useCredentials: true,
+ credentials: 'same-origin',
+ })
+ .then((response) => {
+ if (response.status == 200) {
+ context.commit('setSystemStartupTime', response.data.startupTime);
+ }
+ resolve(true);
+ })
+ .catch((err) => {
+ reject(err);
+ });
+ });
+ },
+ getAllSettings(context) {
+ return new Promise((resolve, reject) => {
+ axios
+ .get(`${context.state.systemSettingsApiUrl}/getSettings`, {
+ timeout: 5000,
+ useCredentials: true,
+ credentials: 'same-origin',
+ })
+ .then((response) => {
+ if (response.status == 200) {
+ context.commit('setDatabaseType', response.data.databaseType);
+ context.commit('setSystemEventTypes', response.data.systemEventTypes);
+ context.commit('setAuditEventTypes', response.data.auditEventTypes);
+ context.commit('setSystemInfoSettings', response.data.systemInfoSettings);
+ context.commit('setEmailSettings', response.data.emailSettings);
+ context.commit('setHttpSettings', response.data.httpSettings);
+ context.commit('setMiscSettings', response.data.miscSettings);
+ context.commit('setScadaConfig', response.data.scadaConfig);
+ }
+ resolve(true);
+ })
+ .catch((err) => {
+ reject(err);
+ });
+ });
+ },
+ getAuditEventTypes(context) {
+ return new Promise((resolve, reject) => {
+ axios
+ .get(
+ `${context.state.systemSettingsApiUrl}/getAuditEventAlarmLevels`,
+ context.state.requestOptions,
+ )
+ .then((response) => {
+ if (response.status == 200) {
+ context.commit('setAuditEventTypes', response.data);
+ resolve(response.data);
+ }
+ reject(false);
+ })
+ .catch((err) => {
+ console.error(err);
+ reject(false);
+ });
+ });
+ },
+ getSystemEventTypes(context) {
+ return new Promise((resolve, reject) => {
+ axios
+ .get(
+ `${context.state.systemSettingsApiUrl}/getSystemEventAlarmLevels`,
+ context.state.requestOptions,
+ )
+ .then((response) => {
+ if (response.status == 200) {
+ context.commit('setSystemEventTypes', response.data);
+ resolve(response.data);
+ }
+ reject(false);
+ })
+ .catch((err) => {
+ console.error(err);
+ reject(false);
+ });
+ });
+ },
+ getEmailSettings(context) {
+ return new Promise((resolve, reject) => {
+ axios
+ .get(
+ `${context.state.systemSettingsApiUrl}/getEmail`,
+ context.state.requestOptions,
+ )
+ .then((response) => {
+ if (response.status == 200) {
+ context.commit('setEmailSettings', response.data);
+ resolve(response.data);
+ }
+ reject(false);
+ })
+ .catch((err) => {
+ console.error(err);
+ reject(false);
+ });
+ });
+ },
+ getHttpSettings(context) {
+ return new Promise((resolve, reject) => {
+ axios
+ .get(
+ `${context.state.systemSettingsApiUrl}/getHttp`,
+ context.state.requestOptions,
+ )
+ .then((response) => {
+ if (response.status == 200) {
+ context.commit('setHttpSettings', response.data);
+ resolve(response.data);
+ }
+ reject(false);
+ })
+ .catch((err) => {
+ console.error(err);
+ reject(false);
+ });
+ });
+ },
+ getMiscSettings(context) {
+ return new Promise((resolve, reject) => {
+ axios
+ .get(
+ `${context.state.systemSettingsApiUrl}/getMisc`,
+ context.state.requestOptions,
+ )
+ .then((response) => {
+ if (response.status == 200) {
+ context.commit('setMiscSettings', response.data);
+ resolve(response.data);
+ }
+ reject(false);
+ })
+ .catch((err) => {
+ console.error(err);
+ reject(false);
+ });
+ });
+ },
+ getSmsDomainSettings(context) {
+ return new Promise((resolve, reject) => {
+ axios
+ .get(
+ `${context.state.systemSettingsApiUrl}/getSMSDomain`,
+ context.state.requestOptions,
+ )
+ .then((response) => {
+ if (response.status == 200) {
+ context.commit('setSmsDomainSettings', response.data);
+ resolve(response.data);
+ }
+ reject(false);
+ })
+ .catch((err) => {
+ console.error(err);
+ reject(false);
+ });
+ });
+ },
+ getScadaConfiguration(context) {
+ return new Promise((resolve, reject) => {
+ axios
+ .get(
+ `${context.state.systemSettingsApiUrl}/getScadaConfig`,
+ context.state.requestOptions,
+ )
+ .then((response) => {
+ if (response.status == 200) {
+ context.commit('setScadaConfig', response.data);
+ resolve(response.data);
+ }
+ reject(false);
+ })
+ .catch((err) => {
+ console.error(err);
+ reject(false);
+ });
+ });
+ },
+ getDatabaseSize(context) {
+ return new Promise((resolve, reject) => {
+ axios
+ .get(`${context.state.systemSettingsApiUrl}/getDatabaseSize`, {
+ timeout: 5000,
+ useCredentials: true,
+ credentials: 'same-origin',
+ })
+ .then((response) => {
+ if (response.status == 200) {
+ context.commit('setDatabaseInfo', response.data);
+ }
+ resolve(true);
+ })
+ .catch((err) => {
+ reject(err);
+ });
+ });
+ },
+ saveEmailSettings(context) {
+ return new Promise((resolve, reject) => {
+ axios
+ .post(
+ `${context.state.systemSettingsApiUrl}/saveEmail`,
+ context.state.emailSettings,
+ { timeout: 5000, useCredentials: true, credentials: 'same-origin' },
+ )
+ .then((response) => {
+ if (response.status == 200) {
+ resolve(true);
+ } else {
+ reject(false);
+ }
+ })
+ .catch((err) => {
+ reject(err);
+ });
+ });
+ },
+ saveMiscSettings(context) {
+ return new Promise((resolve, reject) => {
+ axios
+ .post(
+ `${context.state.systemSettingsApiUrl}/saveMisc`,
+ context.state.miscSettings,
+ { timeout: 5000, useCredentials: true, credentials: 'same-origin' },
+ )
+ .then((response) => {
+ if (response.status == 200) {
+ resolve(true);
+ } else {
+ reject(false);
+ }
+ })
+ .catch((err) => {
+ reject(err);
+ });
+ });
+ },
+ saveSmsDomainSettings(context) {
+ return new Promise((resolve, reject) => {
+ axios
+ .post(
+ `${context.state.systemSettingsApiUrl}/saveSMSDomain/${context.state.smsDomainSettings}`,
+ { timeout: 5000, useCredentials: true, credentials: 'same-origin' },
+ )
+ .then((response) => {
+ if (response.status == 200) {
+ resolve(true);
+ } else {
+ reject(false);
+ }
+ })
+ .catch((err) => {
+ reject(err);
+ });
+ });
+ },
+ saveHttpSettings(context) {
+ return new Promise((resolve, reject) => {
+ axios
+ .post(
+ `${context.state.systemSettingsApiUrl}/saveHttp`,
+ context.state.httpSettings,
+ { timeout: 5000, useCredentials: true, credentials: 'same-origin' },
+ )
+ .then((response) => {
+ if (response.status == 200) {
+ resolve(true);
+ } else {
+ reject(false);
+ }
+ })
+ .catch((err) => {
+ reject(err);
+ });
+ });
+ },
+ saveSystemEventTypes(context) {
+ return new Promise((resolve, reject) => {
+ axios
+ .post(
+ `${context.state.systemSettingsApiUrl}/saveSystemEventAlarmLevels`,
+ context.state.systemEventTypes,
+ { timeout: 5000, useCredentials: true, credentials: 'same-origin' },
+ )
+ .then((response) => {
+ if (response.status == 200) {
+ resolve(true);
+ } else {
+ reject(false);
+ }
+ })
+ .catch((err) => {
+ reject(err);
+ });
+ });
+ },
+ saveAuditEventTypes(context) {
+ return new Promise((resolve, reject) => {
+ axios
+ .post(
+ `${context.state.systemSettingsApiUrl}/saveAuditEventAlarmLevels`,
+ context.state.auditEventTypes,
+ { timeout: 5000, useCredentials: true, credentials: 'same-origin' },
+ )
+ .then((response) => {
+ if (response.status == 200) {
+ resolve(true);
+ } else {
+ reject(false);
+ }
+ })
+ .catch((err) => {
+ reject(err);
+ });
+ });
+ },
+ sendTestEmail(context) {
+ return new Promise((resolve, reject) => {
+ axios
+ .get(`${context.state.systemSettingsApiUrl}/sendTestEmail`, {
+ timeout: 5000,
+ useCredentials: true,
+ credentials: 'same-origin',
+ })
+ .then((response) => {
+ if (response.status == 200) {
+ resolve(response.data);
+ } else {
+ reject(false);
+ }
+ })
+ .catch((err) => {
+ reject(err);
+ });
+ });
+ },
+ purgeData(context) {
+ return new Promise((resolve, reject) => {
+ axios
+ .get(`${context.state.systemSettingsApiUrl}/purgeData`, {
+ timeout: 5000,
+ useCredentials: true,
+ credentials: 'same-origin',
+ })
+ .then((response) => {
+ if (response.status == 200) {
+ resolve(true);
+ } else {
+ reject(false);
+ }
+ })
+ .catch((err) => {
+ reject(err);
+ });
+ });
+ },
+ saveSystemInfoSettings(context) {
+ return new Promise((resolve, reject) => {
+ axios
+ .post(
+ `${context.state.systemSettingsApiUrl}/saveSystemInfo`,
+ context.state.systemInfoSettings,
+ { timeout: 5000, useCredentials: true, credentials: 'same-origin' },
+ )
+ .then((response) => {
+ if (response.status == 200) {
+ resolve(true);
+ } else {
+ reject(false);
+ }
+ })
+ .catch((err) => {
+ reject(err);
+ });
+ });
+ },
+ saveDefaultLoggingType(context) {
+ return new Promise((resolve, reject) => {
+ axios
+ .post(
+ `${context.state.systemSettingsApiUrl}/saveDefaultLoggingType/${context.state.defaultLoggingType}`,
+ { timeout: 5000, useCredentials: true, credentials: 'same-origin' },
+ )
+ .then((response) => {
+ if (response.status === 200) {
+ resolve(true);
+ } else {
+ reject(false);
+ }
+ })
+ .catch((err) => {
+ reject(err);
+ });
+ });
+ },
+ getDefaultLoggingType(context) {
+ return new Promise((resolve, reject) => {
+ axios
+ .get(
+ `${context.state.systemSettingsApiUrl}/getDefaultLoggingType`,
+ context.state.requestOptions,
+ )
+ .then((response) => {
+ if (response.status === 200) {
+ console.debug(response.data);
+ context.commit('setDefaultLoggingType', response.data.defaultLoggingType);
+ resolve(response.data.defaultLoggingType);
+ }
+ reject(false);
+ })
+ .catch((err) => {
+ console.error(err);
+ reject(false);
+ });
+ });
+ },
+ configurationEqual(ctx, objects) {
+ return new Promise((resolve, reject) => {
+ const keys1 = Object.keys(objects.object1);
+ const keys2 = Object.keys(objects.object2);
+ if (keys1.length !== keys2.length) {
+ resolve(false);
+ }
+ for (let key of keys1) {
+ if (objects.object1[key] !== objects.object2[key]) {
+ resolve(false);
+ }
+ }
+ resolve(true);
+ });
+ },
+ },
+ getters: {},
+};
+export default storeSystemSettings;
diff --git a/scadalts-ui/src/views/About.vue b/scadalts-ui/src/views/About.vue
index 95633cdd3c..c482b211fb 100644
--- a/scadalts-ui/src/views/About.vue
+++ b/scadalts-ui/src/views/About.vue
@@ -1,11 +1,11 @@
-
-
{{ $t('about') }}
-
+
+
{{ $t('about') }}
+
diff --git a/scadalts-ui/src/views/AlarmNotifications/CreationSettings.vue b/scadalts-ui/src/views/AlarmNotifications/CreationSettings.vue
new file mode 100644
index 0000000000..9f2bb6c55f
--- /dev/null
+++ b/scadalts-ui/src/views/AlarmNotifications/CreationSettings.vue
@@ -0,0 +1,99 @@
+
+
+
+
+ mdi-pencil
+
+
+
+
+
+ {{ $t('plcalarms.notification.settings.title') }}
+
+
+
+
{{ $t('plcalarms.notification.settings.ped.title') }}
+
+
{{ $t('plcalarms.notification.settings.eh.title') }}
+
+
+ {{
+ $t('uiv.modal.ok')
+ }}
+
+
+
+
+
+
diff --git a/scadalts-ui/src/views/AlarmNotifications/README.md b/scadalts-ui/src/views/AlarmNotifications/README.md
new file mode 100644
index 0000000000..2efae1a5a0
--- /dev/null
+++ b/scadalts-ui/src/views/AlarmNotifications/README.md
@@ -0,0 +1,38 @@
+# PLC Alarms Notification List
+
+New component for preparing a Notification Configuration that allow Scada-LTS users to simply receive Alarm and Warning evnets directly to their mailboxes or phones.
+
+## Usage
+
+### Preparation
+
+- Create a mailing list and assign users to it.
+ _(if you want to receive notification about Events that was taking place druring inactive period select **Collect inactive msg** and set up **cron** pattern for example like this one "0 */1 * \* \* ?" that will try to send past emails every one minute)_
+- Create **alarm** ( AL )_ or **warning** ( ST )_ binary datapoints that will handle information about specific event.
+ _\*(it could be any name of data point but must contain this uppercase expresion AL|ST with spaces around them. For example "Test AL Datapoint" or "Point-0 ST ". Underscores are not allowed - here are examples that are not valid: "Test_AL\_", "DP ST" or "Point-0_AL")_
+
+### Definition
+
+- Open SMS and Email notification page
+ _(open Alarms>Alarms Notifications or use this link: /ScadaBR/app.shtm#/alarm-notifications)_
+- Select mailing list for which you want to configure a notification
+ _(User is able to configure two mailing list at once, or use the second one section to compare the configuration.)_
+- Expand specific datapoint and click on the phone or mail icon to set up notification channel.
+ _(There is an option to select both of them or to select none of them. Green fill color of the icon means that it is active communication channel)_
+- Click Save button if everyting is ready.
+
+### Check
+
+- In EventHandlers page check that valid Event Handlers has been created.
+
+## Known bugs
+
+Sometimes when user tries to save SMS and Email channel to specific datapoint at once only one is saved correctly. Simillar situation happens when user tries to toggle between SMS/Email channel. So solve that problem we suggest to do that step by step or tires to refresh the page to see which changes was applied correctly.
+
+## Troubleshooting
+
+When you have noticed that Inactive Emails or SMSes was not sent make sure that mailing list is configured with selected **Collect inactive msg** and CRON pattern is valid.
+
+If it's still not working make sure that event handlers generates alarm level higher than none.
+
+In other cases open an issue on the Scada-LTS GitHub project page or inform the development team.
diff --git a/scadalts-ui/src/views/AlarmNotifications/index.vue b/scadalts-ui/src/views/AlarmNotifications/index.vue
new file mode 100644
index 0000000000..767c90a3f2
--- /dev/null
+++ b/scadalts-ui/src/views/AlarmNotifications/index.vue
@@ -0,0 +1,383 @@
+
+
+
+
+
+
+ {{ $t('plcalarms.notification.title') }}
+
+
+ mdi-help
+
+ {{ $t('plcalarms.notification.help') }}
+
+
+
+
+
+ mdi-content-save
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ snackbar.text }}
+
+
+
+
diff --git a/scadalts-ui/src/views/Alarms.vue b/scadalts-ui/src/views/Alarms.vue
index 091377de95..b5142bd19a 100644
--- a/scadalts-ui/src/views/Alarms.vue
+++ b/scadalts-ui/src/views/Alarms.vue
@@ -1,71 +1,64 @@
-
diff --git a/scadalts-ui/src/views/Components.vue b/scadalts-ui/src/views/Components.vue
index cc16d56179..6509ed16e3 100644
--- a/scadalts-ui/src/views/Components.vue
+++ b/scadalts-ui/src/views/Components.vue
@@ -1,33 +1,61 @@
-
-
Components
-
-
-
- Tests of the test component Tests of the IsAlive component Tests of the SimpleComponentSVG component Tests of the SleepAndReactivationDS component Tests of the CMP component Tests of the ExportImportPointHierarchy component Tests of the AmCharts component Tests of the StepLine Chart component Test of the Alarms component
-
-
-
+
Components
+
+
+
+
+ Tests of the test component
+
+
+ Tests of the IsAlive component
+
+
+ Tests of the SimpleComponentSVG component
+
+
+ Tests of the SleepAndReactivationDS component
+
+
+ Tests of the CMP component
+
+
+ Tests of the ExportImportPointHierarchy component
+
+
+ Tests of the AmCharts component
+
+
+ Tests of the StepLine Chart component
+
+
+ Test of the Alarms component
+
+
+
+
+
-
+
diff --git a/scadalts-ui/src/views/HistoricalAlarms.vue b/scadalts-ui/src/views/HistoricalAlarms.vue
index 0421b86051..701ef1f305 100644
--- a/scadalts-ui/src/views/HistoricalAlarms.vue
+++ b/scadalts-ui/src/views/HistoricalAlarms.vue
@@ -1,27 +1,24 @@
-
-
+
+
diff --git a/scadalts-ui/src/views/Home.vue b/scadalts-ui/src/views/Home.vue
index 215cd1278d..68c3f7aed8 100644
--- a/scadalts-ui/src/views/Home.vue
+++ b/scadalts-ui/src/views/Home.vue
@@ -1,17 +1,17 @@
-
-
-
-
+
+
+
diff --git a/scadalts-ui/src/views/SystemSettings/AuditEventTypesComponent.vue b/scadalts-ui/src/views/SystemSettings/AuditEventTypesComponent.vue
index b8b12052d4..808574e5b1 100644
--- a/scadalts-ui/src/views/SystemSettings/AuditEventTypesComponent.vue
+++ b/scadalts-ui/src/views/SystemSettings/AuditEventTypesComponent.vue
@@ -1,193 +1,183 @@
-
-
-
- {{ $t("systemsettings.audit.title")
- }}*
-
-
-
-
-
-
{{ $t(event.translation) }}
-
-
-
- {{ $t("alarmlevels.none") }}
-
- {{ $t("alarmlevels.information") }}
-
- {{ $t("alarmlevels.urgent") }}
-
- {{ $t("alarmlevels.critical") }}
-
-
- {{ $t("alarmlevels.lifesafety") }}
-
-
-
-
-
-
-
+
+
+ {{ $t('systemsettings.audit.title') }}
+ *
+
+
+
+
+
+
+
+
+
+
+
-
\ No newline at end of file
+
diff --git a/scadalts-ui/src/views/SystemSettings/DefaultLoggingTypeComponent.vue b/scadalts-ui/src/views/SystemSettings/DefaultLoggingTypeComponent.vue
index 2e9dcff5f1..1227cf8747 100644
--- a/scadalts-ui/src/views/SystemSettings/DefaultLoggingTypeComponent.vue
+++ b/scadalts-ui/src/views/SystemSettings/DefaultLoggingTypeComponent.vue
@@ -1,110 +1,119 @@
-
-
-
- {{ $t("systemsettings.loggingtype.title")
- }}*
-
-
-
-
-
-
-
- {{opt.label}}
-
-
-
-
-
-
+
+
+ {{ $t('systemsettings.loggingtype.title') }}
+ *
+
+
+
+
+
-
\ No newline at end of file
+
diff --git a/scadalts-ui/src/views/SystemSettings/EmailSettingsComponent.vue b/scadalts-ui/src/views/SystemSettings/EmailSettingsComponent.vue
index 56d5d762bf..4e52c12ddf 100644
--- a/scadalts-ui/src/views/SystemSettings/EmailSettingsComponent.vue
+++ b/scadalts-ui/src/views/SystemSettings/EmailSettingsComponent.vue
@@ -1,313 +1,247 @@
-
-
-
- {{ $t("systemsettings.email.title")
- }}*
-
-
-
-
-
-
-
-
-
-
-
{{ $t("systemsettings.email.host") }}
-
-
-
-
-
-
-
{{ $t("systemsettings.email.port") }}
-
-
-
-
-
-
-
{{ $t("systemsettings.email.address") }}
-
-
-
-
-
-
-
{{ $t("systemsettings.email.name") }}
-
-
-
-
-
-
-
{{ $t("systemsettings.email.contentType") }}
-
-
-
-
- {{ $t("systemsettings.email.contenttype.htmltext") }}
-
-
- {{ $t("systemsettings.email.contenttype.html") }}
-
-
- {{ $t("systemsettings.email.contenttype.text") }}
-
-
-
-
-
-
-
- {{ $t("systemsettings.email.auth.enable") }}
- {{ $t("systemsettings.email.auth.disable") }}
-
-
-
-
-
-
-
{{ $t("systemsettings.email.username") }}
-
-
-
-
-
-
-
{{ $t("systemsettings.email.password") }}
-
-
-
-
-
-
-
- {{ $t("systemsettings.email.tls.enable") }}
- {{ $t("systemsettings.email.tls.disable") }}
-
-
-
-
-
+
+
+ {{ $t('systemsettings.email.title') }}
+ *
+
+
+
+ mdi-send
+
+
+ {{ $t('systemsettings.tooltip.sendtestemail') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
\ No newline at end of file
+
diff --git a/scadalts-ui/src/views/SystemSettings/HttpSettingsComponent.vue b/scadalts-ui/src/views/SystemSettings/HttpSettingsComponent.vue
index 8df2240b65..e93ee794f7 100644
--- a/scadalts-ui/src/views/SystemSettings/HttpSettingsComponent.vue
+++ b/scadalts-ui/src/views/SystemSettings/HttpSettingsComponent.vue
@@ -1,210 +1,169 @@
-
-
-
- {{ $t("systemsettings.http.title")
- }}*
-
-
-
-
-
-
- {{ $t("systemsettings.http.proxy.enable") }}
- {{ $t("systemsettings.http.proxy.disable") }}
-
-
-
-
-
-
-
-
{{ $t("systemsettings.http.proxy.host") }}
-
-
-
-
-
-
-
{{ $t("systemsettings.http.proxy.port") }}
-
-
-
-
-
-
-
{{ $t("systemsettings.http.proxy.username") }}
-
-
-
-
-
-
-
{{ $t("systemsettings.http.proxy.password") }}
-
-
-
-
-
+
+
+ {{ $t('systemsettings.http.title') }}
+ *
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
\ No newline at end of file
+
diff --git a/scadalts-ui/src/views/SystemSettings/MiscSettingsComponent.vue b/scadalts-ui/src/views/SystemSettings/MiscSettingsComponent.vue
index 29c88b614f..4ef9bc13db 100644
--- a/scadalts-ui/src/views/SystemSettings/MiscSettingsComponent.vue
+++ b/scadalts-ui/src/views/SystemSettings/MiscSettingsComponent.vue
@@ -1,260 +1,254 @@
-
-
-
- {{ $t("systemsettings.misc.title")
- }}*
-
-
-
-
-
-
-
-
-
-
{{ $t("systemsettings.misc.uiPerformance") }}
-
-
-
-
- {{ $t("systemsettings.misc.performance.high") }}
-
-
- {{ $t("systemsettings.misc.performance.medium") }}
-
-
- {{ $t("systemsettings.misc.performance.low") }}
-
-
-
-
-
-
-
{{ $t("systemsettings.misc.purge.events") }}
-
-
-
-
-
- {{ $t("timeperiod.days") }}
- {{ $t("timeperiod.weeks") }}
- {{ $t("timeperiod.months") }}
- {{ $t("timeperiod.years") }}
-
-
-
-
-
-
{{ $t("systemsettings.misc.purge.reports") }}
-
-
-
-
-
- {{ $t("timeperiod.days") }}
- {{ $t("timeperiod.weeks") }}
- {{ $t("timeperiod.months") }}
- {{ $t("timeperiod.years") }}
-
-
-
-
-
-
{{ $t("systemsettings.misc.purge.future") }}
-
-
-
-
-
- {{ $t("timeperiod.minutes") }}
- {{ $t("timeperiod.hours") }}
-
-
-
-
-
+
+
+ {{ $t('systemsettings.misc.title') }}
+ *
+
+
+
+ mdi-delete
+
+
+ {{ $t('systemsettings.tooltip.purgedata') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
\ No newline at end of file
+
diff --git a/scadalts-ui/src/views/SystemSettings/README.md b/scadalts-ui/src/views/SystemSettings/README.md
index 4f2a853eeb..40cbbde2f9 100644
--- a/scadalts-ui/src/views/SystemSettings/README.md
+++ b/scadalts-ui/src/views/SystemSettings/README.md
@@ -1,23 +1,27 @@
# System Settings Vue Component
+
Vesrion: 1.1.0
Creator: Radoslaw Jajko [rjajko@softq.pl](mailto:rjajko@softq.pl)
System Settings component use REST API to configure Scada-LTS parameters. All available settings are displayed in the SystemSettings section "mainbar" as individual components with common interface. All changes done by user are summarized before final save. From each section changes can be individually restored or saved.
-There is a sidebar on the right that display Application Info such as Runtime, database version, application version or latest available Scada-LTS release.
+There is a sidebar on the right that display Application Info such as Runtime, database version, application version or latest available Scada-LTS release.
Only admin user can open this page.
## How to create a new section?
+
Create new vue file with naming convention `[name]Component.vue`. Each component can share the common interface from the main SystemSettings page. There are few methods that has to be implemented to be compatible with the main page actions.
### Interface methods
-To inheritance the behaviour of the main component it is necessary to implement descripted below methods.
+
+To inheritance the behaviour of the main component it is necessary to implement descripted below methods.
+
```js
/**
* Fetch Data from remote server
* and initialize the _*Store variable
- * to hold the unchanged object values.
+ * to hold the unchanged object values.
*/
async fetchData() {}
@@ -33,7 +37,7 @@ saveData()
* Restore data
* When user tries to revert his changes.
* Invoked from parent component.
- * Simply download data again and set your
+ * Simply download data again and set your
* edit_flag to false
*/
restoreData()
@@ -41,20 +45,20 @@ restoreData()
/**
* Function that is triggered whenever user
* change any value in this section.
- * When action is performed notify parent component.
+ * When action is performed notify parent component.
*/
async watchDataChagne()
/**
* Notify parent component
- * Using special common interface. This method
- * emit a new event called "chagned" that
+ * Using special common interface. This method
+ * emit a new event called "chagned" that
* send to parent object with configuration changes
- *
+ *
* It is REQUIRED to set the same name for
- * "component" parameter as it is declared in the
- * parent component attribute "ref=name"!
- *
+ * "component" parameter as it is declared in the
+ * parent component attribute "ref=name"!
+ *
* This interface structure is common for all
* settings sections.
*/
@@ -69,31 +73,34 @@ emitData()
*/
sumarizeDataChanges()
```
-__Remember to add required methods and variables to VuexStore!__ It is necessary to be able to reset to default values.
+
+**Remember to add required methods and variables to VuexStore!** It is necessary to be able to reset to default values.
Briefly described emitted data:
+
```js
// ** emited data structure **
// component value must be the same
// as the reference in parent component
data = {
- component: String,
- title: String,
- changed: Boolean,
- data: {
- label: String,
- originalData: Object,
- changedData: Object
- }
-}
+ component: String,
+ title: String,
+ changed: Boolean,
+ data: {
+ label: String,
+ originalData: Object,
+ changedData: Object,
+ },
+};
```
### Parent component HTML
-Inside a parent component (index.vue file) you should imported this new component and append it somewhere inside SystemSettings section. Add a new line that create this new component and create the reference (`ref=""`) to this element and handle the `@changed` event by `componentChanged()` method. Example is presented below.
+
+Inside a parent component (index.vue file) you should imported this new component and append it somewhere inside SystemSettings section. Add a new line that create this new component and create the reference (`ref=""`) to this element and handle the `@changed` event by `componentChanged()` method. Example is presented below.
+
```html
-
+
```
-Now your component is bonded with the main page. Index page will automatically detect new component and will be able to save or restore changes easily due to implement methods.
\ No newline at end of file
+
+Now your component is bonded with the main page. Index page will automatically detect new component and will be able to save or restore changes easily due to implement methods.
diff --git a/scadalts-ui/src/views/SystemSettings/ScadaConfigurationComponent.vue b/scadalts-ui/src/views/SystemSettings/ScadaConfigurationComponent.vue
index 9b2d9cd7cd..c9ae293131 100644
--- a/scadalts-ui/src/views/SystemSettings/ScadaConfigurationComponent.vue
+++ b/scadalts-ui/src/views/SystemSettings/ScadaConfigurationComponent.vue
@@ -1,68 +1,59 @@
-
-
-
- {{ $t("systemsettings.scadaconf.title") }}
-
-
-
-
-
-
{{ $t(`systemsettings.scadaconf.${key}`) }}
-
-
-
{{ scadaConfig[key] | convert }}
-
-
-
+
+
+
+
+ {{
+ $t('systemsettings.scadaconf.title')
+ }}
+
+ {{ $t('systemsettings.tooltip.scadaconf') }}
+
+
+
+
+
+ env.properties
+
+
+
+ {{ $t(`systemsettings.scadaconf.${key}`) }}
+
+
+ {{ scadaConfig[key] | convert }}
+
+
+
+
+
+
+
+
-
\ No newline at end of file
+
diff --git a/scadalts-ui/src/views/SystemSettings/SmsDomainSettingsComponent.vue b/scadalts-ui/src/views/SystemSettings/SmsDomainSettingsComponent.vue
new file mode 100644
index 0000000000..5b4777ada7
--- /dev/null
+++ b/scadalts-ui/src/views/SystemSettings/SmsDomainSettingsComponent.vue
@@ -0,0 +1,118 @@
+
+
+
+
+ {{ $t('systemsettings.smsdomain.title') }}
+ *
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/scadalts-ui/src/views/SystemSettings/SystemEventTypesComponent.vue b/scadalts-ui/src/views/SystemSettings/SystemEventTypesComponent.vue
index 498e7d3c8f..e788fbeb71 100644
--- a/scadalts-ui/src/views/SystemSettings/SystemEventTypesComponent.vue
+++ b/scadalts-ui/src/views/SystemSettings/SystemEventTypesComponent.vue
@@ -1,187 +1,185 @@
-
-
-
{{ $t("systemsettings.event.title") }}*
-
-
-
-
{{ $t(event.translation) }}
-
-
-
- {{ $t("alarmlevels.none") }}
-
- {{ $t("alarmlevels.information") }}
-
- {{ $t("alarmlevels.urgent") }}
- {{ $t("alarmlevels.critical") }}
-
- {{ $t("alarmlevels.lifesafety") }}
-
-
-
-
-
-
+
+
+ {{ $t('systemsettings.event.title') }}
+ *
+
+
+
+
+
+
+
+
+
+
+
-
\ No newline at end of file
+
diff --git a/scadalts-ui/src/views/SystemSettings/index.vue b/scadalts-ui/src/views/SystemSettings/index.vue
index a42141897c..390a8ddec8 100644
--- a/scadalts-ui/src/views/SystemSettings/index.vue
+++ b/scadalts-ui/src/views/SystemSettings/index.vue
@@ -1,508 +1,508 @@
-
-
-
- {{ $t("systemsettings.title") }}
-
- {{ $t("systemsettings.label.save") }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
{{$t(component.title)}}
-
-
-
-
-
-
-
-
{{$t(e.label)}}
-
{{e.originalData | blank | convert}}
-
{{e.changedData | blank | convert}}
-
-
+
+
+
+
+
+
+ {{ $t('systemsettings.title') }}
+
+ mdi-content-save
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
- {{$t("uiv.modal.cancel")}}
- {{ $t("systemsettings.label.restoreall") }}
- {{ $t("systemsettings.label.saveall") }}
-
-
-
-
Not allowed to see that page
-
-
+
+ {{ $t('systemsettings.info.systemtime') }}
+
+
+ {{ systemRunningTime }}
+
+
+
+
+
+ {{ $t('systemsettings.info.milestone') }}
+
+
+
+ {{ $store.getters.appMilestone }} build
+ {{ $store.getters.appBuild }}
+
+
+
+
+
+
+ {{ $t('systemsettings.info.branch') }}
+
+
+ {{ $store.getters.appBranch }}
+
+
+
+
+
+ {{ $t('systemsettings.info.tag') }}
+
+
+ {{ $store.getters.appTag }}
+
+
+
+
+
+ {{ $t('systemsettings.info.uiversion') }}
+
+
+ {{ $store.getters.appVersion }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t('systemsettings.database.title') }}
+
+ mdi-refresh
+
+
+
+
+
+
+ {{ $t('systemsettings.database.schemaVersion') }}
+
+
+ {{ schemaVersion }}
+
+
+
+ {{ $t('systemsettings.database.size') }}
+
+
+ {{ databaseInfo.databaseSize }}
+
+
+
+ {{ $t('systemsettings.database.file') }}
+
+
+ {{ databaseInfo.filedataCount }}
+
+
+
+ {{ $t('systemsettings.database.total') }}
+
+
+ {{ databaseInfo.filedataSize }}
+
+
+
+ {{ $t('systemsettings.database.histroy') }}
+
+
+ {{ databaseInfo.historyCount }}
+
+
+
+ {{ $t('systemsettings.database.event') }}
+
+
+ {{ databaseInfo.eventCount }}
+
+
+
+ {{ $t('systemsettings.database.top') }}
+
+
+
+ {{ point.pointName }}
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t('systemsettings.label.summary') }}
+
+
+
+
+
+ {{ $t(component.title) }}
+
+
+
+
+ mdi-redo-variant
+
+
+ {{ $t('systemsettings.label.restore') }}
+
+
+
+
+ mdi-content-save
+
+
+ {{ $t('systemsettings.label.save') }}
+
+
+
+
+
+ {{ $t(e.label) }}
+ {{ e.originalData | blank | convert }}
+ {{
+ e.changedData | blank | convert
+ }}
+
+
+
+
+
+
+ {{ $t('uiv.modal.cancel') }}
+ {{
+ $t('systemsettings.label.restoreall')
+ }}
+ {{
+ $t('systemsettings.label.saveall')
+ }}
+
+
+
+
+
+ Not allowed to see that page
+
+
\ No newline at end of file
+
diff --git a/scadalts-ui/src/views/components/ExampleChartCmp.vue b/scadalts-ui/src/views/components/ExampleChartCmp.vue
index 4eec73d40d..ae41c04abe 100644
--- a/scadalts-ui/src/views/components/ExampleChartCmp.vue
+++ b/scadalts-ui/src/views/components/ExampleChartCmp.vue
@@ -1,33 +1,29 @@
-
-
Example of the use of the AmCharts component
+
+
Example of the use of the AmCharts component
-
-
-
- Describe:
-
-
-
-
-
+
+
+
+ Describe:
+
+
+
+
+
-
+
diff --git a/scadalts-ui/src/views/components/ExampleCmp.vue b/scadalts-ui/src/views/components/ExampleCmp.vue
index 7e13d8740d..520ff3978b 100644
--- a/scadalts-ui/src/views/components/ExampleCmp.vue
+++ b/scadalts-ui/src/views/components/ExampleCmp.vue
@@ -1,33 +1,29 @@
-
-
Example of the use of the CMP component
+
+
Example of the use of the CMP component
-
-
-
- Describe:
-
-
-
-
-
+
+
+
+ Describe:
+
+
+
+
+
-
+
diff --git a/scadalts-ui/src/views/components/ExampleExportImportPointHierarchy.vue b/scadalts-ui/src/views/components/ExampleExportImportPointHierarchy.vue
index 905b089d0c..d318e6ba9e 100644
--- a/scadalts-ui/src/views/components/ExampleExportImportPointHierarchy.vue
+++ b/scadalts-ui/src/views/components/ExampleExportImportPointHierarchy.vue
@@ -1,32 +1,29 @@
-
-
Example of the use of the ExportImportPointHierarchy component
+
+
Example of the use of the ExportImportPointHierarchy component
-
-
-
- Describe:
-
-
-
-
-
+
+
+
+ Describe:
+
+
+
+
+
-
+
diff --git a/scadalts-ui/src/views/components/ExampleIsAlive.vue b/scadalts-ui/src/views/components/ExampleIsAlive.vue
index f0116a80ed..2436c6ca46 100644
--- a/scadalts-ui/src/views/components/ExampleIsAlive.vue
+++ b/scadalts-ui/src/views/components/ExampleIsAlive.vue
@@ -1,31 +1,29 @@
-
-
Example of the use of the IsAlive component
+
+
Example of the use of the IsAlive component
-
-
-
- Describe:
-
-
-
-
-
+
+
+
+ Describe:
+
+
+
+
+
-
+
diff --git a/scadalts-ui/src/views/components/ExampleLiveAlarms.vue b/scadalts-ui/src/views/components/ExampleLiveAlarms.vue
index 2cc4564a5c..77f728b79c 100644
--- a/scadalts-ui/src/views/components/ExampleLiveAlarms.vue
+++ b/scadalts-ui/src/views/components/ExampleLiveAlarms.vue
@@ -1,33 +1,29 @@
-
-
Example of the use of the live alarms component
+
+
Example of the use of the live alarms component
-
-
-
- Describe:
-
-
-
-
-
+
+
+
+ Describe:
+
+
+
+
+
-
+
diff --git a/scadalts-ui/src/views/components/ExampleSimpleComponentSVG.vue b/scadalts-ui/src/views/components/ExampleSimpleComponentSVG.vue
index d9dcae7703..c5e1cc3e1e 100644
--- a/scadalts-ui/src/views/components/ExampleSimpleComponentSVG.vue
+++ b/scadalts-ui/src/views/components/ExampleSimpleComponentSVG.vue
@@ -1,31 +1,29 @@
-
-
Example of the use of the SimpleComponentSvg component
+
+
Example of the use of the SimpleComponentSvg component
-
-
-
- Describe:
-
-
-
-
-
+
+
+
+ Describe:
+
+
+
+
+
-
+
diff --git a/scadalts-ui/src/views/components/ExampleSleepAndReactivationDS.vue b/scadalts-ui/src/views/components/ExampleSleepAndReactivationDS.vue
index af5d54f1a2..d2f4dbad98 100644
--- a/scadalts-ui/src/views/components/ExampleSleepAndReactivationDS.vue
+++ b/scadalts-ui/src/views/components/ExampleSleepAndReactivationDS.vue
@@ -1,31 +1,29 @@
-
-
Example of the use of the SleepAndReactivationDS component
+
+
Example of the use of the SleepAndReactivationDS component
-
-
-
- Describe:
-
-
-
-
-
+
+
+
+ Describe:
+
+
+
+
+
-
+
diff --git a/scadalts-ui/src/views/components/ExampleStepLineChartCmp.vue b/scadalts-ui/src/views/components/ExampleStepLineChartCmp.vue
index 221124235b..443572825e 100644
--- a/scadalts-ui/src/views/components/ExampleStepLineChartCmp.vue
+++ b/scadalts-ui/src/views/components/ExampleStepLineChartCmp.vue
@@ -1,33 +1,29 @@
-
-
Example of the use of the StepLineChart component
+
+
Example of the use of the StepLineChart component
-
-
-
- Describe:
-
-
-
-
-
+
+
+
+ Describe:
+
+
+
+
+
-
+
diff --git a/scadalts-ui/src/views/components/ExampleTest.vue b/scadalts-ui/src/views/components/ExampleTest.vue
index 591a05c470..1ef84a06eb 100644
--- a/scadalts-ui/src/views/components/ExampleTest.vue
+++ b/scadalts-ui/src/views/components/ExampleTest.vue
@@ -1,30 +1,28 @@
-
-
Example of the use of the Test component
-
-
-
- Describe:
-
-
-
-
-
+
Example of the use of the Test component
+
+
+
+ Describe:
+
+
+
+
+
-
+
diff --git a/scadalts-ui/src/views/components/HistoricalAlarmsComponent.vue b/scadalts-ui/src/views/components/HistoricalAlarmsComponent.vue
index c2d6504586..bd74f3d3ec 100644
--- a/scadalts-ui/src/views/components/HistoricalAlarmsComponent.vue
+++ b/scadalts-ui/src/views/components/HistoricalAlarmsComponent.vue
@@ -1,261 +1,278 @@
-
-
-
- Filter
-
-
-
-
-
-
-
-
-
-
+
+
+
+ Filter
+
+
+
+
+
+
-
-
diff --git a/scadalts-ui/tests/mocks/store/index.js b/scadalts-ui/tests/mocks/store/index.js
index 336cc216a7..497901c060 100644
--- a/scadalts-ui/tests/mocks/store/index.js
+++ b/scadalts-ui/tests/mocks/store/index.js
@@ -1,16 +1,15 @@
-import Vue from 'vue'
-import Vuex from 'vuex'
-import systemSettings from './systemSettings'
-
-Vue.use(Vuex)
+import Vue from 'vue';
+import Vuex from 'vuex';
+import systemSettings from './systemSettings';
+Vue.use(Vuex);
export default new Vuex.Store({
- modules: {
- systemSettings
- },
- state: {},
- mutations: {},
- actions: {},
- plugins: []
-})
+ modules: {
+ systemSettings,
+ },
+ state: {},
+ mutations: {},
+ actions: {},
+ plugins: [],
+});
diff --git a/scadalts-ui/tests/mocks/store/systemSettings/index.js b/scadalts-ui/tests/mocks/store/systemSettings/index.js
index f96683002a..578bbfb41c 100644
--- a/scadalts-ui/tests/mocks/store/systemSettings/index.js
+++ b/scadalts-ui/tests/mocks/store/systemSettings/index.js
@@ -1,133 +1,131 @@
/**
* @author Radoslaw Jajko
- *
+ *
*/
const storeSystemSettings = {
- state: {
- systemSettingsApiUrl: 'MOCK',
- databaseType: undefined,
- databaseInfo: undefined,
- systemEventTypes: undefined,
- auditEventTypes: undefined,
- systemInfoSettings: {
- instanceDescription: "Scada-LTS 2.3.3",
- language: "en",
- newVersionNotificationLevel: "0"
- },
- emailSettings: {
- auth: false,
- contentType: 1,
- from: "ScadaLTS",
- host: "",
- name: "",
- password: "",
- port: 25,
- tls: false,
- username: ""
- },
- httpSettings: {
- useProxy: false,
- port: 16,
- host: "",
- username: "",
- password: ""
- },
- miscSettings: {
- eventPurgePeriodType: 6,
- eventPurgePeriods: 2,
- futureDateLimitPeriodType: 3,
- futureDateLimitPeriods: 24,
- groveLogging: false,
- reportPurgePeriodType: 6,
- reportPurgePeriods: 2,
- uiPerformance: 2000
- }
- },
- mutations: {
- setDatabaseType(state, databaseType) {
- state.databaseType = databaseType;
- },
- setDatabaseInfo(state, databaseInfo) {
- state.databaseInfo = databaseInfo;
- },
- setSystemEventTypes(state, systemEventTypes) {
- state.systemEventTypes = systemEventTypes;
- },
- setAuditEventTypes(state, auditEventTypes) {
- state.auditEventTypes = auditEventTypes;
- },
- setSystemInfoSettings(state, systemInfoSettings) {
- state.systemInfoSettings = systemInfoSettings;
- },
- setEmailSettings(state, emailSettings) {
- state.emailSettings = emailSettings;
- },
- setHttpSettings(state, httpSettings) {
- state.httpSettings = httpSettings;
- },
- setMiscSettings(state, miscSettings) {
- state.miscSettings = miscSettings;
- }
- },
- actions: {
- getDatabaseType() {
- return new Promise((resolve, reject) => {
- resolve()
- })
- },
- saveDatabaseType(context, databaseType) {
- return new Promise((resolve, reject) => {
- resolve()
- })
- },
- getAllSettings(context) {
- return new Promise((resolve, reject) => {
- resolve()
- })
- },
- getDatabaseSize(context) {
- return new Promise((resolve, reject) => {
- resolve()
- })
- },
- saveEmailSettings(context) {
- return new Promise((resolve, reject) => {
- resolve()
- })
- },
- saveMiscSettings(context) {
- return new Promise((resolve, reject) => {
- resolve()
- })
- },
- saveHttpSettings(context) {
- return new Promise((resolve, reject) => {
- resolve()
- })
- },
- saveSystemEventTypes(context) {
- return new Promise((resolve, reject) => {
- resolve()
- })
- },
- saveAuditEventTypes(context) {
- return new Promise((resolve, reject) => {
- resolve()
- })
- },
- purgeData(context) {
- return new Promise((resolve, reject) => {
- resolve()
- })
- },
- saveSystemInfoSettings(context) {
- return new Promise((resolve, reject) => {
- resolve()
- })
- }
- },
- getters: {
-
- }
-}
-export default storeSystemSettings
\ No newline at end of file
+ state: {
+ systemSettingsApiUrl: 'MOCK',
+ databaseType: undefined,
+ databaseInfo: undefined,
+ systemEventTypes: undefined,
+ auditEventTypes: undefined,
+ systemInfoSettings: {
+ instanceDescription: 'Scada-LTS 2.3.3',
+ language: 'en',
+ newVersionNotificationLevel: '0',
+ },
+ emailSettings: {
+ auth: false,
+ contentType: 1,
+ from: 'ScadaLTS',
+ host: '',
+ name: '',
+ password: '',
+ port: 25,
+ tls: false,
+ username: '',
+ },
+ httpSettings: {
+ useProxy: false,
+ port: 16,
+ host: '',
+ username: '',
+ password: '',
+ },
+ miscSettings: {
+ eventPurgePeriodType: 6,
+ eventPurgePeriods: 2,
+ futureDateLimitPeriodType: 3,
+ futureDateLimitPeriods: 24,
+ groveLogging: false,
+ reportPurgePeriodType: 6,
+ reportPurgePeriods: 2,
+ uiPerformance: 2000,
+ },
+ },
+ mutations: {
+ setDatabaseType(state, databaseType) {
+ state.databaseType = databaseType;
+ },
+ setDatabaseInfo(state, databaseInfo) {
+ state.databaseInfo = databaseInfo;
+ },
+ setSystemEventTypes(state, systemEventTypes) {
+ state.systemEventTypes = systemEventTypes;
+ },
+ setAuditEventTypes(state, auditEventTypes) {
+ state.auditEventTypes = auditEventTypes;
+ },
+ setSystemInfoSettings(state, systemInfoSettings) {
+ state.systemInfoSettings = systemInfoSettings;
+ },
+ setEmailSettings(state, emailSettings) {
+ state.emailSettings = emailSettings;
+ },
+ setHttpSettings(state, httpSettings) {
+ state.httpSettings = httpSettings;
+ },
+ setMiscSettings(state, miscSettings) {
+ state.miscSettings = miscSettings;
+ },
+ },
+ actions: {
+ getDatabaseType() {
+ return new Promise((resolve, reject) => {
+ resolve();
+ });
+ },
+ saveDatabaseType(context, databaseType) {
+ return new Promise((resolve, reject) => {
+ resolve();
+ });
+ },
+ getAllSettings(context) {
+ return new Promise((resolve, reject) => {
+ resolve();
+ });
+ },
+ getDatabaseSize(context) {
+ return new Promise((resolve, reject) => {
+ resolve();
+ });
+ },
+ saveEmailSettings(context) {
+ return new Promise((resolve, reject) => {
+ resolve();
+ });
+ },
+ saveMiscSettings(context) {
+ return new Promise((resolve, reject) => {
+ resolve();
+ });
+ },
+ saveHttpSettings(context) {
+ return new Promise((resolve, reject) => {
+ resolve();
+ });
+ },
+ saveSystemEventTypes(context) {
+ return new Promise((resolve, reject) => {
+ resolve();
+ });
+ },
+ saveAuditEventTypes(context) {
+ return new Promise((resolve, reject) => {
+ resolve();
+ });
+ },
+ purgeData(context) {
+ return new Promise((resolve, reject) => {
+ resolve();
+ });
+ },
+ saveSystemInfoSettings(context) {
+ return new Promise((resolve, reject) => {
+ resolve();
+ });
+ },
+ },
+ getters: {},
+};
+export default storeSystemSettings;
diff --git a/scadalts-ui/tests/unit/AlarmNotifications/AlarmNotifications.spec.js b/scadalts-ui/tests/unit/AlarmNotifications/AlarmNotifications.spec.js
new file mode 100644
index 0000000000..4efab1fe3c
--- /dev/null
+++ b/scadalts-ui/tests/unit/AlarmNotifications/AlarmNotifications.spec.js
@@ -0,0 +1,96 @@
+/**
+ * @author Radoslaw Jajko
+ */
+import Vuex from 'vuex';
+import Vuetify from '@/plugins/vuetify';
+import { expect } from 'chai';
+import { createLocalVue, mount } from '@vue/test-utils';
+import AlarmNotifications from '@/views/AlarmNotifications';
+import i18n from '@/i18n';
+
+const localVue = createLocalVue();
+localVue.use(Vuex);
+localVue.use(Vuetify);
+
+const storeAlarmsNotifications = {
+ state: {},
+
+ mutations: {},
+
+ actions: {
+ getAllPlcDataSources(context) {
+ return new Promise((resolve) => {
+ let ds = [
+ {
+ id: 22,
+ name: 'UNIT_TEST_DS',
+ xid: 'UNIT_DS_01',
+ },
+ ];
+ resolve(ds);
+ });
+ },
+ getAllMailingLists(context, datasourceId) {
+ return new Promise((resolve) => {
+ let ml = [
+ {
+ id: 1,
+ inactiveIntervals: [],
+ name: 'TestUnit',
+ recipientType: 1,
+ referenceAddress: null,
+ referenceId: 2,
+ xid: 'TEST_ML_UNIT_1',
+ },
+ ];
+ resolve(ml);
+ });
+ },
+ getPlcEventHandlers(context, datasourceId) {
+ return new Promise((resolve) => {
+ let eh = [
+ {
+ id: 11,
+ xid: 'TEST_EH_UNIT_1',
+ alias: 'UnitTest_EventHandler',
+ eventTypeId: 1,
+ eventTypeRef1: 2,
+ eventTypeRef2: 3,
+ recipients: [{ recipientType: 1, referenceId: 1, referenceAddress: null }],
+ },
+ ];
+ resolve(eh);
+ });
+ },
+ },
+};
+
+const modules = {
+ storeAlarmsNotifications,
+};
+
+const store = new Vuex.Store({ modules });
+
+describe('PLC Alarms Notification Tests', () => {
+ const wrapper = mount(AlarmNotifications, {
+ store,
+ localVue,
+ i18n,
+ stubs: ['VSelect', 'VIcon', 'VSnackbar'],
+ });
+
+ it('Initialize Component', () => {
+ expect(wrapper.name()).to.equal('AlarmNotifications');
+ expect(wrapper.vm.mailingLists[0].id).to.equal(1);
+ expect(wrapper.vm.mailingLists[0].name).to.equal('TestUnit');
+ expect(wrapper.vm.eventHandlers[0].id).to.equal(11);
+ expect(wrapper.vm.eventHandlers[0].alias).to.equal('UnitTest_EventHandler');
+ });
+
+ it('Load PLC DataSources', () => {
+ wrapper.vm.initDataSources();
+ wrapper.vm.$nextTick(() => {
+ expect(wrapper.vm.items.length).to.equal(1);
+ });
+ });
+});
diff --git a/scadalts-ui/tests/unit/SystemSettings/LoggingTypeSettings.spec.js b/scadalts-ui/tests/unit/SystemSettings/LoggingTypeSettings.spec.js
index 16ee960967..c53a535ac0 100644
--- a/scadalts-ui/tests/unit/SystemSettings/LoggingTypeSettings.spec.js
+++ b/scadalts-ui/tests/unit/SystemSettings/LoggingTypeSettings.spec.js
@@ -1,92 +1,91 @@
/**
* @author Radoslaw Jajko
*/
-import Vuex from 'vuex'
-import { expect } from 'chai'
-import { createLocalVue, mount } from '@vue/test-utils'
-import DefaultLoggingTypeSettingsComponent from '@/views/SystemSettings/DefaultLoggingTypeComponent'
-import i18n from '@/i18n'
+import Vuex from 'vuex';
+import Vuetify from '@/plugins/vuetify';
+import { expect } from 'chai';
+import { createLocalVue, mount } from '@vue/test-utils';
+import DefaultLoggingTypeSettingsComponent from '@/views/SystemSettings/DefaultLoggingTypeComponent';
+import i18n from '@/i18n';
const localVue = createLocalVue();
localVue.use(Vuex);
+localVue.use(Vuetify);
const systemSettings = {
- state: {
- defaultLoggingType: 1
- },
-
- mutations: {
- setDefaultLoggingType(state, defaultLoggingType) {
- state.defaultLoggingType = defaultLoggingType;
- }
- },
-
- actions: {
- getDefaultLoggingType(context) {
- return new Promise(resolve => {
- context.state.defaultLoggingType = 3;
- resolve(3)
- })
- },
- saveDefaultLoggingType(context) {
- return new Promise(resolve => {
- resolve(true)
- })
- }
- }
-}
+ state: {
+ defaultLoggingType: 1,
+ },
+
+ mutations: {
+ setDefaultLoggingType(state, defaultLoggingType) {
+ state.defaultLoggingType = defaultLoggingType;
+ },
+ },
+
+ actions: {
+ getDefaultLoggingType(context) {
+ return new Promise((resolve) => {
+ context.state.defaultLoggingType = 3;
+ resolve(3);
+ });
+ },
+ saveDefaultLoggingType(context) {
+ return new Promise((resolve) => {
+ resolve(true);
+ });
+ },
+ },
+};
const modules = {
- systemSettings
-}
-
-const store = new Vuex.Store({modules})
+ systemSettings,
+};
+const store = new Vuex.Store({ modules });
describe('SystemSettings - LoggingType Settings Tests', () => {
-
- const wrapper = mount(DefaultLoggingTypeSettingsComponent, {
- store, localVue, i18n
- });
-
- it('Initialize Component', () => {
- expect(wrapper.name()).to.equal('DefaultLoggingTypeSettingsComponent')
- })
-
- it('Test loading variable from Vuex store', () => {
- expect(wrapper.vm.defaultLoggingType).to.equal(3);
- expect(wrapper.vm.defaultLoggingTypeStore).to.equal(3);
- })
-
- it('Test i18n English Translation', () => {
- expect(wrapper.findAll('option').at(1).html()).to.contain("All data")
- expect(wrapper.findAll('option').at(2).html()).to.contain("Do not log")
- })
-
- it('Test value saving', async () => {
- wrapper.vm.defaultLoggingType = 5;
- wrapper.vm.saveData();
- wrapper.vm.$nextTick(() => {
- expect(wrapper.vm.defaultLoggingType).to.equal(5);
- expect(wrapper.vm.defaultLoggingTypeStore).to.equal(5);
- })
- })
-
- it('Test changing and emitting the settings', async () => {
- wrapper.vm.defaultLoggingType = 2;
- await wrapper.vm.watchLoggingTypeChange();
- expect(wrapper.vm.isDefaultLoggingTypeEdited).to.be.true;
- await wrapper.vm.$nextTick();
- expect(wrapper.emitted().changed[0][0].component).to.equal("defaultLoggingTypeSettingsComponent");
- expect(wrapper.emitted().changed[0][0].changed).to.be.true;
- })
-
- it('Test changing and restoring data', async() => {
- wrapper.vm.defaultLoggingType = 1;
- await wrapper.vm.watchLoggingTypeChange();
- expect(wrapper.vm.isDefaultLoggingTypeEdited).to.be.true;
- await wrapper.vm.restoreData();
- expect(wrapper.vm.defaultLoggingType).to.equal(3);
- })
-
-})
\ No newline at end of file
+ const wrapper = mount(DefaultLoggingTypeSettingsComponent, {
+ store,
+ localVue,
+ i18n,
+ stubs: ['VSelect', 'VIcon'],
+ });
+
+ it('Initialize Component', () => {
+ expect(wrapper.name()).to.equal('DefaultLoggingTypeSettingsComponent');
+ });
+
+ it('Test loading variable from Vuex store', () => {
+ expect(wrapper.vm.defaultLoggingType).to.equal(3);
+ expect(wrapper.vm.defaultLoggingTypeStore).to.equal(3);
+ });
+
+ it('Test value saving', async () => {
+ wrapper.vm.defaultLoggingType = 5;
+ wrapper.vm.saveData();
+ wrapper.vm.$nextTick(() => {
+ expect(wrapper.vm.defaultLoggingType).to.equal(5);
+ expect(wrapper.vm.defaultLoggingTypeStore).to.equal(5);
+ });
+ });
+
+ it('Test changing and emitting the settings', async () => {
+ wrapper.vm.defaultLoggingType = 2;
+ await wrapper.vm.watchLoggingTypeChange();
+ expect(wrapper.vm.isDefaultLoggingTypeEdited).to.be.true;
+ await wrapper.vm.$nextTick();
+ expect(wrapper.emitted().changed[0][0].component).to.equal(
+ 'defaultLoggingTypeSettingsComponent',
+ );
+ expect(wrapper.emitted().changed[0][0].changed).to.be.true;
+ });
+
+ it('Test changing and restoring data', async () => {
+ wrapper.vm.defaultLoggingType = 1;
+ await wrapper.vm.watchLoggingTypeChange();
+ expect(wrapper.vm.isDefaultLoggingTypeEdited).to.be.true;
+ await wrapper.vm.restoreData();
+ expect(wrapper.vm.defaultLoggingType).to.equal(3);
+ });
+});
diff --git a/scadalts-ui/tests/unit/SystemSettings/README.md b/scadalts-ui/tests/unit/SystemSettings/README.md
index d738b698bf..5cef52333e 100644
--- a/scadalts-ui/tests/unit/SystemSettings/README.md
+++ b/scadalts-ui/tests/unit/SystemSettings/README.md
@@ -1,9 +1,11 @@
# Vue Unit testing for System Settings
+
Most important features are emiting, saving and restoring data received from SystemSettings components. So each of the common function must be tested (list below):
+
- fetchData()
- saveData()
- restoreData()
- watchForTypeChange()
- emitData()
-This methods are common for all System Settings components and must return valid data. Most of the components are using Vuex and Uiv so this is importatnt to mock that objects if it is needed. Also remember about using i18n translations.
\ No newline at end of file
+This methods are common for all System Settings components and must return valid data. Most of the components are using Vuex and Uiv so this is importatnt to mock that objects if it is needed. Also remember about using i18n translations.
diff --git a/scadalts-ui/tests/unit/WatchListJsonChart.spec.js b/scadalts-ui/tests/unit/WatchListJsonChart.spec.js
index 8f531b5f6c..6229b60309 100644
--- a/scadalts-ui/tests/unit/WatchListJsonChart.spec.js
+++ b/scadalts-ui/tests/unit/WatchListJsonChart.spec.js
@@ -1,63 +1,64 @@
import { createLocalVue, mount } from '@vue/test-utils';
import WatchListJsonChart from '@/components/watch_list/WatchListJsonChart';
-import i18n from '@/i18n'
+import Vuetify from '@/plugins/vuetify';
+import i18n from '@/i18n';
import * as uiv from 'uiv';
-import { expect } from 'chai'
+import { expect } from 'chai';
class LocalStorageMock {
- constructor() {
- this.store = {};
- }
+ constructor() {
+ this.store = {};
+ }
- clear() {
- this.store = {};
- }
+ clear() {
+ this.store = {};
+ }
- getItem(key) {
- return this.store[key] || null;
- }
+ getItem(key) {
+ return this.store[key] || null;
+ }
- setItem(key, value) {
- this.store[key] = JSON.stringify(value);
- }
+ setItem(key, value) {
+ this.store[key] = JSON.stringify(value);
+ }
- removeItem(key) {
- delete this.store[key];
- }
-};
+ removeItem(key) {
+ delete this.store[key];
+ }
+}
-global.localStorage = new LocalStorageMock;
+global.localStorage = new LocalStorageMock();
-const localVue = createLocalVue()
-localVue.use(uiv)
+const localVue = createLocalVue();
+localVue.use(uiv);
+localVue.use(Vuetify);
describe('WatchListJsonChart.vue Test', () => {
+ const WATCHLIST_NAME = 'UnitTestWL';
- const WATCHLIST_NAME = 'UnitTestWL';
-
- const wrapper = mount(WatchListJsonChart, {
- localVue,
- i18n,
- propsData: {
- pointId: '1',
- watchlistName: WATCHLIST_NAME,
- }
- })
-
- it('Initialize blank JsonChart', () => {
- expect(wrapper.name()).to.equal('WatchListJsonChart')
- expect(wrapper.vm.pointId).to.equal('1');
- expect(wrapper.vm.chartType).to.equal('live');
- })
-
- it('Change to Static chart', () => {
- wrapper.find('#static-btn-1').trigger('click')
- expect(wrapper.vm.chartType).to.equal('static');
- })
-
- it('Change to Compare chart', () => {
- wrapper.find('#compare-btn-1').trigger('click')
- expect(wrapper.vm.chartType).to.equal('compare');
- })
-
-})
\ No newline at end of file
+ const wrapper = mount(WatchListJsonChart, {
+ localVue,
+ i18n,
+ propsData: {
+ pointId: '1',
+ watchlistName: WATCHLIST_NAME,
+ },
+ stubs: ['VApp'],
+ });
+
+ it('Initialize blank JsonChart', () => {
+ expect(wrapper.name()).to.equal('WatchListJsonChart');
+ expect(wrapper.vm.pointId).to.equal('1');
+ expect(wrapper.vm.chartType).to.equal('live');
+ });
+
+ it('Change to Static chart', () => {
+ wrapper.find('#static-btn-1').trigger('click');
+ expect(wrapper.vm.chartType).to.equal('static');
+ });
+
+ it('Change to Compare chart', () => {
+ wrapper.find('#compare-btn-1').trigger('click');
+ expect(wrapper.vm.chartType).to.equal('compare');
+ });
+});
diff --git a/scadalts-ui/vue.config.js b/scadalts-ui/vue.config.js
index 32c29db0dd..85d603d455 100644
--- a/scadalts-ui/vue.config.js
+++ b/scadalts-ui/vue.config.js
@@ -1,35 +1,42 @@
var webpack = require('webpack');
-const fs = require('fs')
-const packageJson = JSON.parse(fs.readFileSync('./package.json'))
+const fs = require('fs');
+const packageJson = JSON.parse(fs.readFileSync('./package.json'));
const tag = packageJson.tag || 0;
-const version = packageJson.version || 0
-const milestone = packageJson.milestone || 0
-const build = packageJson.build || 0
-const branch = packageJson.branch || 'local'
+const version = packageJson.version || 0;
+const milestone = packageJson.milestone || 0;
+const build = packageJson.build || 0;
+const branch = packageJson.branch || 'local';
module.exports = {
- filenameHashing: false,
-
- configureWebpack: {
- devtool: 'source-map',
- plugins: [
- new webpack.DefinePlugin({
- 'process.env': {
- PACKAGE_VERSION: '"' + version + '"',
- PACKAGE_TAG: '"' + tag + '"',
- SCADA_LTS_MILESTONE: '"' + milestone + '"',
- SCADA_LTS_BUILD: '"' + build + '"',
- SCADA_LTS_BRANCH: '"' + branch + '"'
- }
- })
- ]
- },
-
- pluginOptions: {
- i18n: {
- locale: 'en',
- fallbackLocale: 'en',
- localeDir: 'locales',
- enableInSFC: true
- }
- }
-}
+ filenameHashing: false,
+ configureWebpack: {
+ devtool: 'source-map',
+ plugins: [
+ new webpack.DefinePlugin({
+ 'process.env': {
+ PACKAGE_VERSION: '"' + version + '"',
+ PACKAGE_TAG: '"' + tag + '"',
+ SCADA_LTS_MILESTONE: '"' + milestone + '"',
+ SCADA_LTS_BUILD: '"' + build + '"',
+ SCADA_LTS_BRANCH: '"' + branch + '"',
+ },
+ }),
+ ],
+ },
+ pluginOptions: {
+ i18n: {
+ locale: 'en',
+ fallbackLocale: 'en',
+ localeDir: 'locales',
+ enableInSFC: true,
+ },
+ },
+ transpileDependencies: ['vuetify'],
+ devServer: {
+ proxy: {
+ '^/api': {
+ target: 'http://localhost:8080/ScadaBR',
+ changeOrigin: true,
+ },
+ },
+ },
+};
diff --git a/settings.gradle b/settings.gradle
new file mode 100644
index 0000000000..4ec5bd25b9
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1,12 @@
+/*
+ * Scada-LTS gradle settings file.
+ *
+ * The settings file is used to specify which projects to include in your build.
+ *
+ * This project contains a sub-project called "scadalts-ui" that is an Vue.js frontend
+ * project for User Interface for modern Scada-LTS views. It also provides some additional
+ * controls to the classic application.
+ */
+
+rootProject.name = 'Scada-LTS'
+include ':scadalts-ui'
diff --git a/src/com/serotonin/mango/Common.java b/src/com/serotonin/mango/Common.java
index 046b3b2e26..214e2246c0 100644
--- a/src/com/serotonin/mango/Common.java
+++ b/src/com/serotonin/mango/Common.java
@@ -93,7 +93,7 @@ public class Common {
* the correct version.
*/
public static final String getVersion() {
- return "2.4.0";
+ return "2.5.0";
}
public static final Long getStartupTime() {
diff --git a/src/com/serotonin/mango/rt/EventManager.java b/src/com/serotonin/mango/rt/EventManager.java
index 2d142f663b..2656c23a07 100644
--- a/src/com/serotonin/mango/rt/EventManager.java
+++ b/src/com/serotonin/mango/rt/EventManager.java
@@ -18,11 +18,7 @@
*/
package com.serotonin.mango.rt;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
import java.util.concurrent.CopyOnWriteArrayList;
import org.apache.commons.logging.Log;
@@ -363,6 +359,10 @@ private void setHandlers(EventInstance evt) {
evt.setHandlers(rts);
}
+ public void handleRaiseEvent(EventInstance evt) {
+ handleRaiseEvent(evt, Collections.emptySet());
+ }
+
private void handleRaiseEvent(EventInstance evt,
Set defaultAddresses) {
if (evt.getHandlers() != null) {
diff --git a/src/com/serotonin/mango/rt/RuntimeManager.java b/src/com/serotonin/mango/rt/RuntimeManager.java
index 6bd5c33273..29a5701d26 100644
--- a/src/com/serotonin/mango/rt/RuntimeManager.java
+++ b/src/com/serotonin/mango/rt/RuntimeManager.java
@@ -25,22 +25,28 @@
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList;
+import com.serotonin.mango.db.dao.*;
+import com.serotonin.mango.rt.event.*;
+import com.serotonin.mango.rt.event.schedule.ResetDailyLimitSendingEventRT;
+import com.serotonin.mango.rt.event.schedule.ScheduledExecuteInactiveEventRT;
import com.serotonin.mango.vo.User;
import com.serotonin.mango.vo.dataSource.http.ICheckReactivation;
+import com.serotonin.mango.vo.mailingList.MailingList;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.scada_lts.dao.event.EventDAO;
+import org.scada_lts.dao.event.ScheduledExecuteInactiveEventDAO;
+import org.scada_lts.mango.service.DataPointService;
+import org.scada_lts.mango.service.DataSourceService;
+import org.scada_lts.mango.service.MailingListService;
+import org.scada_lts.mango.service.SystemSettingsService;
+import org.scada_lts.service.CommunicationChannel;
+import org.scada_lts.service.InactiveEventsProvider;
+import org.scada_lts.service.ScheduledExecuteInactiveEventService;
import org.springframework.util.Assert;
import com.serotonin.ShouldNeverHappenException;
import com.serotonin.mango.Common;
-import com.serotonin.mango.db.dao.CompoundEventDetectorDao;
-import com.serotonin.mango.db.dao.DataPointDao;
-import com.serotonin.mango.db.dao.DataSourceDao;
-import com.serotonin.mango.db.dao.MaintenanceEventDao;
-import com.serotonin.mango.db.dao.PointLinkDao;
-import com.serotonin.mango.db.dao.PointValueDao;
-import com.serotonin.mango.db.dao.PublisherDao;
-import com.serotonin.mango.db.dao.ScheduledEventDao;
import com.serotonin.mango.rt.dataImage.DataPointEventMulticaster;
import com.serotonin.mango.rt.dataImage.DataPointListener;
import com.serotonin.mango.rt.dataImage.DataPointRT;
@@ -49,7 +55,6 @@
import com.serotonin.mango.rt.dataImage.types.MangoValue;
import com.serotonin.mango.rt.dataSource.DataSourceRT;
import com.serotonin.mango.rt.dataSource.meta.MetaDataSourceRT;
-import com.serotonin.mango.rt.event.SimpleEventDetector;
import com.serotonin.mango.rt.event.compound.CompoundEventDetectorRT;
import com.serotonin.mango.rt.event.detectors.PointEventDetectorRT;
import com.serotonin.mango.rt.event.maintenance.MaintenanceEventRT;
@@ -112,6 +117,12 @@ public class RuntimeManager {
*/
private final List maintenanceEvents = new CopyOnWriteArrayList();
+ private final Map sendEmailForInactiveEvents = new ConcurrentHashMap<>();
+ private final Map sendSmsForInactiveEvents = new ConcurrentHashMap<>();
+
+ private final Map resetDailyLimitSentEmails = new ConcurrentHashMap<>();
+
+
private boolean started = false;
//
@@ -124,6 +135,28 @@ synchronized public void initialize(boolean safe) {
// Set the started indicator to true.
started = true;
+ ScheduledExecuteInactiveEventService service = ScheduledExecuteInactiveEventService.getInstance();
+ MailingListService mailingListService = new MailingListService();
+ List mailingLists = mailingListService.getMailingLists();
+ for(MailingList mailingList: mailingLists) {
+ if (mailingList.isCollectInactiveEmails()) {
+ startSendEmailForInactiveEvent(mailingList, service);
+ }
+ }
+
+ for(MailingList mailingList: mailingLists) {
+ if (mailingList.isCollectInactiveEmails()) {
+ startSendSmsForInactiveEvent(mailingList, service);
+ }
+ }
+
+ for(MailingList mailingList: mailingLists) {
+ if(mailingList.isCollectInactiveEmails()
+ && mailingList.isDailyLimitSentEmails()) {
+ startResetDailyLimitSentEmails(mailingList, mailingListService);
+ }
+ }
+
// Initialize data sources that are enabled.
DataSourceDao dataSourceDao = new DataSourceDao();
List> configs = dataSourceDao.getDataSources();
@@ -248,6 +281,15 @@ synchronized public void terminate() {
for (String key : simpleEventDetectors.keySet())
stopSimpleEventDetector(key);
+
+ for (Integer key : sendEmailForInactiveEvents.keySet())
+ stopSendEmailForInactiveEvent(key);
+
+ for (Integer key : sendSmsForInactiveEvents.keySet())
+ stopSendSmsForInactiveEvent(key);
+
+ for (Integer key : resetDailyLimitSentEmails.keySet())
+ stopResetDailyLimitSentEmails(key);
}
public void joinTermination() {
@@ -886,4 +928,98 @@ private void stopMaintenanceEvent(int id) {
rt.terminate();
}
}
+
+ private void startSendEmailForInactiveEvent(MailingList mailingList, ScheduledExecuteInactiveEventService inactiveEmailsService) {
+ CommunicationChannel channel = CommunicationChannel.newEmailChannel(mailingList, new SystemSettingsService());
+ ScheduledExecuteInactiveEventRT sendEmail = new ScheduledExecuteInactiveEventRT(inactiveEmailsService,
+ InactiveEventsProvider.newInstance(new EventDAO(), ScheduledExecuteInactiveEventDAO.getInstance(),
+ channel, 600),
+ new DataPointService(), new DataSourceService(), 300);
+ sendEmail.initialize();
+ sendEmailForInactiveEvents.put(mailingList.getId(), sendEmail);
+ }
+
+ private void startSendSmsForInactiveEvent(MailingList mailingList, ScheduledExecuteInactiveEventService inactiveEmailsService) {
+ CommunicationChannel channel = CommunicationChannel.newSmsChannel(mailingList, new SystemSettingsService());
+ ScheduledExecuteInactiveEventRT sendSms = new ScheduledExecuteInactiveEventRT(inactiveEmailsService,
+ InactiveEventsProvider.newInstance(new EventDAO(), ScheduledExecuteInactiveEventDAO.getInstance(),
+ channel, 600),
+ new DataPointService(), new DataSourceService(), 300);
+ sendSms.initialize();
+ sendSmsForInactiveEvents.put(mailingList.getId(), sendSms);
+ }
+
+ private void startResetDailyLimitSentEmails(MailingList mailingList, MailingListService mailingListService) {
+ ResetDailyLimitSendingEventRT reset = new ResetDailyLimitSendingEventRT(mailingList, this,
+ mailingListService);
+ reset.initialize();
+ resetDailyLimitSentEmails.put(mailingList.getId(), reset);
+ }
+
+ public void removeMailingList(MailingList mailingList) {
+ removeMailingList(mailingList.getId());
+ }
+
+ public void removeMailingList(int mailingListId) {
+ stopSendEmailForInactiveEvent(mailingListId);
+ stopSendSmsForInactiveEvent(mailingListId);
+ stopResetDailyLimitSentEmails(mailingListId);
+ }
+
+ public void stopSendEmailSms(int mailingListId) {
+ stopSendEmailForInactiveEvent(mailingListId);
+ stopSendSmsForInactiveEvent(mailingListId);
+ }
+
+ public void saveMailingList(MailingList mailingList) {
+ if(mailingList.isCollectInactiveEmails()) {
+ ScheduledExecuteInactiveEventService service = ScheduledExecuteInactiveEventService.getInstance();
+ startSendEmailForInactiveEvent(mailingList, service);
+ startSendSmsForInactiveEvent(mailingList, service);
+ if(mailingList.isDailyLimitSentEmails()) {
+ MailingListService mailingListService = new MailingListService();
+ startResetDailyLimitSentEmails(mailingList, mailingListService);
+ }
+ }
+ }
+
+ public void startSendEmailSms(MailingList mailingList) {
+ if(mailingList.isCollectInactiveEmails()) {
+ ScheduledExecuteInactiveEventService service = ScheduledExecuteInactiveEventService.getInstance();
+ startSendEmailForInactiveEvent(mailingList, service);
+ startSendSmsForInactiveEvent(mailingList, service);
+ }
+ }
+
+ private void stopSendSmsForInactiveEvent(int mailingListId) {
+
+ ScheduledExecuteInactiveEventRT sendSms = sendSmsForInactiveEvents.get(mailingListId);
+
+ if (sendSms == null)
+ return;
+
+ sendSms.terminate();
+ sendSmsForInactiveEvents.remove(mailingListId);
+ }
+
+ private void stopSendEmailForInactiveEvent(int mailingListId) {
+
+ ScheduledExecuteInactiveEventRT sendEmail = sendEmailForInactiveEvents.get(mailingListId);
+
+ if (sendEmail == null)
+ return;
+
+ sendEmail.terminate();
+ sendEmailForInactiveEvents.remove(mailingListId);
+ }
+
+ private void stopResetDailyLimitSentEmails(int mailingListId) {
+ ResetDailyLimitSendingEventRT reset = resetDailyLimitSentEmails.get(mailingListId);
+
+ if (reset == null)
+ return;
+
+ reset.terminate();
+ resetDailyLimitSentEmails.remove(mailingListId);
+ }
}
diff --git a/src/com/serotonin/mango/rt/event/EventInstance.java b/src/com/serotonin/mango/rt/event/EventInstance.java
index 045fd4c79e..62313c623e 100644
--- a/src/com/serotonin/mango/rt/event/EventInstance.java
+++ b/src/com/serotonin/mango/rt/event/EventInstance.java
@@ -407,6 +407,19 @@ public boolean equals(Object obj) {
return false;
return true;
}
-
-
+
+ public EventInstance copyWithContext(Map context) {
+ EventInstance eventInstance = new EventInstance(eventType, activeTimestamp, rtnApplicable, alarmLevel, message, context);
+ eventInstance.setId(id);
+ eventInstance.setAcknowledgedByUserId(acknowledgedByUserId);
+ eventInstance.setAcknowledgedByUsername(acknowledgedByUsername);
+ eventInstance.setAcknowledgedTimestamp(acknowledgedTimestamp);
+ eventInstance.setAlternateAckSource(alternateAckSource);
+ eventInstance.setEventComments(eventComments);
+ eventInstance.setHandlers(handlers);
+ eventInstance.setSilenced(silenced);
+ eventInstance.setUserNotified(userNotified);
+ return eventInstance;
+ }
+
}
diff --git a/src/com/serotonin/mango/rt/event/ScheduledEvent.java b/src/com/serotonin/mango/rt/event/ScheduledEvent.java
new file mode 100644
index 0000000000..d97b1c8846
--- /dev/null
+++ b/src/com/serotonin/mango/rt/event/ScheduledEvent.java
@@ -0,0 +1,45 @@
+package com.serotonin.mango.rt.event;
+
+import com.serotonin.mango.vo.event.EventHandlerVO;
+import org.scada_lts.service.CommunicationChannel;
+import org.scada_lts.service.ScheduledExecuteInactiveEventInstance;
+
+import java.util.Objects;
+
+public class ScheduledEvent {
+
+ private final EventInstance event;
+ private final EventHandlerVO eventHandler;
+
+ public ScheduledEvent(EventInstance event, EventHandlerVO eventHandler) {
+ this.event = event;
+ this.eventHandler = eventHandler;
+ }
+
+ public EventInstance getEvent() {
+ return event;
+ }
+
+ public EventHandlerVO getEventHandler() {
+ return eventHandler;
+ }
+
+ public ScheduledExecuteInactiveEventInstance toScheduledExecuteInactiveEventInstance(CommunicationChannel channel) {
+ return new ScheduledExecuteInactiveEventInstance(eventHandler, event, channel.getData());
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (!(o instanceof ScheduledEvent)) return false;
+ ScheduledEvent that = (ScheduledEvent) o;
+ return Objects.equals(getEvent().getId(), that.getEvent().getId()) &&
+ Objects.equals(getEventHandler().getId(), that.getEventHandler().getId());
+ }
+
+ @Override
+ public int hashCode() {
+
+ return Objects.hash(getEvent().getId(), getEventHandler().getId());
+ }
+}
diff --git a/src/com/serotonin/mango/rt/event/handlers/EmailHandlerRT.java b/src/com/serotonin/mango/rt/event/handlers/EmailHandlerRT.java
index 3b5af581d5..8551640a83 100644
--- a/src/com/serotonin/mango/rt/event/handlers/EmailHandlerRT.java
+++ b/src/com/serotonin/mango/rt/event/handlers/EmailHandlerRT.java
@@ -18,32 +18,22 @@
*/
package com.serotonin.mango.rt.event.handlers;
-import java.text.MessageFormat;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.ResourceBundle;
-import java.util.Set;
-
-import org.apache.commons.lang3.exception.ExceptionUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.joda.time.DateTime;
-
import com.serotonin.mango.Common;
import com.serotonin.mango.db.dao.MailingListDao;
-import org.scada_lts.dao.SystemSettingsDAO;
import com.serotonin.mango.rt.event.EventInstance;
-import com.serotonin.mango.rt.event.type.SystemEventType;
-import com.serotonin.mango.rt.maint.work.EmailWorkItem;
+import com.serotonin.mango.util.SendMsgUtils;
import com.serotonin.mango.util.timeout.ModelTimeoutClient;
import com.serotonin.mango.util.timeout.ModelTimeoutTask;
import com.serotonin.mango.vo.event.EventHandlerVO;
-import com.serotonin.mango.web.email.MangoEmailContent;
-import com.serotonin.mango.web.email.UsedImagesDirective;
import com.serotonin.timer.TimerTask;
-import com.serotonin.util.StringUtils;
-import com.serotonin.web.email.EmailInline;
-import com.serotonin.web.i18n.LocalizableMessage;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.joda.time.DateTime;
+import org.scada_lts.mango.service.MailingListService;
+import org.scada_lts.service.CommunicationChannelType;
+import org.scada_lts.service.ScheduledExecuteInactiveEventService;
+
+import java.util.Set;
public class EmailHandlerRT extends EventHandlerRT implements ModelTimeoutClient {
private static final Log LOG = LogFactory.getLog(EmailHandlerRT.class);
@@ -51,8 +41,10 @@ public class EmailHandlerRT extends EventHandlerRT implements ModelTimeoutClient
private TimerTask escalationTask;
private Set activeRecipients;
+ private ScheduledExecuteInactiveEventService service;
+ private MailingListService mailingListService;
- private enum NotificationType {
+ public enum EmailNotificationType implements NotificationType {
ACTIVE("active", "ftl.subject.active"), //
ESCALATION("escalation", "ftl.subject.escalation"), //
INACTIVE("inactive", "ftl.subject.inactive");
@@ -60,7 +52,7 @@ private enum NotificationType {
String file;
String key;
- private NotificationType(String file, String key) {
+ EmailNotificationType(String file, String key) {
this.file = file;
this.key = key;
}
@@ -81,6 +73,22 @@ public String getKey() {
public EmailHandlerRT(EventHandlerVO vo) {
this.vo = vo;
+ this.service = ScheduledExecuteInactiveEventService.getInstance();
+ this.mailingListService = new MailingListService();
+ }
+
+ public EmailHandlerRT(EventHandlerVO vo, MailingListService mailingListService) {
+ this.vo = vo;
+ this.service = ScheduledExecuteInactiveEventService.getInstance();
+ this.mailingListService = mailingListService;
+ }
+
+ public EmailHandlerRT(EventHandlerVO vo,
+ ScheduledExecuteInactiveEventService service,
+ MailingListService mailingListService) {
+ this.vo = vo;
+ this.service = service;
+ this.mailingListService = mailingListService;
}
public Set getActiveRecipients() {
@@ -90,17 +98,17 @@ public Set getActiveRecipients() {
@Override
public void eventRaised(EventInstance evt) {
// Get the email addresses to send to
- activeRecipients = new MailingListDao().getRecipientAddresses(vo.getActiveRecipients(),
- new DateTime(evt.getActiveTimestamp()));
+ activeRecipients = getActiveRecipients(evt);
+
+ service.scheduleEvent(vo, evt);
// Send an email to the active recipients.
- sendEmail(evt, NotificationType.ACTIVE, activeRecipients);
+ sendEmail(evt, activeRecipients);
// If an inactive notification is to be sent, save the active recipients.
if (vo.isSendInactive()) {
if (vo.isInactiveOverride())
- inactiveRecipients = new MailingListDao().getRecipientAddresses(vo.getInactiveRecipients(),
- new DateTime(evt.getActiveTimestamp()));
+ inactiveRecipients = getInactiveRecipients(evt);
else
inactiveRecipients = activeRecipients;
}
@@ -121,7 +129,7 @@ synchronized public void scheduleTimeout(EventInstance evt, long fireTime) {
fireTime));
// Send the escalation.
- sendEmail(evt, NotificationType.ESCALATION, addresses);
+ sendEmail(evt, EmailNotificationType.ESCALATION, addresses);
// If an inactive notification is to be sent, save the escalation recipients, but only if inactive recipients
// have not been overridden.
@@ -137,133 +145,36 @@ synchronized public void eventInactive(EventInstance evt) {
if (inactiveRecipients != null && inactiveRecipients.size() > 0)
// Send an email to the inactive recipients.
- sendEmail(evt, NotificationType.INACTIVE, inactiveRecipients);
+ sendEmail(evt, EmailNotificationType.INACTIVE, inactiveRecipients);
}
public static void sendActiveEmail(EventInstance evt, Set addresses) {
- sendEmail(evt, NotificationType.ACTIVE, addresses, null);
+ SendMsgUtils.sendEmail(evt, EmailNotificationType.ACTIVE, addresses, null);
}
- private void sendEmail(EventInstance evt, NotificationType notificationType, Set addresses) {
- sendEmail(evt, notificationType, addresses, vo.getAlias());
+ protected Set getActiveRecipients(EventInstance evt) {
+ CommunicationChannelType type = CommunicationChannelType.EMAIL;
+ Set addresses = mailingListService.getRecipientAddresses(vo.getActiveRecipients(),
+ new DateTime(evt.getActiveTimestamp()), type);
+ return type.formatAddresses(addresses, "", type.getReplaceRegex());
}
- private static String getInfoEmail(EventInstance evt, NotificationType notificationType, String alias) {
-
- String messageInfoAlias = MessageFormat.format("Alias: {0} \n", alias);
- String messageInfoEmail = MessageFormat.format("Event: {0} \n", evt.getId());
- String messageInfoNotyfication = MessageFormat.format("Notyfication: {0} \n", notificationType.getKey());
- String subject = "";
- String messageExceptionWhenGetSubjectEmail = "";
- try {
- LocalizableMessage subjectMsg;
- LocalizableMessage notifTypeMsg = new LocalizableMessage(notificationType.getKey());
- if (StringUtils.isEmpty(alias)) {
- if (evt.getId() == Common.NEW_ID)
- subjectMsg = new LocalizableMessage("ftl.subject.default", notifTypeMsg);
- else
- subjectMsg = new LocalizableMessage("ftl.subject.default.id", notifTypeMsg, evt.getId());
- } else {
- if (evt.getId() == Common.NEW_ID)
- subjectMsg = new LocalizableMessage("ftl.subject.alias", alias, notifTypeMsg);
- else
- subjectMsg = new LocalizableMessage("ftl.subject.alias.id", alias, notifTypeMsg, evt.getId());
- }
-
- ResourceBundle bundle = Common.getBundle();
- subject = subjectMsg.getLocalizedMessage(bundle);
- } catch (Exception e) {
- messageExceptionWhenGetSubjectEmail = MessageFormat.format("StackTrace for subjectMsg {0}",ExceptionUtils.getStackTrace(e));
- }
-
- String messages = new StringBuilder()
- .append(messageInfoEmail)
- .append(messageInfoNotyfication)
- .append(messageInfoAlias)
- .append(subject)
- .append(messageExceptionWhenGetSubjectEmail).toString();
-
- return messages;
+ protected Set getInactiveRecipients(EventInstance evt) {
+ CommunicationChannelType type = CommunicationChannelType.EMAIL;
+ Set addresses = mailingListService.getRecipientAddresses(vo.getInactiveRecipients(),
+ new DateTime(evt.getActiveTimestamp()), type);
+ return type.formatAddresses(addresses, "", type.getReplaceRegex());
}
- private static void validateEmail(EventInstance evt, NotificationType notificationType, Set addresses, String alias) throws Exception {
-
- String messageErrorEventInstance = "Event Instance null \n";
- String messageErrorNotyficationType = "Notification type is null \n";
- String messageErrorEmails = "Don't have e-mail \n";
- String messageErrorAlias = "Don't have alias\n";
- String messages = "";
- if (evt == null || evt.getEventType() == null) messages += messageErrorEventInstance;
- if (notificationType == null) messages += messageErrorNotyficationType;
- if (addresses == null || addresses.size() == 0) messages += messageErrorEmails;
- if (alias == null) messages += messageErrorAlias;
-
- if (messages.length() > 0) {
- throw new Exception(getInfoEmail(evt, notificationType, alias) + messages );
- }
+ protected EventHandlerVO getVo() {
+ return this.vo;
+ }
+ protected void sendEmail(EventInstance evt, Set addresses) {
+ SendMsgUtils.sendEmail(evt, EmailNotificationType.ACTIVE, addresses, vo.getAlias());
}
- private static void sendEmail(EventInstance evt, NotificationType notificationType, Set addresses,
- String alias) {
- try {
-
- validateEmail(evt, notificationType, addresses, alias);
-
- if (evt.getEventType().isSystemMessage()) {
- if (((SystemEventType) evt.getEventType()).getSystemEventTypeId() == SystemEventType.TYPE_EMAIL_SEND_FAILURE) {
- // Don't send email notifications about email send failures.
- LOG.info("Not sending email for event raised due to email failure");
- return;
- }
- }
-
- ResourceBundle bundle = Common.getBundle();
-
- // Determine the subject to use.
-
- LocalizableMessage subjectMsg;
- LocalizableMessage notifTypeMsg = new LocalizableMessage(notificationType.getKey());
- if (StringUtils.isEmpty(alias)) {
- if (evt.getId() == Common.NEW_ID)
- subjectMsg = new LocalizableMessage("ftl.subject.default", notifTypeMsg);
- else
- subjectMsg = new LocalizableMessage("ftl.subject.default.id", notifTypeMsg, evt.getId());
- } else {
- if (evt.getId() == Common.NEW_ID)
- subjectMsg = new LocalizableMessage("ftl.subject.alias", alias, notifTypeMsg);
- else
- subjectMsg = new LocalizableMessage("ftl.subject.alias.id", alias, notifTypeMsg, evt.getId());
- }
-
- String subject = subjectMsg.getLocalizedMessage(bundle);
-
- String[] toAddrs = addresses.toArray(new String[0]);
- UsedImagesDirective inlineImages = new UsedImagesDirective();
-
- // Send the email.
- Map model = new HashMap();
- model.put("evt", evt);
- if (evt.getContext() != null)
- model.putAll(evt.getContext());
- model.put("img", inlineImages);
- model.put("instanceDescription", SystemSettingsDAO.getValue(SystemSettingsDAO.INSTANCE_DESCRIPTION));
- MangoEmailContent content = new MangoEmailContent(notificationType.getFile(), model, bundle, subject,
- Common.UTF8);
-
- for (String s : inlineImages.getImageList())
- content.addInline(new EmailInline.FileInline(s, Common.ctx.getServletContext().getRealPath(s)));
-
- EmailWorkItem.queueEmail(toAddrs, content);
-
- } catch (Exception e) {
- LOG.error(
- MessageFormat.format(
- "Info about email: {0}, StackTrace: {1}",
- new Object[] {
- getInfoEmail(evt,notificationType,alias),
- ExceptionUtils.getStackTrace(e)}
- ));
- }
+ private void sendEmail(EventInstance evt, NotificationType notificationType, Set addresses) {
+ SendMsgUtils.sendEmail(evt, notificationType, addresses, vo.getAlias());
}
}
diff --git a/src/com/serotonin/mango/rt/event/handlers/EmailToSmsHandlerRT.java b/src/com/serotonin/mango/rt/event/handlers/EmailToSmsHandlerRT.java
new file mode 100644
index 0000000000..3f751aaa59
--- /dev/null
+++ b/src/com/serotonin/mango/rt/event/handlers/EmailToSmsHandlerRT.java
@@ -0,0 +1,82 @@
+package com.serotonin.mango.rt.event.handlers;
+
+import com.serotonin.mango.rt.event.EventInstance;
+import com.serotonin.mango.util.SendMsgUtils;
+import com.serotonin.mango.vo.event.EventHandlerVO;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.joda.time.DateTime;
+import org.scada_lts.mango.service.MailingListService;
+import org.scada_lts.mango.service.SystemSettingsService;
+import org.scada_lts.service.CommunicationChannelType;
+import org.scada_lts.service.ScheduledExecuteInactiveEventService;
+
+import java.util.Set;
+
+public class EmailToSmsHandlerRT extends EmailHandlerRT {
+
+ private static final Log LOG = LogFactory.getLog(EmailToSmsHandlerRT.class);
+
+ public enum SmsNotificationType implements NotificationType {
+ ACTIVE("activeSms", "ftl.subject.active"),
+ LIMIT("limitSms", "ftl.subject.active");
+
+ String file;
+ String key;
+
+ SmsNotificationType(String file, String key) {
+ this.file = file;
+ this.key = key;
+ }
+
+ public String getFile() {
+ return file;
+ }
+
+ public String getKey() {
+ return key;
+ }
+ }
+
+ private final SystemSettingsService systemSettingsService;
+ private final MailingListService mailingListService;
+
+ @Deprecated
+ public EmailToSmsHandlerRT(EventHandlerVO vo) {
+ super(vo);
+ this.systemSettingsService = new SystemSettingsService();
+ this.mailingListService = new MailingListService();
+ }
+
+ public EmailToSmsHandlerRT(EventHandlerVO vo, ScheduledExecuteInactiveEventService service,
+ MailingListService mailingListService, SystemSettingsService systemSettingsService) {
+ super(vo, service, mailingListService);
+ this.systemSettingsService = systemSettingsService;
+ this.mailingListService = mailingListService;
+ }
+
+ @Override
+ protected Set getActiveRecipients(EventInstance evt) {
+ Set addresses = mailingListService.getRecipientAddresses(getVo().getActiveRecipients(),
+ new DateTime(evt.getActiveTimestamp()), CommunicationChannelType.SMS);
+ return formatAddresses(addresses);
+ }
+
+ @Override
+ protected Set getInactiveRecipients(EventInstance evt) {
+ Set addresses = mailingListService.getRecipientAddresses(getVo().getInactiveRecipients(),
+ new DateTime(evt.getActiveTimestamp()), CommunicationChannelType.SMS);
+ return formatAddresses(addresses);
+ }
+
+ @Override
+ protected void sendEmail(EventInstance evt, Set addresses) {
+ SendMsgUtils.sendSms(evt, SmsNotificationType.ACTIVE, addresses, vo.getAlias());
+ }
+
+ private Set formatAddresses(Set addresses) {
+ String domain = systemSettingsService.getSMSDomain();
+ CommunicationChannelType type = CommunicationChannelType.SMS;
+ return type.formatAddresses(addresses, domain, type.getReplaceRegex());
+ }
+}
diff --git a/src/com/serotonin/mango/rt/event/handlers/EventHandlerRT.java b/src/com/serotonin/mango/rt/event/handlers/EventHandlerRT.java
index 3b0d741221..5d483bd156 100644
--- a/src/com/serotonin/mango/rt/event/handlers/EventHandlerRT.java
+++ b/src/com/serotonin/mango/rt/event/handlers/EventHandlerRT.java
@@ -40,4 +40,5 @@ abstract public class EventHandlerRT {
* @param evt
*/
abstract public void eventInactive(EventInstance evt);
+
}
diff --git a/src/com/serotonin/mango/rt/event/handlers/NotificationType.java b/src/com/serotonin/mango/rt/event/handlers/NotificationType.java
new file mode 100644
index 0000000000..d45e6d43cd
--- /dev/null
+++ b/src/com/serotonin/mango/rt/event/handlers/NotificationType.java
@@ -0,0 +1,6 @@
+package com.serotonin.mango.rt.event.handlers;
+
+public interface NotificationType {
+ String getFile();
+ String getKey();
+}
diff --git a/src/com/serotonin/mango/rt/event/schedule/ResetDailyLimitSendingEventRT.java b/src/com/serotonin/mango/rt/event/schedule/ResetDailyLimitSendingEventRT.java
new file mode 100644
index 0000000000..1b1b10911f
--- /dev/null
+++ b/src/com/serotonin/mango/rt/event/schedule/ResetDailyLimitSendingEventRT.java
@@ -0,0 +1,55 @@
+package com.serotonin.mango.rt.event.schedule;
+
+import com.serotonin.mango.rt.RuntimeManager;
+import com.serotonin.mango.util.timeout.ModelTimeoutClient;
+import com.serotonin.mango.util.timeout.ModelTimeoutTask;
+import com.serotonin.mango.vo.mailingList.MailingList;
+import com.serotonin.timer.CronTimerTrigger;
+import com.serotonin.timer.TimerTask;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.scada_lts.mango.service.MailingListService;
+
+import java.text.ParseException;
+
+public class ResetDailyLimitSendingEventRT implements ModelTimeoutClient {
+
+
+ private final Log log = LogFactory.getLog(ResetDailyLimitSendingEventRT.class);
+
+ private TimerTask task;
+ private final int mailingListId;
+ private final RuntimeManager runtimeManager;
+ private final MailingListService mailingListService;
+
+ public ResetDailyLimitSendingEventRT(MailingList mailingList, RuntimeManager runtimeManager,
+ MailingListService mailingListService) {
+ this.mailingListId = mailingList.getId();
+ this.runtimeManager = runtimeManager;
+ this.mailingListService = mailingListService;
+ }
+
+ public void initialize() {
+ try {
+ CronTimerTrigger activeTrigger = new CronTimerTrigger("0 0 0 * * ?");
+ task = new ModelTimeoutTask<>(activeTrigger, this, true);
+ } catch (ParseException e) {
+ log.error(e);
+ throw new RuntimeException(e);
+ }
+ }
+
+ public void terminate() {
+ if (task != null)
+ task.cancel();
+ }
+
+ @Override
+ public void scheduleTimeout(Boolean model, long fireTime) {
+ log.info("run: " + ResetDailyLimitSendingEventRT.class.getName());
+ runtimeManager.stopSendEmailSms(mailingListId);
+ MailingList mailingList1 = mailingListService.getMailingList(mailingListId);
+ runtimeManager.startSendEmailSms(mailingList1);
+ log.info("executed: " + ResetDailyLimitSendingEventRT.class.getName());
+ }
+}
diff --git a/src/com/serotonin/mango/rt/event/schedule/ScheduledExecuteInactiveEventRT.java b/src/com/serotonin/mango/rt/event/schedule/ScheduledExecuteInactiveEventRT.java
new file mode 100644
index 0000000000..2e182967eb
--- /dev/null
+++ b/src/com/serotonin/mango/rt/event/schedule/ScheduledExecuteInactiveEventRT.java
@@ -0,0 +1,306 @@
+package com.serotonin.mango.rt.event.schedule;
+
+import com.serotonin.mango.rt.event.AlarmLevels;
+import com.serotonin.mango.rt.event.EventInstance;
+import com.serotonin.mango.rt.event.ScheduledEvent;
+import com.serotonin.mango.rt.event.type.DataPointEventType;
+import com.serotonin.mango.rt.event.type.DataSourceEventType;
+import com.serotonin.mango.rt.event.type.EventType;
+import com.serotonin.mango.util.timeout.ModelTimeoutClient;
+import com.serotonin.mango.util.timeout.ModelTimeoutTask;
+import com.serotonin.mango.vo.DataPointVO;
+import com.serotonin.mango.vo.dataSource.DataSourceVO;
+import com.serotonin.mango.vo.event.EventHandlerVO;
+import com.serotonin.timer.CronTimerTrigger;
+import com.serotonin.timer.TimerTask;
+import com.serotonin.web.i18n.LocalizableMessage;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.joda.time.DateTime;
+import org.scada_lts.mango.service.DataPointService;
+import org.scada_lts.mango.service.DataSourceService;
+import org.scada_lts.service.CommunicationChannel;
+import org.scada_lts.service.CommunicationChannelTypable;
+import org.scada_lts.service.InactiveEventsProvider;
+import org.scada_lts.service.ScheduledExecuteInactiveEventService;
+import org.springframework.dao.EmptyResultDataAccessException;
+
+import java.text.ParseException;
+import java.util.Collections;
+import java.util.List;
+import java.util.Queue;
+import java.util.Set;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Optional;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.BiPredicate;
+
+public class ScheduledExecuteInactiveEventRT implements ModelTimeoutClient {
+
+ private static final Log log = LogFactory.getLog(ScheduledExecuteInactiveEventRT.class);
+
+ private TimerTask task;
+ private final CommunicationChannel communicationChannel;
+ private final ScheduledExecuteInactiveEventService service;
+ private final InactiveEventsProvider inactiveEventsProvider;
+ private final int limit;
+
+ private final AtomicInteger nonBlockingLock;
+ private final AtomicInteger failsCounter;
+ private final AtomicInteger limitLock;
+ private final AtomicInteger communicateLimitLock;
+
+ private final AtomicInteger currentExecutedCounter;
+ private final AtomicInteger currentScheduledCounter;
+ private final DataPointService dataPointService;
+ private final DataSourceService dataSourceService;
+ private final Queue> toExecute;
+
+ public ScheduledExecuteInactiveEventRT(ScheduledExecuteInactiveEventService service,
+ InactiveEventsProvider inactiveEventsProvider,
+ DataPointService dataPointService,
+ DataSourceService dataSourceService,
+ int defaultLimit) {
+ this.communicationChannel = inactiveEventsProvider.getCommunicationChannel();
+ this.limit = communicationChannel.isDailyLimitSent() ?
+ communicationChannel.getDailyLimitSentNumber() : defaultLimit;
+ this.limitLock = new AtomicInteger(limit);
+ this.service = service;
+ this.inactiveEventsProvider = inactiveEventsProvider;
+ this.dataPointService = dataPointService;
+ this.dataSourceService = dataSourceService;
+ this.toExecute = new ConcurrentLinkedQueue<>();
+ this.failsCounter = new AtomicInteger(0);
+ this.communicateLimitLock = new AtomicInteger(0);
+ this.currentExecutedCounter = new AtomicInteger(0);
+ this.currentScheduledCounter = new AtomicInteger(0);
+ this.nonBlockingLock = new AtomicInteger(0);
+ }
+
+ public void initialize() {
+ try {
+ CronTimerTrigger activeTrigger = new CronTimerTrigger(communicationChannel.getSendingActivationCron());
+ task = new ModelTimeoutTask<>(activeTrigger, this, true);
+ } catch (ParseException e) {
+ log.error(e);
+ }
+ }
+
+ public void terminate() {
+ if (task != null)
+ task.cancel();
+ toExecute.clear();
+ }
+
+ @Override
+ public void scheduleTimeout(Boolean model, long fireTime) {
+ DateTime dateTime = new DateTime(fireTime);
+ if (communicationChannel.isActiveFor(dateTime)) {
+ Set addresses = communicationChannel.getActiveAdresses(dateTime);
+ if(!addresses.isEmpty()) {
+ schedule(addresses, fireTime);
+ execute();
+ }
+ }
+ }
+
+ public int getCurrentExecutedNumber() {
+ return currentExecutedCounter.get();
+ }
+
+ public int getCurrentScheduledNumber() {
+ return currentScheduledCounter.get();
+ }
+
+ private void schedule(Set addresses, long fireTime) {
+ if(isSchedule() && nonBlockingLock.getAndDecrement() == 0) {
+ try {
+ List scheduledEvents = inactiveEventsProvider
+ .getScheduledEvents(limitLock.get());
+ for (ScheduledEvent event : scheduledEvents) {
+ toExecute.offer(new Execute<>(this::send, event, new ExecuteData(communicationChannel, limitLock,
+ failsCounter, communicateLimitLock, addresses, fireTime)));
+ currentScheduledCounter.incrementAndGet();
+ if (communicationChannel.isDailyLimitSent()) {
+ if (limitLock.get() > 0)
+ limitLock.decrementAndGet();
+ }
+ }
+ } finally {
+ nonBlockingLock.set(0);
+ }
+ }
+ }
+
+ private boolean isSchedule() {
+ return toExecute.peek() == null && (!communicationChannel.isDailyLimitSent() || limitLock.get() > 0);
+ }
+
+ private void execute() {
+ if(limit <= 0) {
+ return;
+ }
+ AtomicInteger oneExecuteLimit = new AtomicInteger(limit);
+ Execute execute;
+ while ((execute = toExecute.poll()) != null) {
+ execute.execute();
+ currentExecutedCounter.incrementAndGet();
+ if(oneExecuteLimit.decrementAndGet() < 1)
+ break;
+ }
+ }
+
+ private static boolean communicateLimit(Set addresses, long fireTime, CommunicationChannel communicationChannel) {
+ LocalizableMessage dailyLimitExceededMsg = new LocalizableMessage("mailingLists.dailyLimitExceeded");
+ EventType eventType = new DataPointEventType();
+ EventInstance event = new EventInstance(eventType, fireTime,false,
+ AlarmLevels.INFORMATION, dailyLimitExceededMsg, Collections.emptyMap());
+ CommunicationChannelTypable type = communicationChannel.getType();
+
+ boolean sent = type.sendLimit(event, addresses,"Limit");
+ if(sent) {
+ log.info("Last message sent today for a list of addresses id: " + communicationChannel.getChannelId() + ", type: " + communicationChannel.getType());
+ return true;
+ }
+ return false;
+ }
+
+ private boolean send(ScheduledEvent scheduledEvent, Set addresses) {
+ EventInstance event = scheduledEvent.getEvent();
+ EventType eventType = event.getEventType();
+ EventHandlerVO eventHandler = scheduledEvent.getEventHandler();
+ CommunicationChannelTypable type = communicationChannel.getType();
+ Optional dataPoint = getDataPoint(eventType);
+ if (dataPoint.isPresent() && isExists(eventType)) {
+
+ Map context = createContext(dataPoint.get());
+ EventInstance toSend = event.copyWithContext(context);
+
+ String eventHandlerAlias = eventHandler.getAlias();
+ String alias = eventHandlerAlias == null || eventHandlerAlias.isEmpty() ? "Delay msg" : eventHandlerAlias;
+ boolean sent = type.sendMsg(toSend, addresses, alias);
+ if(sent) {
+ service.unscheduleEvent(scheduledEvent, communicationChannel);
+ inactiveEventsProvider.confirm(scheduledEvent);
+ return true;
+ }
+ inactiveEventsProvider.repeat(scheduledEvent);
+ return false;
+ }
+ service.unscheduleEvent(scheduledEvent, communicationChannel);
+ inactiveEventsProvider.confirm(scheduledEvent);
+ return false;
+ }
+
+ private Map createContext(DataPointVO dataPoint) {
+ Map context = new HashMap<>();
+ context.put("point", dataPoint);
+ return context;
+ }
+
+ private boolean isExists(EventType eventType) {
+ return (!(eventType instanceof DataPointEventType) || isDataSourceExists(eventType))
+ && (!(eventType instanceof DataSourceEventType) || isDataSourceExists(eventType));
+ }
+
+ private Optional getDataPoint(EventType eventType) {
+ try {
+ DataPointVO dataPoint = dataPointService.getDataPoint(eventType.getDataPointId());
+ return Optional.ofNullable(dataPoint);
+ } catch (EmptyResultDataAccessException ex) {
+ return Optional.empty();
+ }
+ }
+
+ private boolean isDataSourceExists(EventType eventType) {
+ try {
+ DataSourceVO dataSource = dataSourceService.getDataSource(eventType.getDataSourceId());
+ return dataSource != null;
+ } catch (EmptyResultDataAccessException ex) {
+ return false;
+ }
+ }
+
+ private static class Execute {
+ BiPredicate> predicate;
+ ExecuteData executeData;
+ N arg1;
+
+ public Execute(BiPredicate> predicate, N arg1, ExecuteData executeData) {
+ this.predicate = predicate;
+ this.executeData = executeData;
+ this.arg1 = arg1;
+ }
+
+ void execute() {
+ Set addresses = executeData.getAddresses();
+ boolean executed = predicate.test(arg1, addresses);
+
+ long fireTime = executeData.getFireTime();
+ CommunicationChannel channel = executeData.getCommunicationChannel();
+
+ if(channel.isDailyLimitSent()) {
+ AtomicInteger limit = executeData.getLimit();
+ AtomicInteger fails = executeData.getFails();
+ AtomicInteger lock = executeData.getLock();
+ if (!executed)
+ fails.incrementAndGet();
+ else if (limit.get() == 0 && fails.get() == 0 && lock.getAndDecrement() == 0) {
+ boolean communicated = false;
+ try {
+ communicated = ScheduledExecuteInactiveEventRT.communicateLimit(addresses, fireTime, channel);
+ } finally {
+ if(!communicated)
+ lock.set(0);
+ }
+ }
+ }
+ }
+ }
+
+ private static class ExecuteData {
+ CommunicationChannel communicationChannel;
+ AtomicInteger limit;
+ AtomicInteger fails;
+ AtomicInteger lock;
+ Set addresses;
+ long fireTime;
+
+ public ExecuteData(CommunicationChannel communicationChannel, AtomicInteger limit, AtomicInteger fails,
+ AtomicInteger lock, Set addresses, long fireTime) {
+ this.communicationChannel = communicationChannel;
+ this.limit = limit;
+ this.fails = fails;
+ this.lock = lock;
+ this.addresses = addresses;
+ this.fireTime = fireTime;
+ }
+
+ public CommunicationChannel getCommunicationChannel() {
+ return communicationChannel;
+ }
+
+ public AtomicInteger getLimit() {
+ return limit;
+ }
+
+ public Set getAddresses() {
+ return addresses;
+ }
+
+ public long getFireTime() {
+ return fireTime;
+ }
+
+ public AtomicInteger getFails() {
+ return fails;
+ }
+
+ public AtomicInteger getLock() {
+ return lock;
+ }
+ }
+
+}
diff --git a/src/com/serotonin/mango/util/EmailContentUtils.java b/src/com/serotonin/mango/util/EmailContentUtils.java
new file mode 100644
index 0000000000..70f1656edd
--- /dev/null
+++ b/src/com/serotonin/mango/util/EmailContentUtils.java
@@ -0,0 +1,85 @@
+package com.serotonin.mango.util;
+
+import com.serotonin.mango.Common;
+import com.serotonin.mango.rt.event.EventInstance;
+import com.serotonin.mango.rt.event.handlers.NotificationType;
+import com.serotonin.mango.web.email.MangoEmailContent;
+import com.serotonin.mango.web.email.MangoTextContent;
+import com.serotonin.mango.web.email.UsedImagesDirective;
+import com.serotonin.util.StringUtils;
+import com.serotonin.web.email.EmailInline;
+import com.serotonin.web.i18n.LocalizableMessage;
+import freemarker.template.TemplateException;
+import org.scada_lts.dao.SystemSettingsDAO;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.ResourceBundle;
+
+public final class EmailContentUtils {
+
+ private EmailContentUtils(){}
+
+ public static MangoTextContent createTextContent(EventInstance evt, NotificationType notificationType, String alias) throws TemplateException, IOException {
+ ResourceBundle bundle = Common.getBundle();
+ String subject = getSubject(evt, notificationType, alias, bundle);
+ Map model = createSmsModel(evt);
+ return new MangoTextContent(notificationType.getFile(), model, bundle, subject, Common.UTF8);
+ }
+
+ public static MangoEmailContent createContent(EventInstance evt, NotificationType notificationType, String alias) throws TemplateException, IOException {
+ ResourceBundle bundle = Common.getBundle();
+ String subject = getSubject(evt, notificationType, alias, bundle);
+ UsedImagesDirective inlineImages = new UsedImagesDirective();
+
+ Map model = createModel(evt, inlineImages);
+ MangoEmailContent content = new MangoEmailContent(notificationType.getFile(), model, bundle, subject,
+ Common.UTF8);
+
+ addInLineToContent(inlineImages, content);
+ return content;
+ }
+
+ private static void addInLineToContent(UsedImagesDirective inlineImages, MangoEmailContent content) {
+ for (String s : inlineImages.getImageList())
+ content.addInline(new EmailInline.FileInline(s, Common.ctx.getServletContext().getRealPath(s)));
+ }
+
+ private static Map createModel(EventInstance evt, UsedImagesDirective inlineImages) {
+ Map model = new HashMap<>();
+ model.put("evt", evt);
+ if (evt.getContext() != null)
+ model.putAll(evt.getContext());
+ model.put("img", inlineImages);
+ model.put("instanceDescription", SystemSettingsDAO.getValue(SystemSettingsDAO.INSTANCE_DESCRIPTION));
+ return model;
+ }
+
+ private static Map createSmsModel(EventInstance evt) {
+ Map model = new HashMap<>();
+ model.put("evt", evt);
+ if (evt.getContext() != null)
+ model.putAll(evt.getContext());
+ return model;
+ }
+
+ private static String getSubject(EventInstance evt, NotificationType notificationType, String alias, ResourceBundle bundle) {
+ // Determine the subject to use.
+ LocalizableMessage subjectMsg;
+ LocalizableMessage notifTypeMsg = new LocalizableMessage(notificationType.getKey());
+ if (StringUtils.isEmpty(alias)) {
+ if (evt.getId() == Common.NEW_ID)
+ subjectMsg = new LocalizableMessage("ftl.subject.default", notifTypeMsg);
+ else
+ subjectMsg = new LocalizableMessage("ftl.subject.default.id", notifTypeMsg, evt.getId());
+ } else {
+ if (evt.getId() == Common.NEW_ID)
+ subjectMsg = new LocalizableMessage("ftl.subject.alias", alias, notifTypeMsg);
+ else
+ subjectMsg = new LocalizableMessage("ftl.subject.alias.id", alias, notifTypeMsg, evt.getId());
+ }
+
+ return subjectMsg.getLocalizedMessage(bundle);
+ }
+}
diff --git a/src/com/serotonin/mango/util/IntervalUtil.java b/src/com/serotonin/mango/util/IntervalUtil.java
new file mode 100644
index 0000000000..b354917656
--- /dev/null
+++ b/src/com/serotonin/mango/util/IntervalUtil.java
@@ -0,0 +1,27 @@
+package com.serotonin.mango.util;
+
+import com.serotonin.mango.rt.event.EventInstance;
+import com.serotonin.mango.vo.mailingList.MailingList;
+import org.joda.time.DateTime;
+
+public final class IntervalUtil {
+
+ private IntervalUtil() {}
+
+ public static boolean isActiveByInterval(MailingList mailingList, EventInstance event) {
+ DateTime dateTime = new DateTime(event.getActiveTimestamp());
+ return !mailingList.getInactiveIntervals().contains(getIntervalIdAt(dateTime));
+ }
+
+ public static boolean isActiveByInterval(MailingList mailingList, DateTime fireTime) {
+ return !mailingList.getInactiveIntervals().contains(getIntervalIdAt(fireTime));
+ }
+
+ public static int getIntervalIdAt(DateTime dt) {
+ int interval = 0;
+ interval += dt.getMinuteOfHour() / 15;
+ interval += dt.getHourOfDay() * 4;
+ interval += (dt.getDayOfWeek() - 1) * 96;
+ return interval;
+ }
+}
diff --git a/src/com/serotonin/mango/util/SendMsgUtils.java b/src/com/serotonin/mango/util/SendMsgUtils.java
new file mode 100644
index 0000000000..55314c3bd9
--- /dev/null
+++ b/src/com/serotonin/mango/util/SendMsgUtils.java
@@ -0,0 +1,231 @@
+package com.serotonin.mango.util;
+
+import com.serotonin.mango.Common;
+import com.serotonin.mango.rt.event.EventInstance;
+import com.serotonin.mango.rt.event.handlers.NotificationType;
+import com.serotonin.mango.rt.event.type.SystemEventType;
+import com.serotonin.mango.rt.maint.work.EmailWorkItem;
+import com.serotonin.mango.web.email.MangoEmailContent;
+import com.serotonin.util.StringUtils;
+import com.serotonin.web.email.EmailSender;
+import com.serotonin.web.i18n.LocalizableMessage;
+import org.apache.commons.lang3.exception.ExceptionUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.scada_lts.dao.SystemSettingsDAO;
+
+import javax.mail.internet.InternetAddress;
+import java.text.MessageFormat;
+import java.util.ResourceBundle;
+import java.util.Set;
+
+public final class SendMsgUtils {
+
+ private SendMsgUtils() {}
+
+ private static final Log LOG = LogFactory.getLog(SendMsgUtils.class);
+
+ public static boolean sendEmailWithoutQueue(EventInstance evt, NotificationType notificationType,
+ Set addresses, String alias) {
+ try {
+
+ validateEmail(evt, notificationType, addresses, alias);
+
+ if (evt.getEventType().isSystemMessage()) {
+ if (((SystemEventType) evt.getEventType()).getSystemEventTypeId() == SystemEventType.TYPE_EMAIL_SEND_FAILURE) {
+ // Don't send email notifications about email send failures.
+ LOG.info("Not sending email for event raised due to email failure");
+ return false;
+ }
+ }
+ String[] toAddrs = addresses.toArray(new String[0]);
+ MangoEmailContent content = EmailContentUtils.createContent(evt, notificationType, alias);
+
+ // Send the email.
+ sendEmailWithoutQueue(toAddrs, content);
+ return true;
+
+ } catch (Exception e) {
+ LOG.error(MessageFormat.format("Info about email: {0}, StackTrace: {1}",
+ getInfoEmail(evt,notificationType,alias),
+ e.getMessage()));
+ return false;
+ }
+ }
+
+ public static boolean sendSmsWithoutQueue(EventInstance evt, NotificationType notificationType, Set addresses,
+ String alias) {
+ try {
+
+ validateEmail(evt, notificationType, addresses, alias);
+
+ if (evt.getEventType().isSystemMessage()) {
+ if (((SystemEventType) evt.getEventType()).getSystemEventTypeId() == SystemEventType.TYPE_EMAIL_SEND_FAILURE) {
+ // Don't send email notifications about email send failures.
+ LOG.info("Not sending email for event raised due to email failure");
+ return false;
+ }
+ }
+ String[] toAddrs = addresses.toArray(new String[0]);
+ MangoEmailContent content = EmailContentUtils.createTextContent(evt, notificationType, alias);
+
+ // Send the email.
+ sendEmailWithoutQueue(toAddrs, content);
+ return true;
+
+ } catch (Exception e) {
+ LOG.error(MessageFormat.format("Info about email: {0}, StackTrace: {1}",
+ getInfoEmail(evt,notificationType,alias),
+ e.getMessage()));
+ return false;
+ }
+ }
+
+ public static boolean sendEmail(EventInstance evt, NotificationType notificationType, Set addresses,
+ String alias) {
+ try {
+
+ validateEmail(evt, notificationType, addresses, alias);
+
+ if (evt.getEventType().isSystemMessage()) {
+ if (((SystemEventType) evt.getEventType()).getSystemEventTypeId() == SystemEventType.TYPE_EMAIL_SEND_FAILURE) {
+ // Don't send email notifications about email send failures.
+ LOG.info("Not sending email for event raised due to email failure");
+ return false;
+ }
+ }
+ String[] toAddrs = addresses.toArray(new String[0]);
+ MangoEmailContent content = EmailContentUtils.createContent(evt, notificationType, alias);
+
+ // Send the email.
+ EmailWorkItem.queueEmail(toAddrs, content);
+ return true;
+
+ } catch (Exception e) {
+ LOG.error(MessageFormat.format("Info about email: {0}, StackTrace: {1}",
+ getInfoEmail(evt,notificationType,alias),
+ e.getMessage()));
+ return false;
+ }
+ }
+
+ public static boolean sendSms(EventInstance evt, NotificationType notificationType, Set addresses,
+ String alias) {
+ try {
+
+ validateEmail(evt, notificationType, addresses, alias);
+
+ if (evt.getEventType().isSystemMessage()) {
+ if (((SystemEventType) evt.getEventType()).getSystemEventTypeId() == SystemEventType.TYPE_EMAIL_SEND_FAILURE) {
+ // Don't send email notifications about email send failures.
+ LOG.info("Not sending email for event raised due to email failure");
+ return false;
+ }
+ }
+
+ MangoEmailContent content = EmailContentUtils.createTextContent(evt, notificationType, alias);
+ String[] toAddrs = addresses.toArray(new String[0]);
+
+ EmailWorkItem.queueEmail(toAddrs, content);
+ return true;
+
+ } catch (Exception e) {
+ LOG.error(MessageFormat.format("Info about email: {0}, StackTrace: {1}",
+ getInfoEmail(evt,notificationType,alias),
+ e.getMessage()));
+ return false;
+ }
+ }
+
+ private static void sendEmailWithoutQueue(String[] toAddrs, MangoEmailContent content)
+ throws Exception {
+ InternetAddress[] toAddresses = new InternetAddress[toAddrs.length];
+ for (int i = 0; i < toAddrs.length; i++)
+ toAddresses[i] = new InternetAddress(toAddrs[i]);
+
+ String addr = SystemSettingsDAO.getValue(SystemSettingsDAO.EMAIL_FROM_ADDRESS);
+ String pretty = SystemSettingsDAO.getValue(SystemSettingsDAO.EMAIL_FROM_NAME);
+ String host = SystemSettingsDAO.getValue(SystemSettingsDAO.EMAIL_SMTP_HOST);
+ int port = SystemSettingsDAO.getIntValue(SystemSettingsDAO.EMAIL_SMTP_PORT);
+ boolean authorization = SystemSettingsDAO.getBooleanValue(SystemSettingsDAO.EMAIL_AUTHORIZATION);
+ String username = SystemSettingsDAO.getValue(SystemSettingsDAO.EMAIL_SMTP_USERNAME);
+ String password = SystemSettingsDAO.getValue(SystemSettingsDAO.EMAIL_SMTP_PASSWORD);
+ boolean tls = SystemSettingsDAO.getBooleanValue(SystemSettingsDAO.EMAIL_TLS);
+
+ validateConfig(SystemSettingsDAO.EMAIL_FROM_ADDRESS, addr);
+ validateConfig(SystemSettingsDAO.EMAIL_SMTP_HOST, host);
+ if(authorization) {
+ validateConfig(SystemSettingsDAO.EMAIL_SMTP_USERNAME, username);
+ validateConfig(SystemSettingsDAO.EMAIL_SMTP_PASSWORD, password);
+ }
+
+ InternetAddress fromAddress = new InternetAddress(addr, pretty);
+ EmailSender emailSender = new EmailSender(host, port, authorization, username, password, tls);
+
+ emailSender.send(fromAddress, toAddresses, content.getSubject(), content);
+ }
+
+ private static String getInfoEmail(EventInstance evt, NotificationType notificationType, String alias) {
+
+ String messageInfoAlias = MessageFormat.format("Alias: {0} \n", alias);
+ String messageInfoEmail = MessageFormat.format("Event: {0} \n", evt.getId());
+ String messageInfoNotyfication = MessageFormat.format("Notyfication: {0} \n", notificationType.getKey());
+ String subject = "";
+ String messageExceptionWhenGetSubjectEmail = "";
+ try {
+ LocalizableMessage subjectMsg;
+ LocalizableMessage notifTypeMsg = new LocalizableMessage(notificationType.getKey());
+ if (StringUtils.isEmpty(alias)) {
+ if (evt.getId() == Common.NEW_ID)
+ subjectMsg = new LocalizableMessage("ftl.subject.default", notifTypeMsg);
+ else
+ subjectMsg = new LocalizableMessage("ftl.subject.default.id", notifTypeMsg, evt.getId());
+ } else {
+ if (evt.getId() == Common.NEW_ID)
+ subjectMsg = new LocalizableMessage("ftl.subject.alias", alias, notifTypeMsg);
+ else
+ subjectMsg = new LocalizableMessage("ftl.subject.alias.id", alias, notifTypeMsg, evt.getId());
+ }
+
+ ResourceBundle bundle = Common.getBundle();
+ subject = subjectMsg.getLocalizedMessage(bundle);
+ } catch (Exception e) {
+ messageExceptionWhenGetSubjectEmail = MessageFormat.format("StackTrace for subjectMsg {0}",ExceptionUtils.getStackTrace(e));
+ }
+
+ String messages = new StringBuilder()
+ .append(messageInfoEmail)
+ .append(messageInfoNotyfication)
+ .append(messageInfoAlias)
+ .append(subject)
+ .append(messageExceptionWhenGetSubjectEmail).toString();
+
+ return messages;
+ }
+
+ private static void validateEmail(EventInstance evt, NotificationType notificationType, Set addresses, String alias) throws Exception {
+
+ String messageErrorEventInstance = "Event Instance null \n";
+ String messageErrorNotyficationType = "Notification type is null \n";
+ String messageErrorEmails = "Don't have e-mail \n";
+ String messageErrorAlias = "Don't have alias\n";
+ String messages = "";
+ if (evt == null || evt.getEventType() == null) messages += messageErrorEventInstance;
+ if (notificationType == null) messages += messageErrorNotyficationType;
+ if (addresses == null || addresses.size() == 0) messages += messageErrorEmails;
+ if (alias == null) messages += messageErrorAlias;
+
+ if (messages.length() > 0) {
+ throw new Exception(getInfoEmail(evt, notificationType, alias) + messages );
+ }
+
+ }
+
+ private static void validateConfig(String name, Object object) throws Exception {
+ if(object == null)
+ throw new IllegalStateException("Email config properties: " + name + " is null!");
+ if((object instanceof String) && ((String)object).isEmpty())
+ throw new IllegalStateException("Email config properties: " + name + " is empty!");
+ }
+
+}
diff --git a/src/com/serotonin/mango/vo/event/EventHandlerVO.java b/src/com/serotonin/mango/vo/event/EventHandlerVO.java
index ba95f3805d..2b18612564 100644
--- a/src/com/serotonin/mango/vo/event/EventHandlerVO.java
+++ b/src/com/serotonin/mango/vo/event/EventHandlerVO.java
@@ -45,6 +45,7 @@
import com.serotonin.mango.rt.event.handlers.ProcessHandlerRT;
import com.serotonin.mango.rt.event.handlers.ScriptHandlerRT;
import com.serotonin.mango.rt.event.handlers.SetPointHandlerRT;
+import com.serotonin.mango.rt.event.handlers.EmailToSmsHandlerRT;
import com.serotonin.mango.rt.event.type.AuditEventType;
import com.serotonin.mango.util.ChangeComparable;
import com.serotonin.mango.util.ExportCodes;
@@ -66,6 +67,7 @@ public class EventHandlerVO implements Serializable,
public static final int TYPE_EMAIL = 2;
public static final int TYPE_PROCESS = 3;
public static final int TYPE_SCRIPT = 4;
+ public static final int TYPE_SMS = 5;
public static ExportCodes TYPE_CODES = new ExportCodes();
static {
@@ -76,6 +78,8 @@ public class EventHandlerVO implements Serializable,
"eventHandlers.type.process");
TYPE_CODES.addElement(TYPE_SCRIPT, "SCRIPT",
"eventHandlers.type.script");
+ TYPE_CODES.addElement(TYPE_SMS, "SMS",
+ "eventHandlers.type.sms");
}
public static final int RECIPIENT_TYPE_ACTIVE = 1;
@@ -152,6 +156,8 @@ public EventHandlerRT createRuntime() {
return new ProcessHandlerRT(this);
case TYPE_SCRIPT:
return new ScriptHandlerRT(this);
+ case TYPE_SMS:
+ return new EmailToSmsHandlerRT(this);
}
throw new ShouldNeverHappenException("Unknown handler type: "
+ handlerType);
@@ -185,6 +191,8 @@ private static LocalizableMessage getTypeMessage(int handlerType) {
return new LocalizableMessage("eventHandlers.type.process");
case TYPE_SCRIPT:
return new LocalizableMessage("eventHandlers.type.script");
+ case TYPE_SMS:
+ return new LocalizableMessage("eventHandlers.type.sms");
}
return new LocalizableMessage("common.unknown");
}
@@ -478,6 +486,9 @@ else if (dataType != dpInactive.getPointLocator()
} else if (handlerType == TYPE_SCRIPT) {
if (activeScriptCommand < 1 && inactiveScriptCommand < 1)
response.addGenericMessage("eventHandlers.invalidScripts");
+ } else if (handlerType == TYPE_SMS) {
+ if (activeRecipients.isEmpty())
+ response.addGenericMessage("eventHandlers.noEmailRecips");
}
}
@@ -547,6 +558,10 @@ else if (inactiveAction == SET_ACTION_STATIC_VALUE)
"eventHandlers.activeCommand", activeScriptCommand);
AuditEventType.addPropertyMessage(list,
"eventHandlers.inactiveCommand", inactiveScriptCommand);
+ } else if (handlerType == TYPE_SMS) {
+ AuditEventType.addPropertyMessage(list,
+ "eventHandlers.emailRecipients",
+ createRecipientMessage(activeRecipients));
}
}
@@ -626,6 +641,11 @@ public void addPropertyChanges(List list,
AuditEventType.maybeAddPropertyChangeMessage(list,
"eventHandlers.inactiveCommand",
from.inactiveScriptCommand, inactiveScriptCommand);
+ } else if (handlerType == TYPE_SMS) {
+ AuditEventType.maybeAddPropertyChangeMessage(list,
+ "eventHandlers.emailRecipients",
+ createRecipientMessage(from.activeRecipients),
+ createRecipientMessage(activeRecipients));
}
}
@@ -688,6 +708,8 @@ private void writeObject(ObjectOutputStream out) throws IOException {
} else if (handlerType == TYPE_SCRIPT) {
out.writeInt(activeScriptCommand);
out.writeInt(inactiveScriptCommand);
+ } else if(handlerType == TYPE_SMS) {
+ out.writeObject(activeRecipients);
}
}
@@ -723,6 +745,9 @@ private void readObject(ObjectInputStream in) throws IOException,
} else if (handlerType == TYPE_PROCESS) {
activeProcessCommand = SerializationHelper.readSafeUTF(in);
inactiveProcessCommand = SerializationHelper.readSafeUTF(in);
+ } else if(handlerType == TYPE_SMS) {
+ activeRecipients = (List) in
+ .readObject();
}
} else if (ver == 2) {
handlerType = in.readInt();
@@ -750,6 +775,9 @@ private void readObject(ObjectInputStream in) throws IOException,
} else if (handlerType == TYPE_PROCESS) {
activeProcessCommand = SerializationHelper.readSafeUTF(in);
inactiveProcessCommand = SerializationHelper.readSafeUTF(in);
+ } else if (handlerType == TYPE_SMS) {
+ activeRecipients = (List) in
+ .readObject();
}
} else if (ver == 3) {
handlerType = in.readInt();
@@ -780,6 +808,9 @@ private void readObject(ObjectInputStream in) throws IOException,
} else if (handlerType == TYPE_SCRIPT) {
activeScriptCommand = in.readInt();
inactiveScriptCommand = in.readInt();
+ } else if (handlerType == TYPE_SMS) {
+ activeRecipients = (List) in
+ .readObject();
}
}
}
@@ -834,6 +865,8 @@ public void jsonSerialize(Map map) {
} else if (handlerType == TYPE_SCRIPT) {
map.put("activeScriptCommand", activeScriptCommand);
map.put("inactiveScriptCommand", inactiveScriptCommand);
+ } else if (handlerType == TYPE_SMS) {
+ map.put("activeRecipients", activeRecipients);
}
}
@@ -980,6 +1013,13 @@ public void jsonDeserialize(JsonReader reader, JsonObject json)
script = json.getInt("inactiveScriptCommand");
if (text != null)
inactiveScriptCommand = script;
+ } else if (handlerType == TYPE_SMS) {
+ JsonArray jsonActiveRecipients = json
+ .getJsonArray("activeRecipients");
+ if (jsonActiveRecipients != null)
+ activeRecipients = reader.readPropertyValue(
+ jsonActiveRecipients, List.class,
+ RecipientListEntryBean.class);
}
}
diff --git a/src/com/serotonin/mango/vo/mailingList/AddressEntry.java b/src/com/serotonin/mango/vo/mailingList/AddressEntry.java
index 0cfa9cb8c0..062be8105f 100644
--- a/src/com/serotonin/mango/vo/mailingList/AddressEntry.java
+++ b/src/com/serotonin/mango/vo/mailingList/AddressEntry.java
@@ -29,6 +29,8 @@
import com.serotonin.json.JsonRemoteEntity;
import com.serotonin.mango.util.LocalizableJsonException;
import com.serotonin.util.StringUtils;
+import org.scada_lts.service.CommunicationChannelTypable;
+import org.scada_lts.service.CommunicationChannelType;
@JsonRemoteEntity
public class AddressEntry extends EmailRecipient {
@@ -52,6 +54,17 @@ public void appendAllAddresses(Set addresses) {
addresses.add(address);
}
+ @Override
+ public void appendAddresses(Set addresses, DateTime sendTime, CommunicationChannelTypable type) {
+ appendAllAddresses(addresses, type);
+ }
+
+ @Override
+ public void appendAllAddresses(Set addresses, CommunicationChannelTypable type) {
+ if(type.validateAddress(address))
+ addresses.add(address);
+ }
+
@Override
public int getRecipientType() {
return EmailRecipient.TYPE_ADDRESS;
diff --git a/src/com/serotonin/mango/vo/mailingList/EmailRecipient.java b/src/com/serotonin/mango/vo/mailingList/EmailRecipient.java
index de11c2443a..90324c75d8 100644
--- a/src/com/serotonin/mango/vo/mailingList/EmailRecipient.java
+++ b/src/com/serotonin/mango/vo/mailingList/EmailRecipient.java
@@ -29,6 +29,8 @@
import com.serotonin.json.JsonRemoteEntity;
import com.serotonin.json.JsonSerializable;
import com.serotonin.mango.util.ExportCodes;
+import org.scada_lts.service.CommunicationChannelTypable;
+import org.scada_lts.service.CommunicationChannelType;
@JsonRemoteEntity(typeFactory = EmailRecipientFactory.class)
abstract public class EmailRecipient implements JsonSerializable {
@@ -49,6 +51,10 @@ abstract public class EmailRecipient implements JsonSerializable {
abstract public void appendAllAddresses(Set addresses);
+ abstract public void appendAddresses(Set addresses, DateTime sendTime, CommunicationChannelTypable type);
+
+ abstract public void appendAllAddresses(Set addresses, CommunicationChannelTypable type);
+
abstract public int getReferenceId();
abstract public String getReferenceAddress();
diff --git a/src/com/serotonin/mango/vo/mailingList/MailingList.java b/src/com/serotonin/mango/vo/mailingList/MailingList.java
index 5240191eef..4be6dd71db 100644
--- a/src/com/serotonin/mango/vo/mailingList/MailingList.java
+++ b/src/com/serotonin/mango/vo/mailingList/MailingList.java
@@ -23,6 +23,9 @@
import java.util.Set;
import java.util.TreeSet;
+import com.serotonin.mango.rt.event.EventInstance;
+import com.serotonin.mango.util.IntervalUtil;
+import com.serotonin.timer.CronExpression;
import org.joda.time.DateTime;
import com.serotonin.json.JsonObject;
@@ -32,6 +35,8 @@
import com.serotonin.mango.Common;
import com.serotonin.util.StringUtils;
import com.serotonin.web.dwr.DwrResponseI18n;
+import org.scada_lts.service.CommunicationChannelTypable;
+import org.scada_lts.service.CommunicationChannelType;
@JsonRemoteEntity
public class MailingList extends EmailRecipient {
@@ -44,11 +49,19 @@ public class MailingList extends EmailRecipient {
@JsonRemoteProperty(innerType = EmailRecipient.class)
private List entries;
+ private String cronPattern;
+ private boolean collectInactiveEmails;
+ private int dailyLimitSentEmailsNumber;
+ private boolean dailyLimitSentEmails;
+
/**
* Integers that are present in the inactive intervals set are times at which the mailing list schedule is not to be
* sent to. Intervals are split into 15 minutes, starting at [00:00 to 00:15) on Monday. Thus, there are 4 * 24 * 7
* = 672 individual periods.
*/
+
+
+
@JsonRemoteProperty(innerType = Integer.class)
private Set inactiveIntervals = new TreeSet();
@@ -109,7 +122,7 @@ public void setInactiveIntervals(Set inactiveIntervals) {
@Override
public void appendAddresses(Set addresses, DateTime sendTime) {
- if (sendTime != null && inactiveIntervals.contains(getIntervalIdAt(sendTime)))
+ if (sendTime != null && !isActive(sendTime))
return;
appendAllAddresses(addresses);
}
@@ -120,12 +133,17 @@ public void appendAllAddresses(Set addresses) {
e.appendAddresses(addresses, null);
}
- private static int getIntervalIdAt(DateTime dt) {
- int interval = 0;
- interval += dt.getMinuteOfHour() / 15;
- interval += dt.getHourOfDay() * 4;
- interval += (dt.getDayOfWeek() - 1) * 96;
- return interval;
+ @Override
+ public void appendAddresses(Set addresses, DateTime sendTime, CommunicationChannelTypable type) {
+ if (sendTime != null && !isActive(sendTime))
+ return;
+ appendAllAddresses(addresses, type);
+ }
+
+ @Override
+ public void appendAllAddresses(Set addresses, CommunicationChannelTypable type) {
+ for (EmailRecipient e : entries)
+ e.appendAddresses(addresses, null, type);
}
public void validate(DwrResponseI18n response) {
@@ -140,6 +158,14 @@ public void validate(DwrResponseI18n response) {
// Check for entries.
if (entries.size() == 0)
response.addGenericMessage("mailingLists.validate.entries");
+
+ if(isCollectInactiveEmails()) {
+ try {
+ new CronExpression(cronPattern);
+ } catch (Exception e) {
+ response.addContextualMessage("cronPattern", "mailingLists.validate.correctCron", e.getMessage());
+ }
+ }
}
@Override
@@ -157,4 +183,44 @@ public void jsonSerialize(Map map) {
public void jsonDeserialize(JsonReader reader, JsonObject json) {
// no op
}
+
+ public String getCronPattern() {
+ return cronPattern;
+ }
+
+ public void setCronPattern(String cronPattern) {
+ this.cronPattern = cronPattern;
+ }
+
+ public boolean isCollectInactiveEmails() {
+ return collectInactiveEmails;
+ }
+
+ public void setCollectInactiveEmails(boolean collectInactiveEmails) {
+ this.collectInactiveEmails = collectInactiveEmails;
+ }
+
+ public int getDailyLimitSentEmailsNumber() {
+ return dailyLimitSentEmailsNumber;
+ }
+
+ public void setDailyLimitSentEmailsNumber(int dailyLimitSentEmailsNumber) {
+ this.dailyLimitSentEmailsNumber = dailyLimitSentEmailsNumber;
+ }
+
+ public boolean isDailyLimitSentEmails() {
+ return dailyLimitSentEmails;
+ }
+
+ public void setDailyLimitSentEmails(boolean dailyLimitSentEmails) {
+ this.dailyLimitSentEmails = dailyLimitSentEmails;
+ }
+
+ public boolean isActive(DateTime sendTime) {
+ return IntervalUtil.isActiveByInterval(this, sendTime);
+ }
+
+ public boolean isActive(EventInstance sendTime) {
+ return IntervalUtil.isActiveByInterval(this, sendTime);
+ }
}
diff --git a/src/com/serotonin/mango/vo/mailingList/UserEntry.java b/src/com/serotonin/mango/vo/mailingList/UserEntry.java
index 27b566e95b..2697283df0 100644
--- a/src/com/serotonin/mango/vo/mailingList/UserEntry.java
+++ b/src/com/serotonin/mango/vo/mailingList/UserEntry.java
@@ -30,12 +30,22 @@
import com.serotonin.mango.db.dao.UserDao;
import com.serotonin.mango.util.LocalizableJsonException;
import com.serotonin.mango.vo.User;
+import org.scada_lts.service.CommunicationChannelTypable;
+import org.scada_lts.service.CommunicationChannelType;
@JsonRemoteEntity
public class UserEntry extends EmailRecipient {
private int userId;
private User user;
+ public UserEntry() {
+ }
+
+ public UserEntry(int userId, User user) {
+ this.userId = userId;
+ this.user = user;
+ }
+
@Override
public int getRecipientType() {
return EmailRecipient.TYPE_USER;
@@ -72,6 +82,11 @@ public void appendAddresses(Set addresses, DateTime sendTime) {
appendAllAddresses(addresses);
}
+ @Override
+ public void appendAddresses(Set addresses, DateTime sendTime, CommunicationChannelTypable type) {
+ appendAllAddresses(addresses, type);
+ }
+
@Override
public void appendAllAddresses(Set addresses) {
if (user == null)
@@ -80,6 +95,18 @@ public void appendAllAddresses(Set addresses) {
addresses.add(user.getEmail());
}
+ @Override
+ public void appendAllAddresses(Set addresses, CommunicationChannelTypable type) {
+ if (user == null)
+ return;
+ if (!user.isDisabled()) {
+ if(type == CommunicationChannelType.EMAIL)
+ addresses.add(user.getEmail());
+ if(type == CommunicationChannelType.SMS)
+ addresses.add(user.getPhone());
+ }
+ }
+
@Override
public String toString() {
if (user == null)
diff --git a/src/com/serotonin/mango/web/dwr/EventHandlersDwr.java b/src/com/serotonin/mango/web/dwr/EventHandlersDwr.java
index fc6d44c813..54ce4f3a13 100644
--- a/src/com/serotonin/mango/web/dwr/EventHandlersDwr.java
+++ b/src/com/serotonin/mango/web/dwr/EventHandlersDwr.java
@@ -274,6 +274,17 @@ public DwrResponseI18n saveEmailEventHandler(int eventSourceId,
handlerId, xid, alias, disabled);
}
+ public DwrResponseI18n saveSmsEventHandler(int eventSourceId,
+ int eventTypeRef1, int eventTypeRef2, int handlerId, String xid,
+ String alias, boolean disabled,
+ List activeRecipients) {
+ EventHandlerVO handler = new EventHandlerVO();
+ handler.setHandlerType(EventHandlerVO.TYPE_SMS);
+ handler.setActiveRecipients(activeRecipients);
+ return save(eventSourceId, eventTypeRef1, eventTypeRef2, handler,
+ handlerId, xid, alias, disabled);
+ }
+
public DwrResponseI18n saveProcessEventHandler(int eventSourceId,
int eventTypeRef1, int eventTypeRef2, int handlerId, String xid,
String alias, boolean disabled, String activeProcessCommand,
diff --git a/src/com/serotonin/mango/web/dwr/MailingListsDwr.java b/src/com/serotonin/mango/web/dwr/MailingListsDwr.java
index fb19d3b238..8e01f91906 100644
--- a/src/com/serotonin/mango/web/dwr/MailingListsDwr.java
+++ b/src/com/serotonin/mango/web/dwr/MailingListsDwr.java
@@ -65,15 +65,22 @@ public MailingList getMailingList(int id) {
}
public DwrResponseI18n saveMailingList(int id, String xid, String name,
- List entryBeans,
- List inactiveIntervals) {
+ List entryBeans, List inactiveIntervals,
+ boolean dailyLimitSentEmails, String cronPattern, boolean collectInactiveEmails,
+ int collectInactiveEmailsNumber) {
+
DwrResponseI18n response = new DwrResponseI18n();
MailingListDao mailingListDao = new MailingListDao();
// Validate the given information. If there is a problem, return an
// appropriate error message.
MailingList ml = createMailingList(id, xid, name, entryBeans);
+
ml.getInactiveIntervals().addAll(inactiveIntervals);
+ ml.setDailyLimitSentEmailsNumber(collectInactiveEmailsNumber);
+ ml.setDailyLimitSentEmails(dailyLimitSentEmails);
+ ml.setCronPattern(cronPattern);
+ ml.setCollectInactiveEmails(collectInactiveEmails);
if (StringUtils.isEmpty(xid))
response.addContextualMessage("xid", "validate.required");
diff --git a/src/com/serotonin/mango/web/email/MangoEmailContent.java b/src/com/serotonin/mango/web/email/MangoEmailContent.java
index e21d2be467..68484cc311 100644
--- a/src/com/serotonin/mango/web/email/MangoEmailContent.java
+++ b/src/com/serotonin/mango/web/email/MangoEmailContent.java
@@ -23,7 +23,7 @@ public MangoEmailContent(String templateName, Map model, Resourc
String defaultSubject, String encoding) throws TemplateException, IOException {
super(encoding);
- int type = SystemSettingsDAO.getIntValue(SystemSettingsDAO.EMAIL_CONTENT_TYPE);
+ int type = getType();
this.defaultSubject = defaultSubject;
this.subjectDirective = new SubjectDirective(bundle);
@@ -45,6 +45,10 @@ public String getSubject() {
return subject;
}
+ protected int getType() {
+ return SystemSettingsDAO.getIntValue(SystemSettingsDAO.EMAIL_CONTENT_TYPE);
+ }
+
private Template getTemplate(String name, boolean html) throws IOException {
if (html)
name = "html/" + name + ".ftl";
diff --git a/src/com/serotonin/mango/web/email/MangoTextContent.java b/src/com/serotonin/mango/web/email/MangoTextContent.java
new file mode 100644
index 0000000000..cbbed53573
--- /dev/null
+++ b/src/com/serotonin/mango/web/email/MangoTextContent.java
@@ -0,0 +1,18 @@
+package com.serotonin.mango.web.email;
+
+import freemarker.template.TemplateException;
+
+import java.io.IOException;
+import java.util.Map;
+import java.util.ResourceBundle;
+
+public class MangoTextContent extends MangoEmailContent {
+ public MangoTextContent(String templateName, Map model, ResourceBundle bundle, String defaultSubject, String encoding) throws TemplateException, IOException {
+ super(templateName, model, bundle, defaultSubject, encoding);
+ }
+
+ @Override
+ protected int getType() {
+ return MangoEmailContent.CONTENT_TYPE_TEXT;
+ }
+}
diff --git a/src/org/scada_lts/dao/DataPointDAO.java b/src/org/scada_lts/dao/DataPointDAO.java
index 8532a8f38a..5ec8f19f87 100644
--- a/src/org/scada_lts/dao/DataPointDAO.java
+++ b/src/org/scada_lts/dao/DataPointDAO.java
@@ -81,6 +81,16 @@ public class DataPointDAO {
+ "ds." + COLUMN_NAME_DS_ID + "="
+ "dp." + COLUMN_NAME_DATA_SOURCE_ID + " ";
+ private static final String DATA_POINT_SELECT_PLC = "" +
+ "SELECT " +
+ "dp." + COLUMN_NAME_ID + ", " +
+ "dp." + COLUMN_NAME_XID + ", " +
+ "dp." + COLUMN_NAME_DATA_SOURCE_ID + ", " +
+ "dp." + COLUMN_NAME_DATA + ", " +
+ "dp." + COLUMN_NAME_DATAPOINT_NAME + ", " +
+ "dp." + COLUMN_NAME_PLC_ALARM_LEVEL + " " +
+ "FROM dataPoints dp ";
+
private static final String DATA_POINT_SELECT_ID = ""
+ "select DISTINCT "
+ COLUMN_NAME_ID + " "
@@ -138,6 +148,23 @@ public DataPointVO mapRow(ResultSet resultSet, int rowNum) throws SQLException {
}
}
+ private class DataPointSimpleRowMapper implements RowMapper {
+
+
+ @Override
+ public DataPointVO mapRow(ResultSet resultSet, int rowNum) throws SQLException {
+
+ DataPointVO dataPoint = (DataPointVO) new SerializationData().readObject(resultSet.getBlob(COLUMN_NAME_DATA).getBinaryStream());
+
+ dataPoint.setId(resultSet.getInt(COLUMN_NAME_ID));
+ dataPoint.setXid(resultSet.getString(COLUMN_NAME_XID));
+ dataPoint.setDataSourceId(resultSet.getInt(COLUMN_NAME_DATA_SOURCE_ID));
+ dataPoint.setName(resultSet.getString(COLUMN_NAME_DATAPOINT_NAME));
+
+ return dataPoint;
+ }
+ }
+
public DataPointVO getDataPoint(int id) {
if (LOG.isTraceEnabled()) {
@@ -205,6 +232,14 @@ public List getDataPoints(int dataSourceId) {
return dataPointList;
}
+ public List getPlcDataPoints(int dataSourceId) {
+
+ String templateSelectPlcWhereId = DATA_POINT_SELECT_PLC + " where (dp." + COLUMN_NAME_DATA_SOURCE_ID + "=? AND dp.plcAlarmLevel>0)";
+ List dataPointList = DAO.getInstance().getJdbcTemp().query(templateSelectPlcWhereId, new Object[] {dataSourceId}, new DataPointSimpleRowMapper());
+ return dataPointList;
+
+ }
+
public List getDataPointsIds(int dataSourceId) {
if (LOG.isTraceEnabled()) {
diff --git a/src/org/scada_lts/dao/DataSourceDAO.java b/src/org/scada_lts/dao/DataSourceDAO.java
index 1dd7775f69..f83d171b78 100644
--- a/src/org/scada_lts/dao/DataSourceDAO.java
+++ b/src/org/scada_lts/dao/DataSourceDAO.java
@@ -75,6 +75,18 @@ public class DataSourceDAO {
+ COLUMN_NAME_DATA + " "
+ "from dataSources ";
+ private static final String DATA_SOURCE_PLC_SELECT = "" +
+ "SELECT DISTINCT " +
+ "ds." + COLUMN_NAME_ID + ", " +
+ "ds." + COLUMN_NAME_XID + ", " +
+ "ds." + COLUMN_NAME_NAME + ", " +
+ "ds." + COLUMN_NAME_DATA + " " +
+ "FROM dataSources ds " +
+ "JOIN dataPoints dp ON " +
+ "dp.dataSourceId = ds." + COLUMN_NAME_ID + " " +
+ "WHERE dp.plcAlarmLevel>0";
+
+
private static final String DATA_SOURCE_SELECT_WHERE_ID = ""
+ DATA_SOURCE_SELECT
+ "where "
@@ -180,6 +192,11 @@ public List> getDataSources() {
return objList;
}
+ public List> getDataSourcesPlc() {
+ List> list = DAO.getInstance().getJdbcTemp().query(DATA_SOURCE_PLC_SELECT, new DataSourceRowMapper());
+ return list;
+ }
+
public List> getDataSourceBaseOfName( String partOfNameDS) {
if (LOG.isTraceEnabled()) {
LOG.trace("getDataSources()");
diff --git a/src/org/scada_lts/dao/SystemSettingsDAO.java b/src/org/scada_lts/dao/SystemSettingsDAO.java
index 754d60d34b..7ef4dc75c1 100644
--- a/src/org/scada_lts/dao/SystemSettingsDAO.java
+++ b/src/org/scada_lts/dao/SystemSettingsDAO.java
@@ -343,6 +343,7 @@ public String getDatabaseSchemaVersion(String key, String defaultValue) {
DEFAULT_VALUES.put(CHART_BACKGROUND_COLOUR, "white");
DEFAULT_VALUES.put(PLOT_BACKGROUND_COLOUR, "white");
DEFAULT_VALUES.put(PLOT_GRIDLINE_COLOUR, "silver");
+
DEFAULT_VALUES.put(DEFAULT_LOGGING_TYPE, DataPointVO.LoggingTypes.ON_CHANGE);
DEFAULT_VALUES.put(SMS_DOMAIN, "localhost");
}
diff --git a/src/org/scada_lts/dao/event/EventDAO.java b/src/org/scada_lts/dao/event/EventDAO.java
index 4a8f5041e5..10f764947a 100644
--- a/src/org/scada_lts/dao/event/EventDAO.java
+++ b/src/org/scada_lts/dao/event/EventDAO.java
@@ -26,6 +26,8 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.Set;
+import java.util.Collections;
import java.util.ResourceBundle;
import org.apache.commons.logging.Log;
@@ -33,6 +35,8 @@
import org.scada_lts.dao.DAO;
import org.scada_lts.dao.GenericDaoCR;
import org.scada_lts.dao.SerializationData;
+import org.scada_lts.utils.QueryUtils;
+import org.scada_lts.web.mvc.api.dto.eventHandler.EventHandlerPlcDTO;
import org.springframework.dao.DataAccessException;
import org.springframework.dao.EmptyResultDataAccessException;
import org.springframework.jdbc.core.ArgumentPreparedStatementSetter;
@@ -142,7 +146,38 @@ public class EventDAO implements GenericDaoCR {
+ "from "
+ "events e "
+ "left join users u on e."+COLUMN_NAME_ACT_USER_ID+"=u.id ";
-
+
+ private static final String BASIC_EVENT_SELECT_WHERE_ID_IN = ""
+ +"select "
+ + "e."+COLUMN_NAME_ID+", "
+ + "e."+COLUMN_NAME_TYPE_ID+", "
+ + "e."+COLUMN_NAME_TYPE_REF_1+", "
+ + "e."+COLUMN_NAME_TYPE_REF_2+","
+ + "e."+COLUMN_NAME_ACTIVE_TS+","
+ + "e."+COLUMN_NAME_RTN_APPLICABLE+", "
+ + "e."+COLUMN_NAME_RTN_TS+","
+ + "e."+COLUMN_NAME_RTN_CAUSE+", "
+ + "e."+COLUMN_NAME_ALARM_LEVEL+", "
+ + "e."+COLUMN_NAME_MESSAGE+", "
+ + "e."+COLUMN_NAME_ACT_TS+", "
+ + "e."+COLUMN_NAME_ACT_USER_ID+", "
+ + "e."+COLUMN_NAME_ALTERNATE_ACK_SOURCE+" "
+ + "from "
+ + "events e where "
+ + COLUMN_NAME_ID + " "
+ + "in (?)";
+
+ private static final String EVENT_HANDLER_SELECT_ID_IN= ""
+ +"select "
+ + COLUMN_NAME_EVENT_HANDLER_ID+", "
+ + COLUMN_NAME_EVENT_HANDLER_XID+", "
+ + COLUMN_NAME_EVENT_HANDLER_ALIAS+", "
+ + COLUMN_NAME_EVENT_HANDLER_DATA+" "
+ + "from "
+ + "eventHandlers where "
+ + COLUMN_NAME_EVENT_HANDLER_ID + " "
+ + "in (?)";
+
private static final String EVENT_INSERT = ""
+ "insert events ("
+ COLUMN_NAME_TYPE_ID + ","
@@ -276,7 +311,19 @@ public class EventDAO implements GenericDaoCR {
+ COLUMN_NAME_EVENT_HANDLER_DATA+" "
+ "from "
+ "eventHandlers ";
-
+
+ private static final String EVENT_HANDLER_SELECT_PLC= "" +
+ "SELECT " +
+ COLUMN_NAME_EVENT_HANDLER_ID+", " +
+ COLUMN_NAME_EVENT_HANDLER_XID+", " +
+ COLUMN_NAME_EVENT_HANDLER_ALIAS+", " +
+ COLUMN_NAME_EVENT_HANDLER_TYPE_ID+", " +
+ COLUMN_NAME_EVENT_HANDLER_TYPE_REF1+", " +
+ COLUMN_NAME_EVENT_HANDLER_TYPE_REF2+", " +
+ COLUMN_NAME_EVENT_HANDLER_DATA+" " +
+ "FROM " +
+ "eventHandlers ";
+
private static final String EVENT_HANDLER_FILTER= " "
+ COLUMN_NAME_EVENT_HANDLER_TYPE_ID+"=? and "
+ COLUMN_NAME_EVENT_HANDLER_TYPE_REF1+"=? and "
@@ -471,6 +518,27 @@ public EventHandlerVO mapRow(ResultSet rs, int rowNum) throws SQLException {
}
}
+ private class PlcEventHandlerRowMapper implements RowMapper {
+ public EventHandlerPlcDTO mapRow(ResultSet rs, int rowNum) throws SQLException {
+ EventHandlerVO h;
+ EventHandlerPlcDTO result = new EventHandlerPlcDTO();
+
+ h = (EventHandlerVO) new SerializationData().readObject(rs.getBlob(7).getBinaryStream());
+ result.setId(rs.getInt(1));
+ result.setXid(rs.getString(2));
+ result.setAlias(rs.getString(3));
+ result.setEventTypeId(rs.getInt(4));
+ result.setEventTypeRef1(rs.getInt(5));
+ result.setEventTypeRef2(rs.getInt(6));
+ result.setHandlerType(h.getHandlerType());
+ result.setRecipients(h.getActiveRecipients());
+
+ return result;
+ }
+ }
+
+
+
@Override
public List findAllWithUserName() {
@@ -855,7 +923,11 @@ public List getEventHandlers(int typeId, int ref1, int ref2) {
public List getEventHandlers() {
return (List) DAO.getInstance().getJdbcTemp().query(EVENT_HANDLER_SELECT, new Object[] {}, new EventHandlerRowMapper());
}
-
+
+ public List getPlcEventHandlers() {
+ return (List) DAO.getInstance().getJdbcTemp().query(EVENT_HANDLER_SELECT_PLC, new Object[] {}, new PlcEventHandlerRowMapper());
+ }
+
public EventHandlerVO getEventHandler(int eventHandlerId) {
try {
return (EventHandlerVO) DAO.getInstance().getJdbcTemp().queryForObject(EVENT_HANDLER_SELECT+" where " + EVENT_HANDLER_FILTER_ID, new Object[] {eventHandlerId}, new EventHandlerRowMapper());
@@ -922,7 +994,7 @@ public void updateEventHandler(EventHandlerVO handler) {
}
//TODO rewrite because insert does not requires select
- public EventHandlerVO saveEventHandler(final int typeId,final int typeRef1, final int typeRef2, final EventHandlerVO handler) {
+ public EventHandlerVO saveEventHandler(int typeId, int typeRef1, int typeRef2, EventHandlerVO handler) {
if (handler.getId() == Common.NEW_ID) {
int id = insertEventHandler(typeId, typeRef1, typeRef2,handler);
return getEventHandler(id);
@@ -968,4 +1040,23 @@ public void updateEventAckUserId(int userId) {
DAO.getInstance().getJdbcTemp().update(EVENT_UPDATE_WHERE_ACK_USER_ID, new Object[]{userId});
}
+
+ @Transactional(readOnly = true)
+ public List getAllStatusEvents(Set ids) {
+ if(ids.isEmpty())
+ return Collections.emptyList();
+ String args = QueryUtils.getArgsIn(ids.size());
+ String query = BASIC_EVENT_SELECT_WHERE_ID_IN.replace("?", args);
+ return DAO.getInstance().getJdbcTemp().query(query, ids.toArray(), new EventRowMapper());
+ }
+
+ @Transactional(readOnly = true)
+ public List getEventHandlers(Set ids) {
+ if(ids.isEmpty())
+ return Collections.emptyList();
+ String args = QueryUtils.getArgsIn(ids.size());
+ String query = EVENT_HANDLER_SELECT_ID_IN.replace("?", args);
+ return DAO.getInstance().getJdbcTemp().query(query, ids.toArray(), new EventHandlerRowMapper());
+ }
+
}
diff --git a/src/org/scada_lts/dao/event/ScheduledExecuteInactiveEvent.java b/src/org/scada_lts/dao/event/ScheduledExecuteInactiveEvent.java
new file mode 100644
index 0000000000..273ae0523c
--- /dev/null
+++ b/src/org/scada_lts/dao/event/ScheduledExecuteInactiveEvent.java
@@ -0,0 +1,54 @@
+package org.scada_lts.dao.event;
+
+import com.serotonin.mango.rt.event.EventInstance;
+import com.serotonin.mango.vo.event.EventHandlerVO;
+import com.serotonin.mango.vo.mailingList.MailingList;
+
+import java.util.Objects;
+
+public class ScheduledExecuteInactiveEvent {
+
+ private final int eventHandlerId;
+ private final int sourceEventId;
+ private final int mailingListId;
+
+ public ScheduledExecuteInactiveEvent(int eventHandlerId, int sourceEventId, int mailingListId) {
+ this.eventHandlerId = eventHandlerId;
+ this.sourceEventId = sourceEventId;
+ this.mailingListId = mailingListId;
+ }
+
+ public ScheduledExecuteInactiveEvent(EventHandlerVO eventHandler, EventInstance sourceEvent, MailingList mailingList) {
+ this.eventHandlerId = eventHandler.getId();
+ this.sourceEventId = sourceEvent.getId();
+ this.mailingListId = mailingList.getId();
+ }
+
+ public int getMailingListId() {
+ return mailingListId;
+ }
+
+ public int getSourceEventId() {
+ return sourceEventId;
+ }
+
+ public int getEventHandlerId() {
+ return eventHandlerId;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (!(o instanceof ScheduledExecuteInactiveEvent)) return false;
+ ScheduledExecuteInactiveEvent that = (ScheduledExecuteInactiveEvent) o;
+ return getEventHandlerId() == that.getEventHandlerId() &&
+ getSourceEventId() == that.getSourceEventId() &&
+ getMailingListId() == that.getMailingListId();
+ }
+
+ @Override
+ public int hashCode() {
+
+ return Objects.hash(getEventHandlerId(), getSourceEventId(), getMailingListId());
+ }
+}
diff --git a/src/org/scada_lts/dao/event/ScheduledExecuteInactiveEventDAO.java b/src/org/scada_lts/dao/event/ScheduledExecuteInactiveEventDAO.java
new file mode 100644
index 0000000000..dddcd881eb
--- /dev/null
+++ b/src/org/scada_lts/dao/event/ScheduledExecuteInactiveEventDAO.java
@@ -0,0 +1,24 @@
+package org.scada_lts.dao.event;
+
+import org.springframework.jdbc.core.JdbcTemplate;
+
+import java.util.List;
+
+public interface ScheduledExecuteInactiveEventDAO {
+
+ List select(int limit);
+ List selectByMailingListId(int mailingListId);
+ List selectByMailingListId(int mailingListId, int limit);
+ List selectByMailingListId(int mailingListId, List exclude, int limit);
+ ScheduledExecuteInactiveEvent insert(ScheduledExecuteInactiveEvent scheduledInactiveCommunicationEvent);
+ void delete(ScheduledExecuteInactiveEvent scheduledInactiveCommunicationEvent);
+
+ static ScheduledExecuteInactiveEventDAO getInstance() {
+ return ScheduledExecuteInactiveEventDAOimpl.getInstance();
+ }
+
+ static ScheduledExecuteInactiveEventDAO newInstance(JdbcTemplate jdbcTemplate) {
+ return new ScheduledExecuteInactiveEventDAOimpl(jdbcTemplate);
+ }
+
+}
diff --git a/src/org/scada_lts/dao/event/ScheduledExecuteInactiveEventDAOimpl.java b/src/org/scada_lts/dao/event/ScheduledExecuteInactiveEventDAOimpl.java
new file mode 100644
index 0000000000..ee531f2960
--- /dev/null
+++ b/src/org/scada_lts/dao/event/ScheduledExecuteInactiveEventDAOimpl.java
@@ -0,0 +1,231 @@
+package org.scada_lts.dao.event;
+
+import com.mysql.jdbc.Statement;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.scada_lts.dao.DAO;
+import org.scada_lts.utils.QueryUtils;
+import org.springframework.jdbc.core.ArgumentPreparedStatementSetter;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.PreparedStatementCreator;
+import org.springframework.jdbc.core.RowMapper;
+import org.springframework.jdbc.support.GeneratedKeyHolder;
+import org.springframework.jdbc.support.KeyHolder;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+class ScheduledExecuteInactiveEventDAOimpl implements ScheduledExecuteInactiveEventDAO {
+
+ private static final String COLUMN_NAME_MAILING_LIST_ID = "mailingListId";
+ private static final String COLUMN_NAME_SOURCE_EVENT_ID = "sourceEventId";
+ private static final String COLUMN_NAME_EVENT_HANDLER_ID = "eventHandlerId";
+ private static final String TABLE_NAME = "scheduledExecuteInactiveEvent";
+
+ private static final String SCHEDULED_INACTIVE_COMMUNICATION_EVENT_SELECT_WHERE = ""
+ + "select "
+ + COLUMN_NAME_MAILING_LIST_ID + ", "
+ + COLUMN_NAME_SOURCE_EVENT_ID + ", "
+ + COLUMN_NAME_EVENT_HANDLER_ID + " "
+ + "from "
+ + TABLE_NAME + " "
+ + "where "
+ + COLUMN_NAME_MAILING_LIST_ID + "=? ";
+
+ private static final String SCHEDULED_INACTIVE_COMMUNICATION_EVENT_SELECT = ""
+ + "select "
+ + COLUMN_NAME_MAILING_LIST_ID + ", "
+ + COLUMN_NAME_SOURCE_EVENT_ID + ", "
+ + COLUMN_NAME_EVENT_HANDLER_ID + " "
+ + "from "
+ + TABLE_NAME;
+
+ private static final String SCHEDULED_INACTIVE_COMMUNICATION_EVENT_INSERT = ""
+ + "insert into "
+ + TABLE_NAME + " ("
+ + COLUMN_NAME_MAILING_LIST_ID + ", "
+ + COLUMN_NAME_SOURCE_EVENT_ID + ", "
+ + COLUMN_NAME_EVENT_HANDLER_ID + ") "
+ + "values (?,?,?)";
+
+ private static final String SCHEDULED_INACTIVE_COMMUNICATION_EVENT_DELETE = ""
+ + "delete from "
+ + TABLE_NAME + " "
+ + "where "
+ + COLUMN_NAME_MAILING_LIST_ID + "=? "
+ + "and "
+ + COLUMN_NAME_SOURCE_EVENT_ID + "=? "
+ + "and "
+ + COLUMN_NAME_EVENT_HANDLER_ID + "=? ";
+
+ private static final Log LOG = LogFactory.getLog(ScheduledExecuteInactiveEventDAOimpl.class);
+
+ private final JdbcTemplate jdbcTemplate;
+
+ private static class LazyHolder {
+ public static final ScheduledExecuteInactiveEventDAO INSTANCE = new ScheduledExecuteInactiveEventDAOimpl();
+ }
+
+ ScheduledExecuteInactiveEventDAOimpl() {
+ this.jdbcTemplate = DAO.getInstance().getJdbcTemp();
+ }
+
+ ScheduledExecuteInactiveEventDAOimpl(JdbcTemplate jdbcTemplate) {
+ this.jdbcTemplate = jdbcTemplate;
+ }
+
+ static ScheduledExecuteInactiveEventDAO getInstance() {
+ return LazyHolder.INSTANCE;
+ }
+
+ @Override
+ public List selectByMailingListId(int mailingListId) {
+
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("select(int mailingListId) mailingListId:" + mailingListId);
+ }
+
+ return jdbcTemplate.query(SCHEDULED_INACTIVE_COMMUNICATION_EVENT_SELECT_WHERE
+ + " ORDER BY " + COLUMN_NAME_SOURCE_EVENT_ID + " ASC", new Object[] {mailingListId},
+ new ScheduledExecuteInactiveEventRowMapper());
+ }
+
+ @Override
+ public List selectByMailingListId(int mailingListId, int limit) {
+
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("select(int mailingListId) mailingListId:" + mailingListId);
+ }
+
+ return jdbcTemplate.query(SCHEDULED_INACTIVE_COMMUNICATION_EVENT_SELECT_WHERE
+ + " ORDER BY " + COLUMN_NAME_SOURCE_EVENT_ID + " ASC"
+ + " LIMIT " + limit, new Object[] {mailingListId},
+ new ScheduledExecuteInactiveEventRowMapper());
+ }
+
+ @Override
+ public List selectByMailingListId(int mailingListId,
+ List exclude,
+ int limit) {
+ if(!exclude.isEmpty())
+ return selectWithNotIn(mailingListId, exclude, limit);
+ return selectByMailingListId(mailingListId, limit);
+ }
+
+ @Override
+ public List select(int limit) {
+
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("select():");
+ }
+
+ return jdbcTemplate.query(SCHEDULED_INACTIVE_COMMUNICATION_EVENT_SELECT
+ + " ORDER BY " + COLUMN_NAME_SOURCE_EVENT_ID + " ASC"
+ + " LIMIT " + limit,
+ new ScheduledExecuteInactiveEventRowMapper());
+ }
+
+ @Override
+ public ScheduledExecuteInactiveEvent insert(ScheduledExecuteInactiveEvent scheduledExecuteInactiveEvent) {
+
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("insert(ScheduledExecuteInactiveEvent scheduledExecuteInactiveEvent): " + scheduledExecuteInactiveEvent);
+ }
+
+ KeyHolder keyHolder = new GeneratedKeyHolder();
+
+ jdbcTemplate.update(new PreparedStatementCreator() {
+ @Override
+ public PreparedStatement createPreparedStatement(Connection connection) throws SQLException {
+ PreparedStatement preparedStatement = connection.prepareStatement(SCHEDULED_INACTIVE_COMMUNICATION_EVENT_INSERT,
+ Statement.RETURN_GENERATED_KEYS);
+ new ArgumentPreparedStatementSetter(new Object[] {
+ scheduledExecuteInactiveEvent.getMailingListId(),
+ scheduledExecuteInactiveEvent.getSourceEventId(),
+ scheduledExecuteInactiveEvent.getEventHandlerId()
+ }).setValues(preparedStatement);
+ return preparedStatement;
+ }
+ }, keyHolder);
+
+ return scheduledExecuteInactiveEvent;
+ }
+
+ @Override
+ public void delete(ScheduledExecuteInactiveEvent event) {
+
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("delete(ScheduledInactiveCommunicationEvent getMailingListId) getMailingListId:" + event);
+ }
+
+ jdbcTemplate.update(SCHEDULED_INACTIVE_COMMUNICATION_EVENT_DELETE, event.getMailingListId(), event.getSourceEventId(), event.getEventHandlerId());
+ }
+
+ private static class ScheduledExecuteInactiveEventRowMapper implements RowMapper {
+
+ @Override
+ public ScheduledExecuteInactiveEvent mapRow(ResultSet rs, int rowNum) throws SQLException {
+ return new ScheduledExecuteInactiveEvent(rs.getInt(COLUMN_NAME_EVENT_HANDLER_ID),
+ rs.getInt(COLUMN_NAME_SOURCE_EVENT_ID),
+ rs.getInt(COLUMN_NAME_MAILING_LIST_ID));
+ }
+ }
+
+ private List selectWithNotIn(int mailingListId, List exclude, int limit) {
+ Exclude excludeEventHandlers = new Exclude(COLUMN_NAME_EVENT_HANDLER_ID, getEventHandlerIds(exclude));
+ Exclude excludeEvents = new Exclude(COLUMN_NAME_SOURCE_EVENT_ID, getEventIds(exclude));
+
+ return jdbcTemplate.query(SCHEDULED_INACTIVE_COMMUNICATION_EVENT_SELECT_WHERE
+ + " AND " + excludeEventHandlers.toSql()
+ + " AND " + excludeEvents.toSql()
+ + " ORDER BY " + COLUMN_NAME_SOURCE_EVENT_ID + " ASC"
+ + " LIMIT " + limit, mergeWithOrder(mailingListId,
+ excludeEventHandlers.getArgs(), excludeEvents.getArgs( )),
+ new ScheduledExecuteInactiveEventRowMapper());
+ }
+
+ private static List getEventHandlerIds(List exclude) {
+ return exclude.stream().map(ScheduledExecuteInactiveEvent::getEventHandlerId).collect(Collectors.toList());
+ }
+
+ private static List getEventIds(List exclude) {
+ return exclude.stream().map(ScheduledExecuteInactiveEvent::getSourceEventId).collect(Collectors.toList());
+ }
+
+ private static class Exclude {
+ private String columnName;
+ private List args;
+
+ public Exclude(String columnName, List args) {
+ this.columnName = columnName;
+ this.args = args;
+ }
+
+ public String toSql() {
+ return columnName + " NOT IN (" + QueryUtils.getArgsIn(args.size()) + ")";
+ }
+
+ public List getArgs() {
+ return args;
+ }
+
+ @Override
+ public String toString() {
+ return toSql();
+ }
+ }
+
+ private Integer[] mergeWithOrder(Integer id, List... ids) {
+ List result = new ArrayList<>();
+ result.add(id);
+ for(List list: ids) {
+ result.addAll(list);
+ }
+ return result.toArray(new Integer[]{});
+ }
+ }
diff --git a/src/org/scada_lts/dao/mailingList/MailingListDAO.java b/src/org/scada_lts/dao/mailingList/MailingListDAO.java
index 3010e51423..019e1139e6 100644
--- a/src/org/scada_lts/dao/mailingList/MailingListDAO.java
+++ b/src/org/scada_lts/dao/mailingList/MailingListDAO.java
@@ -22,6 +22,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.scada_lts.dao.DAO;
+import org.scada_lts.utils.QueryUtils;
import org.springframework.dao.EmptyResultDataAccessException;
import org.springframework.jdbc.core.ArgumentPreparedStatementSetter;
import org.springframework.jdbc.core.PreparedStatementCreator;
@@ -36,7 +37,9 @@
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
+import java.util.Collections;
import java.util.List;
+import java.util.Set;
/**
* DAO for MailingList
@@ -50,6 +53,11 @@ public class MailingListDAO {
private static final String COLUMN_NAME_ID = "id";
private static final String COLUMN_NAME_XID = "xid";
private static final String COLUMN_NAME_NAME = "name";
+ private static final String COLUMN_NAME_DAILY_LIMIT_SENT_EMAILS = "dailyLimitSentEmails";
+ private static final String COLUMN_NAME_DAILY_LIMIT_SENT_EMAILS_NUMBER = "dailyLimitSentEmailsNumber";
+ private static final String COLUMN_NAME_COLLECT_INACTIVE_EMAILS = "collectInactiveEmails";
+ private static final String COLUMN_NAME_CRON_PATTERN = "cronPattern";
+
// @formatter:off
@@ -57,25 +65,52 @@ public class MailingListDAO {
+ "select "
+ COLUMN_NAME_ID + ", "
+ COLUMN_NAME_XID + ", "
- + COLUMN_NAME_NAME + " "
+ + COLUMN_NAME_NAME + ", "
+ + COLUMN_NAME_DAILY_LIMIT_SENT_EMAILS + ", "
+ + COLUMN_NAME_DAILY_LIMIT_SENT_EMAILS_NUMBER + ", "
+ + COLUMN_NAME_COLLECT_INACTIVE_EMAILS + ", "
+ + COLUMN_NAME_CRON_PATTERN + " "
+ "from mailingLists ";
+ private static final String MAILING_LIST_SELECT_WHERE_ID_IN = ""
+ + "select "
+ + COLUMN_NAME_ID + ", "
+ + COLUMN_NAME_XID + ", "
+ + COLUMN_NAME_NAME + ", "
+ + COLUMN_NAME_DAILY_LIMIT_SENT_EMAILS + ", "
+ + COLUMN_NAME_DAILY_LIMIT_SENT_EMAILS_NUMBER + ", "
+ + COLUMN_NAME_COLLECT_INACTIVE_EMAILS + ", "
+ + COLUMN_NAME_CRON_PATTERN + " "
+ + "from mailingLists where "
+ + COLUMN_NAME_ID + " "
+ + "in (?) ";
+
private static final String MAILING_LIST_INSERT = ""
+ "insert into mailingLists ("
+ COLUMN_NAME_XID + ", "
- + COLUMN_NAME_NAME + ") "
- + "values (?,?) ";
+ + COLUMN_NAME_NAME + ", "
+ + COLUMN_NAME_DAILY_LIMIT_SENT_EMAILS + ", "
+ + COLUMN_NAME_DAILY_LIMIT_SENT_EMAILS_NUMBER + ", "
+ + COLUMN_NAME_COLLECT_INACTIVE_EMAILS + ", "
+ + COLUMN_NAME_CRON_PATTERN + ") "
+ + "values (?,?,?,?,?,?) ";
private static final String MAILING_LIST_UPDATE = ""
+ "update mailingLists set "
+ COLUMN_NAME_XID + "=?, "
- + COLUMN_NAME_NAME + "=? "
+ + COLUMN_NAME_NAME + "=?, "
+ + COLUMN_NAME_DAILY_LIMIT_SENT_EMAILS + "=?, "
+ + COLUMN_NAME_DAILY_LIMIT_SENT_EMAILS_NUMBER + "=?, "
+ + COLUMN_NAME_COLLECT_INACTIVE_EMAILS + "=?, "
+ + COLUMN_NAME_CRON_PATTERN + "=? "
+ "where "
+ COLUMN_NAME_ID + "=? ";
private static final String MAILING_LIST_DELETE = ""
+ "delete from mailingLists where "
+ COLUMN_NAME_ID + "=? ";
+
+
// @formatter:on
private class MailingListRowMapper implements RowMapper {
@@ -86,6 +121,10 @@ public MailingList mapRow(ResultSet rs, int rowNum) throws SQLException {
mailingList.setId(rs.getInt(COLUMN_NAME_ID));
mailingList.setXid(rs.getString(COLUMN_NAME_XID));
mailingList.setName(rs.getString((COLUMN_NAME_NAME)));
+ mailingList.setCollectInactiveEmails(rs.getBoolean(COLUMN_NAME_COLLECT_INACTIVE_EMAILS));
+ mailingList.setCronPattern(rs.getString(COLUMN_NAME_CRON_PATTERN));
+ mailingList.setDailyLimitSentEmails(rs.getBoolean(COLUMN_NAME_DAILY_LIMIT_SENT_EMAILS));
+ mailingList.setDailyLimitSentEmailsNumber(rs.getInt(COLUMN_NAME_DAILY_LIMIT_SENT_EMAILS_NUMBER));
return mailingList;
}
}
@@ -143,7 +182,9 @@ public int insert(final MailingList mailingList) {
@Override
public PreparedStatement createPreparedStatement(Connection connection) throws SQLException {
PreparedStatement preparedStatement = connection.prepareStatement(MAILING_LIST_INSERT, Statement.RETURN_GENERATED_KEYS);
- new ArgumentPreparedStatementSetter(new Object[] {mailingList.getXid(), mailingList.getName()}).setValues(preparedStatement);
+ new ArgumentPreparedStatementSetter(new Object[] {mailingList.getXid(), mailingList.getName(),
+ mailingList.isDailyLimitSentEmails(), mailingList.getDailyLimitSentEmailsNumber(),
+ mailingList.isCollectInactiveEmails(), mailingList.getCronPattern()}).setValues(preparedStatement);
return preparedStatement;
}
}, keyHolder);
@@ -158,7 +199,9 @@ public void update(MailingList mailingList) {
LOG.trace("update(MailingList mailingList) mailingList:" + mailingList.toString());
}
- DAO.getInstance().getJdbcTemp().update(MAILING_LIST_UPDATE, new Object[] {mailingList.getXid(), mailingList.getName(), mailingList.getId()});
+ DAO.getInstance().getJdbcTemp().update(MAILING_LIST_UPDATE, new Object[] {mailingList.getXid(), mailingList.getName(),
+ mailingList.isDailyLimitSentEmails(), mailingList.getDailyLimitSentEmailsNumber(),
+ mailingList.isCollectInactiveEmails(), mailingList.getCronPattern(), mailingList.getId()});
}
@Transactional(readOnly = false,propagation= Propagation.REQUIRES_NEW,isolation= Isolation.READ_COMMITTED,rollbackFor=SQLException.class)
@@ -170,4 +213,14 @@ public void delete(int id) {
DAO.getInstance().getJdbcTemp().update(MAILING_LIST_DELETE, new Object[] {id});
}
+
+ @Transactional(readOnly = true)
+ public List getMailingLists(Set ids) {
+ if(ids.isEmpty())
+ return Collections.emptyList();
+ String args = QueryUtils.getArgsIn(ids.size());
+ String query = MAILING_LIST_SELECT_WHERE_ID_IN.replace("?", args);
+ return DAO.getInstance().getJdbcTemp().query(query, ids.toArray(), new MailingListRowMapper());
+ }
+
}
diff --git a/src/org/scada_lts/dao/migration/mysql/V2_5__ScheduledExecuteInactiveEvent.java b/src/org/scada_lts/dao/migration/mysql/V2_5__ScheduledExecuteInactiveEvent.java
new file mode 100644
index 0000000000..9556ca673c
--- /dev/null
+++ b/src/org/scada_lts/dao/migration/mysql/V2_5__ScheduledExecuteInactiveEvent.java
@@ -0,0 +1,32 @@
+package org.scada_lts.dao.migration.mysql;
+
+import org.flywaydb.core.api.migration.BaseJavaMigration;
+import org.flywaydb.core.api.migration.Context;
+import org.scada_lts.dao.DAO;
+import org.springframework.jdbc.core.JdbcTemplate;
+
+public class V2_5__ScheduledExecuteInactiveEvent extends BaseJavaMigration {
+
+ @Override
+ public void migrate(Context context) throws Exception {
+
+ final JdbcTemplate jdbcTmp = DAO.getInstance().getJdbcTemp();
+
+ jdbcTmp.execute("ALTER TABLE mailingLists ADD cronPattern VARCHAR(100) COMMENT 'cron pattern';");
+ jdbcTmp.execute("ALTER TABLE mailingLists ADD collectInactiveEmails BINARY DEFAULT false COMMENT 'Collect inactive emails and send when activated';");
+ jdbcTmp.execute("ALTER TABLE mailingLists ADD dailyLimitSentEmails BINARY DEFAULT false COMMENT 'Daily limit sent emails';");
+ jdbcTmp.execute("ALTER TABLE mailingLists ADD dailyLimitSentEmailsNumber INT DEFAULT 0 COMMENT 'Daily limit sent emails number';");
+ jdbcTmp.execute("CREATE TABLE scheduledExecuteInactiveEvent (\n" +
+ " mailingListId INT NOT NULL,\n" +
+ " sourceEventId INT NOT NULL,\n" +
+ " eventHandlerId INT NOT NULL,\n" +
+ " UNIQUE (mailingListId, sourceEventId, eventHandlerId), \n" +
+ " FOREIGN KEY (sourceEventId) REFERENCES events(id) ON DELETE CASCADE,\n" +
+ " FOREIGN KEY (mailingListId) REFERENCES mailingLists(id) ON DELETE CASCADE,\n" +
+ " FOREIGN KEY (eventHandlerId) REFERENCES eventHandlers(id) ON DELETE CASCADE\n" +
+ ") ENGINE=InnoDB;");
+
+ }
+
+
+}
\ No newline at end of file
diff --git a/src/org/scada_lts/mango/adapter/MangoMailingList.java b/src/org/scada_lts/mango/adapter/MangoMailingList.java
index b4b589124e..7f8de91de7 100644
--- a/src/org/scada_lts/mango/adapter/MangoMailingList.java
+++ b/src/org/scada_lts/mango/adapter/MangoMailingList.java
@@ -17,10 +17,13 @@
*/
package org.scada_lts.mango.adapter;
+
import com.serotonin.mango.vo.mailingList.EmailRecipient;
import com.serotonin.mango.vo.mailingList.MailingList;
import com.serotonin.mango.web.dwr.beans.RecipientListEntryBean;
import org.joda.time.DateTime;
+import org.scada_lts.service.CommunicationChannel;
+import org.scada_lts.service.CommunicationChannelType;
import java.util.List;
import java.util.Set;
@@ -42,8 +45,14 @@ public interface MangoMailingList {
MailingList getMailingList(String xid);
+ List getMailingLists(Set ids);
+
Set getRecipientAddresses(List beans, DateTime sendTime);
+ Set getRecipientAddresses(List beans, DateTime sendTime, CommunicationChannelType type);
+
+ List convertToMailingLists(List beans);
+
void populateEntrySubclasses(List entries);
void saveMailingList(final MailingList ml);
diff --git a/src/org/scada_lts/mango/service/DataPointService.java b/src/org/scada_lts/mango/service/DataPointService.java
index 69472bafb9..c2bb2aca0a 100644
--- a/src/org/scada_lts/mango/service/DataPointService.java
+++ b/src/org/scada_lts/mango/service/DataPointService.java
@@ -190,6 +190,11 @@ public Map> getDataPoints(String partOfNameDS, Str
return pointsWithListData;
}
+ public List getPlcDataPoints(int dataSourceId) {
+ List datapointList = dataPointDAO.getPlcDataPoints(dataSourceId);
+ return datapointList;
+ }
+
public List valuesPointBooleanBaseOnNameFilter2DTO(Map> values) {
List result = new LinkedList<>();
for (Map.Entry> entry : values.entrySet()) {
@@ -410,7 +415,7 @@ private void setEventDetectors(DataPointVO dataPoint) {
dataPoint.setEventDetectors(getEventDetectors(dataPoint));
}
- private List getEventDetectors(DataPointVO dataPoint) {
+ public List getEventDetectors(DataPointVO dataPoint) {
EventDetectorsCache.LOG.trace("getEventDetectors() dpId:" + dataPoint.getId());
long startTime = 0;
@@ -439,7 +444,7 @@ private List getEventDetectors(DataPointVO dataPoint) {
return result;
}
- private void saveEventDetectors(DataPointVO dataPoint) {
+ public void saveEventDetectors(DataPointVO dataPoint) {
List detectors = getEventDetectors(dataPoint);
for (PointEventDetectorVO pointEventDetector: detectors) {
@@ -457,6 +462,10 @@ private void saveEventDetectors(DataPointVO dataPoint) {
}
}
+ public void deleteEventDetector(DataPointVO dataPoint, int id){
+ pointEventDetectorDAO.delete(dataPoint.getId(), id);
+ }
+
private PointEventDetectorVO removeFromList(List list, int id) {
for (PointEventDetectorVO ped : list) {
if (ped.getId() == id) {
diff --git a/src/org/scada_lts/mango/service/DataSourceService.java b/src/org/scada_lts/mango/service/DataSourceService.java
index 4651a237a1..a815a2dace 100644
--- a/src/org/scada_lts/mango/service/DataSourceService.java
+++ b/src/org/scada_lts/mango/service/DataSourceService.java
@@ -56,6 +56,8 @@ public List> getDataSources() {
return dataSourceDAO.getDataSources();
}
+ public List> getDataSourcesPlc() { return dataSourceDAO.getDataSourcesPlc(); }
+
@Override
public DataSourceVO getDataSource(int id) {
try {
diff --git a/src/org/scada_lts/mango/service/EventService.java b/src/org/scada_lts/mango/service/EventService.java
index f69fd49a82..fe5a54741c 100644
--- a/src/org/scada_lts/mango/service/EventService.java
+++ b/src/org/scada_lts/mango/service/EventService.java
@@ -41,6 +41,8 @@
import org.scada_lts.dao.event.EventDAO;
import org.scada_lts.dao.event.UserEventDAO;
import org.scada_lts.mango.adapter.MangoEvent;
+import org.scada_lts.web.mvc.api.dto.eventHandler.EventHandlerPlcDTO;
+import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Isolation;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
@@ -56,6 +58,7 @@
/**
* @author grzegorz bylica Abil'I.T. development team, sdt@abilit.eu
*/
+@Service
public class EventService implements MangoEvent {
private static final Log LOG = LogFactory.getLog(EventService.class);
@@ -287,6 +290,8 @@ public List getEventHandlers(EventTypeVO type) {
public List getEventHandlers() {
return eventDAO.getEventHandlers();
}
+
+ public List getPlcEventHandlers() { return eventDAO.getPlcEventHandlers(); }
@Override
public EventHandlerVO getEventHandler(int eventHandlerId) {
@@ -309,7 +314,7 @@ public EventHandlerVO saveEventHandler(final EventType type, final EventHandlerV
}
@Override
- public EventHandlerVO saveEventHandler(final EventTypeVO type, final EventHandlerVO handler) {
+ public EventHandlerVO saveEventHandler(EventTypeVO type, EventHandlerVO handler) {
if (type == null) {
return eventDAO.saveEventHandler(0, 0, 0, handler);
} else {
@@ -326,6 +331,12 @@ public void deleteEventHandler(final int handlerId) {
AuditEventType.raiseDeletedEvent(AuditEventType.TYPE_EVENT_HANDLER, handler);
}
+
+ public void deleteEventHandler(final String handlerXid) {
+ EventHandlerVO handler = getEventHandler(handlerXid);
+ eventDAO.delete(handler.getId());
+ AuditEventType.raiseDeletedEvent(AuditEventType.TYPE_EVENT_HANDLER, handler);
+ }
@Override
public boolean toggleSilence(int eventId, int userId) {
diff --git a/src/org/scada_lts/mango/service/MailingListService.java b/src/org/scada_lts/mango/service/MailingListService.java
index 2a9b9f1e5b..8a517e3c6a 100644
--- a/src/org/scada_lts/mango/service/MailingListService.java
+++ b/src/org/scada_lts/mango/service/MailingListService.java
@@ -18,11 +18,13 @@
package org.scada_lts.mango.service;
import com.serotonin.mango.Common;
-import com.serotonin.mango.db.dao.UserDao;
+import com.serotonin.mango.rt.maint.work.EmailWorkItem;
import com.serotonin.mango.vo.mailingList.EmailRecipient;
import com.serotonin.mango.vo.mailingList.MailingList;
import com.serotonin.mango.vo.mailingList.UserEntry;
import com.serotonin.mango.web.dwr.beans.RecipientListEntryBean;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.joda.time.DateTime;
import org.scada_lts.dao.DAO;
import org.scada_lts.dao.UserDAO;
@@ -30,6 +32,9 @@
import org.scada_lts.dao.mailingList.MailingListInactiveDAO;
import org.scada_lts.dao.mailingList.MailingListMemberDAO;
import org.scada_lts.mango.adapter.MangoMailingList;
+import org.scada_lts.service.CommunicationChannel;
+import org.scada_lts.service.CommunicationChannelType;
+import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.HashSet;
@@ -41,6 +46,7 @@
*
* @author Mateusz Kaproń Abil'I.T. development team, sdt@abilit.eu
*/
+@Service
public class MailingListService implements MangoMailingList {
//TODO
@@ -55,13 +61,32 @@ public class MailingListService implements MangoMailingList {
// @Resource
private static final MailingListMemberDAO mailingListMemberDAO = new MailingListMemberDAO();
+ private static final Log LOG = LogFactory.getLog(MailingListService.class);
+
private void setRelationalData(MailingList mailingList) {
+
mailingList.getInactiveIntervals().addAll(mailingListInactiveDAO.getInactiveInterval(mailingList.getId()));
mailingList.setEntries(mailingListMemberDAO.getEmailRecipient(mailingList.getId()));
populateEntrySubclasses((mailingList.getEntries()));
}
+ private boolean updateFromDatabase(MailingList mailingList) {
+ try {
+ MailingList mailingListFromDatabase = mailingListDAO.getMailingList(mailingList.getId());
+
+ mailingList.setDailyLimitSentEmails(mailingListFromDatabase.isDailyLimitSentEmails());
+ mailingList.setDailyLimitSentEmailsNumber(mailingListFromDatabase.getDailyLimitSentEmailsNumber());
+ mailingList.setCronPattern(mailingListFromDatabase.getCronPattern());
+ mailingList.setCollectInactiveEmails(mailingListFromDatabase.isCollectInactiveEmails());
+
+ return true;
+ } catch (Exception ex) {
+ LOG.error("problem with getMailingList id: " + mailingList.getId() + ", message: " + ex.getMessage(), ex);
+ return false;
+ }
+ }
+
@Override
public String generateUniqueXid() {
return DAO.getInstance().generateUniqueXid(MailingList.XID_PREFIX, "mailingLists");
@@ -79,10 +104,18 @@ public List getMailingLists() {
return lists;
}
+ @Override
+ public List getMailingLists(Set ids) {
+ List lists = mailingListDAO.getMailingLists(ids);
+ setRelationalData(lists);
+ return lists;
+ }
+
@Override
public MailingList getMailingList(int id) {
MailingList mailingList = mailingListDAO.getMailingList(id);
setRelationalData(mailingList);
+ updateFromDatabase(mailingList);
return mailingList;
}
@@ -91,6 +124,7 @@ public MailingList getMailingList(String xid) {
MailingList mailingList = mailingListDAO.getMailingList(xid);
if (mailingList != null) {
setRelationalData(mailingList);
+ updateFromDatabase(mailingList);
}
return mailingList;
}
@@ -109,6 +143,42 @@ public Set getRecipientAddresses(List beans, Dat
return addresses;
}
+ @Override
+ public Set getRecipientAddresses(List beans, DateTime sendTime, CommunicationChannelType type) {
+ List entries = new ArrayList(beans.size());
+ for (RecipientListEntryBean bean : beans) {
+ entries.add(bean.createEmailRecipient());
+ }
+ populateEntrySubclasses(entries);
+ Set addresses = new HashSet();
+ for (EmailRecipient entry : entries) {
+ entry.appendAddresses(addresses, sendTime, type);
+ }
+ return addresses;
+ }
+
+ @Override
+ public List convertToMailingLists(List beans) {
+ List entries = new ArrayList<>();
+ for (RecipientListEntryBean bean : beans) {
+ entries.add(bean.createEmailRecipient());
+ }
+ populateEntrySubclasses(entries);
+ List addresses = new ArrayList<>();
+ for(EmailRecipient recipient: entries) {
+ if(recipient instanceof MailingList)
+ addresses.add(MailingList.class.cast(recipient));
+ else {
+ MailingList mailingList = new MailingList();
+ List emailRecipients = new ArrayList<>();
+ emailRecipients.add(recipient);
+ mailingList.setEntries(emailRecipients);
+ addresses.add(mailingList);
+ }
+ }
+ return addresses;
+ }
+
@Override
public void populateEntrySubclasses(List entries) {
// Update the user type entries with their respective user objects.
@@ -116,6 +186,7 @@ public void populateEntrySubclasses(List entries) {
for (EmailRecipient e : entries) {
if (e instanceof MailingList) {
setRelationalData((MailingList) e);
+ updateFromDatabase((MailingList) e);
} else if (e instanceof UserEntry) {
UserEntry ue = (UserEntry) e;
ue.setUser(userDAO.getUser(ue.getUserId()));
@@ -125,12 +196,22 @@ public void populateEntrySubclasses(List entries) {
@Override
public void saveMailingList(final MailingList mailingList) {
+
+ if (mailingList.getId() != Common.NEW_ID) {
+ Common.ctx.getRuntimeManager().removeMailingList(mailingList);
+ }
+
if (mailingList.getId() == Common.NEW_ID) {
mailingList.setId(mailingListDAO.insert(mailingList));
} else {
mailingListDAO.update(mailingList);
}
saveRelationalData(mailingList);
+ boolean updated = updateFromDatabase(mailingList);
+ if(updated) {
+ setRelationalData(mailingList);
+ Common.ctx.getRuntimeManager().saveMailingList(mailingList);
+ }
}
@Override
@@ -145,11 +226,13 @@ public void saveRelationalData(final MailingList mailingList) {
private void setRelationalData(List mailingLists) {
for (MailingList mailingList: mailingLists) {
setRelationalData(mailingList);
+ updateFromDatabase(mailingList);
}
}
@Override
public void deleteMailingList(int mailingListId) {
+ Common.ctx.getRuntimeManager().removeMailingList(mailingListId);
mailingListDAO.delete(mailingListId);
}
diff --git a/src/org/scada_lts/service/CommunicationChannel.java b/src/org/scada_lts/service/CommunicationChannel.java
new file mode 100644
index 0000000000..25ca12ea56
--- /dev/null
+++ b/src/org/scada_lts/service/CommunicationChannel.java
@@ -0,0 +1,44 @@
+package org.scada_lts.service;
+
+import com.serotonin.mango.rt.event.EventInstance;
+import com.serotonin.mango.vo.event.EventHandlerVO;
+import com.serotonin.mango.vo.mailingList.MailingList;
+import org.joda.time.DateTime;
+import org.scada_lts.mango.service.SystemSettingsService;
+
+import java.util.Set;
+
+public interface CommunicationChannel {
+
+ int getChannelId();
+ CommunicationChannelTypable getType();
+
+ int getDailyLimitSentNumber();
+ boolean isDailyLimitSent();
+ String getSendingActivationCron();
+ boolean isActiveFor(DateTime fireTime);
+ boolean isActiveFor(EventInstance event);
+ Set getActiveAdresses(DateTime fireTime);
+ Set getActiveAdresses(EventInstance event);
+ Set getAllAdresses();
+ boolean isCollectInactiveEvents();
+ MailingList getData();
+
+ static CommunicationChannel newChannel(MailingList mailingList, CommunicationChannelTypable type,
+ SystemSettingsService systemSettingsService) {
+ return new CommunicationChannelImpl(mailingList, type, systemSettingsService);
+ }
+
+ static CommunicationChannel newSmsChannel(MailingList mailingList, SystemSettingsService systemSettingsService) {
+ return new CommunicationChannelImpl(mailingList, CommunicationChannelType.SMS, systemSettingsService);
+ }
+
+ static CommunicationChannel newEmailChannel(MailingList mailingList, SystemSettingsService systemSettingsService) {
+ return new CommunicationChannelImpl(mailingList, CommunicationChannelType.EMAIL, systemSettingsService);
+ }
+
+ static CommunicationChannel newChannel(MailingList mailingList, EventHandlerVO eventHandler, SystemSettingsService systemSettingsService) {
+ return new CommunicationChannelImpl(mailingList, CommunicationChannelType.getType(eventHandler.getHandlerType()), systemSettingsService);
+ }
+
+}
diff --git a/src/org/scada_lts/service/CommunicationChannelImpl.java b/src/org/scada_lts/service/CommunicationChannelImpl.java
new file mode 100644
index 0000000000..f3361c6a74
--- /dev/null
+++ b/src/org/scada_lts/service/CommunicationChannelImpl.java
@@ -0,0 +1,121 @@
+package org.scada_lts.service;
+
+import com.serotonin.mango.rt.event.EventInstance;
+import com.serotonin.mango.util.IntervalUtil;
+import com.serotonin.mango.vo.mailingList.MailingList;
+import org.joda.time.DateTime;
+import org.scada_lts.mango.service.SystemSettingsService;
+
+import java.util.HashSet;
+import java.util.Objects;
+import java.util.Set;
+
+class CommunicationChannelImpl implements CommunicationChannel {
+
+ private final MailingList mailingList;
+ private final CommunicationChannelTypable type;
+ private final SystemSettingsService systemSettingsService;
+
+
+ CommunicationChannelImpl(MailingList mailingList,
+ CommunicationChannelTypable type,
+ SystemSettingsService systemSettingsService) {
+ this.mailingList = mailingList;
+ this.type = type;
+ this.systemSettingsService = systemSettingsService;
+
+ }
+
+ @Override
+ public int getChannelId() {
+ return mailingList.getId();
+ }
+
+ @Override
+ public int getDailyLimitSentNumber() {
+ return mailingList.getDailyLimitSentEmailsNumber();
+ }
+
+ @Override
+ public String getSendingActivationCron() {
+ return mailingList.getCronPattern();
+ }
+
+ @Override
+ public boolean isCollectInactiveEvents() {
+ return mailingList.isCollectInactiveEmails();
+ }
+
+ @Override
+ public boolean isActiveFor(DateTime fireTime) {
+ return IntervalUtil.isActiveByInterval(mailingList, fireTime);
+ }
+
+ @Override
+ public boolean isActiveFor(EventInstance event) {
+ return IntervalUtil.isActiveByInterval(mailingList, event);
+ }
+
+ @Override
+ public Set getActiveAdresses(DateTime fireTime) {
+ Set adresses = new HashSet<>();
+ mailingList.appendAddresses(adresses, fireTime, type);
+ return formatAddresses(adresses);
+ }
+
+ @Override
+ public Set getActiveAdresses(EventInstance event) {
+ Set adresses = new HashSet<>();
+ DateTime fireTime = new DateTime(event.getActiveTimestamp());
+ mailingList.appendAddresses(adresses, fireTime, type);
+ return formatAddresses(adresses);
+ }
+
+ @Override
+ public Set getAllAdresses() {
+ Set adresses = new HashSet<>();
+ mailingList.appendAllAddresses(adresses, type);
+ return formatAddresses(adresses);
+ }
+
+ @Override
+ public CommunicationChannelTypable getType() {
+ return type;
+ }
+
+ @Override
+ public boolean isDailyLimitSent() {
+ return mailingList.isDailyLimitSentEmails();
+ }
+
+ @Override
+ public MailingList getData() {
+ return mailingList;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (!(o instanceof CommunicationChannelImpl)) return false;
+ CommunicationChannelImpl that = (CommunicationChannelImpl) o;
+ return getChannelId() == that.getChannelId() &&
+ getType() == that.getType();
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(getChannelId(), getType());
+ }
+
+ @Override
+ public String toString() {
+ return "CommunicationChannelImpl{" +
+ "mailingList=" + mailingList +
+ ", type=" + type +
+ '}';
+ }
+
+ private Set formatAddresses(Set adresses) {
+ return type.formatAddresses(adresses, systemSettingsService.getSMSDomain(), type.getReplaceRegex());
+ }
+}
diff --git a/src/org/scada_lts/service/CommunicationChannelTypable.java b/src/org/scada_lts/service/CommunicationChannelTypable.java
new file mode 100644
index 0000000000..ffdcf2d5c1
--- /dev/null
+++ b/src/org/scada_lts/service/CommunicationChannelTypable.java
@@ -0,0 +1,17 @@
+package org.scada_lts.service;
+
+import com.serotonin.mango.rt.event.EventInstance;
+
+import java.util.Set;
+
+public interface CommunicationChannelTypable {
+
+ boolean validateAddress(String address);
+ String removeWhitespace(String address);
+ Set formatAddresses(Set addresses, String domain, String replaceRegex);
+ Set formatAddresses(Set addresses, String domain);
+ String getReplaceRegex();
+ int getEventHandlerType();
+ boolean sendMsg(EventInstance event, Set addresses, String alias);
+ boolean sendLimit(EventInstance event, Set addresses, String alias);
+}
diff --git a/src/org/scada_lts/service/CommunicationChannelType.java b/src/org/scada_lts/service/CommunicationChannelType.java
new file mode 100644
index 0000000000..cc9aeabd50
--- /dev/null
+++ b/src/org/scada_lts/service/CommunicationChannelType.java
@@ -0,0 +1,130 @@
+package org.scada_lts.service;
+
+import com.serotonin.mango.rt.event.EventInstance;
+import com.serotonin.mango.rt.event.handlers.EmailHandlerRT;
+import com.serotonin.mango.rt.event.handlers.EmailToSmsHandlerRT;
+import com.serotonin.mango.util.SendMsgUtils;
+import com.serotonin.mango.vo.event.EventHandlerVO;
+
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+public enum CommunicationChannelType implements CommunicationChannelTypable {
+
+ EMAIL(EventHandlerVO.TYPE_EMAIL, "(?:[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*|\"(?:[\\x01-\\x08\\x0b\\x0c\\x0e-\\x1f\\x21\\x23-\\x5b\\x5d-\\x7f]|\\\\[\\x01-\\x09\\x0b\\x0c\\x0e-\\x7f])*\")@(?:(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?|\\[(?:(?:(2(5[0-5]|[0-4][0-9])|1[0-9][0-9]|[1-9]?[0-9]))\\.){3}(?:(2(5[0-5]|[0-4][0-9])|1[0-9][0-9]|[1-9]?[0-9])|[a-z0-9-]*[a-z0-9]:(?:[\\x01-\\x08\\x0b\\x0c\\x0e-\\x1f\\x21-\\x5a\\x53-\\x7f]|\\\\[\\x01-\\x09\\x0b\\x0c\\x0e-\\x7f])+)\\])") {
+
+ private String replaceRegex = "\\s";
+
+ @Override
+ public boolean sendMsg(EventInstance event, Set addresses, String alias) {
+ return SendMsgUtils.sendEmailWithoutQueue(event,EmailHandlerRT.EmailNotificationType.ACTIVE,addresses,alias);
+ }
+
+ @Override
+ public boolean sendLimit(EventInstance event, Set addresses, String alias) {
+ return sendMsg(event, addresses, alias);
+ }
+
+ @Override
+ public Set