Changeset 12525 for branches/HiveStatistics/sources/HeuristicLab.Services.WebApp/3.3

Timestamp:

06/26/15 18:02:03 (9 years ago)

Author:

dglaser

Message:

#2388:

HeuristicLab.Services.WebApp.Statistics-3.3:

• added groups page
• improved jobs, clients and users pages

HeuristicLab.Services.WebApp-3.3:

• merged from trunk

Location:

branches/HiveStatistics/sources/HeuristicLab.Services.WebApp/3.3

Files:

• Controllers/DataTransfer/Plugin.cs (modified) (1 diff)
• Controllers/PluginController.cs (modified) (1 diff)
• HeuristicLab.Services.WebApp-3.3.csproj (modified) (1 diff)
• Plugin.cs (modified) (4 diffs)
• WebApp/plugins/plugins/plugins.cshtml (modified) (3 diffs)
• WebApp/plugins/plugins/plugins.js (modified) (1 diff)
• WebApp/plugins/plugins/pluginsCtrl.js (modified) (2 diffs)

branches/HiveStatistics/sources/HeuristicLab.Services.WebApp/3.3/Controllers/DataTransfer/Plugin.cs

@@ -28 +28 @@
     public DateTime? LastReload { get; set; }
     public int Reloads { get; set; }
+    public string Exception { get; set; }
   }
 }

branches/HiveStatistics/sources/HeuristicLab.Services.WebApp/3.3/Controllers/PluginController.cs

@@ -38 +38 @@
         Name = plugin.Name,
         AssemblyName = plugin.AssemblyName,
-        LastReload = plugin.LastReload
+        LastReload = plugin.LastReload,
+        Exception = plugin.Exception
       });
     }

branches/HiveStatistics/sources/HeuristicLab.Services.WebApp/3.3/HeuristicLab.Services.WebApp-3.3.csproj

@@ -177 +177 @@
     </Content>
     <Content Include="WebApp\plugins\login\loginCtrl.js">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="WebApp\plugins\plugins\pluginsExceptionCtrl.js">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>

branches/HiveStatistics/sources/HeuristicLab.Services.WebApp/3.3/Plugin.cs

@@ -34 +34 @@
     public string Directory { get; set; }
     public string AssemblyName { get; set; }
+    public string Exception { get; set; }
     public DateTime? LastReload { get; set; }
 
@@ -66 +67 @@
     public void ReloadControllers() {
       AssemblyName = null;
+      Exception = null;
       Controllers.Clear();
       LastReload = DateTime.Now;
@@ -76 +78 @@
           return;
         var assemblyPath = assemblies.First();
+        AssemblyName = Path.GetFileName(assemblyPath);
         var assembly = Assembly.Load(File.ReadAllBytes(assemblyPath));
         var assemblyTypes = assembly.GetTypes();
@@ -83 +86 @@
           Controllers.Add(controllerName, new HttpControllerDescriptor(configuration, controllerName, apiController));
         }
-        AssemblyName = Path.GetFileName(assemblyPath);
       }
-      catch (Exception) {
-        AssemblyName = "Error loading assembly";
+      catch (Exception e) {
+        Exception = e.ToString();
         Controllers.Clear();
       }

branches/HiveStatistics/sources/HeuristicLab.Services.WebApp/3.3/WebApp/plugins/plugins/plugins.cshtml

@@ -1 +1 @@
 <div class="default-view-container">
+    <script type="text/ng-template" id="pluginsExceptionDialog">
+        <div class="modal-header">
+            <button type="button" ng-click="close()" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+            <h4 class="modal-title">Plugin {{pluginName}}</h4>
+        </div>
+        <div class="modal-body">
+            {{exception}}
+        </div>
+    </script>
     <div class="row">
         <div class="col-lg-12">
@@ -14 +23 @@
                                 <th>Assembly</th>
                                 <th>Last reload</th>
+                                <th>Status</th>
                                 <th></th>
                             </tr>
@@ -22 +32 @@
                             <td>{{plugin.AssemblyName}}</td>
                             <td>{{plugin.LastReload}}</td>
+                            <td>
+                                <span ng-hide="plugin.Exception" class="glyphicon glyphicon glyphicon-ok" style="color: green"></span>
+                                <span ng-show="plugin.Exception" class="glyphicon glyphicon glyphicon-remove" style="color: darkred"
+                                      ng-click="open(plugin.Name, plugin.Exception)"></span>
+                            </td>
                             <td>
                                 <a ng-href="" data-ng-click="reloadPlugin(plugin.Name)">Reload</a>

branches/HiveStatistics/sources/HeuristicLab.Services.WebApp/3.3/WebApp/plugins/plugins/plugins.js

@@ -5 +5 @@
     plugin.files = [
         'pluginsService.js',
-        'pluginsCtrl.js'
+        'pluginsCtrl.js',
+        'pluginsExceptionCtrl.js'
     ];
     plugin.view = 'plugins.cshtml';

branches/HiveStatistics/sources/HeuristicLab.Services.WebApp/3.3/WebApp/plugins/plugins/pluginsCtrl.js

@@ -2 +2 @@
     var module = appPluginsPlugin.getAngularModule();
     module.controller('app.plugins.ctrl',
-        ['$scope', 'app.plugins.service', function ($scope, pluginService) {
+        ['$scope', '$modal', 'app.plugins.service', function ($scope, $modal, pluginService) {
             var getPlugins = function () {
                 pluginService.getPlugins({}, function (plugins) {
@@ -22 +22 @@
 
             $scope.reloadPlugin = function (name) {
-                pluginService.reloadPlugin({ name: name }, function() {
+                pluginService.reloadPlugin({ name: name }, function () {
                     getPlugins();
+                });
+            };
+
+            $scope.open = function (pluginName, exception) {
+                $scope.pluginName = pluginName;
+                $scope.exception = exception;
+                $modal.open({
+                    animation: true,
+                    templateUrl: 'pluginsExceptionDialog',
+                    controller: 'app.plugins.pluginsExceptionCtrl',
+                    resolve: {
+                        pluginName: function () {
+                            return $scope.pluginName;
+                        },
+                        exception: function () {
+                            return $scope.exception;
+                        }
+                    }
                 });
             };