Merge branch 'develop'

CHANGELOG.md

@@ -32,6 +32,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - fixed validator issue of equipment parameter form in myems-admin
 - fixed validator issue of combined equipment parameter form in myems-admin
 - fixed webpack-dev-server version 4.12.0 caused compile errors
+- fixed save button issue of non-working-day dialog in myems-admin
 
 ### Removed
 

myems-admin/views/settings/workingcalendar/workingcalendar.html

@@ -48,7 +48,7 @@
 								</div>
 							</form>
 							<div class="hr-line-dashed"></div>
-							<a ng-click="addNonWorkingDay()" class="btn btn-primary btn-rounded  btn-outline" href=""><i
+							<a ng-click="currentWorkingCalendar.id?addNonWorkingDay():''" ng-disabled="!currentWorkingCalendar.id" class="btn btn-primary btn-rounded  btn-outline" href=""><i
 									class="fa fa-plus-circle"></i> {{'SETTING.ADD_NON_WORKING_DAY' | translate}}</a>
 							<table class="table table-bordered table-hover">
 								<thead>