From 6865fba169628ec61a4a4823852d5dd0d9ec7586 Mon Sep 17 00:00:00 2001
From: "13621160019@163.com" <13621160019@163.com>
Date: Sat, 13 Nov 2021 19:38:52 +0800
Subject: [PATCH] updated virtual meter model view in admin ui

---
 .../settings/meter/virtualmeter.model.html    | 49 +++++++++----------
 1 file changed, 23 insertions(+), 26 deletions(-)

diff --git a/admin/views/settings/meter/virtualmeter.model.html b/admin/views/settings/meter/virtualmeter.model.html
index e32108f3..bec5fdba 100644
--- a/admin/views/settings/meter/virtualmeter.model.html
+++ b/admin/views/settings/meter/virtualmeter.model.html
@@ -14,7 +14,16 @@
                             </div>
                         </div>
                     </div>
+                    <div class="hr-line-dashed"></div>
+                    <div class="form-group"><label class="col-sm-5 control-label">{{'SETTING.EXPRESSION' | translate}}</label>
 
+                        <div class="col-sm-7">
+                            <textarea ng-model="virtualmeter.expression.equation"  type="text" rows="2" name="virtualmeterexpression" class="form-control" required=""></textarea>
+                            <div class="m-t-xs" ng-show="form_virtualmeter.virtualmeterexpression.$invalid && form_virtualmeter.virtualmeterexpression.$dirty">
+                                <small class="text-danger" ng-show="form_virtualmeter.virtualmeterexpression.$error.required">{{'SETTING.INPUT_EXPRESSION' | translate}}</small>
+                            </div>
+                        </div>
+                    </div>
                     <div class="hr-line-dashed"></div>
                     <div class="form-group"><label class="col-sm-5 control-label">{{'SETTING.CATEGORY' | translate}}</label>
                         <div class="col-sm-7">
@@ -30,38 +39,12 @@
                         </div>
                     </div>
                     <div class="hr-line-dashed"></div>
-                    <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>
-                                <ui-select-choices repeat="energyitem.id as energyitem in energyitems | filter: $select.search">
-                                    <div ng-bind-html="energyitem.name | highlight: $select.search"></div>
-                                </ui-select-choices>
-                            </ui-select>
-                            <div class="m-t-xs" ng-show="form_virtualmeter.virtualmeter.energy_item_id.$invalid && form_virtualmeter.virtualmeter.energy_item_id.$dirty">
-                                <small class="text-danger" ng-show="form_virtualmeter.virtualmeter.energy_item_id.$error.required">{{'SETTING.SELECT_ENERGY_ITEM' | translate}}</small>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="hr-line-dashed"></div>
-                    <div class="form-group"><label class="col-sm-5 control-label">{{'SETTING.EXPRESSION' | translate}}</label>
-
-                        <div class="col-sm-7">
-                            <textarea ng-model="virtualmeter.expression.equation"  type="text" rows="2" name="virtualmeterexpression" class="form-control" required=""></textarea>
-                            <div class="m-t-xs" ng-show="form_virtualmeter.virtualmeterexpression.$invalid && form_virtualmeter.virtualmeterexpression.$dirty">
-                                <small class="text-danger" ng-show="form_virtualmeter.virtualmeterexpression.$error.required">{{'SETTING.INPUT_EXPRESSION' | translate}}</small>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="hr-line-dashed"></div>
                     <div class="form-group"><label class="col-sm-5 control-label">{{'SETTING.IS_INPUT_COUNTED' | translate}}</label>
-
                         <div class="col-sm-7">
                             <div class="checkbox checkbox-success">
                                 <input id="chk_virtualmeter_iscounted" type="checkbox" ng-model="virtualmeter.is_counted" ng-checked="virtualmeter.is_counted">
                                 <label for="chk_virtualmeter_iscounted">{{'SETTING.IS_INPUT_COUNTED' | translate}}</label>
                             </div>
-
                         </div>
                     </div>
                     <div class="hr-line-dashed"></div>
@@ -76,6 +59,20 @@
                         </div>
                     </div>
                     <div class="hr-line-dashed"></div>
+                    <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>
+                                <ui-select-choices repeat="energyitem.id as energyitem in energyitems | filter: $select.search">
+                                    <div ng-bind-html="energyitem.name | highlight: $select.search"></div>
+                                </ui-select-choices>
+                            </ui-select>
+                            <div class="m-t-xs" ng-show="form_virtualmeter.virtualmeter.energy_item_id.$invalid && form_virtualmeter.virtualmeter.energy_item_id.$dirty">
+                                <small class="text-danger" ng-show="form_virtualmeter.virtualmeter.energy_item_id.$error.required">{{'SETTING.SELECT_ENERGY_ITEM' | translate}}</small>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="hr-line-dashed"></div>
                     <div class="form-group"><label class="col-sm-5 control-label">{{'METER.DESCRIPTION' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
                       <div class="col-sm-7">
                           <input ng-model="virtualmeter.description" type="text" name="virtualmeterdescription" class="form-control" >