Merge branch 'PR' into develop

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

@@ -80,6 +80,9 @@
     <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' && form_equipmentparameter.$invalid" 
+        class="btn btn-primary" ng-click="ok()">{{'SETTING.SAVE' | translate}}</button>
     </div>
 </div>