Dev

BExIS++.sln

@@ -1630,8 +1630,8 @@ Global
 		{C1AE3004-853A-4CCF-9099-AE919C6121C8} = {96384857-88D4-4282-8EFD-FE8FCB0319B7}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		EnterpriseLibraryConfigurationToolBinariesPath = packages\Unity.2.1.505.0\lib\NET35;packages\Unity.2.1.505.2\lib\NET35
 		SolutionGuid = {9B6E4921-8EBA-487D-A098-3E473A0EAC64}
+		EnterpriseLibraryConfigurationToolBinariesPath = packages\Unity.2.1.505.0\lib\NET35;packages\Unity.2.1.505.2\lib\NET35
 	EndGlobalSection
 	GlobalSection(SubversionScc) = preSolution
 		Svn-Managed = True

Components/AAA/BExIS.Security.Entities/Objects/EntityReference.cs

@@ -27,6 +27,8 @@ public class EntityReference : BaseEntity
         public virtual int TargetVersion { get; set; }
         public virtual string Context { get; set; }
         public virtual string ReferenceType { get; set; }
+        public virtual string LinkType { get; set; }
+        public virtual string Category { get; set; }
         public virtual DateTime CreationDate { get; set; }
 
         public EntityReference()
@@ -37,9 +39,14 @@ public EntityReference()
             TargetEntityId = 0;
             Context = "";
             ReferenceType = "";
+            CreationDate = DateTime.Now;
+            LinkType = "";
+            Category = "";
+            SourceVersion = 0;
+            TargetVersion = 0;
         }
 
-        public EntityReference(long sourceId, long sourceEntityId, int sourceVersion, long targetId, long targetEntityId, int targetVersion, string context, string type, DateTime creationDate)
+        public EntityReference(long sourceId, long sourceEntityId, int sourceVersion, long targetId, long targetEntityId, int targetVersion, string context, string type, DateTime creationDate, string linkType , string category)
         {
             SourceId = sourceId;
             SourceEntityId = sourceEntityId;
@@ -50,6 +57,8 @@ public EntityReference(long sourceId, long sourceEntityId, int sourceVersion, lo
             Context = context;
             ReferenceType = type;
             CreationDate = creationDate;
+            Category = category;
+            LinkType = linkType;
         }
     }
 }

Components/AAA/BExIS.Security.Orm.NH/Mappings/Default/Objects/EntityReference.hbm.xml

@@ -22,6 +22,8 @@
 
     <property name="Context" type="string" />
 	<property name="ReferenceType" type="string" />
+	<property name="LinkType" type="string" />
+	<property name="Category" type="string" />
 	<property name="CreationDate" type="DateTime" />
   </class>
 </hibernate-mapping>

Components/AAA/BExIS.Security.Services/Objects/EntityReferenceManager.cs

@@ -1,5 +1,6 @@
 using BExIS.Security.Entities.Objects;
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using Vaiona.Persistence.Api;
 
@@ -42,7 +43,9 @@ public bool Exist(EntityReference entityReference, bool includeVersion = false,
                          r.TargetEntityId.Equals(entityReference.TargetEntityId) &&
                          r.TargetVersion.Equals(entityReference.TargetVersion) &&
                          r.Context.Equals(entityReference.Context) &&
-                         r.ReferenceType.Equals(entityReference.ReferenceType)
+                         r.ReferenceType.Equals(entityReference.ReferenceType) &&
+                         r.LinkType.Equals(entityReference.LinkType) &&
+                         r.Category.Equals(entityReference.Category)
 
                     ).Count() == 0) return false;
                 }
@@ -55,7 +58,10 @@ public bool Exist(EntityReference entityReference, bool includeVersion = false,
                          r.TargetEntityId.Equals(entityReference.TargetEntityId) &&
                          r.TargetVersion.Equals(entityReference.TargetVersion) &&
                          r.Context.Equals(entityReference.Context) &&
-                         r.ReferenceType.Equals(entityReference.ReferenceType)
+                         r.ReferenceType.Equals(entityReference.ReferenceType) &&
+                         r.LinkType.Equals(entityReference.LinkType) &&
+                         r.Category.Equals(entityReference.Category)
+
 
                     ).Count() == 0) return false;
                 }
@@ -67,7 +73,10 @@ public bool Exist(EntityReference entityReference, bool includeVersion = false,
                          r.TargetId.Equals(entityReference.TargetId) &&
                          r.TargetEntityId.Equals(entityReference.TargetEntityId) &&
                          r.Context.Equals(entityReference.Context) &&
-                         r.ReferenceType.Equals(entityReference.ReferenceType)
+                         r.ReferenceType.Equals(entityReference.ReferenceType) &&
+                         r.LinkType.Equals(entityReference.LinkType) &&
+                         r.Category.Equals(entityReference.Category)
+
                     ).Count() == 0) return false;
                 }
 
@@ -85,9 +94,9 @@ public void Create(EntityReference entityReference)
             }
         }
 
-        public EntityReference Create(long sourceId, long sourceEntityId, int sourceEntityVersion, long targetId, long targetEntityId, int targetEntityVersion, string context, string type)
+        public EntityReference Create(long sourceId, long sourceEntityId, int sourceEntityVersion, long targetId, long targetEntityId, int targetEntityVersion, string context, string type, string linkType, string category)
         {
-            EntityReference entityReference = new EntityReference(sourceId, sourceEntityId, sourceEntityVersion, targetId, targetEntityId, targetEntityVersion, context, type, DateTime.Now);
+            EntityReference entityReference = new EntityReference(sourceId, sourceEntityId, sourceEntityVersion, targetId, targetEntityId, targetEntityVersion, context, type, DateTime.Now, linkType, category);
 
             using (var uow = this.GetUnitOfWork())
             {
@@ -110,6 +119,17 @@ public void Delete(long id)
             }
         }
 
+        public void Delete(IEnumerable<long> ids)
+        {
+            using (var uow = this.GetUnitOfWork())
+            {
+                var repo = uow.GetRepository<EntityReference>();
+                var entityReferences = repo.Query(l=> ids.Contains(l.Id)).Select(l=>l.Id).ToList();
+                repo.Delete(entityReferences);
+                uow.Commit();
+            }
+        }
+
         public void Delete(EntityReference entityReference)
         {
             using (var uow = this.GetUnitOfWork())

Components/DLM/BExIS.Dlm.Entities/Data/Dataset.cs

@@ -9,6 +9,17 @@
 /// </summary>
 namespace BExIS.Dlm.Entities.Data
 {
+    /// <summary>
+    /// This is a list fo currently used entity types in BExIS. It is used to identify the type of the entity in a generic way.
+    /// </summary>
+    public enum EntityType
+    {
+        Dataset = 1,
+        Publication = 2,
+        Sample = 3,
+        Extension = 4,
+    }
+
     /// <summary>
     ///
     /// </summary>

Components/DLM/BExIS.Dlm.Entities/Data/EntityTemplate.cs

@@ -62,9 +62,7 @@ public virtual List<int> MetadataFields
         public virtual bool MetadataInvalidSaveMode { get; set; }
 
         /// <summary>
-        /// should the user be able to save the metadata if not alle mandatory are filled correct
-        /// if true - also not valid metadat will be stored
-        /// if false -  only valid metadata will be stored
+        /// should the user be able to select a datastructure
         /// </summary>
         public virtual bool HasDatastructure { get; set; }
 
@@ -84,6 +82,27 @@ public virtual List<long> DatastructureList
                 JsonDatastructureList = JsonConvert.SerializeObject(value);
             }
         }
+        /// <summary>
+        /// should the user be able to select a extension
+        /// </summary>
+        public virtual bool HasExtension { get; set; }
+
+        /// <summary>
+        /// List of available Extensions
+        /// </summary>
+        public virtual string JsonExtensionList { get; set; }
+
+        public virtual List<ExtensionType> ExtensionList
+        {
+            get
+            {
+                return JsonConvert.DeserializeObject<List<ExtensionType>>(JsonExtensionList);
+            }
+            set
+            {
+                JsonExtensionList = JsonConvert.SerializeObject(value);
+            }
+        }
 
         /// <summary>
         ///
@@ -174,13 +193,16 @@ public EntityTemplate()
             PermissionGroups = new PermissionsType();
             NotificationGroups = new List<long>();
             MetadataInvalidSaveMode = true;
+            ExtensionList = new List<ExtensionType>();
+
             Order = 0;
             JsonAllowedFileTypes = "";
             JsonDatastructureList = "";
             JsonDisabledHooks = "";
             JsonMetadataFields = "";
             JsonPermissionGroups = "";
             JsonNotificationGroups = "";
+            JsonExtensionList = "";
         }
 
         public EntityTemplate(string name, string description, Entity entityType, MetadataStructure.MetadataStructure metadataStructure)
@@ -192,6 +214,7 @@ public EntityTemplate(string name, string description, Entity entityType, Metada
             AllowedFileTypes = new List<string>();
             DisabledHooks = new List<string>();
             DatastructureList = new List<long>();
+            ExtensionList = new List<ExtensionType>();
             MetadataFields = new List<int>();
             PermissionGroups = new PermissionsType();
             NotificationGroups = new List<long>();
@@ -203,6 +226,7 @@ public EntityTemplate(string name, string description, Entity entityType, Metada
             JsonMetadataFields = "";
             JsonPermissionGroups = "";
             JsonNotificationGroups = "";
+            JsonExtensionList = "";
         }
     }
 
@@ -221,4 +245,19 @@ public PermissionsType()
             ViewEdit = new List<long>();
         }
     }
+
+    public class ExtensionType
+    {
+        public long TemplateId { get; set; }
+        public string ReferenceType { get; set; }
+        public bool Unique { get; set; }
+
+
+        public ExtensionType()
+        {
+            TemplateId = 0;
+            ReferenceType = "";
+            Unique = true;
+        }
+    }
 }

Components/DLM/BExIS.Dlm.Orm.NH/Mappings/Default/Data/EntityTemplate.hbm.xml

@@ -44,6 +44,14 @@
 		<column name="JsonDatastructureList" />
 	</property>
 
+	<property name="HasExtension" type="Boolean">
+		<column name="HasExtension" />
+	</property>
+
+	<property name="JsonExtensionList" type="string">
+		<column name="JsonExtensionList" />
+	</property>
+
 	<property name="JsonAllowedFileTypes" type="string">
 		<column name="JsonAllowedFileTypes" />
 	</property>

Components/UI/BExIS.UI/BExIS.UI.csproj

@@ -119,6 +119,7 @@
     <Compile Include="Hooks\View.cs" />
     <Compile Include="Models\DataTable.cs" />
     <Compile Include="Models\EntitySelectorModel.cs" />
+    <Compile Include="Models\ExtensionItem.cs" />
     <Compile Include="Models\FileUploader.cs" />
     <Compile Include="Models\ListItem.cs" />
     <Compile Include="Models\Menu.cs" />

Components/UI/BExIS.UI/Models/ExtensionItem.cs

@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BExIS.UI.Models
+{
+    public  class ExtensionItem
+    {
+        public long Id { get; set; }
+        public int Version { get; set; }
+        public string Title { get; set; }
+
+        public string LinkType { get; set; }
+        public string ReferenceType { get; set; }
+    }
+}

Components/UI/BExIS.UI/Models/ReferenceModels.cs

@@ -40,6 +40,8 @@ public class ReferenceModel
 
         public string Context { get; set; }
         public string ReferenceType { get; set; }
+        public string LinkType { get; set; }
+        public string Category { get; set; }
 
         public ReferenceModel()
         {
@@ -48,6 +50,8 @@ public ReferenceModel()
             Source = new ReferenceElementModel();
             Context = "";
             ReferenceType = "";
+            LinkType = "";
+            Category = "";
         }
     }
 
@@ -100,6 +104,7 @@ public class CreateSimpleReferenceModel
         [Required]
         public String ReferenceType { get; set; }
 
+
         public CreateSimpleReferenceModel()
         {
             Context = "";
@@ -113,4 +118,39 @@ public CreateSimpleReferenceModel(long sourceId, long sourceTypeId, int sourceVe
             Context = "";
         }
     }
+
+    public class ReferenceConfig
+    {
+        public List<ReferenceConfigElement> ReferenceTypes { get; set; }
+        public List<string> EntityWhiteList { get; set; }
+
+        public ReferenceConfig()
+        {
+            ReferenceTypes = new List<ReferenceConfigElement>();
+            EntityWhiteList = new List<string>();
+        }
+    }
+
+    public class ReferenceConfigElement
+    {
+        /*
+         	"description": "has dwc:Event extension",
+			"referenceType": "HasEvent",
+            "linkType": "extension",
+            "category": "extension"
+			},
+        */
+        public string ReferenceType { get; set; }
+        public string Description { get; set; }
+        public string LinkType { get; set; }
+        public string Category { get; set; }
+
+        public ReferenceConfigElement()
+        {
+            ReferenceType="";
+            Description = "";
+            LinkType = "";
+            Category = "";
+        }
+    }
 }

Components/Utils/BExIS.Utils.Data/BExIS.Utils.Data.csproj

@@ -44,6 +44,9 @@
     <Reference Include="Microsoft.Web.Infrastructure, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\Microsoft.Web.Infrastructure.2.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
     </Reference>
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">