Changeset 12477


Ignore:
Timestamp:
06/18/15 17:28:03 (7 years ago)
Author:
dglaser
Message:

#2388: Created WebApp.Statistics plugin

Location:
branches/HiveStatistics/sources
Files:
31 added
15 edited

Legend:

Unmodified
Added
Removed
  • branches/HiveStatistics/sources/HeuristicLab 3.3 Services.sln

    r12428 r12477  
    6969    .nuget\NuGet.targets = .nuget\NuGet.targets
    7070  EndProjectSection
     71EndProject
     72Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Services.WebApp.Statistics-3.3", "HeuristicLab.Services.WebApp.Statistics\3.3\HeuristicLab.Services.WebApp.Statistics-3.3.csproj", "{1BC54353-7D4C-4734-BAA9-3D11B3242B59}"
    7173EndProject
    7274Global
     
    243245    {2351DBE7-D0E1-44F9-9CE9-2F0F5E580572}.Release|x86.ActiveCfg = Release|x86
    244246    {2351DBE7-D0E1-44F9-9CE9-2F0F5E580572}.Release|x86.Build.0 = Release|x86
     247    {1BC54353-7D4C-4734-BAA9-3D11B3242B59}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     248    {1BC54353-7D4C-4734-BAA9-3D11B3242B59}.Debug|Any CPU.Build.0 = Debug|Any CPU
     249    {1BC54353-7D4C-4734-BAA9-3D11B3242B59}.Debug|x64.ActiveCfg = Debug|Any CPU
     250    {1BC54353-7D4C-4734-BAA9-3D11B3242B59}.Debug|x86.ActiveCfg = Debug|Any CPU
     251    {1BC54353-7D4C-4734-BAA9-3D11B3242B59}.Release|Any CPU.ActiveCfg = Release|Any CPU
     252    {1BC54353-7D4C-4734-BAA9-3D11B3242B59}.Release|Any CPU.Build.0 = Release|Any CPU
     253    {1BC54353-7D4C-4734-BAA9-3D11B3242B59}.Release|x64.ActiveCfg = Release|Any CPU
     254    {1BC54353-7D4C-4734-BAA9-3D11B3242B59}.Release|x86.ActiveCfg = Release|Any CPU
    245255  EndGlobalSection
    246256  GlobalSection(SolutionProperties) = preSolution
  • branches/HiveStatistics/sources/HeuristicLab.Services.Hive.DataAccess/3.3/Daos/HiveStatistics/DimJobDao.cs

    r12468 r12477  
    3131      return Table.SingleOrDefault(x => x.JobId == id);
    3232    }
     33
     34    public IQueryable<DimJob> GetByUserId(Guid id) {
     35      return Table.Where(x => x.UserId == id);
     36    }
    3337  }
    3438}
  • branches/HiveStatistics/sources/HeuristicLab.Services.Hive.DataAccess/3.3/Daos/HiveStatistics/FactTaskDao.cs

    r12468 r12477  
    4040    }
    4141
     42    public IQueryable<FactTask> GetByJobId(Guid id) {
     43      return Table.Where(x => x.JobId == id);
     44    }
     45
    4246    public override void Delete(IEnumerable<Guid> ids) {
    4347      string paramIds = string.Join(",", ids.Select(x => string.Format("'{0}'", x)));
  • branches/HiveStatistics/sources/HeuristicLab.Services.Hive.DataAccess/3.3/HiveDataContext.dbml

    r12468 r12477  
    11<?xml version="1.0" encoding="utf-8"?><Database Name="HeuristicLab.Hive-3.3" Class="HiveDataContext" xmlns="http://schemas.microsoft.com/linqtosql/dbml/2007">
    2   <Connection Mode="AppSettings" ConnectionString="Data Source=localhost;Initial Catalog=HeuristicLab.Hive-3.3;Integrated Security=True" SettingsObjectName="HeuristicLab.Services.Hive.DataAccess.Settings" SettingsPropertyName="HeuristicLab_Hive_LinqConnectionString" Provider="System.Data.SqlClient" />
     2  <Connection Mode="AppSettings" ConnectionString="Data Source=.\SQLEXPRESS;Initial Catalog=HeuristicLab.Hive-3.3;Integrated Security=True" SettingsObjectName="HeuristicLab.Services.Hive.DataAccess.Settings" SettingsPropertyName="HeuristicLab_Hive_LinqConnectionString" Provider="System.Data.SqlClient" />
    33  <Table Name="dbo.AssignedResources" Member="AssignedResources">
    44    <Type Name="AssignedResource">
     
    251251      <Column Name="JobName" Type="System.String" DbType="VarChar(MAX) NOT NULL" CanBeNull="false" />
    252252      <Column Name="UserName" Type="System.String" DbType="VarChar(MAX) NOT NULL" CanBeNull="false" />
     253      <Column Member="DateCreated" Type="System.DateTime" CanBeNull="false" />
    253254      <Association Name="DimJob_FactTask" Member="FactTasks" ThisKey="JobId" OtherKey="JobId" Type="FactTask" />
    254255    </Type>
  • branches/HiveStatistics/sources/HeuristicLab.Services.Hive.DataAccess/3.3/HiveDataContext.dbml.layout

    r12468 r12477  
    259259      </nestedChildShapes>
    260260    </classShape>
    261     <classShape Id="e0cb8641-a75e-4b9f-beda-3218c56938b1" absoluteBounds="8.125, 9.125, 2, 1.5785953776041666">
     261    <classShape Id="e0cb8641-a75e-4b9f-beda-3218c56938b1" absoluteBounds="8.125, 9.125, 2, 1.7708968098958344">
    262262      <DataClassMoniker Name="/HiveDataContext/DimJob" />
    263263      <nestedChildShapes>
    264         <elementListCompartment Id="6b9e8260-7e4b-4357-9c26-eebebfd69504" absoluteBounds="8.14, 9.585, 1.9700000000000002, 1.0185953776041665" name="DataPropertiesCompartment" titleTextColor="Black" itemTextColor="Black" />
     264        <elementListCompartment Id="6b9e8260-7e4b-4357-9c26-eebebfd69504" absoluteBounds="8.14, 9.585, 1.9700000000000002, 1.2108968098958333" name="DataPropertiesCompartment" titleTextColor="Black" itemTextColor="Black" />
    265265      </nestedChildShapes>
    266266    </classShape>
     
    290290      </nodes>
    291291    </associationConnector>
    292     <associationConnector edgePoints="[(8.5 : 10.7035953776042); (8.5 : 11.25)]" fixedFrom="NotFixed" fixedTo="NotFixed">
     292    <associationConnector edgePoints="[(8.5 : 10.8958968098958); (8.5 : 11.25)]" fixedFrom="Algorithm" fixedTo="Algorithm">
    293293      <AssociationMoniker Name="/HiveDataContext/DimJob/DimJob_FactTask" />
    294294      <nodes>
  • branches/HiveStatistics/sources/HeuristicLab.Services.Hive.DataAccess/3.3/HiveDataContext.designer.cs

    r12468 r12477  
    54155415    private string _UserName;
    54165416   
     5417    private System.DateTime _DateCreated;
     5418   
    54175419    private EntitySet<FactTask> _FactTasks;
    54185420   
     
    54295431    partial void OnUserNameChanging(string value);
    54305432    partial void OnUserNameChanged();
     5433    partial void OnDateCreatedChanging(System.DateTime value);
     5434    partial void OnDateCreatedChanged();
    54315435    #endregion
    54325436   
     
    55135517          this.SendPropertyChanged("UserName");
    55145518          this.OnUserNameChanged();
     5519        }
     5520      }
     5521    }
     5522   
     5523    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DateCreated")]
     5524    public System.DateTime DateCreated
     5525    {
     5526      get
     5527      {
     5528        return this._DateCreated;
     5529      }
     5530      set
     5531      {
     5532        if ((this._DateCreated != value))
     5533        {
     5534          this.OnDateCreatedChanging(value);
     5535          this.SendPropertyChanging();
     5536          this._DateCreated = value;
     5537          this.SendPropertyChanged("DateCreated");
     5538          this.OnDateCreatedChanged();
    55155539        }
    55165540      }
  • branches/HiveStatistics/sources/HeuristicLab.Services.Hive.DataAccess/3.3/SQL Scripts/Initialize Hive Database.sql

    r12468 r12477  
    219219);
    220220CREATE TABLE [statistics].[DimJob] (
    221     [JobId]    UNIQUEIDENTIFIER NOT NULL,
    222     [UserId]   UNIQUEIDENTIFIER NOT NULL,
    223     [JobName]  VARCHAR (MAX)    NOT NULL,
    224     [UserName] VARCHAR (MAX)    NOT NULL,
     221    [JobId]       UNIQUEIDENTIFIER NOT NULL,
     222    [UserId]      UNIQUEIDENTIFIER NOT NULL,
     223    [JobName]     VARCHAR (MAX)    NOT NULL,
     224    [UserName]    VARCHAR (MAX)    NOT NULL,
     225  [DateCreated] DATETIME       NOT NULL,
    225226    CONSTRAINT [PK_DimJob] PRIMARY KEY CLUSTERED ([JobId] ASC)
    226227);
  • branches/HiveStatistics/sources/HeuristicLab.Services.Hive.DataAccess/3.3/Settings.Designer.cs

    r11623 r12477  
    22// <auto-generated>
    33//     This code was generated by a tool.
    4 //     Runtime Version:4.0.30319.34014
     4//     Runtime Version:4.0.30319.34209
    55//
    66//     Changes to this file may cause incorrect behavior and will be lost if
     
    2727        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
    2828        [global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.ConnectionString)]
    29         [global::System.Configuration.DefaultSettingValueAttribute("Data Source=localhost;Initial Catalog=HeuristicLab.Hive-3.3;Integrated Security=T" +
    30             "rue;")]
     29        [global::System.Configuration.DefaultSettingValueAttribute("Data Source=.\\SQLEXPRESS;Initial Catalog=HeuristicLab.Hive-3.3;Integrated Securit" +
     30            "y=True;")]
    3131        public string HeuristicLab_Hive_LinqConnectionString {
    3232            get {
  • branches/HiveStatistics/sources/HeuristicLab.Services.Hive.DataAccess/3.3/Settings.settings

    r6983 r12477  
    66      <DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
    77&lt;SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
    8   &lt;ConnectionString&gt;Data Source=localhost;Initial Catalog=HeuristicLab.Hive-3.3;Integrated Security=True;&lt;/ConnectionString&gt;
     8  &lt;ConnectionString&gt;Data Source=.\SQLEXPRESS;Initial Catalog=HeuristicLab.Hive-3.3;Integrated Security=True;&lt;/ConnectionString&gt;
    99  &lt;ProviderName&gt;System.Data.SqlClient&lt;/ProviderName&gt;
    1010&lt;/SerializableConnectionString&gt;</DesignTimeValue>
    11       <Value Profile="(Default)">Data Source=localhost;Initial Catalog=HeuristicLab.Hive-3.3;Integrated Security=True;</Value>
     11      <Value Profile="(Default)">Data Source=.\SQLEXPRESS;Initial Catalog=HeuristicLab.Hive-3.3;Integrated Security=True;</Value>
    1212    </Setting>
    1313    <Setting Name="LongRunningDatabaseCommandTimeout" Type="System.TimeSpan" Scope="Application">
  • branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/HiveJanitor.cs

    r12468 r12477  
    6262      while (!stop) {
    6363        try {
    64           LogFactory.GetLogger(typeof(HiveJanitor).Namespace).Log("HiveJanitor: starting cleanup");
     64          LogFactory.GetLogger(typeof(HiveJanitor).Namespace).Log("HiveJanitor: starting cleanup.");
    6565          bool cleanup = false;
    6666          trans.UseTransaction(() => {
     
    7575            eventManager.Cleanup();
    7676          }
    77           LogFactory.GetLogger(typeof(HiveJanitor).Namespace).Log("HiveJanitor: cleanup finished");
     77          LogFactory.GetLogger(typeof(HiveJanitor).Namespace).Log("HiveJanitor: cleanup finished.");
    7878        }
    7979        catch (Exception e) {
     
    8888      while (!stop) {
    8989        try {
    90           LogFactory.GetLogger(typeof(HiveJanitor).Namespace).Log("HiveJanitor: starting generate statistics");
     90          LogFactory.GetLogger(typeof(HiveJanitor).Namespace).Log("HiveJanitor: starting generate statistics.");
    9191          statisticsGenerator.GenerateStatistics();
    92           LogFactory.GetLogger(typeof(HiveJanitor).Namespace).Log("HiveJanitor: generate statistics finished");
     92          LogFactory.GetLogger(typeof(HiveJanitor).Namespace).Log("HiveJanitor: generate statistics finished.");
    9393        }
    9494        catch (Exception e) {
  • branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/HiveStatisticsGenerator.cs

    r12468 r12477  
    106106          UserId = x.OwnerUserId,
    107107          JobName = x.Name ?? string.Empty,
     108          DateCreated = x.DateCreated
    108109        })
    109110        .ToList();
     
    112113        JobName = x.JobName,
    113114        UserId = x.UserId,
    114         UserName = GetUserName(x.UserId)
     115        UserName = GetUserName(x.UserId),
     116        DateCreated = x.DateCreated
    115117      }));
    116118    }
  • branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/Properties/Settings.Designer.cs

    r12441 r12477  
    8989    [global::System.Configuration.ApplicationScopedSettingAttribute()]
    9090    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
    91     [global::System.Configuration.DefaultSettingValueAttribute("00:05:00")]
     91    [global::System.Configuration.DefaultSettingValueAttribute("00:01:00")]
    9292    public global::System.TimeSpan GenerateStatisticsInterval {
    9393      get {
  • branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Status/3.3/status.js

    r12428 r12477  
    2323            name: 'History',
    2424            route: '#/status/history',
    25             icon: 'glyphicon glyphicon-stats'
     25            icon: 'glyphicon glyphicon-calendar'
    2626        }]
    2727    });
  • branches/HiveStatistics/sources/HeuristicLab.Services.WebApp/3.3/HeuristicLab.Services.WebApp-3.3.csproj

    r12467 r12477  
    261261    </ProjectReference>
    262262  </ItemGroup>
     263  <ItemGroup>
     264    <None Include="Properties\PublishProfiles\WebApp.pubxml" />
     265  </ItemGroup>
    263266  <PropertyGroup>
    264267    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
  • branches/HiveStatistics/sources/HeuristicLab.Services.WebApp/3.3/HeuristicLab.Services.WebApp-3.3.csproj.user

    r12428 r12477  
    11<?xml version="1.0" encoding="utf-8"?>
    22<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     3  <PropertyGroup>
     4    <NameOfLastUsedPublishProfile>WebApp</NameOfLastUsedPublishProfile>
     5  </PropertyGroup>
    36  <ProjectExtensions>
    47    <VisualStudio>
Note: See TracChangeset for help on using the changeset viewer.