Skip to content
Snippets Groups Projects
Commit 11f21c26 authored by Marcel Nellesen's avatar Marcel Nellesen
Browse files

Adjusted Model (coscine/issues#1051)

parent fafd139f
Branches
No related tags found
1 merge request!98Topic/1051 basic reporting
Show whitespace changes
Inline Side-by-side
Showing
with 38 additions and 17 deletions
src/Database.T4/DataModel/CsDatabase.tt
+ 1
− 1
View file @ 11f21c26
......@@ -4,7 +4,7 @@
<#@ include file="$(ProjectDir)\LinqToDB.Templates\PluralizationService.ttinclude" #>
<#@ assembly name="$(ProjectDir)..\packages\Coscine.Configuration.1.5.0\lib\net461\Coscine.Configuration.dll"#>
<#@ assembly name="$(ProjectDir)..\packages\Coscine.Migrations.1.8.0-topic-1051-basic0002\lib\net461\Coscine.Migrations.dll" #>
<#@ assembly name="$(ProjectDir)..\packages\Coscine.Migrations.1.8.0-topic-1051-basic0005\lib\net461\Coscine.Migrations.dll" #>
<#@ assembly name="$(ProjectDir)..\packages\Coscine.Database.Helpers.1.1.0\lib\net461\Coscine.Database.Helpers.dll" #>
<#@ assembly name="$(ProjectDir)..\packages\Microsoft.Extensions.DependencyInjection.2.0.0\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.dll"#>
......
src/Database.T4/Database.T4.csproj
+ 1
− 1
View file @ 11f21c26
......@@ -50,7 +50,7 @@
<HintPath>..\packages\Coscine.Database.Helpers.1.1.0\lib\net461\Coscine.Database.Helpers.dll</HintPath>
</Reference>
<Reference Include="Coscine.Migrations, Version=1.8.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Coscine.Migrations.1.8.0-topic-1051-basic0002\lib\net461\Coscine.Migrations.dll</HintPath>
<HintPath>..\packages\Coscine.Migrations.1.8.0-topic-1051-basic0005\lib\net461\Coscine.Migrations.dll</HintPath>
</Reference>
<Reference Include="FluentMigrator, Version=3.2.8.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL">
<HintPath>..\packages\FluentMigrator.3.2.8\lib\net461\FluentMigrator.dll</HintPath>
......
src/Database.T4/Properties/AssemblyInfo.cs
+ 1
− 1
View file @ 11f21c26
......@@ -11,6 +11,6 @@ using System.Reflection;
[assembly: AssemblyProduct("Database.T4")]
[assembly: AssemblyVersion("1.25.0")]
[assembly: AssemblyFileVersion("1.25.0")]
[assembly: AssemblyInformationalVersion("1.25.0-topic-1051-basic0001")]
[assembly: AssemblyInformationalVersion("1.25.0-topic-1051-basic0002")]
[assembly: AssemblyCopyright("2020 IT Center, RWTH Aachen University")]
src/Database.T4/packages.config
+ 1
− 1
View file @ 11f21c26
......@@ -3,7 +3,7 @@
<package id="Consul" version="0.7.2.6" targetFramework="net461" />
<package id="Coscine.Configuration" version="1.5.0" targetFramework="net461" />
<package id="Coscine.Database.Helpers" version="1.1.0" targetFramework="net461" />
<package id="Coscine.Migrations" version="1.8.0-topic-1051-basic0002" targetFramework="net461" />
<package id="Coscine.Migrations" version="1.8.0-topic-1051-basic0005" targetFramework="net461" />
<package id="FluentMigrator" version="3.2.8" targetFramework="net461" />
<package id="FluentMigrator.Abstractions" version="3.2.8" targetFramework="net461" />
<package id="FluentMigrator.Extensions.Oracle" version="3.2.8" targetFramework="net461" />
......
src/Database.Tests/Database.Tests.csproj
+ 1
− 1
View file @ 11f21c26
......@@ -44,7 +44,7 @@
<HintPath>..\packages\Coscine.Database.Helpers.1.1.0\lib\net461\Coscine.Database.Helpers.dll</HintPath>
</Reference>
<Reference Include="Coscine.Migrations, Version=1.8.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Coscine.Migrations.1.8.0-topic-1051-basic0002\lib\net461\Coscine.Migrations.dll</HintPath>
<HintPath>..\packages\Coscine.Migrations.1.8.0-topic-1051-basic0005\lib\net461\Coscine.Migrations.dll</HintPath>
</Reference>
<Reference Include="FluentMigrator, Version=3.2.8.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL">
<HintPath>..\packages\FluentMigrator.3.2.8\lib\net461\FluentMigrator.dll</HintPath>
......
src/Database.Tests/Properties/AssemblyInfo.cs
+ 1
− 1
View file @ 11f21c26
......@@ -11,6 +11,6 @@ using System.Reflection;
[assembly: AssemblyProduct("Database.Tests")]
[assembly: AssemblyVersion("1.25.0")]
[assembly: AssemblyFileVersion("1.25.0")]
[assembly: AssemblyInformationalVersion("1.25.0-topic-1051-basic0001")]
[assembly: AssemblyInformationalVersion("1.25.0-topic-1051-basic0002")]
[assembly: AssemblyCopyright("2020 IT Center, RWTH Aachen University")]
src/Database.Tests/packages.config
+ 1
− 1
View file @ 11f21c26
......@@ -3,7 +3,7 @@
<package id="Consul" version="0.7.2.6" targetFramework="net461" />
<package id="Coscine.Configuration" version="1.5.0" targetFramework="net461" />
<package id="Coscine.Database.Helpers" version="1.1.0" targetFramework="net461" />
<package id="Coscine.Migrations" version="1.8.0-topic-1051-basic0002" targetFramework="net461" />
<package id="Coscine.Migrations" version="1.8.0-topic-1051-basic0005" targetFramework="net461" />
<package id="FluentMigrator" version="3.2.8" targetFramework="net461" />
<package id="FluentMigrator.Abstractions" version="3.2.8" targetFramework="net461" />
<package id="FluentMigrator.Extensions.Oracle" version="3.2.8" targetFramework="net461" />
......
src/Database/Models/KpiModel.cs
+ 7
− 0
View file @ 11f21c26
using Coscine.Database.DataModel;
using Coscine.Database.Util;
using System;
using System.Collections.Generic;
using System.Linq;
......@@ -23,5 +24,11 @@ namespace Coscine.Database.Models
{
databaseObject.Id = id;
}
public int MarkAsSent(Kpi databaseObject)
{
databaseObject.SentSuccessfully = true;
return Update(databaseObject);
}
}
}
src/Database/Properties/AssemblyInfo.cs
+ 1
− 1
View file @ 11f21c26
......@@ -11,6 +11,6 @@ using System.Reflection;
[assembly: AssemblyProduct("Database")]
[assembly: AssemblyVersion("1.25.0")]
[assembly: AssemblyFileVersion("1.25.0")]
[assembly: AssemblyInformationalVersion("1.25.0-topic-1051-basic0001")]
[assembly: AssemblyInformationalVersion("1.25.0-topic-1051-basic0002")]
[assembly: AssemblyCopyright("2020 IT Center, RWTH Aachen University")]
src/Database/ReturnObjects/KpiObject.cs
+ 23
− 9
View file @ 11f21c26
......@@ -10,19 +10,33 @@ namespace Coscine.Database.ReturnObjects
class KpiObject
{
public Guid Id { get; set; }
public string Label { get; set; }
public string MeasurementID { get; set; }
public string Ikz { get; set; }
public int Count { get; set; }
public DateTime LastUpdate { get; set; }
public double? Value { get; set; }
public DateTime? Start { get; set; }
public DateTime? End { get; set; }
public string AdditionalInfo { get; set; }
public string AdditionalInfo1 { get; set; }
public string AdditionalInfo2 { get; set; }
public string AdditionalInfo3 { get; set; }
public string AdditionalInfo4 { get; set; }
public string AdditionalInfo5 { get; set; }
public bool SentSuccessfully { get; set; }
public KpiObject(Guid id, string label, DateTime lastUpdate, string ikz = null, int count = 0, bool sentSuccessfully = false)
public KpiObject(Guid id, string measurementId, string ikz, double value, DateTime start, DateTime end, string additionalInfo = "", string additionalInfo1 = "", string additionalInfo2 = "", string additionalInfo3 = "", string additionalInfo4 = "", string additionalInfo5 = "", bool sentSuccessfully = false)
{
Id = id;
Label = label;
Ikz = ikz != null ? ikz : "external";
Count = count;
LastUpdate = lastUpdate;
MeasurementID = measurementId;
Ikz = ikz;
Value = value;
Start = start;
End = end;
AdditionalInfo = additionalInfo;
AdditionalInfo1 = additionalInfo1;
AdditionalInfo2 = additionalInfo2;
AdditionalInfo3 = additionalInfo3;
AdditionalInfo4 = additionalInfo4;
AdditionalInfo5 = additionalInfo5;
SentSuccessfully = sentSuccessfully;
}
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment