Changeset 13827 for branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager

Timestamp:

05/03/16 17:13:50 (8 years ago)

Author:

jlodewyc

Message:

#2582 Parameter changing busy, save file, download file and email on pass reset

Location:

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager

Files:

• Controllers/JobController.cs (modified) (1 diff)
• Controllers/UserController.cs (modified) (3 diffs)
• Hubs/ProgressHub.cs (modified) (8 diffs)
• Scripts/Hubs/ProgressHubber.js (modified) (1 diff)
• Scripts/Styling/StyleSheet.css (modified) (1 diff)
• Services/Jobs/FileOpeningService.cs (modified) (3 diffs)
• Views/Home/Index.cshtml (modified) (1 diff)
• Views/Job/Index.cshtml (modified) (10 diffs)
• Views/Job/OpenFile.cshtml (modified) (7 diffs)
• Views/Job/OpenFilePartials/DataPartials (added)
• Views/Job/OpenFilePartials/DataPartials/Bool.cshtml (added)
• Views/Job/OpenFilePartials/DataPartials/DataMaster.cshtml (added)
• Views/Job/OpenFilePartials/DataPartials/Double.cshtml (added)
• Views/Job/OpenFilePartials/DataPartials/Int.cshtml (added)
• Views/Job/OpenFilePartials/DataPartials/Others.cshtml (added)
• Views/Job/OpenFilePartials/DataPartials/Percent.cshtml (added)
• Views/Job/OpenFilePartials/DataPartials/String.cshtml (added)
• Views/Job/OpenFilePartials/_Algorithm.cshtml (modified) (5 diffs)
• Views/Job/OpenFilePartials/_AlgorithmSmall.cshtml (modified) (5 diffs)
• Views/Job/OpenFilePartials/_BatchRun.cshtml (modified) (1 diff)
• Views/Job/OpenFilePartials/_BatchRunSmall.cshtml (modified) (3 diffs)
• Views/Job/OpenFilePartials/_Experiment.cshtml (modified) (1 diff)
• Views/Job/OpenFilePartials/_ExperimentSmall.cshtml (modified) (3 diffs)
• Views/Job/SelectedJobPartials/_AlgTask.cshtml (modified) (2 diffs)
• Views/Job/SelectedJobPartials/_BatchTask.cshtml (modified) (2 diffs)
• Views/Job/SelectedJobPartials/_ExpTask.cshtml (modified) (2 diffs)
• Views/Job/UploaderPartial/_UploaderPartial.cshtml (modified) (1 diff)
• Views/Job/Uploads.cshtml (modified) (7 diffs)
• Views/Resource/Index.cshtml (modified) (11 diffs)
• Views/User/Groups.cshtml (modified) (1 diff)
• Views/User/Index.cshtml (modified) (2 diffs)
• Views/User/Roles.cshtml (modified) (2 diffs)
• wwwroot/css/site.min.css (modified) (1 diff)
• wwwroot/js/hubs/calendarhubber.js (modified) (44 diffs)
• wwwroot/js/hubs/progresshubber.js (modified) (1 diff)
• wwwroot/js/hubs/userinfohubber.js (modified) (1 diff)

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Controllers/JobController.cs

@@ -310 +310 @@
             }
         }
-        //TODO Work in progress
-        /* public async Task<IActionResult> DownloadFile(int index, int filedex)
-         {
-             if (((HiveServiceLocatorWeb)(HiveServiceLocatorWeb.Instance)).CheckLogin())
-             {
-                 UploadedJobViewModel upper = new UploadedJobViewModel();
-                 fillUploadsPaths(upper, index);
-
-                HttpContext.Response.ContentType = "APPLICATION/OCTET-STREAM";
-                 String Header = "Attachment; Filename=" + upper.DisplayFilesPaths[filedex];
-                 HttpContext.Response.Headers.Add("Content-Disposition", Header);
-                 System.IO.FileInfo Dfile = new System.IO.FileInfo(upper.FullFilesPaths[filedex]);
-                 await HttpContext.Response.WriteAsync(Dfile.FullName);
-                 //HttpContext.Response.End();
-
-                 var message = upper.DisplayFilesPaths[filedex] + " has been downloaded";
-
-                 upper.message = message;
-                 ViewBag.Title = "Downloaded file";
-
-                 return View("Uploads", upper);
-             }
+        [HttpPost]
+        public IActionResult saveToFile(string fname)
+        {
+            if (init())
+            {
+                weblog.getFileOpener(userId).SaveToFile(fname);
+                return RedirectToAction("Uploads", "Job");
+            }
              else
-             {
-                 HiveServiceLocatorWeb.SetLoginErrorMessage();
-                 return RedirectToAction("Index", "Home");
-             }
-         }*/
+            {
+                return RedirectToAction("Index", "Home");
+            }
+        }
+
+        public FileResult DownloadFile(int index, int filedex)
+        {
+            if (init())
+            {
+                UploadedJobViewModel upper = new UploadedJobViewModel();
+                fillUploadsPaths(upper, index);
+
+                System.IO.FileInfo Dfile = new System.IO.FileInfo(upper.FullFilesPaths[filedex]);
+                var fileName = Dfile.Name;
+                byte[] fileBytes = System.IO.File.ReadAllBytes(upper.FullFilesPaths[filedex]);
+                return File(fileBytes, "application/x-msdownload", fileName);
+            }
+            else
+            {
+                return null;
+            }
+        }
 
         #endregion

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Controllers/UserController.cs

@@ -132 +132 @@
                     user.UserName = inpusername;
                     uid = accessClient.addUser(user);
+                    accessClient.RefreshUsers();
                     var newpass = accessClient.resetPassword(uid);
                     sendPassmail(accessClient.Users.Find(x => x.Id == uid), newpass);
@@ -172 +173 @@
         public static void sendPassmail(Access.User u, string pass)
         {/*
-            SmtpClient smtpClient = new SmtpClient("mail.MyWebsiteDomainName.com", 25);
-
-            smtpClient.Credentials = new System.Net.NetworkCredential("info@MyWebsiteDomainName.com", "myIDPassword");
+            SmtpClient smtpClient = new SmtpClient("smtp.gmail.com",587);
             smtpClient.UseDefaultCredentials = true;
+            smtpClient.Credentials = new System.Net.NetworkCredential("trac.heuristiclab@gmail.com", "||||||||||||");
             smtpClient.DeliveryMethod = SmtpDeliveryMethod.Network;
             smtpClient.EnableSsl = true;
@@ -181 +181 @@
 
             //Setting From , To and CC
-            mail.From = new MailAddress("info@MyWebsiteDomainName", "MyWeb Site");
+            mail.From = new MailAddress("trac.heuristiclab@gmail.com", "HeuristicLab");
             mail.Subject = "Password changed - HeuristicLab Hive";
-            mail.Body = "Hello " + u.FullName + ", " +
-                "Your password was changed through the HeuristicLab Hive web application." +
-                "The new password for " + u.UserName + " is '" + pass + "'.";
+            mail.Body = "Hello " + u.FullName + ", " + Environment.NewLine + Environment.NewLine+
+                "Your password was changed through the HeuristicLab Hive web application." + Environment.NewLine+
+                "The new password for " + u.UserName + " is ' " + pass + " '." + Environment.NewLine + Environment.NewLine +
+                "HeuristicLab Hive";
             mail.To.Add(new MailAddress(u.Email));
 

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Hubs/ProgressHub.cs

@@ -6 +6 @@
 using System.Linq;
 using System.Threading.Tasks;
+using HeuristicLab.Data;
+using System.Reflection;
 
 namespace HeuristicLab.Clients.Hive.WebJobManager
@@ -26 +28 @@
                 userId = Guid.Empty;
             }
-            else {
+            else
+            {
                 userId = Guid.Parse(uid);
                 fileopener = weblog.getFileOpener(userId);
@@ -51 +54 @@
             if (name != null)
                 fileopener.Job.Job.Name = name;
-            if(resource != null && resource != "")
+            if (resource != null && resource != "")
             {
                 fileopener.Job.Job.ResourceNames += "/" + resource;
@@ -70 +73 @@
             {//check if upper job
                 current.ItemTask.ComputeInParallel = !current.ItemTask.ComputeInParallel;
-                
-            }
-            else {
+
+            }
+            else
+            {
                 for (var i = 0; i < arr.Length; i++)
                 {
@@ -89 +93 @@
 
                     }
-                    else {//not deep enough, select right path
+                    else
+                    {//not deep enough, select right path
                         if (current.ItemTask.Item is BatchRun)
                             current = current.ChildHiveTasks[arr[i][1]]; // select right batch
@@ -115 +120 @@
 
             }
-            else {
+            else
+            {
                 for (var i = 0; i < arr.Length; i++)
                 {//loop for depth
@@ -132 +138 @@
 
                     }
-                    else {//not deep enough, choose right path
+                    else
+                    {//not deep enough, choose right path
                         if (current.ItemTask.Item is BatchRun)
                             current = current.ChildHiveTasks[arr[i][1]]; // select right batch
@@ -177 +184 @@
 
         }
+        public void paraEdit(int[][] arr, string problem, string name, string type, string value)
+        {
+
+
+            loader();
+            HiveTask current = fileopener.Job.HiveTasks.ToList()[0];
+            if (arr.Length == 0)
+            {//check if upper job
+                if (current.ItemTask.Item is Algorithm)
+                {
+                    searchEditPara(current, problem, name, type, value);
+                }
+            }
+            else
+            {
+                for (var i = 0; i < arr.Length; i++)
+                {//loop for depth
+                    if (i == arr.Length - 1)
+                    {//Right depth reached, change priority for current
+                        if (current.ItemTask.Item is BatchRun)
+                        {
+                            current = current.ChildHiveTasks[arr[i][1]];
+                        }
+                        else if (current.ItemTask.Item is Experiment)
+                        {
+                            current = current.ChildHiveTasks[arr[i][0]];
+                        }
+                        if (current.ItemTask.Item is Algorithm)
+                        {
+                            searchEditPara(current, problem, name, type, value);
+                        }
+                    }
+                    else
+                    {//not deep enough, choose right path
+                        if (current.ItemTask.Item is BatchRun)
+                            current = current.ChildHiveTasks[arr[i][1]]; // select right batch
+                        else if (current.ItemTask.Item is Experiment)
+                            current = current.ChildHiveTasks[arr[i][0]]; // select right sub task from experiment
+                    }
+                }
+            }
+        }
+        /// <summary>
+        /// Generic parameter setter
+        /// </summary>
+        /// <param name="curr">Current task to edit </param>
+        /// <param name="problem">Problem parameter or normal parameter</param>
+        /// <param name="name">Property name</param>
+        /// <param name="type">Datatype</param>
+        /// <param name="value">New value</param>
+        private void searchEditPara(HiveTask curr, string problem, string name, string type, string value)
+        {
+            var prob = problem == "True" ? true : false;
+
+            var dattype = Type.GetType(type);
+            if (dattype == null)
+            {//Use assemblies to find correct datatype
+                foreach (var a in AppDomain.CurrentDomain.GetAssemblies())
+                {
+                    dattype = a.GetType(type);
+                    if (dattype != null)
+                        break;
+                }
+            }
+            //find parse method
+            var parse = dattype.GetMethod("Parse", new[] { typeof(string) });
+
+            if (parse != null)
+            {
+                //Parses string to correct datatype
+                var val = parse.Invoke(null, new object[] { value });
+
+                //BUGGERS
+                if (name == "ReevaluateElites")
+                    name = "ReevaluteElites";
+                if (name == "DominateOnEqualQualities" || name == "PlusSelection" || name == "ReevaluteElites")
+                    val = ((BoolValue)val).Value;
+                
+               // if (name == "ReduceToPopulationSize")
+                    //name += "Parameter";
+
+                try
+                {
+                    Algorithm alg = (Algorithm)curr.ItemTask.Item;
+                    if (prob)
+                        alg.Problem.GetType().GetProperty(name).SetValue(alg, val);
+                    else
+                        alg.GetType().GetProperty(name).SetValue(alg, val);
+                }
+                catch (NullReferenceException e)
+                {
+                    Console.WriteLine("NullRefException: " + name + " - " + type);
+                }
+                catch(TargetException e)
+                {
+                    Console.WriteLine("TargetException: " + name + " - " + type);
+                }
+            }
+
+        }
 
     }

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Scripts/Hubs/ProgressHubber.js

@@ -77 +77 @@
     document.getElementById("prior" + id).className = "btn dropdown-toggle ";
 }
+
+
+function paraEdit(arr, problem, name, type, value) {
+    hubber.server.paraEdit(arr, problem, name, type, value);
+}

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Scripts/Styling/StyleSheet.css

@@ -159 +159 @@
         background-color:#74a9d8 !important;
     }
+    rect{
+        -webkit-box-shadow: 10px 10px 5px 0px rgba(0,0,0,0.75);
+-moz-box-shadow: 10px 10px 5px 0px rgba(0,0,0,0.75);
+box-shadow: 10px 10px 5px 0px rgba(0,0,0,0.75);
+    }

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Services/Jobs/FileOpeningService.cs

@@ -1 +1 @@
 using HeuristicLab.Clients.Hive.WebJobManager.ViewModels;
+using HeuristicLab.Common;
+using HeuristicLab.Optimization;
 using Microsoft.AspNet.Hosting;
+using Microsoft.AspNet.Mvc;
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Threading;
@@ -41 +45 @@
             vm = new FileOpeningViewModel();
             Job = new RefreshableJob();
+
             Job.Job.Name = "init";
             
@@ -75 +80 @@
             return null;
         }
+        public void SaveToFile(string file)
+        {
+            if(vm != null)
+            {
+                var uploads = Path.Combine(env.WebRootPath, "uploads", weblog.getServiceLocator(UserId).getHiveServiceClient().ClientCredentials.UserName.UserName,
+                    "HiveChanged");
+                Directory.CreateDirectory(uploads);
+                var cont = Job.HiveTasks.First().ItemTask.Item;
+                if (!file.EndsWith(".hl"))
+                    file += ".hl";
+                var fileloc = uploads + "\\" + file;
+                if(cont is Experiment)
+                    ContentManager.Save((Experiment)cont, fileloc, false);
+                else if(cont is BatchRun)
+                    ContentManager.Save((BatchRun)cont, fileloc, false);
+                else if(cont is Algorithm)
+                {
+                    IAlgorithm t = (IAlgorithm)Job.HiveTasks.First().ItemTask.Item;
+                    ContentManager.Save((IStorableContent)t, fileloc, false);
+                }
+                 
+            }
+        }
+        
     }
 }

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/Home/Index.cshtml

@@ -1 +1 @@
 
 @model HeuristicLab.Clients.Hive.WebJobManager.ViewModels.LoginViewModel
-
+<!-- Login page -->
 <div class="container">
     <div class="row" style="align-content:center">
         <div class="col-xs-offset-4 col-sm-4" >
-            <div class="form-login">
+            <div class="form-login"> 
                 <h4>Welcome to HeuristicLab Hive</h4>
                 <form asp-controller="Home" asp-action="Login" method="POST">

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/Job/Index.cshtml

@@ -1 +1 @@
 @using HeuristicLab.Clients.Hive.WebJobManager.ViewModels
 @model JobViewModel
+
+<!-- Displays the job manager overview -->
+
 <div id="userId" style="display:none">@ViewBag.SessionId</div>
 <div>
+    <!-- Main nav menu-->
     @Html.Partial("Navbar", new NavbarViewModel("Job"))
 
+    <!-- Job menu-->
     <ul class="nav nav-pills nav-justified">
         <li role="presentation"
@@ -38 +43 @@
 
         }
-        else {
+        else
+        {<!-- Display side menu containing jobs. -->
             <div class="col-sm-4">
                 <div class="btn-group-vertical btn-block">
@@ -78 +84 @@
                  style="padding:5px; padding-left:10px;">
                 @if (Model.selectedJob != null)
-                {
+                { <!-- A job has been selected by the user, load info into view -->
                     <div class="panel panel-default"
                          style="border-width:2px!important;padding:17px;
@@ -84 +90 @@
                         <div class="row">
                             <h2 style="padding-left:20px">
+                                <!-- Header of the job (title and delete button) -->
                                 @Model.selectedJob.Job.Name
                                 <a onclick="popUpDelete()"
@@ -93 +100 @@
                                     Delete job
                                 </a>
-                                <a style="display:none; "
+                                <!-- HIDDEN BUTTON FOR ASP ACTION -->
+                                <a style="display:none; " 
                                    asp-action="Delete"
                                    asp-route-id="@Model.selectedJob.Id"
@@ -100 +108 @@
 
                                 <script type="text/javascript">
-                                    function popUpDelete() {
+                                    function popUpDelete() {//Quick inline popup with hidden asp button
                                         if (confirm("Are you sure you want to delete this job?") == true) {
                                             document.getElementById("del").click();
@@ -110 +118 @@
                             </h2>
                             <div class="col-sm-6" style="padding-left:30px">
+                                <!-- Information of the job -->
                                 <p>Description: @Model.selectedJob.Job.Description</p>
                                 <p>Resources: @Model.selectedJob.Job.ResourceNames</p>
@@ -138 +147 @@
                         <div class="row" style="text-align:center">
                             @Html.Partial("_Graphlegend")
+                            <!-- Main graph giving overview of all the jobs-->
                             <div id="graphMain" style="width:100%;height:0px">
 
@@ -151 +161 @@
                             </h3>
                             @foreach (var task in Model.selectedJob.HiveTasks)
-                            {
+                            {<!--Display all child jobs recursively -->
                                 @Html.Partial("SelectedJobPartials/_TaskPartial",
                            new HeuristicLab.Clients.Hive.WebJobManager.Models.HiveTaskContainer(task))
@@ -164 +174 @@
         }
         <script type="text/javascript">
-            function showLoader() {
+            function showLoader() {//Shows load spinner
                 document.getElementById("content").style.display = "none";
                 document.getElementById("loader").style.display = "";
 
             }
-            function showDeleter() {
+            function showDeleter() {//Shows delete spinner
                 document.getElementById("content").style.display = "none";
                 document.getElementById("loader").style.display = "";

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/Job/OpenFile.cshtml

@@ -3 +3 @@
 @model HeuristicLab.Clients.Hive.WebJobManager.ViewModels.FileOpeningViewModel
 
-
+<!-- Displays the contents of a file -->
+<!-- Another body used for the side scroller menu-->
 <body id="top"
       class="row"
@@ -12 +13 @@
       style="margin-bottom:500px;margin-left:1px;margin-right:1px;">
     <div id="userId" style="display:none">@ViewBag.SessionId</div>
+    <!-- Main nav menu -->
     @Html.Partial("Navbar", new HeuristicLab.Clients.Hive.WebJobManager.ViewModels.NavbarViewModel("Job"))
 
+    <!-- Job menu-->
     <ul class="nav nav-pills nav-justified">
         <li role="presentation"
@@ -30 +33 @@
         </li>
     </ul>
+    <!-- Back button -->
     <div class="row"
          style="margin-left:20px">
@@ -38 +42 @@
         </a>
     </div>
-
+    <!-- Check model to select right partial, partial handles all subloading -->
     <div class="col-md-9">
         @if (Model.SelectedAlgorithm != null)
@@ -55 +59 @@
 
         }
-
+        <!-- Main menu for job creation -->
         <hr style="border-color:gray; margin-top:50px" />
-        <div id="finish"
-             style="text-align:center">
-            <h2>
-                Hive job information
-            </h2>
-            <div class="row"
-                 style="margin-bottom:20px">
-
-                <div class="col-sm-6"
-                     style="text-align:right">
-                    <h5>Job name</h5>
-                </div>
-                <div class="col-sm-6"
-                     style="text-align:left">
-                    <div class="form-group">
-                        <div class="input-group">
-                            <input type="text"
-                                   class="form-control"
-                                   name="jname"
-                                   id="jname"
-                                   placeholder="Job name">
-                        </div>
+        <div class="row">
+            <div id="finish" class="col-sm-8"
+                 style="text-align:center; border-right:1px solid">
+                <h2>
+                    Hive job information
+                </h2>
+                <div class="row"
+                     style="margin-bottom:20px">
+
+                    <div class="col-sm-6"
+                         style="text-align:right">
+                        <h5>Job name</h5>
+                    </div>
+                    <div class="col-sm-6"
+                         style="text-align:left">
+                        <div class="form-group">
+                            <div class="input-group">
+                                <input type="text"
+                                       class="form-control"
+                                       name="jname"
+                                       id="jname"
+                                       placeholder="Job name">
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="row"
+                     style="margin-bottom:20px">
+                    <div class="col-sm-6"
+                         style="text-align:right">
+                        <h5>
+                            Resources (optional)
+                        </h5>
+                    </div>
+                    <div class="col-sm-6"
+                         style="text-align:left">
+                        <div class="form-group">
+                            <div class="input-group">
+                                <input type="text"
+                                       class="form-control"
+                                       name="jresource"
+                                       id="jresource"
+                                       placeholder="(seperate with ;)">
+                            </div>
+                        </div>
+                    </div>
+                </div>
+
+                <div class="row">
+                    <h5 class="col-sm-6"
+                        style="text-align:right;margin-top:20px">
+                        Set global job priority
+                    </h5>
+                    <div class="col-sm-6">
+                        <div class="btn-group pull-left"
+                             style="margin:10px; box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
+                            text-shadow:2px 2px black;">
+                            <button type="button"
+                                    id="prior"
+                                    class="btn btn-info dropdown-toggle"
+                                    data-toggle="dropdown"
+                                    aria-haspopup="true" aria-expanded="false">
+                                Normal <span class="caret"></span>
+                            </button>
+                            <ul class="dropdown-menu"
+                                style="text-shadow:none">
+                                <li><a onclick="changePriority([],0,'')">Low</a></li>
+                                <li><a onclick="changePriority([],1,'')">Normal</a></li>
+                                <li><a onclick="changePriority([],2,'')">Urgent</a></li>
+                                <li><a onclick="changePriority([],3,'')">Critical</a></li>
+                            </ul>
+                        </div>
+                    </div>
+                </div>
+
+                <!-- adding the job to hive and show progress bar -->
+                <a class="btn btn-lg btn-success"
+                   id="fakehiveadd"
+                   onclick="addtoHive()"
+                   style="margin:10px; box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
+                            text-shadow:2px 2px black;">
+                    Add this job to Hive
+                </a>
+                <!-- HIDDEN BUTTON FOR ASP ACTION -->
+                <a class="btn btn-success "
+                   id="realhiveadd"
+                   asp-controller="Job"
+                   asp-action="AddToHive"
+                   style="display:none"></a>
+
+                <!-- Progress-->
+                
+                <h4 id="result" style="display:none">Start uploading experiment...</h4>
+                <div class="progress" id="progdiv" style="display:none">
+
+                    <div class="progress-bar progress-bar-success progress-bar-striped active" role="progressbar"
+                         id="progress"
+                         aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" style="width:10%">
+
                     </div>
                 </div>
             </div>
-            <div class="row"
-                 style="margin-bottom:20px">
-                <div class="col-sm-6"
-                     style="text-align:right">
-                    <h5>
-                        Resources (optional)
-                    </h5>
-                </div>
-                <div class="col-sm-6"
-                     style="text-align:left">
-                    <div class="form-group">
-                        <div class="input-group">
-                            <input type="text"
-                                   class="form-control"
-                                   name="jresource"
-                                   id="jresource"
-                                   placeholder="(seperate with ;)">
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-            <div class="row">
-                <h5 class="col-sm-6"
-                    style="text-align:right;margin-top:20px">
-                    Set global job priority
-                </h5>
-                <div class="col-sm-6">
-                    <div class="btn-group pull-left"
-                         style="margin:10px; box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
+            <div class="col-sm-4">
+                <h4>Save to file</h4>
+                <form asp-controller="Job"
+                   asp-action="saveToFile"
+                      method="post">
+                    <div class="col-sm-6"
+                         style="text-align:right">
+                        <h5>File name</h5>
+                    </div>
+                    <div class="col-sm-6"
+                         style="text-align:left">
+                        <div class="form-group">
+                            <div class="input-group">
+                                <input type="text"
+                                       class="form-control"
+                                       name="fname"
+                                       id="fname"
+                                       required
+                                       placeholder="File name">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row"
+                         style="text-align:center">
+                        <h5>Directory: /HiveChanged</h5>
+                    </div>
+                    <button class="btn btn-success btn-block" type="submit" 
+                            style="margin:10px; box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
                             text-shadow:2px 2px black;">
-                        <button type="button"
-                                id="prior"
-                                class="btn btn-info dropdown-toggle"
-                                data-toggle="dropdown"
-                                aria-haspopup="true" aria-expanded="false">
-                            Normal <span class="caret"></span>
-                        </button>
-                        <ul class="dropdown-menu"
-                            style="text-shadow:none">
-                            <li><a onclick="changePriority([],0,'')">Low</a></li>
-                            <li><a onclick="changePriority([],1,'')">Normal</a></li>
-                            <li><a onclick="changePriority([],2,'')">Urgent</a></li>
-                            <li><a onclick="changePriority([],3,'')">Critical</a></li>
-                        </ul>
-                    </div>
-                </div>
-            </div>
-
-
-            <a class="btn btn-lg btn-success"
-               id="fakehiveadd"
-               onclick="addtoHive()"
-               style="margin:10px; box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
-                            text-shadow:2px 2px black;">
-                Add this job to Hive
-            </a>
-
-
-
-            <a class="btn btn-success " id="realhiveadd" asp-controller="Job" asp-action="AddToHive" style="display:none"></a>
-            <h4 id="result" style="display:none">Start uploading experiment...</h4>
-            <div class="progress" id="progdiv" style="display:none">
-
-                <div class="progress-bar progress-bar-success progress-bar-striped active" role="progressbar"
-                     id="progress"
-                     aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" style="width:10%">
-
-                </div>
+                    Save to file</button>
+                </form>
             </div>
         </div>
 
 
-
-
     </div>
+    <!-- Side scrolling menu-->
     <nav style="margin-top:50px; "
          class="col-md-2" id="scrolly">
@@ -166 +208 @@
             <li><a href="#top"><i class="fa fa-angle-up"></i> Top</a></li>
             @if (Model.SelectedAlgorithm != null)
-            {
+            {//Algortihm loaded
                 <li><a href="#algorithm">Algorithm parameters</a></li>
                 <li><a href="#problem">Problem parameters</a></li>
             }
             else
-            {
+            {//batch run or experiment
                 <li><a id="ctasks" href="#tasks">Child tasks </a></li>
                 <li><a onclick="shower()" href="#tasks"><i class="fa fa-eye"></i> Show all tasks</a></li>
@@ -210 +252 @@
         collapser = function () {
             $('.collapse').collapse('hide');
-
+            //closes every collapse
         }
         shower = function () {
             $('.collapse').collapse('show');
-
+            //opens every collapse
         }
     </script>

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/Job/OpenFilePartials/_Algorithm.cshtml

@@ -1 @@
-@model HeuristicLab.Clients.Hive.WebJobManager.ViewModels.FileOpeningViewModel
-@{System.Random randomizer = new Random();
-    int randy = randomizer.Next(5000); }
+@using HeuristicLab.Core;
 
 
+@model HeuristicLab.Clients.Hive.WebJobManager.ViewModels.FileOpeningViewModel
+@{System.Random randomizer = new Random();
+    int randy = randomizer.Next(50000); }
+
+<!-- Partial for opening an algorithm only file-->
 <div style="margin-left:20px;margin-right:20px">
     <div class="row" style="text-align:center">
@@ -12 +15 @@
             <span class="label label-primary">Algorithm: @Model.SelectedTask.ItemTask.Name</span>
         </h1>
-        
+
     </div>
 
@@ -30 +33 @@
                     @foreach (var par in Model.SelectedAlgorithm.Parameters.OrderBy(x => x.Name))
                     {
-                        <tr>
-                            <td>@par.Name</td>
 
-                            <td>@par.ActualValue</td>
-                        </tr>
-
+                        @Html.Partial("OpenFilePartials/DataPartials/DataMaster",
+                new HeuristicLab.Clients.Hive.WebJobManager.ViewModels.Jobs.DataPackageVM( par,"[]",0, false))  
                     }
                 </tbody>
@@ -58 +58 @@
                     @foreach (var prob in Model.SelectedAlgorithm.Problem.Parameters.OrderBy(x => x.Name))
                     {
-                        <tr>
-                            <td>@prob.Name</td>
-
-                            <td>@prob.ActualValue</td>
-                        </tr>
+                        @Html.Partial("OpenFilePartials/DataPartials/DataMaster",
+                new HeuristicLab.Clients.Hive.WebJobManager.ViewModels.Jobs.DataPackageVM(prob, "[]", 0,true))
 
                     }
@@ -69 +66 @@
         </div>
     </div>
-    
+
 
 </div>

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/Job/OpenFilePartials/_AlgorithmSmall.cshtml

@@ -1 +1 @@
 @model HeuristicLab.Clients.Hive.WebJobManager.Models.AlgorithmContainer
-@{int randomal = Model.randy.Next(5000);
+@{int randomal = Model.randy.Next(50000);
     var builder = "[";
     foreach (var arr in Model.depth)
@@ -8 +8 @@
     builder += "]";
 }
+<!-- Partial for displaying a small version of an algorithm -->
+
 <p class="text-center">
     <a class="btn btn-primary"
@@ -14 +16 @@
        aria-expanded="false"
        aria-controls="collapseExample@(randomal)"
-       style="margin:10px; box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
+       style="margin:10px;margin-bottom:0; box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
                             text-shadow:2px 2px black;">
         @Model.algo.Name
@@ -62 +64 @@
                 @foreach (var par in Model.algo.Parameters.OrderBy(x => x.Name))
                 {
-                    <tr>
-                        <td>@par.Name</td>
-
-                        <td>@par.ActualValue</td>
-                    </tr>
+                    @Html.Partial("OpenFilePartials/DataPartials/DataMaster",
+                new HeuristicLab.Clients.Hive.WebJobManager.ViewModels.Jobs.DataPackageVM(par, builder, randomal, false))
 
                 }
@@ -84 +83 @@
                 @foreach (var prob in Model.algo.Problem.Parameters.OrderBy(x => x.Name))
                 {
-                    <tr>
-                        <td>@prob.Name</td>
-
-                        <td>@prob.ActualValue</td>
-                    </tr>
+                    @Html.Partial("OpenFilePartials/DataPartials/DataMaster",
+                new HeuristicLab.Clients.Hive.WebJobManager.ViewModels.Jobs.DataPackageVM(prob, builder, randomal, true))
 
                 }

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/Job/OpenFilePartials/_BatchRun.cshtml

@@ -1 +1 @@
 @model HeuristicLab.Clients.Hive.WebJobManager.ViewModels.FileOpeningViewModel
 @{System.Random randomizer = new Random();
-    int randy = randomizer.Next(5000); }
+    int randy = randomizer.Next(50000); }
+
+<!-- Partial for displaying a Bach run file -->
+
 <div style="margin-left:20px;margin-right:20px">
     <div class="row" style="text-align:center">

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/Job/OpenFilePartials/_BatchRunSmall.cshtml

@@ -1 +1 @@
 @model HeuristicLab.Clients.Hive.WebJobManager.Models.BatchRunContainer
 @{
-    int randombr = Model.randy.Next(5000);
+    int randombr = Model.randy.Next(50000);
     var builder = "[";
     foreach (var arr in Model.depth)
@@ -9 +9 @@
     builder += "]";
 }
-
+<!-- Partial for displaying a small version of a batch file-->
 
 <p class="text-center">
@@ -17 +17 @@
        aria-expanded="false"
        aria-controls="collapseExample@(randombr)"
-        style="margin:10px; box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
+        style="margin:10px;margin-bottom:0; box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
                             text-shadow:2px 2px black;">
         @Model.batch.Name

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/Job/OpenFilePartials/_Experiment.cshtml

@@ -1 +1 @@
 @model HeuristicLab.Clients.Hive.WebJobManager.ViewModels.FileOpeningViewModel
 @{System.Random randomizer = new Random();
-    int randy = randomizer.Next(5000); }
+    int randy = randomizer.Next(50000); }
 
-
+<!-- Partial for displaying an experiment file-->
 <div style="margin-left:20px;margin-right:20px; ">
     <div class="row" style="text-align:center">

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/Job/OpenFilePartials/_ExperimentSmall.cshtml

@@ -1 +1 @@
 @model HeuristicLab.Clients.Hive.WebJobManager.Models.ExperimentContainer
-@{int randomex = Model.randy.Next(5000);
+@{int randomex = Model.randy.Next(50000);
     var builder = "[";
     foreach (var arr in Model.depth)
@@ -8 +8 @@
     builder += "]";
 }
+<!-- Partial for displaying a small version of an experiment-->
 <p class="text-center">
     <a class="btn btn-danger"
@@ -14 +15 @@
        aria-expanded="false"
        aria-controls="collapseExample@(randomex)"
-       style="margin:10px; box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
+       style="margin:10px; margin-bottom:0; box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
                             text-shadow:2px 2px black;">
         @Model.exp.Name

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/Job/SelectedJobPartials/_AlgTask.cshtml

@@ -14 +14 @@
 
     <div class="panel-heading"
-         data-toggle="collapse"
-         data-target="#panbody@(Model.hiveTask.Task.Id)"
+         
          onclick="redrawGraph('@(Model.hiveTask.Task.Id)')"
          aria-expanded="false"
@@ -82 +81 @@
             </tbody>
         </table>
+        <a style="box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
+                            text-shadow:2px 2px black;"
+           class="btn btn-info btn-block"
+           data-toggle="collapse"
+         data-target="#panbody@(Model.hiveTask.Task.Id)"><i class="fa fa-bar-chart-o"></i> Show graph</a>
     </div>
     <div class="panel-body " style="text-shadow:none">

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/Job/SelectedJobPartials/_BatchTask.cshtml

@@ -13 +13 @@
 
     <div class="panel-heading"
-         data-toggle="collapse"
-         data-target="#panbody@(Model.hiveTask.Task.Id)"
          onclick="redrawGraph('@(Model.hiveTask.Task.Id)')"
          aria-expanded="false"
@@ -93 +91 @@
             </tbody>
         </table>
+        <a style="box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
+                            text-shadow:2px 2px black;"
+           class="btn btn-info btn-block"
+           data-toggle="collapse"
+           data-target="#panbody@(Model.hiveTask.Task.Id)"><i class="fa fa-bar-chart-o"></i>Show graph</a>
     </div>
     <div class="panel-body " style="text-shadow:none">

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/Job/SelectedJobPartials/_ExpTask.cshtml

@@ -17 +17 @@
 
     <div class="panel-heading"
-         data-toggle="collapse"
-         data-target="#panbody@(Model.hiveTask.Task.Id)"
          onclick="redrawGraph('@(Model.hiveTask.Task.Id)')"
        aria-expanded="false"
@@ -93 +91 @@
             </tbody>
         </table>
+        <a style="box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
+                            text-shadow:2px 2px black;"
+           class="btn btn-info btn-block"
+           data-toggle="collapse"
+           data-target="#panbody@(Model.hiveTask.Task.Id)"><i class="fa fa-bar-chart-o"></i>Show graph</a>
     </div>
     <div class="panel-body " style="text-shadow:none">

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/Job/UploaderPartial/_UploaderPartial.cshtml

@@ -4 +4 @@
                         box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);">
 
-    <form method="post" 
-          asp-action="Uploader" 
-          asp-controller="Job" enctype="multipart/form-data">
-        <input onchange="printFiles()"
-               type="file"
-               id="files"
-               name="files"
-               multiple accept=".hl"
-               style="display:none" />
 
-        <div onclick="firefilebutton()"
-             class="btn btn-info btn-lg btn-block"
-             style="box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
-                            text-shadow:1px 1px black;">
-            <i class="fa fa-folder-open-o"></i> Choose file(s) to upload to the server
-        </div>
+        <form method="post"
+               asp-action="Uploader"
+               asp-controller="Job" enctype="multipart/form-data">
+             <input onchange="printFiles()"
+                    type="file"
+                    id="files"
+                    name="files"
+                    multiple accept=".hl"
+                    style="display:none" />
 
-        <div class="row" style="margin:10px">
+             <div onclick="firefilebutton()"
+                  class="btn btn-info btn-lg btn-block"
+                  style="box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
+                                 text-shadow:1px 1px black;">
+                 <i class="fa fa-folder-open-o"></i> Choose file(s) to upload to the server
+             </div>
 
-            <div id="selectedfiles">
-            <h3>Files</h3>
-            <p>No files selected: press the above button to choose files</p>
-            </div>
+             <div class="row" style="margin:10px">
 
-            <button style="margin-bottom:10px; box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
-                            text-shadow:2px 2px black;"
-                 type="button"
-                    disabled
-                 id="del"
-                 class='btn btn-danger'
-                 onclick='deletefiles()'>
-                <span class='glyphicon glyphicon-trash' aria-hidden='true'></span>
-                Remove files
-            </button>
+                 <div id="selectedfiles">
+                 <h3>Files</h3>
+                 <p>No files selected: press the above button to choose files</p>
+                 </div>
 
-            <div 
-                 style="margin-top:20px;margin-bottom:20px">
+                 <button style="margin-bottom:10px; box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
+                                 text-shadow:2px 2px black;"
+                      type="button"
+                         disabled
+                      id="del"
+                      class='btn btn-danger'
+                      onclick='deletefiles()'>
+                     <span class='glyphicon glyphicon-trash' aria-hidden='true'></span>
+                     Remove files
+                 </button>
 
-                <label for="basic-url">Directory name</label>
-                <div class="input-group">
-                    <span class="input-group-addon"
-                          id="basic-addon3">
-                        .../uploads/@ViewBag.Name
-                    </span>
-                    <input 
-                           type="text"
-                           disabled
-                           class="form-control"
-                           id="directory"
-                           name="directory"
-                           aria-describedby="basic-addon3"
-                           value="@(DateTime.Now.ToString("yyyy.MM.dd"))" />
-                </div>
-            </div>
-            <button style="box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
-                            text-shadow:2px 2px black;"
-                   disabled
-                    id="upl"
-                   class="btn btn-lg btn-block btn-success"
-                   type="submit"
-                    >
-                <i class="fa fa-plus-square"></i> Add to uploads
-                </button>
-        </div>
+                 <div
+                      style="margin-top:20px;margin-bottom:20px">
+
+                     <label for="basic-url">Directory name</label>
+                     <div class="input-group">
+                         <span class="input-group-addon"
+                               id="basic-addon3">
+                             .../uploads/@ViewBag.Name
+                         </span>
+                         <input
+                                type="text"
+                                disabled
+                                class="form-control"
+                                id="directory"
+                                name="directory"
+                                aria-describedby="basic-addon3"
+                                value="@(DateTime.Now.ToString("yyyy.MM.dd"))" />
+                     </div>
+                 </div>
+                 <button style="box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
+                                 text-shadow:2px 2px black;"
+                        disabled
+                         id="upl"
+                        class="btn btn-lg btn-block btn-success"
+                        type="submit"
+                         >
+                     <i class="fa fa-plus-square"></i> Add to uploads
+                     </button>
+             </div>
 
     </form>

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/Job/Uploads.cshtml

@@ -1 +1 @@
 @model HeuristicLab.Clients.Hive.WebJobManager.ViewModels.UploadedJobViewModel
 
+
+<!-- Shows uploaded files and the uploader -->
 <div>
 
@@ -44 +46 @@
         else {
             <div class="col-sm-4">
-                <div class="btn-group-vertical btn-block">
+                <div class="btn-group btn-group-justified btn-block"
+                     role="group" style="margin-bottom:-4px">
+
                     <a class="btn btn-info btn-lg btn-block disabled"
-                       style="box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
+                       style="width:6%; box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
                             text-shadow:2px 2px black;">
                         <i class="fa fa-cloud"></i> Uploads
@@ -59 +63 @@
                        style="box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
                             text-shadow:2px 2px black;">
-                        <i class="fa fa-cloud-upload"></i> Upload new file(s)
+                        <i class="fa fa-cloud-upload"></i> 
                     </a>
+                </div>
+                <div class="btn-group-vertical btn-block">
+                    
                     @for (int i = 0; i < Model.DisplayDatePaths.Count; i++)
                     {
@@ -72 +79 @@
                         </a>
                     }
-
                 </div>
             </div>
@@ -100 +106 @@
                 {
                     <div class="col-sm-8">
-
+                        <h4>Click on a file to prepare it for upload to Hive</h4>
                         @for (int i = 0; i < Model.DisplayFilesPaths.Count; i++)
                     {
+                            
                             <div class="btn-group-justified btn-block">
-
+                                
                                 <a class="btn btn-default @(Model.DisplayFilesPaths[i].EndsWith(".hl") ? "" : "disabled" )"
                                    asp-controller="Job"
@@ -111 +118 @@
                                    asp-route-filedex="@i"
                                    style="width:6%;box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);">
-                                    @Model.DisplayFilesPaths[i]
+                                   <i class="fa fa-list-alt"></i>  @Model.DisplayFilesPaths[i]
+                                </a>
+                                <a id="down"
+                                   style="box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
+                            text-shadow:2px 2px black;"
+                                   class='btn btn-group btn-success'
+                                   asp-controller="Job"
+                                   asp-action="DownloadFile"
+                                   asp-route-index="@(Model.SelectedIndex)"
+                                   asp-route-filedex="@i">
+                                    <span class='glyphicon glyphicon-download-alt' aria-hidden='true'></span>
                                 </a>
                                 <a id="del"
@@ -124 +141 @@
                                     <span class='glyphicon glyphicon-trash' aria-hidden='true'></span>
                                 </a>
+                               
                             </div>
                         }

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/Resource/Index.cshtml

@@ -41 +41 @@
                    class="btn pull-right"
                    style="box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
-                            text-shadow:2px 2px black;font-weight:bold;margin-bottom:5px"
+                            text-shadow:2px 2px black;font-weight:bold;margin-bottom:5px;"
                    ng-class="{ 'btn-success': treeview.currentNode.IsDisposable, 'btn-warning': !treeview.currentNode.IsDisposable }"
                    ng-click="toggleDisposable()">
@@ -60 +60 @@
                     ng-class="{ 'active': permissionview }"
                     ng-style="{ 'text-decoration': permissionview ? 'underline' : ''}">
-                    <a style="text-shadow:2px 2px black; color:white; font-weight:bold; border: 1px solid white;"
+                    <a style="text-shadow:2px 2px black; color:white; font-weight:bold; border:1px solid white;"
                        href=""
                        ng-click="menuchange(1)">
@@ -69 +69 @@
                     role="presentation"
                     ng-class="{ 'active': resaddview }"
-                    ng-style="{ 'text-decoration': resaddview ? 'underline' : ''}">
+                    ng-style="{'text-decoration': resaddview ? 'underline' : ''}">
 
                     <a style="text-shadow:2px 2px black; color:white; font-weight:bold; border: 1px solid white;"
@@ -88 +88 @@
                     <p>
                         This shows only
-                        <span style="text-decoration:underline">direct members</span>
+                        <span style="text-decoration:underline;">direct members</span>
                         of the group (not members of subgroups).
                     </p>
+                    <p><span style="color:lightgray;">Gray clients</span> are already subscribed to another group. White are ungrouped.</p>
                     <p>Adding a member will overwrite the current group it's a member in (if any)</p>
                     <p>Removing an existing member will make it revert to Ungrouped.</p>
@@ -97 +98 @@
                        style="box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
                             text-shadow:2px 2px black;">Reset to current members</a>
-                    <div class="row" style="margin:5px">
+                    <div class="row" style="margin:5px;">
                         <h4>All resources</h4>
                         <label class="col-sm-3"
                                ng-style="{
-                                   'background-color':client.add === true ? 'green' : '' }"
-                               ng-repeat="client in clients  | orderBy:['!add', 'Name' ]  | filter:searchText">
-                            <input type="checkbox"
+                                   'background-color':client.add === true ? 'green' : '',
+                               'color':client.ParentResourceId != null ? 'lightgray' : ''}"
+                               ng-repeat="client in clients  | orderBy:['!add', 'Name']  | filter:searchText">
+                            <input 
+                                  type="checkbox"
                                    name="addres"
                                    value="{{client.Id}}"
@@ -110 +113 @@
                     </div>
                 </div>
-                <input style="display:none"
+                <input style="display:none;"
                        type="text"
                        id="groupid"
@@ -163 +166 @@
                   class="row panel-heading"
                   style="padding:10px;">
-                <table class="table" style="margin-bottom:0px">
+                <table class="table" style="margin-bottom:0;">
                     <tbody>
                         <tr>
@@ -186 +189 @@
                             <td>
 
-                                <input style="display:none" type="text" id="inpid" name="inpid" value="{{treeview.currentNode.Id}}" />
+                                <input style="display:none;" type="text" id="inpid" name="inpid" value="{{treeview.currentNode.Id}}" />
                                 <input type="checkbox" ng-model="checkDel" /> I want to delete this group
                             </td>
@@ -225 +228 @@
                   class="row"
                   style="padding:10px;">
-                <input style="display:none" type="text" id="inpid" name="inpid" value="{{treeview.currentNode.Id}}" />
-
-                <span style="padding:0px" class="col-sm-4">Change group: </span>
+                <input style="display:none;" type="text" id="inpid" name="inpid" value="{{treeview.currentNode.Id}}" />
+
+                <span style="padding:0;" class="col-sm-4">Change group: </span>
 
                 <select class="form-control col-sm-5"
@@ -258 +261 @@
                  ui-calendar="uiConfig.calendar"
                  id="resourcecalendar"
-                 style="font-size:medium"
+                 style="font-size:medium;"
                  class="span8 calendar"
                  ng-model="currentcal.down"></div>
@@ -304 +307 @@
                     <td>
                         <input type="checkbox" class="checkbox" ng-model="currentcal.down[0][selectedEventId].rec.recurrence" ng-change="setChanged(selectedEventId)" />
-                        <p ng-if="currentcal.down[0][selectedEventId].changed && currentcal.down[0][selectedEventId].rec.recurrence" style="color:darkred;font-weight:bold">
+                        <p ng-if="currentcal.down[0][selectedEventId].changed && currentcal.down[0][selectedEventId].rec.recurrence" style="color:darkred; font-weight:bold;">
                             The recurrence itself will be made during saving, settings can be changed here.
                         </p>

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/User/Groups.cshtml

@@ -156 +156 @@
                                 <div class="form-group">
                                     <label class="col-sm-3 control-label">
-                                        Members
+                                       @Model.SelectedGroupMembers.Count members
                                     </label>
                                     <div class="col-sm-8 control-label" >

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/User/Index.cshtml

@@ -221 +221 @@
                                 <div class="form-group">
                                     <label class="col-sm-3 control-label">
-                                        Member of
+                                        Member of @Model.SelectedUserSubscriptions.Count groups
                                     </label>
                                     <div class="col-sm-8 control-label" style="text-align:left">
@@ -293 +293 @@
                                 <div class="form-group">
                                     <label class="col-sm-3 control-label">
-                                        Roles
+                                       @Model.SelectedUserRoles.Count Roles
                                     </label>
                                     <div class="col-sm-8 control-label" style="text-align:left">

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/User/Roles.cshtml

@@ -157 +157 @@
                             <div class="form-group">
                                 <label class="col-sm-3 control-label">
-                                    Users
+                                   @Model.SelectedRoleEnrolled.Count Users
                                 </label>
                                 <div class="col-sm-8 control-label" style="text-align:left">
@@ -189 +189 @@
                             </div>
                             <div class="form-group">
-                                <div class="col-sm-offset-3 col-sm-3">
-                                    <button type="submit"
-                                            id="inpsaver"
-                                            disabled
-                                            class="btn btn-default"
-                                            onclick="showSaver()">
-                                        <i class="fa fa-save"></i> Save changes
-                                    </button>
-                                </div>
-                                <div class="col-sm-5">
+      
+                                <div class="col-sm-3">
                                     <a class="btn btn-danger pull-right"
                                        asp-controller="User"

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/wwwroot/css/site.min.css

@@ -1 @@
-@import url(http://fonts.googleapis.com/css?family=Roboto:400);.wrapper,h4{text-align:center}.label,sub,sup{vertical-align:baseline}[role=button],div[data-tree-model] li,div[data-tree-model] li i{cursor:pointer}.fc table,table{border-spacing:0}body,figure{margin:0}.btn-group>.btn-group,.btn-toolbar .btn,.btn-toolbar .btn-group,.btn-toolbar .input-group,.col-xs-1,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9,.dropdown-menu{float:left}.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse,.pre-scrollable{max-height:340px}.fa,.glyphicon{-moz-osx-font-smoothing:grayscale}body{-webkit-font-smoothing:antialiased;font:400 14px Roboto,arial,sans-serif}.container{padding:25px;position:fixed}.form-login{background-color:#EDEDED;border-radius:15px;border-color:#d2d2d2;border-width:5px;box-shadow:0 1px 0 #cfcfcf;padding:10px 20px 20px;padding:10px 20px 20px}h4{border:0 solid #fff;border-bottom-width:1px;padding-bottom:10px}.panel-warning>.panel-heading{background-image:linear-gradient(to bottom,#eb9114 0,#f1b25b 100%)!important;color:#fff!important}.panel-danger>.panel-heading{background-image:linear-gradient(to bottom,#c12e2a 0,#d9534f 100%)!important;color:#fff!important}.label-as-badge{border-radius:1em}.bar-off{fill:#c2c2d6}.bar-off:hover{fill:#e0e0eb}.bar-wait{fill:#f0a742}.bar-wait:hover{fill:#f4bd71}.bar-trans{fill:#80d4ff}.bar-trans:hover{fill:#9df}.bar-calc{fill:#2f6fa6}.bar-calc:hover{fill:#3884c7}.bar-paus{fill:#47476b}.bar-paus:hover{fill:#5c5c8a}.bar-fin{fill:#5cb85c}.bar-fin:hover{fill:#71c171}.bar-abo{fill:#c2302c}.bar-abo:hover{fill:#d54944}.bar-fail{fill:#c2302c}.bar-fail:hover{fill:#d54944}rect.selection{stroke:gray;stroke-dasharray:4px;stroke-opacity:.5;fill:transparent}svg ::selection{background:0 0}svg ::-moz-selection{background:0 0}svg ::-webkit-selection{background:0 0}.btn-danger:focus,.btn-danger:hover,.btn-default:focus,.btn-default:hover,.btn-info:focus,.btn-info:hover,.btn-primary:focus,.btn-primary:hover,.btn-success:focus,.btn-success:hover,.btn-warning:focus,.btn-warning:hover{background-position:0 -15px}[animate-on-change]{transition:all 1s;-webkit-transition:all 1s}[animate-on-change].changed{background-color:#add8e6;transition:none;-webkit-transition:none}[animate-on-change].changedshut{background-color:#ffa07a;transition:none;-webkit-transition:none}.panel-heading .nav-justified.nav-pills li.active>a{background-color:#74a9d8!important}div[data-angular-treeview]{-moz-user-select:-moz-none;-khtml-user-select:none;-webkit-user-select:none;-ms-user-select:none;user-select:none;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;font-weight:600;color:#fff;text-decoration:none;text-shadow:1px 1px #000}div[data-tree-model] ul{padding:5px;list-style:none;border:#778899;overflow:hidden}div[data-tree-model] li{position:relative;padding:0 0 0 20px;line-height:20px;margin-top:3px;border:#add8e6;border-radius:10px;box-shadow:2px 3px 5px rgba(0,0,0,.6),inset 1px 10px 300px 51px rgba(33,151,184,1)}div[data-tree-model] li .expanded{padding:1px 10px;background-image:url(../img/folder.png);background-repeat:no-repeat}div[data-tree-model] li .collapsed{padding:1px 10px;background-image:url(../img/folder-closed.png);background-repeat:no-repeat}div[data-tree-model] li .normal{padding:1px 10px;color:#000;background-image:url(../img/file.png);background-repeat:no-repeat}div[data-tree-model] li.selected{box-shadow:2px 3px 5px rgba(0,0,0,.6),inset 1px 10px 300px 51px #5cb85c!important}div[data-tree-model] span.selected{color:#fff!important;text-shadow:1px 1px #000!important;font-weight:700;padding:1px 5px}div[data-tree-model] li.changed{box-shadow:2px 3px 5px rgba(0,0,0,.6),inset 1px 10px 300px 51px rgba(250,250,210,1)}div[data-tree-model] span.changed{color:#000;text-shadow:1px 1px #fff;font-weight:700;padding:1px 5px}div[data-tree-model] span.loaded{text-decoration:underline;font-style:oblique}/*!
+@import url(http://fonts.googleapis.com/css?family=Roboto:400);.wrapper,h4{text-align:center}.label,sub,sup{vertical-align:baseline}[role=button],div[data-tree-model] li,div[data-tree-model] li i{cursor:pointer}.fc table,table{border-spacing:0}body,figure{margin:0}.btn-group>.btn-group,.btn-toolbar .btn,.btn-toolbar .btn-group,.btn-toolbar .input-group,.col-xs-1,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9,.dropdown-menu{float:left}.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse,.pre-scrollable{max-height:340px}.fa,.glyphicon{-moz-osx-font-smoothing:grayscale}body{-webkit-font-smoothing:antialiased;font:400 14px Roboto,arial,sans-serif}.container{padding:25px;position:fixed}.form-login{background-color:#EDEDED;border-radius:15px;border-color:#d2d2d2;border-width:5px;box-shadow:0 1px 0 #cfcfcf;padding:10px 20px 20px;padding:10px 20px 20px}h4{border:0 solid #fff;border-bottom-width:1px;padding-bottom:10px}.panel-warning>.panel-heading{background-image:linear-gradient(to bottom,#eb9114 0,#f1b25b 100%)!important;color:#fff!important}.panel-danger>.panel-heading{background-image:linear-gradient(to bottom,#c12e2a 0,#d9534f 100%)!important;color:#fff!important}.label-as-badge{border-radius:1em}.bar-off{fill:#c2c2d6}.bar-off:hover{fill:#e0e0eb}.bar-wait{fill:#f0a742}.bar-wait:hover{fill:#f4bd71}.bar-trans{fill:#80d4ff}.bar-trans:hover{fill:#9df}.bar-calc{fill:#2f6fa6}.bar-calc:hover{fill:#3884c7}.bar-paus{fill:#47476b}.bar-paus:hover{fill:#5c5c8a}.bar-fin{fill:#5cb85c}.bar-fin:hover{fill:#71c171}.bar-abo{fill:#c2302c}.bar-abo:hover{fill:#d54944}.bar-fail{fill:#c2302c}.bar-fail:hover{fill:#d54944}rect.selection{stroke:gray;stroke-dasharray:4px;stroke-opacity:.5;fill:transparent}svg ::selection{background:0 0}svg ::-moz-selection{background:0 0}svg ::-webkit-selection{background:0 0}.btn-danger:focus,.btn-danger:hover,.btn-default:focus,.btn-default:hover,.btn-info:focus,.btn-info:hover,.btn-primary:focus,.btn-primary:hover,.btn-success:focus,.btn-success:hover,.btn-warning:focus,.btn-warning:hover{background-position:0 -15px}[animate-on-change]{transition:all 1s;-webkit-transition:all 1s}[animate-on-change].changed{background-color:#add8e6;transition:none;-webkit-transition:none}[animate-on-change].changedshut{background-color:#ffa07a;transition:none;-webkit-transition:none}.panel-heading .nav-justified.nav-pills li.active>a{background-color:#74a9d8!important}rect{-webkit-box-shadow:10px 10px 5px 0 rgba(0,0,0,.75);-moz-box-shadow:10px 10px 5px 0 rgba(0,0,0,.75);box-shadow:10px 10px 5px 0 rgba(0,0,0,.75)}div[data-angular-treeview]{-moz-user-select:-moz-none;-khtml-user-select:none;-webkit-user-select:none;-ms-user-select:none;user-select:none;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;font-weight:600;color:#fff;text-decoration:none;text-shadow:1px 1px #000}div[data-tree-model] ul{padding:5px;list-style:none;border:#778899;overflow:hidden}div[data-tree-model] li{position:relative;padding:0 0 0 20px;line-height:20px;margin-top:3px;border:#add8e6;border-radius:10px;box-shadow:2px 3px 5px rgba(0,0,0,.6),inset 1px 10px 300px 51px rgba(33,151,184,1)}div[data-tree-model] li .expanded{padding:1px 10px;background-image:url(../img/folder.png);background-repeat:no-repeat}div[data-tree-model] li .collapsed{padding:1px 10px;background-image:url(../img/folder-closed.png);background-repeat:no-repeat}div[data-tree-model] li .normal{padding:1px 10px;color:#000;background-image:url(../img/file.png);background-repeat:no-repeat}div[data-tree-model] li.selected{box-shadow:2px 3px 5px rgba(0,0,0,.6),inset 1px 10px 300px 51px #5cb85c!important}div[data-tree-model] span.selected{color:#fff!important;text-shadow:1px 1px #000!important;font-weight:700;padding:1px 5px}div[data-tree-model] li.changed{box-shadow:2px 3px 5px rgba(0,0,0,.6),inset 1px 10px 300px 51px rgba(250,250,210,1)}div[data-tree-model] span.changed{color:#000;text-shadow:1px 1px #fff;font-weight:700;padding:1px 5px}div[data-tree-model] span.loaded{text-decoration:underline;font-style:oblique}/*!
  * Bootstrap v3.3.6 (http://getbootstrap.com)
  * Copyright 2011-2015 Twitter, Inc.

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

@@ -12 +12 @@
                var hubber = $.connection.calendarHub;
 
-               vm.alertMessage = "No alerts";
-               vm.currentcal = [];
-               $scope.permissionview = false;
-               $scope.resaddview = false;
-               vm.selectedEventId = -1;
-               vm.groups = [];
-               vm.clients = [];
+               vm.currentcal = [];//Reference to current calendar (treeview.currentNode.calendar)
+               $scope.permissionview = false;//Show permissions or not
+               $scope.resaddview = false;//Show add resources or not
+               vm.selectedEventId = -1;//Selected downtime (-1 for none)
+               vm.groups = []; //All resource groups
+               vm.clients = []; //All resources 
                vm.init = function () {
-
-                   //  $.connection.hub.logging = true;
-
 
                    var v = document.getElementById("userId").innerHTML;
                    $.connection.hub.qs = { 'userid': v };
+                   //Connection string set to identify the unique session ID for the user
                    $.connection.hub.start().done(function () {
-                       hubber.server.requestInfo();
-                   });
+                       hubber.server.requestInfo();//initial data request
+                   });
+
+                   //Process all initial data needed (heavy load)
                    hubber.client.processData = function (data, users, groups) {
                        vm.data = JSON.parse(data);
@@ -37 +36 @@
                        $scope.$apply();
                    };
+
+                   //Saving from current graph is done -> refresh it
                    hubber.client.savingCurrentDone = function () {
                        vm.calendarSaver = false;
@@ -42 +43 @@
                        $scope.$apply();
                    };
+
+                   //Saving all graphs done -> clear everything
                    hubber.client.savingAllDone = function () {
                        vm.calendarSaver = false;
@@ -47 +50 @@
                        $scope.$apply();
                    };
+
+                   //Dispose toggle refresh for current
                    hubber.client.processDispose = function (disp) {
                        vm.treeview.currentNode.IsDisposable = disp;
@@ -52 +57 @@
                        $scope.$apply();
                    }
+
+                   //Permissions refresh for specific resource 
                    hubber.client.processPermissions = function (id, perm) {
                        var json = JSON.parse(perm);
@@ -60 +67 @@
                        $scope.$apply();
                    }
+
+                   //Process downtimes for a resource. Data conversion
                    hubber.client.processDowntime = function (id, down) {
                        var json = JSON.parse(down);
@@ -99 +108 @@
                    }
 
+                   //Initial function to build the resource tree
+                   $scope.buildTree = function () {
+                       vm.tree = [];
+                       vm.temptree = [];
+                       vm.top = false;
+                       var ungrouped = {
+                           children: [],
+                           Name: 'Ungrouped'
+                       }
+                       for (; vm.data.length > 0;) {
+
+                           if (vm.data[0].ParentResourceId == null && vm.data[0].IsDisposable !== undefined) {
+                               var curr = $scope.seekChildren(vm.data.splice(0, 1)[0]);
+                               vm.clients.push(curr);
+                               ungrouped.children.push(curr);
+                           }
+                           else if (vm.data[0].ParentResourceId == null) {
+                               var curr = $scope.seekChildren(vm.data.splice(0, 1)[0]);
+                               vm.groups.push(curr);
+                               vm.tree.push(curr);
+                           }
+                           else {
+                               var curr = $scope.seekChildren(vm.data.splice(0, 1)[0]);
+                               if (curr.IsDisposable !== undefined)
+                                   vm.clients.push(curr);
+                               else
+                                   vm.groups.push(curr);
+                               vm.temptree.push(curr);
+                           }
+                       }
+                       vm.tree.push(ungrouped);
+
+                   };//End for hubber init
+
+                   //menu navigation
+                   $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;
+                       }
+                   }
+
+                   //Seeks for children, used recursively for building the treeview
+                   $scope.seekChildren = function (current) {
+                       current.calendar = [];
+                       current.children = [];
+                       current.todelete = [];
+                       current.changes = false;
+                       current.collapsed = true;
+                       for (var t = 0; t < vm.temptree.length;) {
+                           if (current.Id == vm.temptree[t].ParentResourceId) {
+                               current.children.push(vm.temptree.splice(t, 1)[0]);
+                           }
+                           else {
+                               t++;
+                           }
+                       }
+                       var childc = current.children.length;//Remembers count of children received from temp tree;
+                       for (var t = 0; t < vm.data.length;) {
+                           if (current.Id == vm.data[t].ParentResourceId) {
+                               if (vm.data[t].IsDisposable !== undefined)
+                                   vm.clients.push(vm.data[t]);
+                               else
+                                   vm.groups.push(vm.data[t]);
+                               current.children.push(vm.data.splice(t, 1)[0]);
+                           }
+                           else {
+                               t++;
+                           }
+                       }
+                       for (var t = childc; t < current.children.length; t++) {
+                           current.children[t] = $scope.seekChildren(current.children[t]);
+                       }
+                       return current;
+                   }
+
+                   //Change to another resource
                    $scope.$watch("treeview.currentNode", function (newValue, oldValue) {
                        $scope.currentcal = [];
@@ -105 +201 @@
                        $scope.selectedEventId = -1;
                        
+                       //Check if resource already has downtime data loaded
                        if ($scope.treeview.currentNode != null && $scope.treeview.currentNode.Id != undefined) {
                            if ($scope.treeview.currentNode.calendar.length === 0) {
+                               //Reach out to server to receive resource data
                                hubber.server.requestPermissions(vm.treeview.currentNode.Id);
                                hubber.server.requestDownTime(vm.treeview.currentNode.Id);
@@ -114 +212 @@
                                $timeout(function () {
                                    refreshPermissions();
-                                   
+                                   //set previously loaded data
                                    $scope.currentcal = $scope.treeview.currentNode.calendar;
                                }, 0);
@@ -124 +222 @@
                    });
                }
+
+               //Resets the add resources menu 
                $scope.refreshAdds = function() {
                    for (var i = 0; i < $scope.clients.length; i++) {
@@ -133 +233 @@
                    }
                }
+
+               //Resets the permissions menu
                function refreshPermissions() {
                    for (var i = 0; i < $scope.permUsers.length; i++){
@@ -149 +251 @@
                    }
                }
+
+               //Add resource group show by clearing the tree
                $scope.clearTreeSelect = function () {
                    if (vm.treeview.currentNode != undefined) {
@@ -156 +260 @@
                    }
                }
-               $scope.buildTree = function () {
-                   vm.tree = [];
-                   vm.temptree = [];
-                   vm.top = false;
-                   var ungrouped = {
-                       children: [],
-                       Name: 'Ungrouped'
-                   }
-                   for (; vm.data.length > 0;) {
-
-                       if (vm.data[0].ParentResourceId == null && vm.data[0].IsDisposable !== undefined) {
-                           var curr = $scope.seekChildren(vm.data.splice(0, 1)[0]);
-                           vm.clients.push(curr);
-                           ungrouped.children.push(curr);
-                       }
-                       else if (vm.data[0].ParentResourceId == null) {
-                           var curr = $scope.seekChildren(vm.data.splice(0, 1)[0]);
-                           vm.groups.push(curr);
-                           vm.tree.push(curr);
-                       }
-                       else {
-                           var curr = $scope.seekChildren(vm.data.splice(0, 1)[0]);
-                           if (curr.IsDisposable !== undefined)
-                               vm.clients.push(curr);
-                           else
-                               vm.groups.push(curr);
-                           vm.temptree.push(curr);
-                       }
-                   }
-                   vm.tree.push(ungrouped);
-
-               };
-
-               $scope.seekChildren = function (current) {
-                   current.calendar = [];
-                   current.children = [];
-                   current.todelete = [];
-                   current.changes = false;
-                   current.collapsed = true;
-                   for (var t = 0; t < vm.temptree.length;) {
-                       if (current.Id == vm.temptree[t].ParentResourceId) {
-                           current.children.push(vm.temptree.splice(t, 1)[0]);
-                       }
-                       else {
-                           t++;
-                       }
-                   }
-                   var childc = current.children.length;//Remembers count of children received from temp tree;
-                   for (var t = 0; t < vm.data.length;) {
-                       if (current.Id == vm.data[t].ParentResourceId) {
-                           if (vm.data[t].IsDisposable !== undefined)
-                               vm.clients.push(vm.data[t]);
-                           else
-                               vm.groups.push(vm.data[t]);
-                           current.children.push(vm.data.splice(t, 1)[0]);
-                       }
-                       else {
-                           t++;
-                       }
-                   }
-                   for (var t = childc; t < current.children.length; t++) {
-                       current.children[t] = $scope.seekChildren(current.children[t]);
-                   }
-                   return current;
-               }
+
+               //Reach out to server to toggle disposable for current calendar
                $scope.toggleDisposable = function () {
                    $scope.calendarDispose = true;
                    hubber.server.toggleDisposable(vm.treeview.currentNode.Id);
                }
+
+               //Pushes permissions to server
                $scope.pushPermissions = function () {
                    var perms = [];
@@ -239 +282 @@
                    hubber.server.changePermissions(perms, node.Id);
                }
+
+               //Collects all data from a single resource to save to the server
                function collectInfoToSave(node, refresh, last) {
                    var arr = node.calendar.down[0];
@@ -246 +291 @@
                    for (var i = 0; i < arr.length; i++) {
                        if (arr[i].id === '00000000-0000-0000-0000-000000000000') {
+                           //NEW DOWNTIME
                            var t = arr[i].allDay.toString();
                            toadd.push([
@@ -263 +309 @@
                        }
                        else if (arr[i].changed === true) {
+                           //EDIT EXISTING DOWNTIME
                            var t = arr[i].allDay.toString();
                            toupd.push([
@@ -282 +329 @@
                    hubber.server.saveCalendar(node.Id, todel, toadd, toupd, refresh, last);
                }
+
+               //Save current calendar
                $scope.saveCurrentCalendar = function () {
                    vm.calendarSaver = true;
-                   collectInfoToSave(vm.treeview.currentNode, true, false);
+                   collectInfoToSave(vm.treeview.currentNode, true, false);//true for refresh, false for save all
                    //true for refresh, false for showing it's only one calendar saved.
                }
+
+               //Save all changed calendars
                $scope.saveAllCalendars = function () {
 
@@ -302 +353 @@
                    }).then(function (success) {
                        vm.calendarSaver = true;
+
                        for (var i = 0; i < $scope.allSave.length; i++) {
                            if (i >= $scope.allSave.length - 1)
@@ -312 +364 @@
 
                }
+
+               //Checks treeview for edits and builds new array containing these (recurse for children)
                function createSaveRequests(node) {
                    if (node.changes === true)
@@ -319 +373 @@
                    }
                }
+
+               //Clears and refreshes calendar for current resource (delete current changes)
                $scope.clearCurrentCalendar = function () {
 
@@ -332 +388 @@
 
                }
+
+               //Clears all calendars and refreshes current (Deletes all changes)
                $scope.clearAllCalendars = function () {
                    ngDialog.openConfirm({
@@ -346 +404 @@
 
                }
+
+               //Function that clears all calendar (separate so dialog is not called when saveAll is finished)
                function clearAllCalendarsFunc() {
                    $(".ng-binding.changed").removeClass('changed');
@@ -360 +420 @@
                    $(".selected.ng-scope").addClass('loaded');
                }
+
+               //Recurse trough tree view
                function clearCalendarsRecurse(node) {
 
@@ -369 +431 @@
                    }
                }
+
+               //Delete all downtimes from current resource
                $scope.deleteAllEvents = function () {
                    vm.calendarDeleter = true;
@@ -386 +450 @@
                    });
                }
+
+               //Delete all past events
                $scope.deleteAllPreviousEvents = function () {
                    vm.calendarDeleter = true;
@@ -408 +474 @@
                }
 
-
+               //Sets the status of a downtime AND the current resource to changed
                $scope.setChanged = function (id) {
                    if (id != -1) {
@@ -421 +487 @@
                    $(".selected").addClass('changed');
                }
-               //*Add event by click
+
+               //Adds event by click on empty space
                $scope.calendarClick = function (date, jsEvent, view) {
 
@@ -431 +498 @@
                    end.setHours(dat.getHours() + 2);
                    vm.treeview.currentNode.calendar.down[0].push({
-                       id: '00000000-0000-0000-0000-000000000000',
+                       id: '00000000-0000-0000-0000-000000000000',//Makes it recognizable as new for the server
                        title: 'Unavailable',
                        start: dat,
@@ -453 +520 @@
 
                }
+
+               //Finds array index for specific _id
                function checkId(id) {
                    for (var i = 0; i < vm.treeview.currentNode.calendar.down[0].length ; i++) {
@@ -460 +529 @@
                    return -1;
                }
-               /* alert on eventClick */
+               //Set selected downtime
                $scope.eventClick = function (date, jsEvent, view) {
                    vm.selectedEventId = checkId(date._id);
                };
+               //Sets selected downtime by clicking on the button at bottom on the page, moves to date
                $scope.eventClickBtn = function (id) {
                    vm.selectedEventId = checkId(id);
                    vm.goToDate();
                };
-               /* alert on Drop */
+
+               //Drag and drop downtime
                $scope.dragandDrop = function (event, delta, revertFunc, jsEvent, ui, view) {
                    vm.selectedEventId = checkId(event._id);
@@ -487 +558 @@
                    vm.treeview.currentNode.calendar.down[0][vm.selectedEventId].end = new Date(event.end);
                };
-               /* alert on Resize */
+               //Resize downtime
                $scope.resizeEvent = function (event, delta, revertFunc, jsEvent, ui, view) {
                    vm.selectedEventId = checkId(event._id);
@@ -495 +566 @@
                };
 
-               /* remove event */
+               //Removes a downtime from client (existing downtime gets referenced in todelete
                $scope.remove = function (index) {
                    vm.selectedEventId = -1;
@@ -506 +577 @@
 
                };
+               //Remove trough list view at bottom
                $scope.removeList = function (id) {
                    var index = checkId(id);
@@ -517 +589 @@
 
                };
-
+               //Check if start is before end AND start is after now (recursion)
                $scope.checkDateStartEnd = function () {
                    if ($scope.currentcal.down[0][vm.selectedEventId].rec.start > $scope.currentcal.down[0][vm.selectedEventId].rec.end ||
@@ -528 +600 @@
                        $scope.currentcal.down[0][vm.selectedEventId].rec.start = new Date();
                }
-               //pushes all changes to other recurs
+               //pushes all changes to other existing recurs and creates new downtimes where needed
                $scope.pushRecurChanges = function (recid) {
                    ngDialog.openConfirm({
@@ -539 +611 @@
                        plain: true
                    }).then(function (success) {
+
                        var arr = vm.treeview.currentNode.calendar.down[0];
+                       //Deep copy of downtime for referencing
                        var ob = $.extend(true, {}, arr[vm.selectedEventId]);
-                       for (var i = 0; i < arr.length;) {
+
+                       for (var i = 0; i < arr.length;) {//Go trough downtimes and find all recurrences
                            if (arr[i].rec.recid === recid) {
                                if (new Date(arr[i].start) < new Date(ob.rec.start) ||
                                         new Date(arr[i].end) > new Date(ob.rec.end) ||
                                         !ob.rec.days[new Date(arr[i].start).getDay()]) {
-                                   vm.remove(i);
+                                   //Downtime is out of recurrence boundaries
+                                   //Before start date OR After end date OR Not on right day of the week
+                                   vm.remove(i);//NO I++ -> REMOVE SPLICES ARRAY
                                    vm.selectedEventId = -1;
 
                                }
                                else {
-
+                                   //Edit downtime when it is within the bounds
                                    arr[i].start.setHours(ob.start.getHours(), ob.start.getMinutes());
                                    arr[i].end.setHours(ob.end.getHours(), ob.end.getMinutes());
@@ -564 +641 @@
                                i++;
                        }
+                       //init for new downtimes. 
                        var start = new Date(ob.rec.start);
-                       start.setHours(2, 0, 0, 0);
+                       start.setHours(2, 0, 0, 0);//Beginning of the day + time conversion +02
                        var end = new Date(ob.rec.end);
-                       end = new Date(end.setHours(24, 0, 0, 0) + 1000 * 3600 * 2);
-
-                       loop1:
+                       end = new Date(end.setHours(24, 0, 0, 0) + 1000 * 3600 * 2);//End of the day + time conversion +02
+
+                       loop1: //Loop start to end with single day increment
                            for (var d = (start.getTime()) ; d < (end.getTime()) ;) {
                                var tog = ob.rec.days[new Date(d).getDay()];
+                               //Check if day of the week is included in recursion
                                if (tog) {
-                                   loop2:
+                                   loop2://Loop checking existing downtime array to see if day is already filled or not
                                        for (var i = 0; i < arr.length; i++) {
 
@@ -580 +659 @@
                                                if (arr[i].start.getTime() >= d &&
                                                    arr[i].end.getTime() <= dend) {
-                                                   d += (1000 * 3600 * 24);
-                                                   continue loop1;
+                                                   d += (1000 * 3600 * 24);//add day to loop 1
+                                                   continue loop1;//breaks out of loop2 and skips to next day
                                                }
                                            }
                                        }
-
+                                   //Made it here = new event needed: init
                                    var ts = new Date(d);
                                    ts.setHours(new Date(ob.start).getHours(), new Date(ob.start).getMinutes());
@@ -602 +681 @@
                                }
 
-                               d += (1000 * 3600 * 24);// 1 day
-
-                           }
-                   });
-               }
+                               d += (1000 * 3600 * 24);// adds one day
+
+                           }
+                   });
+               }
+
+               //Delete all bound recurrences
                $scope.deleteAllRecurrences = function (recid) {
                    ngDialog.openConfirm({
@@ -627 +708 @@
                }
 
+               //Moves calendar to selected date
                $scope.goToDate = function () {
                    $("#resourcecalendar").fullCalendar('gotoDate', vm.currentcal.down[0][vm.selectedEventId].start);
                }
-               /* Render Tooltip */
+               /* Renders Tooltip */
                $scope.eventRender = function (event, element, view) {
                    element.attr({
@@ -638 +720 @@
                    //$compile(element)($scope);
                };
-               /* config object */
+               //Calendar configuration
                $scope.uiConfig = {
                    calendar: {
@@ -663 +745 @@
                };
 
-               $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;
-                   }
-               }
+               
 
 
 
            }).filter('disp', function () {
-               return function (input) {
+               return function (input) {//Filter boolean to string
                    return input ? 'Disposable' : 'Not disposable';
                }
            }).directive('animateOnChange', function ($timeout) {
-               return function (scope, element, attr) {
+               return function (scope, element, attr) {//Animation on downtime info to show change
                    scope.$watch(attr.animateOnChange, function (nv, ov) {
 
@@ -695 +762 @@
                                $timeout(function () {
                                    element.removeClass('changed');
-                               }, 250); // Could be enhanced to take duration as a parameter
+                               }, 250); 
                            }
                            else {
@@ -701 +768 @@
                                $timeout(function () {
                                    element.removeClass('changedshut');
-                               }, 250); // Could be enhanced to take duration as a parameter
+                               }, 250);
                            }
                        }

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

@@ -1 @@
-function addtoHive(){var a=document.getElementById("jname").value,b=document.getElementById("jresource").value;a&&""!=a&&null!=a?(hubber.server.changeNameResource(a,b),document.getElementById("fakehiveadd").style.display="none",document.getElementById("progdiv").style.display="",document.getElementById("result").style.display="",document.getElementById("realhiveadd").click()):alert("Job name not set!")}function toggleChild(a,b){console.log(a+" toggled"),hubber.server.toggleChild(a),"none"==$("#childs"+b).css("display")?$("#childs"+b).css("display",""):$("#childs"+b).css("display","none"),$("body").click()}function changePriority(a,b,c){switch(console.log(a+" to priority "+b),hubber.server.changePriority(a,b),resetPrior(c),b){case 0:document.getElementById("prior"+c).className+="btn-default",document.getElementById("prior"+c).innerHTML="Low";break;case 1:document.getElementById("prior"+c).className+="btn-info",document.getElementById("prior"+c).innerHTML="Normal";break;case 2:document.getElementById("prior"+c).className+="btn-warning",document.getElementById("prior"+c).innerHTML="Urgent";break;case 3:document.getElementById("prior"+c).className+="btn-danger",document.getElementById("prior"+c).innerHTML="Critical"}document.getElementById("prior"+c).innerHTML+="<span class='caret'></span>"}function resetPrior(a){document.getElementById("prior"+a).className="btn dropdown-toggle "}var hubber=$.connection.progressHub;$(function(){var a=document.getElementById("userId").innerHTML;console.log(a),$.connection.hub.qs={userid:a},$.connection.hub.start().done(function(){$("#progress").css("width","0%"),$("#progress").attr("aria-valuenow",0),hubber.server.handleMessage("Looking for connection...")}),hubber.client.processMessage=function(a,b){b>$("#progress").attr("aria-valuenow")&&($("#progress").css("width",b+"%"),$("#progress").attr("aria-valuenow",b),$("#progress").html(b+"%"),$("#result").html(a))}});
+function addtoHive(){var a=document.getElementById("jname").value,b=document.getElementById("jresource").value;a&&""!=a&&null!=a?(hubber.server.changeNameResource(a,b),document.getElementById("fakehiveadd").style.display="none",document.getElementById("progdiv").style.display="",document.getElementById("result").style.display="",document.getElementById("realhiveadd").click()):alert("Job name not set!")}function toggleChild(a,b){console.log(a+" toggled"),hubber.server.toggleChild(a),"none"==$("#childs"+b).css("display")?$("#childs"+b).css("display",""):$("#childs"+b).css("display","none"),$("body").click()}function changePriority(a,b,c){switch(console.log(a+" to priority "+b),hubber.server.changePriority(a,b),resetPrior(c),b){case 0:document.getElementById("prior"+c).className+="btn-default",document.getElementById("prior"+c).innerHTML="Low";break;case 1:document.getElementById("prior"+c).className+="btn-info",document.getElementById("prior"+c).innerHTML="Normal";break;case 2:document.getElementById("prior"+c).className+="btn-warning",document.getElementById("prior"+c).innerHTML="Urgent";break;case 3:document.getElementById("prior"+c).className+="btn-danger",document.getElementById("prior"+c).innerHTML="Critical"}document.getElementById("prior"+c).innerHTML+="<span class='caret'></span>"}function resetPrior(a){document.getElementById("prior"+a).className="btn dropdown-toggle "}function paraEdit(a,b,c,d,e){hubber.server.paraEdit(a,b,c,d,e)}var hubber=$.connection.progressHub;$(function(){var a=document.getElementById("userId").innerHTML;console.log(a),$.connection.hub.qs={userid:a},$.connection.hub.start().done(function(){$("#progress").css("width","0%"),$("#progress").attr("aria-valuenow",0),hubber.server.handleMessage("Looking for connection...")}),hubber.client.processMessage=function(a,b){b>$("#progress").attr("aria-valuenow")&&($("#progress").css("width",b+"%"),$("#progress").attr("aria-valuenow",b),$("#progress").html(b+"%"),$("#result").html(a))}});

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

@@ -1 @@
-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>")}});
+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'>New pass: "+a+". An email has been sent to the user containing the new password</label>")}});