From bb875521ef69a2a85fde83e7e655ad55a015d939 Mon Sep 17 00:00:00 2001
From: "13621160019@163.com" <13621160019@163.com>
Date: Fri, 7 May 2021 09:01:19 +0800
Subject: [PATCH] added is_virtual to point in myems-admin

---
 .../settings/datasource/point.controller.js          |  1 +
 admin/app/translations.js                            |  3 +++
 admin/views/settings/datasource/datasource.html      |  5 +++--
 admin/views/settings/datasource/point.model.html     | 12 +++++++++++-
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/admin/app/controllers/settings/datasource/point.controller.js b/admin/app/controllers/settings/datasource/point.controller.js
index 6fe0ef12..efe48acd 100644
--- a/admin/app/controllers/settings/datasource/point.controller.js
+++ b/admin/app/controllers/settings/datasource/point.controller.js
@@ -244,6 +244,7 @@ app.controller('ModalAddPointCtrl', function($scope, $uibModalInstance) {
 	$scope.point = {};
 	$scope.point.object_type = "ENERGY_VALUE";
 	$scope.point.is_trend = true;
+	$scope.point.is_virtual = false;
 	$scope.ok = function() {
 		$uibModalInstance.close($scope.point);
 	};
diff --git a/admin/app/translations.js b/admin/app/translations.js
index 8621e535..e71d69fd 100644
--- a/admin/app/translations.js
+++ b/admin/app/translations.js
@@ -449,6 +449,7 @@ function config($translateProvider) {
                 LOW_LIMIT: 'Low Limit',
                 RATIO: 'Ratio',
                 IS_TREND: 'Is Trend',
+                IS_VIRTUAL: 'Is Virtual',
                 ADDRESS: 'Address(JSON)',
                 DESCRIPTION: 'Description(Optionnal)',
                 INPUT_HIGH_LIMIT: 'Please Input High Limit',
@@ -1488,6 +1489,7 @@ function config($translateProvider) {
                 LOW_LIMIT: '低限',
                 RATIO: '比例系数',
                 IS_TREND: '保存趋势',
+                IS_VIRTUAL: '虚拟点',
                 ADDRESS: '地址(JSON)',
                 DESCRIPTION: '描述',
                 INPUT_HIGH_LIMIT: '请输入高限',
@@ -2539,6 +2541,7 @@ function config($translateProvider) {
                 LOW_LIMIT: 'Untergrenze',
                 RATIO: 'Skalierungsfaktor',
                 IS_TREND: 'Trend speichern',
+                IS_VIRTUAL: 'Virtueller Punkt',
                 ADDRESS: 'Adresse (JSON)',
                 DESCRIPTION: 'Beschreibung',
                 INPUT_HIGH_LIMIT: 'Bitte geben Sie das obere Limit ein',
diff --git a/admin/views/settings/datasource/datasource.html b/admin/views/settings/datasource/datasource.html
index fe3ba608..e83bb3d4 100644
--- a/admin/views/settings/datasource/datasource.html
+++ b/admin/views/settings/datasource/datasource.html
@@ -72,6 +72,7 @@
 										<th class="text-center">{{'POINT.LOW_LIMIT' | translate}}</th>
 										<th class="text-center">{{'POINT.RATIO' | translate}}</th>
 										<th class="text-center">{{'POINT.IS_TREND' | translate}}</th>
+										<th class="text-center">{{'POINT.IS_VIRTUAL' | translate}}</th>
 										<th class="text-center">{{'POINT.ADDRESS' | translate}}</th>
 										<th class="text-center">{{'POINT.DESCRIPTION' | translate}} ({{'SETTING.OPTIONAL' | translate}})</th>
 										<th class="text-center">{{'SETTING.ACTION' | translate}}</th>
@@ -86,8 +87,8 @@
 										<td class="text-center">{{ point.high_limit }}</td>
 										<td class="text-center">{{ point.low_limit }}</td>
 										<td class="text-center">{{ point.ratio }}</td>
-										<td class="text-center">
-											{{ point.is_trend==false?'SETTING.NO':'SETTING.YES' | translate }}</td>
+										<td class="text-center">{{ point.is_trend==false?'SETTING.NO':'SETTING.YES' | translate }}</td>
+										<td class="text-center">{{ point.is_virtual==false?'SETTING.NO':'SETTING.YES' | translate }}</td>
 										<td class="text-center md">{{ point.address }}</td>
 										<td class="text-center md">{{ point.description }}</td>
 										<td class="text-center">
diff --git a/admin/views/settings/datasource/point.model.html b/admin/views/settings/datasource/point.model.html
index 00c1bc12..77f6396f 100644
--- a/admin/views/settings/datasource/point.model.html
+++ b/admin/views/settings/datasource/point.model.html
@@ -65,7 +65,6 @@
             </div>
             <div class="hr-line-dashed"></div>
             <div class="form-group"><label class="col-sm-4 control-label">{{'POINT.IS_TREND' | translate}}</label>
-
                 <div class="col-sm-8">
                     <div class="checkbox checkbox-success">
                         <input id="chk_point_istrend" type="checkbox" ng-model="point.is_trend" ng-checked="point.is_trend">
@@ -73,6 +72,17 @@
                     </div>
                 </div>
             </div>
+
+            <div class="hr-line-dashed"></div>
+            <div class="form-group"><label class="col-sm-4 control-label">{{'POINT.IS_VIRTUAL' | translate}}</label>
+                <div class="col-sm-8">
+                    <div class="checkbox checkbox-success">
+                        <input id="chk_point_isvirtual" type="checkbox" ng-model="point.is_virtual" ng-checked="point.is_virtual">
+                        <label for="chk_point_isvirtual">{{'POINT.IS_VIRTUAL' | translate}}</label>
+                    </div>
+                </div>
+            </div>
+
             <div class="hr-line-dashed"></div>
             <div class="form-group"><label class="col-sm-4 control-label">{{'POINT.ADDRESS' | translate}}</label>