Merge branch 'develop'

MyEMS · Jun 19, 2024 · 4a6dc34 · 4a6dc34
2 parents fe0246e + 8b06326
commit 4a6dc34
Show file tree

Hide file tree

Showing 7 changed files with 177 additions and 68 deletions.
diff --git a/myems-admin/app/config.router.js b/myems-admin/app/config.router.js
@@ -1423,8 +1423,9 @@ app
                                                     'app/services/settings/energystoragepowerstation/energystoragepowerstation.service.js',
                                                     'app/services/settings/energystoragepowerstation/energystoragepowerstationcontainer.service.js',
                                                     'app/services/settings/energystoragepowerstation/energystoragepowerstationuser.service.js',
-                                                    'app/services/settings/costcenter/costcenter.service.js',
                                                     'app/services/settings/contact/contact.service.js',
+                                                    'app/services/settings/costcenter/costcenter.service.js',
+                                                    'app/services/settings/svg/svg.service.js',
                                                     'app/services/settings/energystoragecontainer/energystoragecontainer.service.js',
                                                     'app/services/users/user/user.service.js',
                                                     'app/controllers/settings/energystoragepowerstation/energystoragepowerstation.master.controller.js',

diff --git a/...pp/controllers/settings/energystoragepowerstation/energystoragepowerstation.controller.js b/...pp/controllers/settings/energystoragepowerstation/energystoragepowerstation.controller.js
@@ -6,15 +6,27 @@ app.controller('EnergyStoragePowerStationController', function(
     $window,
     $translate,
     $uibModal,
-    CostCenterService,
     ContactService,
+    CostCenterService,
+    SVGService,
     EnergyStoragePowerStationService,
     toaster,
     SweetAlert) {
 	$scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user"));
 	$scope.exportdata = '';
 	$scope.importdata = '';
 
+	$scope.getAllContacts = function() {
+		let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token};
+		ContactService.getAllContacts(headers, function (response) {
+			if (angular.isDefined(response.status) && response.status === 200) {
+				$scope.contacts = response.data;
+			} else {
+				$scope.contacts = [];
+			}
+		});
+	};
+
 	$scope.getAllCostCenters = function() {
 		let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
 		CostCenterService.getAllCostCenters(headers, function (response) {
@@ -26,13 +38,13 @@ app.controller('EnergyStoragePowerStationController', function(
 		});
 	};
 
-	$scope.getAllContacts = function() {
-		let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
-		ContactService.getAllContacts(headers, function (response) {
+	$scope.getAllSVGs = function() {
+		let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token, "Quickmode": 'true'  };
+		SVGService.getAllSVGs(headers, function (response) {
 			if (angular.isDefined(response.status) && response.status === 200) {
-				$scope.contacts = response.data;
+				$scope.svgs = response.data;
 			} else {
-				$scope.contacts = [];
+				$scope.svgs = [];
 			}
 		});
 	};
@@ -66,6 +78,7 @@ app.controller('EnergyStoragePowerStationController', function(
 					return {
 						costcenters: angular.copy($scope.costcenters),
 						contacts: angular.copy($scope.contacts),
+						svgs: angular.copy($scope.svgs),
 						phaseoflifecycles: angular.copy($scope.phaseoflifecycles)
 					};
 				}
@@ -110,6 +123,7 @@ app.controller('EnergyStoragePowerStationController', function(
 						energystoragepowerstation: angular.copy(energystoragepowerstation),
 						costcenters:angular.copy($scope.costcenters),
 						contacts:angular.copy($scope.contacts),
+						svgs:angular.copy($scope.svgs),
 						phaseoflifecycles: angular.copy($scope.phaseoflifecycles)
 					};
 				}
@@ -272,8 +286,9 @@ app.controller('EnergyStoragePowerStationController', function(
 	};
 
 	$scope.getAllEnergyStoragePowerStations();
-	$scope.getAllCostCenters();
 	$scope.getAllContacts();
+	$scope.getAllCostCenters();
+	$scope.getAllSVGs();
 	$scope.getAllPhaseOfLifecycles();
 	$scope.$on('handleBroadcastEnergyStoragePowerStationChanged', function(event) {
   		$scope.getAllEnergyStoragePowerStations();
@@ -284,6 +299,7 @@ app.controller('ModalAddEnergyStoragePowerStationCtrl', function($scope, $uibMod
 	$scope.operation = "SETTING.ADD_ENERGY_STORAGE_POWER_STATION";
 	$scope.costcenters=params.costcenters;
 	$scope.contacts=params.contacts;
+	$scope.svgs=params.svgs;
 	$scope.phaseoflifecycles=params.phaseoflifecycles;
 	$scope.energystoragepowerstation = {
 		is_cost_data_displayed: false
@@ -302,6 +318,7 @@ app.controller('ModalEditEnergyStoragePowerStationCtrl', function($scope, $uibMo
 	$scope.energystoragepowerstation = params.energystoragepowerstation;
 	$scope.costcenters=params.costcenters;
 	$scope.contacts=params.contacts;
+	$scope.svgs=params.svgs;
 	$scope.phaseoflifecycles=params.phaseoflifecycles;
 	$scope.ok = function() {
 		$uibModalInstance.close($scope.energystoragepowerstation);

diff --git a/myems-admin/views/settings/energystoragepowerstation/energystoragepowerstation.model.html b/myems-admin/views/settings/energystoragepowerstation/energystoragepowerstation.model.html
@@ -95,12 +95,14 @@ <h4 class="modal-title">{{operation | translate}}(ID:{{energystoragepowerstation
                     </ui-select>
                 </div>
             </div>
-            <div class="form-group"><label class="col-sm-2 control-label">{{'ENERGY_STORAGE_POWER_STATION.SVG' | translate}}</label>
+            <div class="form-group"><label class="col-sm-2 control-label">{{'COMMON.SVG' | translate}}</label>
                 <div class="col-sm-10">
-                    <textarea ng-model="energystoragepowerstation.svg" rows="10" cols="50" name="energystoragepowerstationsvg" class="form-control" required="" placeholder="<svg></svg>"></textarea>
-                    <div class="m-t-xs" ng-show="form_energystoragepowerstation.energystoragepowerstationsvg.$invalid && form_energystoragepowerstation.energystoragepowerstationsvg.$dirty">
-                        <small class="text-danger" ng-show="form_energystoragepowerstation.energystoragepowerstationsvg.$error.required">{{'ENERGY_STORAGE_POWER_STATION.INPUT_SVG' | translate}}</small>
-                    </div>
+                    <ui-select ng-model="energystoragepowerstation.svg.id" theme="bootstrap" required>
+                        <ui-select-match allow-clear="false" placeholder="{{'COMMON.PLACEHOLDER' | translate}}">{{$select.selected.name}}</ui-select-match>
+                        <ui-select-choices repeat="svg.id as svg in svgs | filter: $select.search">
+                            <div ng-bind-html="svg.name | highlight: $select.search"></div>
+                        </ui-select-choices>
+                    </ui-select>
                 </div>
             </div>
             <div class="form-group"><label class="col-sm-2 control-label">{{'ENERGY_STORAGE_POWER_STATION.IS_COST_DATA_DISPLAYED' | translate}}</label>