Add ZW and ZB to Z-Wave and Zigbee specific controllers and views

Z-Wave-Me · May 23, 2023 · 92e77bb · 92e77bb
1 parent 319575c
commit 92e77bb
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 16 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,5 +1,5 @@
 <!-- Commands view -->
-<div class="cfg-block" ng-controller="ConfigCommandsController">
+<div class="cfg-block" ng-controller="ZWConfigCommandsController">
     <div class="row">
         <div class="col-md-6">
             <h2>{{hasConfigurationCc.commandClass}}</h2>

diff --git a/app/views/expertui/configuration.html b/app/views/expertui/configuration.html
@@ -1,5 +1,5 @@
 <!-- Configuration view -->
-<div ng-controller="ConfigConfigurationController">
+<div ng-controller="ZWConfigConfigurationController">
      <bb-loader></bb-loader>
     <!-- Config navigation -->
 

diff --git a/app/views/zigbee/zigbee_manage_id.html b/app/views/zigbee/zigbee_manage_id.html
@@ -67,7 +67,7 @@ <h3>
                     </div>
 
                         <div class="form-group form-inline">
-                            <a class="btn btn-primary" href="#deviceconfig/{{zigbeeDevice.id}}" title="{{_t('hardware_konfiguration')}}" ng-if="zigbeeDevice.cfg.length > 0">
+                            <a class="btn btn-primary" href="#zigbeedeviceconfig/{{zigbeeDevice.id}}" title="{{_t('hardware_konfiguration')}}" ng-if="zigbeeDevice.cfg.length > 0">
                                 <i class="fas fa-wrench"></i> <span class="btn-name" ng-bind="_t('hardware_konfiguration')"></span>
                             </a>
                         </div>

diff --git a/app/views/zigbee/zigbee_manage_id_new.html b/app/views/zigbee/zigbee_manage_id_new.html
@@ -196,7 +196,7 @@ <h3>
                     </div>
 
                     <div class="form-group form-inline">
-                        <a class="btn btn-primary" href="#deviceconfig/{{zigbeeDevice.id}}" title="{{_t('hardware_konfiguration')}}" ng-if="zigbeeDevice.cfg.length > 0">
+                        <a class="btn btn-primary" href="#zigbeedeviceconfig/{{zigbeeDevice.id}}" title="{{_t('hardware_konfiguration')}}" ng-if="zigbeeDevice.cfg.length > 0">
                             <i class="fas fa-wrench"></i> <span class="btn-name" ng-bind="_t('hardware_konfiguration')"></span>
                         </a>
                     </div>

diff --git a/app/views/zwave/zwave_manage_id.html b/app/views/zwave/zwave_manage_id.html
@@ -67,7 +67,7 @@ <h3>
                     </div>
 
                         <div class="form-group form-inline">
-                            <a class="btn btn-primary" href="#deviceconfig/{{zWaveDevice.id}}" title="{{_t('hardware_konfiguration')}}" ng-if="zWaveDevice.cfg.length > 0">
+                            <a class="btn btn-primary" href="#zwavedeviceconfig/{{zWaveDevice.id}}" title="{{_t('hardware_konfiguration')}}" ng-if="zWaveDevice.cfg.length > 0">
                                 <i class="fas fa-wrench"></i> <span class="btn-name" ng-bind="_t('hardware_konfiguration')"></span>
                             </a>
                         </div>

diff --git a/app/views/zwave/zwave_manage_id_new.html b/app/views/zwave/zwave_manage_id_new.html
@@ -196,7 +196,7 @@ <h3>
                     </div>
 
                     <div class="form-group form-inline">
-                        <a class="btn btn-primary" href="#deviceconfig/{{zWaveDevice.id}}" title="{{_t('hardware_konfiguration')}}" ng-if="zWaveDevice.cfg.length > 0">
+                        <a class="btn btn-primary" href="#zwavedeviceconfig/{{zWaveDevice.id}}" title="{{_t('hardware_konfiguration')}}" ng-if="zWaveDevice.cfg.length > 0">
                             <i class="fas fa-wrench"></i> <span class="btn-name" ng-bind="_t('hardware_konfiguration')"></span>
                         </a>
                     </div>