Changeset 12546


Ignore:
Timestamp:
06/30/15 12:31:15 (6 years ago)
Author:
dglaser
Message:

#2394:

HeuristicLab.Services.WebApp.Status:

  • added used / total cores
  • moved kb to gb filter to WebApp

HeuristicLab.Services.WebApp:

  • added about page
  • added filter
Location:
trunk/sources
Files:
6 added
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Services.WebApp.Status/3.3/HeuristicLab.Services.WebApp.Status-3.3.csproj

    r12428 r12546  
    7373  </PropertyGroup>
    7474  <ItemGroup>
    75     <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
    76       <HintPath>..\..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
    77       <Private>False</Private>
    78     </Reference>
    7975    <Reference Include="System" />
    8076    <Reference Include="System.Core" />
  • trunk/sources/HeuristicLab.Services.WebApp.Status/3.3/WebApp/status/status.cshtml

    r12521 r12546  
    8080                    <tr data-toggle="tooltip" data-placement="bottom" title="All online slaves">
    8181                        <td class="text-left">Total:</td>
    82                         <td class="text-right">{{status.MemoryStatus.TotalMemory | toGB}}</td>
     82                        <td class="text-right">{{status.MemoryStatus.TotalMemory | kbToGB}} GB</td>
    8383                    </tr>
    8484                    <tr data-toggle="tooltip" data-placement="bottom" title="All calculating and idle slaves that are allowed to calculate">
    8585                        <td class="text-left">Active:</td>
    86                         <td class="text-right">{{status.MemoryStatus.ActiveMemory | toGB}}</td>
     86                        <td class="text-right">{{status.MemoryStatus.ActiveMemory | kbToGB}} GB</td>
    8787                    </tr>
    8888                    <tr data-toggle="tooltip" data-placement="bottom" title="All calculating slaves that are allowed to calculate">
    8989                        <td class="text-left">Calculating:</td>
    90                         <td class="text-right">{{status.MemoryStatus.UsedMemory | toGB}}</td>
     90                        <td class="text-right">{{status.MemoryStatus.UsedMemory | kbToGB}} GB</td>
    9191                    </tr>
    9292                </table>
     
    233233                            <td>{{slave.Slave.Name}}</td>
    234234                            <td>{{slave.CpuUtilization | number: 2}} %</td>
    235                             <td>{{slave.Cores | number}}</td>
    236                             <td>{{slave.Memory | toGB}}</td>
     235                            <td>{{slave.Cores - slave.FreeCores | number}} / {{slave.Cores | number}}</td>
     236                            <td>{{slave.Memory - slave.FreeMemory | kbToGB}} / {{slave.Memory | kbToGB}} GB</td>
    237237                        </tr>
    238238                        <tr ng-hide="activeCalculatingSlaves.length">
     
    291291                            <td>{{slave.Slave.Name}}</td>
    292292                            <td>{{slave.CpuUtilization | number: 2}} %</td>
    293                             <td>{{slave.Cores | number}}</td>
    294                             <td>{{slave.Memory | toGB}}</td>
     293                            <td>{{slave.Cores - slave.FreeCores | number}} / {{slave.Cores | number}}</td>
     294                            <td>{{slave.Memory - slave.FreeMemory | kbToGB}} / {{slave.Memory | kbToGB}} GB</td>
    295295                        </tr>
    296296                        <tr ng-hide="activeIdleSlaves.length">
     
    348348                            <td>{{slave.Slave.Name}}</td>
    349349                            <td>{{slave.CpuUtilization | number: 2}} %</td>
    350                             <td>{{slave.Cores | number}}</td>
    351                             <td>{{slave.Memory | toGB}}</td>
     350                            <td>{{slave.Cores - slave.FreeCores | number}} / {{slave.Cores | number}}</td>
     351                            <td>{{slave.Memory - slave.FreeMemory | kbToGB}} / {{slave.Memory | kbToGB}} GB</td>
    352352                        </tr>
    353353                        <tr ng-hide="inactiveSlaves.length">
  • trunk/sources/HeuristicLab.Services.WebApp.Status/3.3/WebApp/status/statusCtrl.js

    r12521 r12546  
    202202        }]
    203203    );
    204 
    205     module.filter('toGB', function () {
    206         return function (text, length, end) {
    207             if (text == null || text == '') text = '0';
    208             text = Math.round(parseInt(text) / 1024);
    209             return text + ' GB';
    210         };
    211     });
    212 
    213204})();
  • trunk/sources/HeuristicLab.Services.WebApp.Status/3.3/packages.config

    r12429 r12546  
    55  <package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net45" />
    66  <package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.3" targetFramework="net45" />
    7   <package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />
     7  <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" />
    88</packages>
  • trunk/sources/HeuristicLab.Services.WebApp/3.3/Configs/BundleConfig.cs

    r12514 r12546  
    8989        .IncludeDirectory("~/WebApp/shared/services", "*.js", true)
    9090        .IncludeDirectory("~/WebApp/shared/directives", "*.js", true)
     91        .IncludeDirectory("~/WebApp/shared/filter", "*.js", true)
    9192        .IncludeDirectory("~/WebApp/shared/menu", "*.js", true)
    9293      );
  • trunk/sources/HeuristicLab.Services.WebApp/3.3/HeuristicLab.Services.WebApp-3.3.csproj

    r12523 r12546  
    2323    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
    2424    <RestorePackages>true</RestorePackages>
    25     <WebGreaseLibPath>..\..\packages\WebGrease.1.5.2\lib</WebGreaseLibPath>
    2625  </PropertyGroup>
    2726  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     
    4443  </PropertyGroup>
    4544  <ItemGroup>
    46     <Reference Include="Antlr3.Runtime, Version=3.4.1.9004, Culture=neutral, PublicKeyToken=eb42632606e9261f, processorArchitecture=MSIL">
    47       <HintPath>..\..\packages\Antlr.3.4.1.9004\lib\Antlr3.Runtime.dll</HintPath>
    48       <Private>True</Private>
     45    <Reference Include="Antlr3.Runtime, Version=3.5.0.2, Culture=neutral, PublicKeyToken=eb42632606e9261f, processorArchitecture=MSIL">
     46      <SpecificVersion>False</SpecificVersion>
     47      <HintPath>..\..\packages\Antlr.3.5.0.2\lib\Antlr3.Runtime.dll</HintPath>
    4948    </Reference>
    5049    <Reference Include="Microsoft.CSharp" />
     
    5352      <Private>True</Private>
    5453    </Reference>
    55     <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
    56       <HintPath>..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
    57       <Private>True</Private>
     54    <Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
     55      <SpecificVersion>False</SpecificVersion>
     56      <HintPath>..\..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
    5857    </Reference>
    5958    <Reference Include="System" />
     
    118117    </Reference>
    119118    <Reference Include="System.Net.Http.WebRequest">
    120     </Reference>
    121     <Reference Include="WebGrease, Version=1.5.2.14234, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
    122       <HintPath>..\..\packages\WebGrease.1.5.2\lib\WebGrease.dll</HintPath>
    123       <Private>True</Private>
    124119    </Reference>
    125120  </ItemGroup>
     
    169164    <Content Include="WebApp\libs\smoothScroll\smoothScroll.js" />
    170165    <Content Include="WebApp\app.js" />
    171     <Content Include="WebApp\plugins\login\login.css">
    172       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    173     </Content>
    174     <Content Include="WebApp\plugins\login\login.js">
    175       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    176     </Content>
    177     <Content Include="WebApp\plugins\login\loginCtrl.js">
    178       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    179     </Content>
     166    <Content Include="WebApp\plugins\about\about.js" />
     167    <Content Include="WebApp\plugins\about\aboutCtrl.js" />
     168    <Content Include="WebApp\plugins\login\login.css" />
     169    <Content Include="WebApp\plugins\login\login.js" />
     170    <Content Include="WebApp\plugins\login\loginCtrl.js" />
    180171    <Content Include="WebApp\plugins\plugins\pluginsExceptionCtrl.js" />
    181     <Content Include="WebApp\plugins\plugins\plugins.js">
    182       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    183     </Content>
    184     <Content Include="WebApp\plugins\plugins\pluginsCtrl.js">
    185       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    186     </Content>
     172    <Content Include="WebApp\plugins\plugins\plugins.js" />
     173    <Content Include="WebApp\plugins\plugins\pluginsCtrl.js" />
    187174    <Content Include="WebApp\plugins\plugins\pluginsService.js" />
    188175    <Content Include="WebApp\shared\directives\flot.js" />
     
    226213    <Content Include="WebApp\libs\bootstrap\fonts\glyphicons-halflings-regular.woff" />
    227214    <Content Include="WebApp\libs\bootstrap\fonts\glyphicons-halflings-regular.woff2" />
     215    <Content Include="WebApp\shared\filter\filters.js" />
    228216    <Content Include="WebApp\shared\images\HeuristicLab-Logo.png" />
    229217    <Content Include="WebApp\shared\layout\layout.cshtml" />
     
    233221    <Content Include="WebApp\shared\menu\menu.cshtml" />
    234222    <Content Include="WebApp\shared\restricted\empty.cshtml" />
    235     <Content Include="WebApp\plugins\login\login.cshtml">
    236       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    237     </Content>
    238     <Content Include="WebApp\plugins\plugins\plugins.cshtml">
    239       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    240     </Content>
    241     <Content Include="WebApp\plugins\plugins\Web.config">
    242       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    243     </Content>
     223    <Content Include="WebApp\plugins\login\login.cshtml" />
     224    <Content Include="WebApp\plugins\plugins\plugins.cshtml" />
     225    <Content Include="WebApp\plugins\plugins\Web.config" />
    244226  </ItemGroup>
    245227  <ItemGroup>
     
    259241      <Name>HeuristicLab.Services.Hive-3.3</Name>
    260242    </ProjectReference>
     243  </ItemGroup>
     244  <ItemGroup>
     245    <Content Include="WebApp\plugins\about\about.cshtml" />
    261246  </ItemGroup>
    262247  <PropertyGroup>
  • trunk/sources/HeuristicLab.Services.WebApp/3.3/Web.config

    r12445 r12546  
    5959      <dependentAssembly>
    6060        <assemblyIdentity name="Newtonsoft.Json" culture="neutral" publicKeyToken="30ad4fe6b2a6aeed" />
    61         <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
     61        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
    6262      </dependentAssembly>
    6363      <dependentAssembly>
     
    6767      <dependentAssembly>
    6868        <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" />
    69         <bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234" />
     69        <bindingRedirect oldVersion="0.0.0.0-1.6.5135.21930" newVersion="1.6.5135.21930" />
    7070      </dependentAssembly>
    7171      <dependentAssembly>
     
    8181        <bindingRedirect oldVersion="1.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
    8282      </dependentAssembly>
     83      <dependentAssembly>
     84        <assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f" culture="neutral" />
     85        <bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2" />
     86      </dependentAssembly>
    8387    </assemblyBinding>
    8488  </runtime>
  • trunk/sources/HeuristicLab.Services.WebApp/3.3/packages.config

    r12430 r12546  
    11<?xml version="1.0" encoding="utf-8"?>
    22<packages>
    3   <package id="Antlr" version="3.4.1.9004" targetFramework="net45" />
     3  <package id="Antlr" version="3.5.0.2" targetFramework="net45" />
    44  <package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net45" />
    55  <package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net45" />
     
    1111  <package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net45" />
    1212  <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
    13   <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
    14   <package id="WebGrease" version="1.5.2" targetFramework="net45" />
     13  <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" />
     14  <package id="WebGrease" version="1.6.0" targetFramework="net45" />
    1515</packages>
Note: See TracChangeset for help on using the changeset viewer.