Merge branch 'develop'

CHANGELOG.md

@@ -17,7 +17,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - fixed HTTPError Deprecated Warning in myems-api
 - fixed edit user issue in myems-api
 - fixed save button issue of energy item dialog in myems-admin
-
+- fixed validator issue of equipment parameter form in myems-admin
 ### Removed
 
 

myems-admin/views/settings/equipment/equipmentparameter.model.html

@@ -79,7 +79,9 @@
     </div>
     <div class="modal-footer">
         <button type="button" class="btn btn-white" ng-click="cancel()">{{'SETTING.CANCEL' | translate}}</button>
-        <!-- <button type="button" ng-disabled="form_equipmentparameter.$invalid" class="btn btn-primary" ng-click="ok()">{{'SETTING.SAVE' | translate}}</button> -->
-        <button type="button" class="btn btn-primary" ng-click="ok()">{{'SETTING.SAVE' | translate}}</button>
+        <button type="button" ng-disabled="(equipmentparameter.parameter_type === 'constant' && (!equipmentparameter.name || !equipmentparameter.constant)) || 
+                                            (equipmentparameter.parameter_type === 'point' && (!equipmentparameter.name || !equipmentparameter.point.id)) || 
+                                            (equipmentparameter.parameter_type === 'fraction' &&  (!equipmentparameter.name || !equipmentparameter.numerator_meter.uuid || !equipmentparameter.denominator_meter.uuid)) " 
+        class="btn btn-primary" ng-click="ok()">{{'SETTING.SAVE' | translate}}</button>
     </div>
 </div>