Changeset 13805 for branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/wwwroot/js

Timestamp:

04/27/16 16:48:35 (9 years ago)

Author:

jlodewyc

Message:

#2582 Bugfixing, email setup password and code commenting

Location:

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/wwwroot/js/hubs

Files:

• calendarhubber.js (modified) (4 diffs)
• userinfohubber.js (modified) (1 diff)

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/wwwroot/js/hubs/calendarhubber.js

@@ -14 +14 @@
                vm.alertMessage = "No alerts";
                vm.currentcal = [];
-               $scope.permission = false;
+               $scope.permissionview = false;
+               $scope.resaddview = false;
                vm.selectedEventId = -1;
                vm.groups = [];
@@ -100 +101 @@
                    $scope.$watch("treeview.currentNode", function (newValue, oldValue) {
                        $scope.currentcal = [];
+                       $scope.resaddview = false;
                        $(".selected.ng-binding").addClass('loaded');
                        $scope.selectedEventId = -1;
@@ -112 +114 @@
                                $timeout(function () {
                                    refreshPermissions();
+                                   
                                    $scope.currentcal = $scope.treeview.currentNode.calendar;
                                }, 0);
 
                            }
-                       }
-
-                   });
+                           $scope.refreshAdds();
+                       }
+
+                   });
+               }
+               $scope.refreshAdds = function() {
+                   for (var i = 0; i < $scope.clients.length; i++) {
+                       $scope.clients[i].add = false;
+                       for (var j = 0; j < $scope.treeview.currentNode.children.length; j++) {
+                           if ($scope.clients[i].Id === $scope.treeview.currentNode.children[j].Id)
+                               $scope.clients[i].add = true;
+                       }
+                   }
                }
                function refreshPermissions() {
@@ -650 +663 @@
                };
 
+               $scope.menuchange = function (i) {
+                   switch(i) {
+                       case 0:
+                           $scope.permissionview = false;
+                           $scope.resaddview = false;
+                           break;
+                       case 1:
+                           $scope.permissionview = true;
+                           $scope.resaddview = false;
+                           break;
+                       case 2:
+                           $scope.permissionview = false;
+                           $scope.resaddview = true;
+                           break;
+                   }
+               }
+
 
 

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/wwwroot/js/hubs/userinfohubber.js

@@ -1 @@
-function resetPass(a){hubber.server.resetPassword(a)}var hubber=$.connection.userInfoHub;$(function(){$.connection.hub.logging=!0;var a=document.getElementById("userId").innerHTML;console.log(a),$.connection.hub.qs={userid:a},$.connection.hub.start(),hubber.client.showNewPass=function(a){$("#inppassreset").html("<label class=' control-label' style='text-align:left'>New password: "+a+"</label>")}});
+function resetPass(a){hubber.server.resetPassword(a)}var hubber=$.connection.userInfoHub;$(function(){var a=document.getElementById("userId").innerHTML;console.log(a),$.connection.hub.qs={userid:a},$.connection.hub.start(),hubber.client.showNewPass=function(a){$("#inppassreset").html("<label class=' control-label' style='text-align:left'>An email has been sent to the user containing the new password</label>")}});