From 92e77bbfca6f52fc12a159cb12e09ed728a7d9c4 Mon Sep 17 00:00:00 2001 From: Poltorak Serguei Date: Wed, 24 May 2023 01:55:09 +0300 Subject: [PATCH] Add ZW and ZB to Z-Wave and Zigbee specific controllers and views --- app/controllers/zigbee-commands.js | 4 ++-- app/controllers/zigbee-configuration.js | 4 ++-- app/controllers/zwave-commands.js | 4 ++-- app/controllers/zwave-configuration.js | 4 ++-- app/routes.js | 8 ++++++-- app/views/expertui/commands.html | 2 +- app/views/expertui/configuration.html | 2 +- app/views/zigbee/zigbee_manage_id.html | 2 +- app/views/zigbee/zigbee_manage_id_new.html | 2 +- app/views/zwave/zwave_manage_id.html | 2 +- app/views/zwave/zwave_manage_id_new.html | 2 +- 11 files changed, 20 insertions(+), 16 deletions(-) diff --git a/app/controllers/zigbee-commands.js b/app/controllers/zigbee-commands.js index bf893c8cb..a4b672720 100644 --- a/app/controllers/zigbee-commands.js +++ b/app/controllers/zigbee-commands.js @@ -4,9 +4,9 @@ */ /** * The controller that handles outputs and inputs. - * @class ConfigCommandsController + * @class ZBConfigCommandsController */ -myAppController.controller('ConfigCommandsController', function ($scope, $routeParams, $location, $cookies, $timeout, $filter,$interval, dataFactory,dataService, expertService,cfg, _) { +myAppController.controller('ZBConfigCommandsController', function ($scope, $routeParams, $location, $cookies, $timeout, $filter,$interval, dataFactory,dataService, expertService,cfg, _) { $scope.commands = []; $scope.interviewCommands; $scope.ccConfiguration = { diff --git a/app/controllers/zigbee-configuration.js b/app/controllers/zigbee-configuration.js index b26772ff1..dac80cab3 100644 --- a/app/controllers/zigbee-configuration.js +++ b/app/controllers/zigbee-configuration.js @@ -5,9 +5,9 @@ /** * The controller that handles outputs and inputs. - * @class ConfigConfigurationController + * @class ZBConfigConfigurationController */ -myAppController.controller('ConfigConfigurationController', function($scope, $routeParams, $location, $interval, $filter, $timeout, dataFactory, dataService, expertService) { +myAppController.controller('ZBConfigConfigurationController', function($scope, $routeParams, $location, $interval, $filter, $timeout, dataFactory, dataService, expertService) { $scope.devices = []; $scope.deviceId = 0; diff --git a/app/controllers/zwave-commands.js b/app/controllers/zwave-commands.js index 39e196eb9..f616e433f 100644 --- a/app/controllers/zwave-commands.js +++ b/app/controllers/zwave-commands.js @@ -4,9 +4,9 @@ */ /** * The controller that handles outputs and inputs. - * @class ConfigCommandsController + * @class ZWConfigCommandsController */ -myAppController.controller('ConfigCommandsController', function ($scope, $routeParams, $location, $cookies, $timeout, $filter,$interval, dataFactory,dataService, expertService,cfg, _) { +myAppController.controller('ZWConfigCommandsController', function ($scope, $routeParams, $location, $cookies, $timeout, $filter,$interval, dataFactory,dataService, expertService,cfg, _) { $scope.commands = []; $scope.interviewCommands; $scope.ccConfiguration = { diff --git a/app/controllers/zwave-configuration.js b/app/controllers/zwave-configuration.js index ce72332dd..ab7ab46e4 100644 --- a/app/controllers/zwave-configuration.js +++ b/app/controllers/zwave-configuration.js @@ -5,9 +5,9 @@ /** * The controller that handles outputs and inputs. - * @class ConfigConfigurationController + * @class ZWConfigConfigurationController */ -myAppController.controller('ConfigConfigurationController', function($scope, $routeParams, $location, $interval, $filter, $timeout, dataFactory, dataService, expertService) { +myAppController.controller('ZWConfigConfigurationController', function($scope, $routeParams, $location, $interval, $filter, $timeout, dataFactory, dataService, expertService) { $scope.devices = []; $scope.deviceId = 0; diff --git a/app/routes.js b/app/routes.js index c5ea4cddc..8c89f594d 100644 --- a/app/routes.js +++ b/app/routes.js @@ -411,10 +411,14 @@ myApp.config(['$routeProvider', function($routeProvider) { templateUrl: 'app/views/rooms/config_rooms_id.html', requireLogin: true, roles: cfg.role_access.config_rooms_id - }). //Device configuration - when('/deviceconfig/:nodeId', { + }). //Z-Wave device configuration + when('/zwavedeviceconfig/:nodeId', { templateUrl: 'app/views/expertui/configuration.html', requireLogin: true + }). //Zigbee device configuration + when('/zigbeedeviceconfig/:nodeId', { + templateUrl: 'app/views/zigxpertui/configuration.html', + requireLogin: true }). //Report when('/report', { templateUrl: 'app/views/report/report.html', diff --git a/app/views/expertui/commands.html b/app/views/expertui/commands.html index 597af0191..7858aca93 100644 --- a/app/views/expertui/commands.html +++ b/app/views/expertui/commands.html @@ -1,5 +1,5 @@ -
+

{{hasConfigurationCc.commandClass}}

diff --git a/app/views/expertui/configuration.html b/app/views/expertui/configuration.html index e0d46d8de..74c0394bd 100644 --- a/app/views/expertui/configuration.html +++ b/app/views/expertui/configuration.html @@ -1,5 +1,5 @@ -
+
diff --git a/app/views/zigbee/zigbee_manage_id.html b/app/views/zigbee/zigbee_manage_id.html index 5a1d1b3fc..2015826ea 100644 --- a/app/views/zigbee/zigbee_manage_id.html +++ b/app/views/zigbee/zigbee_manage_id.html @@ -67,7 +67,7 @@

- +
diff --git a/app/views/zigbee/zigbee_manage_id_new.html b/app/views/zigbee/zigbee_manage_id_new.html index 6adeb767f..39c2f5385 100644 --- a/app/views/zigbee/zigbee_manage_id_new.html +++ b/app/views/zigbee/zigbee_manage_id_new.html @@ -196,7 +196,7 @@

- +
diff --git a/app/views/zwave/zwave_manage_id.html b/app/views/zwave/zwave_manage_id.html index b2d247ccd..44104a33d 100644 --- a/app/views/zwave/zwave_manage_id.html +++ b/app/views/zwave/zwave_manage_id.html @@ -67,7 +67,7 @@

- +
diff --git a/app/views/zwave/zwave_manage_id_new.html b/app/views/zwave/zwave_manage_id_new.html index 0ac1c7cc0..f0586ddc5 100644 --- a/app/views/zwave/zwave_manage_id_new.html +++ b/app/views/zwave/zwave_manage_id_new.html @@ -196,7 +196,7 @@

- +