From 373c2a1fb1163ab7668cd85a38b714e505f7f02f Mon Sep 17 00:00:00 2001
From: "13621160019@163.com" <13621160019@163.com>
Date: Wed, 17 Mar 2021 17:24:34 +0800
Subject: [PATCH] added 'optional' tips to meter,virtual meter and offline
 meter setting in admin UI

---
 admin/views/settings/meter/meter.html         | 26 +++++++------------
 admin/views/settings/meter/meter.model.html   |  4 +--
 .../settings/meter/offline-meter.model.html   |  2 +-
 .../settings/meter/virtual-meter.model.html   |  2 +-
 4 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/admin/views/settings/meter/meter.html b/admin/views/settings/meter/meter.html
index 69f1616c..0f34f7a6 100644
--- a/admin/views/settings/meter/meter.html
+++ b/admin/views/settings/meter/meter.html
@@ -15,12 +15,12 @@
 										<th class="text-center">{{'SETTING.ID' | translate}}</th>
 										<th class="text-center">{{'SETTING.NAME' | translate}}</th>
 										<th class="text-center">{{'SETTING.CATEGORY' | translate}}</th>
-										<th class="text-center">{{'SETTING.ENERGY_ITEM' | translate}}</th>
+										<th class="text-center">{{'SETTING.ENERGY_ITEM' | translate}} ({{'SETTING.OPTIONAL' | translate}})</th>
 										<th class="text-center">{{'SETTING.IS_INPUT_COUNTED' | translate}}</th>
 										<th class="text-center">{{'METER.HOURLY_LOW_LIMIT' | translate}}</th>
 										<th class="text-center">{{'METER.HOURLY_HIGH_LIMIT' | translate}}</th>
 										<th class="text-center">{{'SETTING.COSTCENTER' | translate}}</th>
-										<th class="text-center">{{'METER.MASTER_METER' | translate}}</th>
+										<th class="text-center">{{'METER.MASTER_METER' | translate}} ({{'SETTING.OPTIONAL' | translate}})</th>
 										<th class="text-center">{{'METER.DESCRIPTION' | translate}} ({{'SETTING.OPTIONAL' | translate}})</th>
 										<th class="text-center">{{'SETTING.ACTION' | translate}}</th>
 
@@ -167,18 +167,12 @@
 														<th class="text-center">{{'SETTING.ID' | translate}}</th>
 														<th class="text-center">{{'SETTING.NAME' | translate}}</th>
 														<th class="text-center">{{'SETTING.CATEGORY' | translate}}</th>
-														<th class="text-center">{{'SETTING.ENERGY_ITEM' | translate}}
-														</th>
-														<th class="text-center">
-															{{'SETTING.IS_INPUT_COUNTED' | translate}}</th>
-														<th class="text-center">{{'METER.HOURLY_LOW_LIMIT' | translate}}
-														</th>
-														<th class="text-center">
-															{{'METER.HOURLY_HIGH_LIMIT' | translate}}</th>
-														<th class="text-center">{{'SETTING.COSTCENTER' | translate}}
-														</th>
-														<th class="text-center">{{'METER.MASTER_METER' | translate}}
-														</th>
+														<th class="text-center">{{'SETTING.ENERGY_ITEM' | translate}} ({{'SETTING.OPTIONAL' | translate}})</th>
+														<th class="text-center">{{'SETTING.IS_INPUT_COUNTED' | translate}}</th>
+														<th class="text-center">{{'METER.HOURLY_LOW_LIMIT' | translate}}</th>
+														<th class="text-center">{{'METER.HOURLY_HIGH_LIMIT' | translate}}</th>
+														<th class="text-center">{{'SETTING.COSTCENTER' | translate}}</th>
+														<th class="text-center">{{'METER.MASTER_METER' | translate}}</th>
 														<th class="text-center">{{'METER.DESCRIPTION' | translate}} ({{'SETTING.OPTIONAL' | translate}})</th>
 													</tr>
 												</thead>
@@ -218,7 +212,7 @@
 										<th class="text-center">{{'SETTING.ID' | translate}}</th>
 										<th class="text-center">{{'SETTING.NAME' | translate}}</th>
 										<th class="text-center">{{'SETTING.CATEGORY' | translate}}</th>
-										<th class="text-center">{{'SETTING.ENERGY_ITEM' | translate}}</th>
+										<th class="text-center">{{'SETTING.ENERGY_ITEM' | translate}} ({{'SETTING.OPTIONAL' | translate}})</th>
 										<th class="text-center">{{'SETTING.IS_INPUT_COUNTED' | translate}}</th>
 										<th class="text-center">{{'SETTING.COSTCENTER' | translate}}</th>
 										<th class="text-center">{{'METER.DESCRIPTION' | translate}} ({{'SETTING.OPTIONAL' | translate}})</th>
@@ -259,7 +253,7 @@
 										<th class="text-center">{{'SETTING.ID' | translate}}</th>
 										<th class="text-center">{{'SETTING.NAME' | translate}}</th>
 										<th class="text-center">{{'SETTING.CATEGORY' | translate}}</th>
-										<th class="text-center">{{'SETTING.ENERGY_ITEM' | translate}}</th>
+										<th class="text-center">{{'SETTING.ENERGY_ITEM' | translate}} ({{'SETTING.OPTIONAL' | translate}})</th>
 										<th class="text-center">{{'SETTING.IS_INPUT_COUNTED' | translate}}</th>
 										<th class="text-center">{{'METER.HOURLY_LOW_LIMIT' | translate}}</th>
 										<th class="text-center">{{'METER.HOURLY_HIGH_LIMIT' | translate}}</th>
diff --git a/admin/views/settings/meter/meter.model.html b/admin/views/settings/meter/meter.model.html
index d9201240..44b8af2f 100644
--- a/admin/views/settings/meter/meter.model.html
+++ b/admin/views/settings/meter/meter.model.html
@@ -27,7 +27,7 @@
                 </div>
             </div>
             <div class="hr-line-dashed"></div>
-            <div class="form-group"><label class="col-sm-4 control-label">{{'SETTING.ENERGY_ITEM' | translate}}</label>
+            <div class="form-group"><label class="col-sm-4 control-label">{{'SETTING.ENERGY_ITEM' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
                 <div class="col-sm-8">
                     <ui-select ng-model="meter.energy_item.id" name="meter.energy_item_id" theme="bootstrap">
                         <ui-select-match allow-clear="true" placeholder="{{'COMMON.PLACEHOLDER' | translate}}">{{$select.selected.name}}</ui-select-match>
@@ -79,7 +79,7 @@
                 </div>
             </div>
             <div class="hr-line-dashed"></div>
-            <div class="form-group"><label class="col-sm-4 control-label">{{'METER.MASTER_METER' | translate}}</label>
+            <div class="form-group"><label class="col-sm-4 control-label">{{'METER.MASTER_METER' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
                 <div class="col-sm-8">
                     <ui-select ng-model="meter.master_meter.id" name="meter.master_meter_id" theme="bootstrap">
                         <ui-select-match allow-clear="true" placeholder="{{'COMMON.PLACEHOLDER' | translate}}">{{$select.selected.name}}</ui-select-match>
diff --git a/admin/views/settings/meter/offline-meter.model.html b/admin/views/settings/meter/offline-meter.model.html
index e42172b9..ed260dcf 100644
--- a/admin/views/settings/meter/offline-meter.model.html
+++ b/admin/views/settings/meter/offline-meter.model.html
@@ -27,7 +27,7 @@
                 </div>
             </div>
             <div class="hr-line-dashed"></div>
-            <div class="form-group"><label class="col-sm-4 control-label">{{'SETTING.ENERGY_ITEM' | translate}}</label>
+            <div class="form-group"><label class="col-sm-4 control-label">{{'SETTING.ENERGY_ITEM' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
                 <div class="col-sm-8">
                     <ui-select ng-model="offlinemeter.energy_item.id" name="offlinemeter.energy_item_id" theme="bootstrap">
                         <ui-select-match allow-clear="true" placeholder="{{'COMMON.PLACEHOLDER' | translate}}">{{$select.selected.name}}</ui-select-match>
diff --git a/admin/views/settings/meter/virtual-meter.model.html b/admin/views/settings/meter/virtual-meter.model.html
index 81341aea..e32108f3 100644
--- a/admin/views/settings/meter/virtual-meter.model.html
+++ b/admin/views/settings/meter/virtual-meter.model.html
@@ -30,7 +30,7 @@
                         </div>
                     </div>
                     <div class="hr-line-dashed"></div>
-                    <div class="form-group"><label class="col-sm-5 control-label">{{'SETTING.ENERGY_ITEM' | translate}}</label>
+                    <div class="form-group"><label class="col-sm-5 control-label">{{'SETTING.ENERGY_ITEM' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
                         <div class="col-sm-7">
                             <ui-select ng-model="virtualmeter.energy_item.id" name="virtualmeter.energy_item_id" theme="bootstrap">
                                 <ui-select-match allow-clear="true" placeholder="{{'COMMON.PLACEHOLDER' | translate}}">{{$select.selected.name}}</ui-select-match>