Free cookie consent management tool by TermsFeed Policy Generator

Changeset 12394


Ignore:
Timestamp:
05/20/15 15:43:00 (9 years ago)
Author:
dglaser
Message:

#2388 updated solution and files

Location:
branches/HiveStatistics/sources
Files:
1 deleted
7 edited

Legend:

Unmodified
Added
Removed

  • branches/HiveStatistics/sources/HeuristicLab 3.3 Services.sln

    r11222 r12394  
    11
    22Microsoft Visual Studio Solution File, Format Version 12.00
    3 # Visual Studio 2012
     3# Visual Studio 2013
     4VisualStudioVersion = 12.0.31101.0
     5MinimumVisualStudioVersion = 10.0.40219.1
    46Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{96396439-A764-4022-A8D2-BE021449B8D1}"
    57  ProjectSection(SolutionItems) = preProject
    … …  
    2123Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Services.Hive-3.3", "HeuristicLab.Services.Hive\3.3\HeuristicLab.Services.Hive-3.3.csproj", "{CF9DA321-AC1B-4FD3-9EC3-67BC6B861BDE}"
    2224EndProject
    23 Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "Hive-3.3", "HeuristicLab.Services.Hive.Web\Hive-3.3\", "{0CA6706D-A569-45DE-A85C-4158891CC1BC}"
     25Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "Hive-3.3(1)", "HeuristicLab.Services.Hive.Web\Hive-3.3\", "{0CA6706D-A569-45DE-A85C-4158891CC1BC}"
    2426  ProjectSection(WebsiteProperties) = preProject
    2527    TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.0"
    … …  
    4143    VWDPort = "4505"
    4244    VWDVirtualPath = "/Hive-3.3"
     45    SlnRelativePath = "HeuristicLab.Services.Hive.Web\Hive-3.3\"
    4346    DefaultWebSiteLanguage = "Visual C#"
    4447  EndProjectSection
    … …  
    6770  EndProjectSection
    6871EndProject
     72Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{FF6E7A4E-9A10-4699-AB11-ECB50A36128B}"
     73  ProjectSection(SolutionItems) = preProject
     74    .nuget\NuGet.Config = .nuget\NuGet.Config
     75    .nuget\NuGet.exe = .nuget\NuGet.exe
     76    .nuget\NuGet.targets = .nuget\NuGet.targets
     77  EndProjectSection
     78EndProject
    6979Global
    70   GlobalSection(TestCaseManagementSettings) = postSolution
    71     CategoryFile = HeuristicLab 3.3 Services.vsmdi
    72   EndGlobalSection
    7380  GlobalSection(SolutionConfigurationPlatforms) = preSolution
    7481    CD_ROM|Any CPU = CD_ROM|Any CPU
    … …  
    533540    HideSolutionNode = FALSE
    534541  EndGlobalSection
     542  GlobalSection(TestCaseManagementSettings) = postSolution
     543    CategoryFile = HeuristicLab 3.3 Services.vsmdi
     544  EndGlobalSection
    535545EndGlobal

  • branches/HiveStatistics/sources/HeuristicLab.Services.Hive.JanitorService/3.3/HeuristicLab.Services.Hive.JanitorService-3.3.csproj

    r11207 r12394  
    113113  </ItemGroup>
    114114  <ItemGroup>
    115     <None Include="app.config" />
     115    <None Include="app.config">
     116      <SubType>Designer</SubType>
     117    </None>
    116118    <None Include="HeuristicLab.snk" />
    117119    <None Include="Properties\AssemblyInfo.cs.frame" />

  • branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Statistics/3.3

    • Property svn:global-ignores set to
      Scripts

  • branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Statistics/3.3/Content

    • Property svn:global-ignores set to
      themes

  • branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Statistics/3.3/Controllers/AdminDataController.cs

    r11246 r12394  
    22using System.Collections.Generic;
    33using System.Linq;
    4 using System.Web;
    54using System.Web.Mvc;
    65using HeuristicLab.Services.Hive.DataAccess;
    … …  
    98  public class AdminDataController : Controller {
    109
    11     public JsonResult UserList()
    12     {
    13       using (var db = new HiveDataContext(Settings.Default.HeuristicLab_Hive_LinqConnectionString))
    14       {
     10    public JsonResult UserList() {
     11      using (var db = new HiveDataContext(Settings.Default.HeuristicLab_Hive_LinqConnectionString)) {
    1512        var allUsers = (from users in db.DimUsers
    16                             select new { users.Name })
     13                        select new { users.Name })
    1714                            .ToList();
    1815
    … …  
    2421    }
    2522
    26     public JsonResult TaskStats(DateTime start, DateTime end, string userName=null) {
     23    public JsonResult TaskStats(DateTime start, DateTime end, string userName = null) {
    2724      using (var db = new HiveDataContext(Settings.Default.HeuristicLab_Hive_LinqConnectionString)) {
    2825        var taskStats = (from tasks in db.FactTasks
    29                         join jobs in db.DimJobs
    30                           on tasks.JobId equals jobs.JobId
    31                         where tasks.StartTime >= start &&
    32                         tasks.EndTime < end &&
    33                         (string.IsNullOrEmpty(userName) || jobs.UserName == userName)
    34                         select new { tasks.TotalWaitingTime, tasks.TotalTransferTime, tasks.TotalRuntime, tasks.NumCalculationRuns,
    35                           tasks.CoresRequired, tasks.MemoryRequired})
     26                         join jobs in db.DimJobs
     27                           on tasks.JobId equals jobs.JobId
     28                         where tasks.StartTime >= start &&
     29                         tasks.EndTime < end &&
     30                         (string.IsNullOrEmpty(userName) || jobs.UserName == userName)
     31                         select new {
     32                           tasks.TotalWaitingTime, tasks.TotalTransferTime, tasks.TotalRuntime, tasks.NumCalculationRuns,
     33                           tasks.CoresRequired, tasks.MemoryRequired
     34                         })
    3635                          .ToList();
    3736
    3837        List<KeyValuePair<string, double>> FullStats = new List<KeyValuePair<string, double>>();
    39         FullStats.Add(new KeyValuePair<string, double>("Total Waiting Time",taskStats.Sum(w => w.TotalWaitingTime)));
     38        FullStats.Add(new KeyValuePair<string, double>("Total Waiting Time", taskStats.Sum(w => w.TotalWaitingTime)));
    4039        FullStats.Add(new KeyValuePair<string, double>("Total Transfer Time", taskStats.Sum(t => t.TotalTransferTime)));
    4140        FullStats.Add(new KeyValuePair<string, double>("Total Runtime", taskStats.Sum(r => r.TotalRuntime)));
    … …  
    4948
    5049    public JsonResult MoreTaskInfo(string taskId) {
    51       using (var db = new HiveDataContext(Settings.Default.HeuristicLab_Hive_LinqConnectionString))
    52       {
     50      using (var db = new HiveDataContext(Settings.Default.HeuristicLab_Hive_LinqConnectionString)) {
    5351        var moreInfo = (from tasks in db.FactTasks
    54                          where tasks.TaskId.ToString() == taskId
    55                          select new
    56                          {
    57                            tasks.TotalWaitingTime,
    58                            tasks.TotalTransferTime,
    59                            tasks.TotalRuntime,
    60                            tasks.NumCalculationRuns,
    61                            tasks.CoresRequired,
    62                            tasks.MemoryRequired,
    63                          })
     52                        where tasks.TaskId.ToString() == taskId
     53                        select new {
     54                          tasks.TotalWaitingTime,
     55                          tasks.TotalTransferTime,
     56                          tasks.TotalRuntime,
     57                          tasks.NumCalculationRuns,
     58                          tasks.CoresRequired,
     59                          tasks.MemoryRequired,
     60                        })
    6461                          .ToList();
    6562
    … …  
    7471
    7572    public JsonResult MoreSlaveInfo(string slaveId, DateTime? start = null, DateTime? end = null) {
    76       using (var db = new HiveDataContext(Settings.Default.HeuristicLab_Hive_LinqConnectionString))
    77       {
     73      using (var db = new HiveDataContext(Settings.Default.HeuristicLab_Hive_LinqConnectionString)) {
    7874        var moreInfo = (from slaves in db.FactClientInfos
    7975                        where slaves.ClientId.ToString() == slaveId &&
    8076                        (!start.HasValue || slaves.Time >= start) &&
    8177                        (!end.HasValue || slaves.Time < end)
    82                         select new
    83                         {
     78                        select new {
    8479                          slaves.Time,
    8580                          slaves.TotalTimeIdle,
    … …  
    9287        List<List<KeyValuePair<string, string>>> AllInfo = new List<List<KeyValuePair<string, string>>>();
    9388        List<List<KeyValuePair<string, string>>> DistinctInfo = new List<List<KeyValuePair<string, string>>>();
    94         for(var i=0; i < moreInfo.Count; i++) {
     89        for (var i = 0; i < moreInfo.Count; i++) {
    9590          List<KeyValuePair<string, string>> newRow = new List<KeyValuePair<string, string>>();
    9691          newRow.Add(new KeyValuePair<string, string>("Time", moreInfo.ElementAt(i).Time.ToShortDateString() + " " + moreInfo.ElementAt(i).Time.ToShortTimeString()));
    … …  
    112107            isDistinct = false;
    113108            //Cycles through values of current row and lastRecord
    114             for (var j=0; j < row.Count; j++) {
     109            for (var j = 0; j < row.Count; j++) {
    115110              //Disregards time field from distinct checks
    116111              if (row.ElementAt(j).Key != "Time") {

  • branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Statistics/3.3/HeuristicLab.Services.Hive.Statistics-3.3.csproj

    r11053 r12394  
    2121    <IISExpressWindowsAuthentication />
    2222    <IISExpressUseClassicPipelineMode />
     23    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     24    <RestorePackages>true</RestorePackages>
    2325  </PropertyGroup>
    2426  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    … …  
    126128    <Content Include="App_Code\ExceptionHelper.cshtml" />
    127129    <None Include="Properties\AssemblyInfo.cs.frame" />
    128     <Content Include="Scripts\CollapsingSection.js" />
    129     <Content Include="Scripts\jquery.scrollstop.js" />
    130     <Content Include="Scripts\SmoothieChartResize.js" />
    131     <Content Include="Views\LoginRequired\UserTask.cshtml" />
    132     <Content Include="Views\LoginRequired\Admin.cshtml" />
    133   </ItemGroup>
    134   <ItemGroup>
     130    <Content Include="Content\themes\base\accordion.css" />
     131    <Content Include="Content\themes\base\all.css" />
     132    <Content Include="Content\themes\base\autocomplete.css" />
     133    <Content Include="Content\themes\base\base.css" />
     134    <Content Include="Content\themes\base\button.css" />
     135    <Content Include="Content\themes\base\core.css" />
     136    <Content Include="Content\themes\base\datepicker.css" />
     137    <Content Include="Content\themes\base\dialog.css" />
     138    <Content Include="Content\themes\base\draggable.css" />
    135139    <Content Include="Content\themes\base\images\ui-bg_flat_0_aaaaaa_40x100.png" />
    136140    <Content Include="Content\themes\base\images\ui-bg_flat_75_ffffff_40x100.png" />
    … …  
    146150    <Content Include="Content\themes\base\images\ui-icons_888888_256x240.png" />
    147151    <Content Include="Content\themes\base\images\ui-icons_cd0a0a_256x240.png" />
    148     <Content Include="Content\themes\base\jquery-ui.css" />
    149     <Content Include="Content\themes\base\jquery.ui.accordion.css" />
    150     <Content Include="Content\themes\base\jquery.ui.all.css" />
    151     <Content Include="Content\themes\base\jquery.ui.autocomplete.css" />
    152     <Content Include="Content\themes\base\jquery.ui.base.css" />
    153     <Content Include="Content\themes\base\jquery.ui.button.css" />
    154     <Content Include="Content\themes\base\jquery.ui.core.css" />
    155     <Content Include="Content\themes\base\jquery.ui.datepicker.css" />
    156     <Content Include="Content\themes\base\jquery.ui.dialog.css" />
    157     <Content Include="Content\themes\base\jquery.ui.progressbar.css" />
    158     <Content Include="Content\themes\base\jquery.ui.resizable.css" />
    159     <Content Include="Content\themes\base\jquery.ui.selectable.css" />
    160     <Content Include="Content\themes\base\jquery.ui.slider.css" />
    161     <Content Include="Content\themes\base\jquery.ui.tabs.css" />
    162     <Content Include="Content\themes\base\jquery.ui.theme.css" />
    163     <Content Include="Content\themes\base\minified\images\ui-bg_flat_0_aaaaaa_40x100.png" />
    164     <Content Include="Content\themes\base\minified\images\ui-bg_flat_75_ffffff_40x100.png" />
    165     <Content Include="Content\themes\base\minified\images\ui-bg_glass_55_fbf9ee_1x400.png" />
    166     <Content Include="Content\themes\base\minified\images\ui-bg_glass_65_ffffff_1x400.png" />
    167     <Content Include="Content\themes\base\minified\images\ui-bg_glass_75_dadada_1x400.png" />
    168     <Content Include="Content\themes\base\minified\images\ui-bg_glass_75_e6e6e6_1x400.png" />
    169     <Content Include="Content\themes\base\minified\images\ui-bg_glass_95_fef1ec_1x400.png" />
    170     <Content Include="Content\themes\base\minified\images\ui-bg_highlight-soft_75_cccccc_1x100.png" />
    171     <Content Include="Content\themes\base\minified\images\ui-icons_222222_256x240.png" />
    172     <Content Include="Content\themes\base\minified\images\ui-icons_2e83ff_256x240.png" />
    173     <Content Include="Content\themes\base\minified\images\ui-icons_454545_256x240.png" />
    174     <Content Include="Content\themes\base\minified\images\ui-icons_888888_256x240.png" />
    175     <Content Include="Content\themes\base\minified\images\ui-icons_cd0a0a_256x240.png" />
    176     <Content Include="Content\themes\base\minified\jquery-ui.min.css" />
    177     <Content Include="Content\themes\base\minified\jquery.ui.accordion.min.css" />
    178     <Content Include="Content\themes\base\minified\jquery.ui.autocomplete.min.css" />
    179     <Content Include="Content\themes\base\minified\jquery.ui.button.min.css" />
    180     <Content Include="Content\themes\base\minified\jquery.ui.core.min.css" />
    181     <Content Include="Content\themes\base\minified\jquery.ui.datepicker.min.css" />
    182     <Content Include="Content\themes\base\minified\jquery.ui.dialog.min.css" />
    183     <Content Include="Content\themes\base\minified\jquery.ui.progressbar.min.css" />
    184     <Content Include="Content\themes\base\minified\jquery.ui.resizable.min.css" />
    185     <Content Include="Content\themes\base\minified\jquery.ui.selectable.min.css" />
    186     <Content Include="Content\themes\base\minified\jquery.ui.slider.min.css" />
    187     <Content Include="Content\themes\base\minified\jquery.ui.tabs.min.css" />
    188     <Content Include="Content\themes\base\minified\jquery.ui.theme.min.css" />
     152    <Content Include="Content\themes\base\menu.css" />
     153    <Content Include="Content\themes\base\progressbar.css" />
     154    <Content Include="Content\themes\base\resizable.css" />
     155    <Content Include="Content\themes\base\selectable.css" />
     156    <Content Include="Content\themes\base\selectmenu.css" />
     157    <Content Include="Content\themes\base\slider.css" />
     158    <Content Include="Content\themes\base\sortable.css" />
     159    <Content Include="Content\themes\base\spinner.css" />
     160    <Content Include="Content\themes\base\tabs.css" />
     161    <Content Include="Content\themes\base\theme.css" />
     162    <Content Include="Content\themes\base\tooltip.css" />
     163    <Content Include="Scripts\CollapsingSection.js" />
     164    <None Include="Scripts\jquery-2.1.4.intellisense.js" />
     165    <Content Include="Scripts\jqPlot\plugins\jqplot.mobile.js" />
     166    <Content Include="Scripts\jqPlot\plugins\jqplot.mobile.min.js" />
     167    <Content Include="Scripts\jquery-2.1.4.js" />
     168    <Content Include="Scripts\jquery-2.1.4.min.js" />
     169    <Content Include="Scripts\jquery-ui-1.11.4.js" />
     170    <Content Include="Scripts\jquery-ui-1.11.4.min.js" />
     171    <Content Include="Scripts\jquery.scrollstop.js" />
     172    <None Include="Scripts\jquery.validate-vsdoc.js" />
     173    <Content Include="Scripts\jquery.validate.js" />
     174    <Content Include="Scripts\jquery.validate.min.js" />
     175    <Content Include="Scripts\SmoothieChartResize.js" />
     176    <Content Include="Views\LoginRequired\UserTask.cshtml" />
     177    <Content Include="Views\LoginRequired\Admin.cshtml" />
     178  </ItemGroup>
     179  <ItemGroup>
    189180    <Content Include="Content\hl-logo.png" />
    190181    <Content Include="Global.asax" />
    191182    <None Include="Properties\PublishProfiles\HiveStatistics-3.3.pubxml" />
    192     <None Include="Scripts\jquery-1.8.2.intellisense.js" />
    193183    <Content Include="HeuristicLab.ico" />
    194184    <Content Include="Scripts\jqPlot\changes.txt" />
    … …  
    267257    <Content Include="Scripts\jqPlot\README.txt" />
    268258    <Content Include="Scripts\jqPlot\usage.txt" />
    269     <Content Include="Scripts\jquery-1.8.2.js" />
    270     <Content Include="Scripts\jquery-1.8.2.min.js" />
    271     <None Include="Scripts\jquery.validate-vsdoc.js" />
    272     <Content Include="Scripts\jquery-ui-1.8.24.js" />
    273     <Content Include="Scripts\jquery-ui-1.8.24.min.js" />
     259    <Content Include="Scripts\jquery-2.1.4.min.map" />
    274260    <Content Include="Scripts\jquery.unobtrusive-ajax.js" />
    275261    <Content Include="Scripts\jquery.unobtrusive-ajax.min.js" />
    276     <Content Include="Scripts\jquery.validate.js" />
    277     <Content Include="Scripts\jquery.validate.min.js" />
    278262    <Content Include="Scripts\jquery.validate.unobtrusive.js" />
    279263    <Content Include="Scripts\jquery.validate.unobtrusive.min.js" />
    280     <Content Include="Scripts\modernizr-2.6.2.js" />
    281264    <Content Include="Scripts\smoothie.js" />
    282     <Content Include="Web.config" />
     265    <Content Include="Web.config">
     266      <SubType>Designer</SubType>
     267    </Content>
    283268    <Content Include="Web.Debug.config">
    284269      <DependentUpon>Web.config</DependentUpon>
    … …  
    302287  <ItemGroup>
    303288    <Folder Include="App_Data\" />
     289    <Folder Include="Content\themes\base\minified\images\" />
    304290    <Folder Include="Filters\" />
    305291  </ItemGroup>
    306292  <ItemGroup>
    307     <Content Include="packages.config" />
     293    <Content Include="packages.config">
     294      <SubType>Designer</SubType>
     295    </Content>
    308296  </ItemGroup>
    309297  <ItemGroup>
    … …  
    354342call PreBuildEvent.cmd</PreBuildEvent>
    355343  </PropertyGroup>
     344  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
     345  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     346    <PropertyGroup>
     347      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     348    </PropertyGroup>
     349    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
     350  </Target>
    356351  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
    357352       Other similar extension points exist, see Microsoft.Common.targets.

  • branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Statistics/3.3/packages.config

    r11222 r12394  
    33  <package id="Antlr" version="3.4.1.9004" targetFramework="net40" />
    44  <package id="jqPlot" version="1.0.8" targetFramework="net40" />
    5   <package id="jQuery" version="2.1.1" targetFramework="net40" />
    6   <package id="jQuery.UI.Combined" version="1.10.4" targetFramework="net40" />
    7   <package id="jQuery.Validation" version="1.13.0" targetFramework="net40" />
     5  <package id="jQuery" version="2.1.4" targetFramework="net40" />
     6  <package id="jQuery.UI.Combined" version="1.11.4" targetFramework="net40" />
     7  <package id="jQuery.Validation" version="1.13.1" targetFramework="net40" />
    88  <package id="Microsoft.AspNet.Mvc" version="4.0.30506.0" targetFramework="net40" />
    99  <package id="Microsoft.AspNet.Mvc.FixedDisplayModes" version="1.0.0" targetFramework="net40" />
Note: See TracChangeset for help on using the changeset viewer.