Skip to content

Commit f4c9690

Browse files
sventhielsventhiel
committed
Merge branch 'rc' of https://github.com/bexis2/core into rc
2 parents fc62b37 + 71bfcec commit f4c9690

File tree

151 files changed

+11120
-1003
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

151 files changed

+11120
-1003
lines changed

‎.editorconfig‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,9 @@ csharp_prefer_simple_using_statement = true:suggestion
8484
csharp_style_namespace_declarations = block_scoped:silent
8585
csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
8686

87+
# CS1591: Fehledes XML-Kommentar für öffentlich sichtbaren Typ oder Element
88+
dotnet_diagnostic.CS1591.severity = none
89+
8790
[*.vb]
8891
#### Benennungsstile ####
8992

‎BExIS++.sln‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1606,8 +1606,8 @@ Global
16061606
{37402CAB-EB81-4D08-8791-8653949C0FEB} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
16071607
EndGlobalSection
16081608
GlobalSection(ExtensibilityGlobals) = postSolution
1609-
SolutionGuid = {9B6E4921-8EBA-487D-A098-3E473A0EAC64}
16101609
EnterpriseLibraryConfigurationToolBinariesPath = packages\Unity.2.1.505.0\lib\NET35;packages\Unity.2.1.505.2\lib\NET35
1610+
SolutionGuid = {9B6E4921-8EBA-487D-A098-3E473A0EAC64}
16111611
EndGlobalSection
16121612
GlobalSection(SubversionScc) = preSolution
16131613
Svn-Managed = True

‎Components/App/BExIS.App.Bootstrap/Attributes/BExISAuthorizeAttribute.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
using BExIS.Security.Services.Authorization;
55
using BExIS.Security.Services.Objects;
66
using BExIS.Security.Services.Subjects;
7-
using BExIS.Utils.Config;
87
using System;
98
using System.Linq;
109
using System.Net;
1110
using System.Web;
1211
using System.Web.Mvc;
12+
using BExIS.Utils.Config;
1313

1414
namespace BExIS.App.Bootstrap.Attributes
1515
{

‎Components/App/BExIS.App.Bootstrap/BExIS.App.Bootstrap.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@
132132
<Name>BExIS.Ext.Services</Name>
133133
</ProjectReference>
134134
<ProjectReference Include="..\..\Utils\BExIS.Utils.Config\BExIS.Utils.Config.csproj">
135-
<Project>{6ead7d02-02f7-42ff-85e4-90bb892d3846}</Project>
135+
<Project>{6EAD7D02-02F7-42FF-85E4-90BB892D3846}</Project>
136136
<Name>BExIS.Utils.Config</Name>
137137
</ProjectReference>
138138
<ProjectReference Include="..\..\Utils\BExIS.Utils.Data\BExIS.Utils.Data.csproj">

‎Components/App/BExIS.App.Testing/BExIS.App.Testing.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@
103103
</ItemGroup>
104104
<ItemGroup>
105105
<ProjectReference Include="..\..\Utils\BExIS.Utils.Config\BExIS.Utils.Config.csproj">
106-
<Project>{6ead7d02-02f7-42ff-85e4-90bb892d3846}</Project>
106+
<Project>{6EAD7D02-02F7-42FF-85E4-90BB892D3846}</Project>
107107
<Name>BExIS.Utils.Config</Name>
108108
</ProjectReference>
109109
<ProjectReference Include="..\..\Vaiona\Vaiona.IoC\Vaiona.IoC.csproj">

‎Components/DLM/BExIS.Dlm.Entities/BExIS.Dlm.Entities.csproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,8 @@
6262
<ItemGroup>
6363
<Compile Include="Administration\ResearchPlan.cs" />
6464
<Compile Include="Common\BaseUsage.cs" />
65+
<Compile Include="Curation\CurationEntry.cs" />
66+
<Compile Include="Curation\CurationNote.cs" />
6567
<Compile Include="DataStructure\AggregateFunction.cs" />
6668
<Compile Include="DataStructure\Classifier.cs" />
6769
<Compile Include="DataStructure\Constraint.cs" />

‎Components/DLM/BExIS.Dlm.Entities/Curation/CurationEntry.cs‎

Lines changed: 118 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,118 @@
1+
using BExIS.Dlm.Entities.Data;
2+
using BExIS.Security.Entities.Subjects;
3+
using System;
4+
using System.Collections.Generic;
5+
using System.Linq;
6+
using Vaiona.Entities.Common;
7+
8+
namespace BExIS.Dlm.Entities.Curation
9+
{
10+
public class CurationEntry:BaseEntity
11+
{
12+
public CurationEntry()
13+
{
14+
// Initialize properties with empty values
15+
Id = 0;
16+
Topic = string.Empty;
17+
Type = CurationEntryType.None;
18+
Dataset = null;
19+
Name = string.Empty;
20+
Description = string.Empty;
21+
Solution = string.Empty;
22+
Position = 0;
23+
Source = string.Empty;
24+
Notes = new List<CurationNote>();
25+
CreationDate = DateTime.MinValue;
26+
Creator = null;
27+
UserIsDone = false;
28+
IsApproved = false;
29+
LastChangeDatetime_User = DateTime.MinValue;
30+
LastChangeDatetime_Curator = DateTime.MinValue;
31+
}
32+
33+
public CurationEntry(string topic, CurationEntryType type, Dataset dataset, string name, string description, string solution, int position, string source, IEnumerable<CurationNote> notes, DateTime creationDate, User creator, bool userIsDone, bool isApproved, DateTime lastChangeDatetime_User, DateTime lastChangeDatetime_Curator)
34+
{
35+
Id = 0;
36+
Topic = topic;
37+
Type = type;
38+
Dataset = dataset;
39+
Name = name;
40+
Description = description;
41+
Solution = solution;
42+
Position = position;
43+
Source = source;
44+
Notes = notes;
45+
CreationDate = creationDate;
46+
Creator = creator;
47+
UserIsDone = userIsDone;
48+
IsApproved = isApproved;
49+
LastChangeDatetime_User = lastChangeDatetime_User;
50+
LastChangeDatetime_Curator = lastChangeDatetime_Curator;
51+
}
52+
53+
public virtual string Topic { get; set; }
54+
public virtual CurationEntryType Type { get; set; }
55+
public virtual Dataset Dataset { get; set; }
56+
public virtual string Name { get; set; }
57+
public virtual string Description { get; set; }
58+
public virtual string Solution { get; set; }
59+
public virtual int Position { get; set; }
60+
public virtual string Source { get; set; }
61+
public virtual IEnumerable<CurationNote> Notes { get; set; }
62+
public virtual DateTime CreationDate { get; set; }
63+
public virtual User Creator { get; set; }
64+
public virtual bool UserIsDone { get; set; }
65+
public virtual bool IsApproved { get; set; }
66+
public virtual DateTime LastChangeDatetime_User { get; set; }
67+
public virtual DateTime LastChangeDatetime_Curator { get; set; }
68+
public static CurationUserType GetCurationUserType(User user)
69+
{
70+
if (user.Groups.Any(g => g.Name.Equals("curator", StringComparison.CurrentCultureIgnoreCase)))
71+
{
72+
return CurationUserType.Curator;
73+
}
74+
return CurationUserType.User;
75+
}
76+
}
77+
78+
#region curation types
79+
80+
public enum CurationEntryType
81+
{
82+
None,
83+
StatusEntryItem,
84+
GeneralEntryItem,
85+
MetadataEntryItem,
86+
PrimaryDataEntryItem,
87+
DatastrutcureEntryItem,
88+
LinkEntryItem,
89+
AttachmentEntryItem
90+
}
91+
92+
public class MetadataEntryItem
93+
{
94+
public string Name { get; set; }
95+
public string Value { get; set; }
96+
public string Path { get; set; }
97+
public long Id { get; set; }
98+
99+
}
100+
101+
public class PrimaryDataEntryItem
102+
{
103+
public string Column { get; set; }
104+
public int Row { get; set; }
105+
public string Value { get; set; }
106+
107+
}
108+
109+
public class DataStructureEntryItem
110+
{
111+
public string VarName { get; set; }
112+
public string Type { get; set; }
113+
public string Value { get; set; }
114+
115+
}
116+
117+
#endregion
118+
}

‎Components/DLM/BExIS.Dlm.Entities/Curation/CurationNote.cs‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
using BExIS.Security.Entities.Subjects;
2+
using System;
3+
using Vaiona.Entities.Common;
4+
5+
namespace BExIS.Dlm.Entities.Curation
6+
{
7+
public class CurationNote: BaseEntity
8+
{
9+
public virtual CurationUserType UserType { get; set; }
10+
public virtual DateTime CreationDate { get; set; }
11+
public virtual string Comment { get; set; }
12+
public virtual User User { get; set; }
13+
14+
public CurationNote()
15+
{
16+
Id = 0;
17+
UserType = CurationUserType.User;
18+
CreationDate = DateTime.Now;
19+
Comment = "";
20+
User = null;
21+
}
22+
23+
public CurationNote(int id, CurationUserType userType, DateTime creationDate, string comment, User user)
24+
{
25+
Id = id;
26+
UserType = userType;
27+
CreationDate = creationDate;
28+
Comment = comment;
29+
User = user;
30+
}
31+
32+
public CurationNote(User user, string comment)
33+
{
34+
Id = 0;
35+
UserType = CurationEntry.GetCurationUserType(user);
36+
CreationDate = DateTime.Now;
37+
Comment = comment;
38+
User = user;
39+
}
40+
41+
}
42+
43+
public enum CurationUserType
44+
{
45+
User,
46+
Curator
47+
}
48+
}

‎Components/DLM/BExIS.Dlm.Orm.NH/BExIS.Dlm.Orm.NH.csproj‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,14 @@
6666
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
6767
</Content>
6868
<Content Include="Mappings\Default\Base\BaseEntityProperties.xml" />
69+
<Content Include="Mappings\Default\Curation\CurationEntry.hbm.xml">
70+
<SubType>Designer</SubType>
71+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
72+
</Content>
73+
<Content Include="Mappings\Default\Curation\CurationNote.hbm.xml">
74+
<SubType>Designer</SubType>
75+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
76+
</Content>
6977
<Content Include="Mappings\Default\DataStructure\AggregateFunction.hbm.xml">
7078
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
7179
</Content>

‎Components/DLM/BExIS.Dlm.Orm.NH/Mappings/Default/Curation/CurationEntry.hbm.xml‎

Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
<!--
2+
<?xml version="1.0" encoding="utf-8" ?>
3+
<!DOCTYPE hibernate-mapping [ <!ENTITY BaseEntityProperties SYSTEM "..\BaseEntityProperties.xml"> ]>
4+
-->
5+
6+
<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" assembly="BExIS.Dlm.Entities" namespace="BExIS.Dlm.Entities.Curation">
7+
<class xmlns="urn:nhibernate-mapping-2.2" name="CurationEntry" table="CurationEntries">
8+
<!-- Mapping BaseEntity properties -->
9+
<id name="Id" type="Int64">
10+
<column name="Id" index="idx_CurationEntry_id" />
11+
<generator class="native" />
12+
</id>
13+
14+
<!--&BaseEntityProperties;-->
15+
16+
<version name="VersionNo" type="Int32">
17+
<column name="VersionNo" />
18+
</version>
19+
20+
<property name="Extra" type="System.Xml.XmlDocument, System.Xml, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
21+
<column name="Extra" not-null="false" sql-type="xml" />
22+
</property>
23+
24+
25+
<!-- Mapping CurationEntry -->
26+
27+
<property name="Topic" type="StringClob">
28+
<column name="Topic" sql-type="text"/>
29+
</property>
30+
31+
<property name="Type" type=" BExIS.Dlm.Entities.Curation.CurationEntryType, BExIS.Dlm.Entities">
32+
<column name="Type" />
33+
</property>
34+
35+
<property name="Name" type="string">
36+
<column name="Name" />
37+
</property>
38+
39+
<property name="Description" type="StringClob">
40+
<column name="Description" sql-type="text"/>
41+
</property>
42+
43+
<property name="Solution" type="string">
44+
<column name="Solution" />
45+
</property>
46+
47+
<property name="Position" type="Int32">
48+
<column name="Position" />
49+
</property>
50+
51+
<property name="Source" type="string">
52+
<column name="Source" />
53+
</property>
54+
55+
<property name="CreationDate" type="Timestamp">
56+
<column name="CreationDate" />
57+
</property>
58+
59+
<property name="UserIsDone" type="Boolean">
60+
<column name="UserIsDone" />
61+
</property>
62+
63+
<property name="IsApproved" type="Boolean">
64+
<column name="IsApproved" />
65+
</property>
66+
67+
<property name="LastChangeDatetime_User" type="Timestamp">
68+
<column name="LastChangeDatetime_User" />
69+
</property>
70+
71+
<property name="LastChangeDatetime_Curator" type="Timestamp">
72+
<column name="LastChangeDatetime_Curator" />
73+
</property>
74+
75+
<!-- Mapping entity associations -->
76+
<!--Dataset-->
77+
<many-to-one name="Dataset" class="BExIS.Dlm.Entities.Data.Dataset" not-null="false" column="DatasetRef" />
78+
79+
<!--Creator-->
80+
<many-to-one name="Creator" class="BExIS.Security.Entities.Subjects.User" not-null="false" column="UserRef" />
81+
82+
<!--Notes-->
83+
84+
<set name="Notes" inverse="false" lazy="false" cascade="all">
85+
<key>
86+
<column name="CurationEntryRef" />
87+
</key>
88+
<one-to-many class="BExIS.Dlm.Entities.Curation.CurationNote" />
89+
</set>
90+
91+
92+
</class>
93+
94+
</hibernate-mapping>

0 commit comments

Comments
 (0)