article stack

backend/WebSem/.idea/.idea.WebSem/.idea/dataSources.local.xml

@@ -8,7 +8,9 @@
       <case-sensitivity plain-identifiers="lower" quoted-identifiers="exact" />
       <secret-storage>master_key</secret-storage>
       <user-name>dev</user-name>
-      <resolve-scope>websem-project:public,dev</resolve-scope>
+      <introspection-schemas>websem-project:public</introspection-schemas>
+      <resolve-scope>websem-project:dev,public</resolve-scope>
+      <unqualified-resolve-schemas>websem-project:dev,public</unqualified-resolve-schemas>
     </data-source>
   </component>
 </project>

backend/WebSem/.idea/.idea.WebSem/riderModule.iml

@@ -2,7 +2,10 @@
 <module type="RIDER_MODULE" version="4">
   <component name="NewModuleRootManager">
     <content url="file://$MODULE_DIR$/../..">
+      <sourceFolder url="file://$MODULE_DIR$/../../Test" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/../../WebApiWebSem" isTestSource="false" />
+      <excludeFolder url="file://$MODULE_DIR$/../../Test/bin" />
+      <excludeFolder url="file://$MODULE_DIR$/../../Test/obj" />
       <excludeFolder url="file://$MODULE_DIR$/../../WebApiWebSem/bin" />
       <excludeFolder url="file://$MODULE_DIR$/../../WebApiWebSem/obj" />
       <excludeFolder url="file://$MODULE_DIR$/../../packages" />

backend/WebSem/Test/DataAccess/ArticlesDataAccessTest.cs

@@ -0,0 +1,133 @@
+using System.Collections.Generic;
+using Luticate2.Utils.Dbo.Result;
+using Luticate2.Utils.Utils;
+using WebApiWebSem.DataAccess;
+using WebApiWebSem.Dbo.Articles;
+using WebApiWebSem.Dbo.ArticlesFields;
+using Xunit;
+
+namespace Test.DataAccess
+{
+    public class ArticlesDataAccessTest
+    {
+        [Fact]
+        public void Test1()
+        {
+            Tests.TestRealDb<ArticlesDataAccess>(access =>
+            {
+                var res = access.AddDbo(new ArticlesAddDbo
+                {
+                    Fields = new List<ArticlesFieldsAddDbo>
+                    {
+                        new ArticlesFieldsAddDbo
+                        {
+                            Property = "deathDate",
+                            Type = "date/date",
+                            Value = "1965-01-24"
+                        }
+                    },
+                    Id = "Winston_Churchill",
+                    PictureCaption = "Winston Churchill en 1942.",
+                    PictureUrl = "http://commons.wikimedia.org/wiki/Special:FilePath/Sir_Winston_S_Churchill.jpg?width=300",
+                    Text = "Winston Churchill, né le 30 novembre 1874 au palais de Blenheim",
+                    Type = "person"
+                });
+                Assert.Equal(LuStatus.Success, res.Status);
+                Assert.Equal("Winston_Churchill", res.Data.Id);
+            });
+        }
+
+        [Fact]
+        public void Test2()
+        {
+            Tests.TestRealDb<ArticlesDataAccess>(access =>
+            {
+                var res = access.AddDbo(new ArticlesAddDbo
+                {
+                    Fields = new List<ArticlesFieldsAddDbo>
+                    {
+                        new ArticlesFieldsAddDbo
+                        {
+                            Property = "deathDate",
+                            Type = "date/date",
+                            Value = "1965-01-24"
+                        }
+                    },
+                    Id = "Winston_Churchill",
+                    PictureCaption = "Winston Churchill en 1942.",
+                    PictureUrl = "http://commons.wikimedia.org/wiki/Special:FilePath/Sir_Winston_S_Churchill.jpg?width=300",
+                    Text = "Winston Churchill, né le 30 novembre 1874 au palais de Blenheim",
+                    Type = "person"
+                });
+                Assert.Equal(LuStatus.Success, res.Status);
+                Assert.Equal("Winston_Churchill", res.Data.Id);
+
+                var resGet = access.GetSingleById("Winston_Churchill");
+                Assert.Equal(LuStatus.Success, resGet.Status);
+                Assert.Equal("Winston_Churchill", resGet.Data.Id);
+                Assert.Equal(1, resGet.Data.Fields.Count);
+                Assert.Equal("deathDate", resGet.Data.Fields[0].Property);
+            });
+        }
+
+        [Fact]
+        public void Test3()
+        {
+            Tests.TestRealDb<ArticlesDataAccess>(access =>
+            {
+                var res = access.AddDbo(new ArticlesAddDbo
+                {
+                    Fields = new List<ArticlesFieldsAddDbo>
+                    {
+                        new ArticlesFieldsAddDbo
+                        {
+                            Property = "deathDate",
+                            Type = "date/date",
+                            Value = "1965-01-24"
+                        }
+                    },
+                    Id = "Winston_Churchill",
+                    PictureCaption = "Winston Churchill en 1942.",
+                    PictureUrl = "http://commons.wikimedia.org/wiki/Special:FilePath/Sir_Winston_S_Churchill.jpg?width=300",
+                    Text = "Winston Churchill, né le 30 novembre 1874 au palais de Blenheim",
+                    Type = "person"
+                });
+                Assert.Equal(LuStatus.Success, res.Status);
+                Assert.Equal("Winston_Churchill", res.Data.Id);
+
+
+                var resEdit = access.EditSingleByIdDbo("Winston_Churchill", new ArticlesEditDbo
+                {
+                    Fields = new List<ArticlesFieldsEditDbo>
+                    {
+                        new ArticlesFieldsAddDbo
+                        {
+                            Property = "deathDate",
+                            Type = "date/date",
+                            Value = "1965-01-25"
+                        }
+                    },
+                    PictureCaption = "Test.",
+                    PictureUrl = "http://commons.wikimedia.org/wiki/Special:FilePath/Sir_Winston_S_Churchill.jpg?width=300",
+                    Text = "Winston Churchill, né le 30 novembre 1874 au palais de Blenheim"
+                });
+                Assert.Equal(null, resEdit.Exception);
+                Assert.Equal(LuStatus.Success, resEdit.Status);
+                Assert.Equal("Winston_Churchill", resEdit.Data.Id);
+                Assert.Equal("Test.", resEdit.Data.PictureCaption);
+                Assert.Equal(1, resEdit.Data.Fields.Count);
+                Assert.Equal("deathDate", resEdit.Data.Fields[0].Property);
+                Assert.Equal("1965-01-25", resEdit.Data.Fields[0].Value);
+
+
+
+                var resGet = access.GetSingleById("Winston_Churchill");
+                Assert.Equal(LuStatus.Success, resGet.Status);
+                Assert.Equal("Winston_Churchill", resGet.Data.Id);
+                Assert.Equal(1, resGet.Data.Fields.Count);
+                Assert.Equal("deathDate", resGet.Data.Fields[0].Property);
+                Assert.Equal("1965-01-25", resGet.Data.Fields[0].Value);
+            });
+        }
+    }
+}

backend/WebSem/Test/Properties/AssemblyInfo.cs

@@ -0,0 +1,26 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+
+[assembly: AssemblyTitle("Test")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Test")]
+[assembly: AssemblyCopyright("Copyright ©  2017")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+
+[assembly: Guid("E50B4EB1-252E-41AC-ADC1-E42805810777")]

backend/WebSem/Test/Test.xproj

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+  </PropertyGroup>
+
+  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{E50B4EB1-252E-41AC-ADC1-E42805810777}</ProjectGuid>
+    <ProjectTypeGuids>{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}</ProjectTypeGuids>
+    <RootNamespace>Test</RootNamespace>
+    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
+    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <SchemaVersion>2.0</SchemaVersion>
+  </PropertyGroup>
+  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
+</Project>

backend/WebSem/Test/Tests.cs

@@ -0,0 +1,47 @@
+using System;
+using Luticate2.Utils.DataAccess;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.DependencyInjection;
+using WebApiWebSem.DataAccess;
+
+namespace Test
+{
+    public class Tests
+    {
+        public const string RealDbConnectionString =
+            "User ID=dev;Password=dev;Host=localhost;Port=5432;Database=websem_project;Pooling=true;";
+
+        public static IServiceProvider BuildRealDbServiceProvider()
+        {
+            IServiceCollection serviceCollection = new ServiceCollection();
+            serviceCollection.AddScoped<LuEfTransactionScope>();
+            serviceCollection.AddTransient<ArticlesDataAccess>();
+            serviceCollection.AddDbContext<WsDbContext>(builder => builder.UseNpgsql(RealDbConnectionString),
+                ServiceLifetime.Transient);
+            return serviceCollection.BuildServiceProvider();
+        }
+
+        protected static void _TestRealDb(Action<IServiceProvider> func)
+        {
+            var serviceProvider = BuildRealDbServiceProvider();
+            var transactionScope = serviceProvider.GetService<LuEfTransactionScope>();
+            transactionScope.BeginTransaction<WsDbContext>(null);
+            try
+            {
+                func(serviceProvider);
+            }
+            finally
+            {
+                transactionScope.RollbackTransaction<WsDbContext>();
+            }
+        }
+
+        public static void TestRealDb<TDataAccess>(Action<TDataAccess> func)
+        {
+            _TestRealDb(provider =>
+            {
+                func(provider.GetService<TDataAccess>());
+            });
+        }
+    }
+}

backend/WebSem/Test/project.json

@@ -0,0 +1,27 @@
+{
+    "version": "1.0.0-*",
+    "buildOptions": {
+        "debugType": "portable"
+    },
+    "dependencies": {
+        "WebApiWebSem": "*",
+        "System.Runtime.Serialization.Primitives": "4.1.1",
+        "xunit": "2.1.0",
+        "dotnet-test-xunit": "1.0.0-rc2-192208-24"
+    },
+    "testRunner": "xunit",
+    "frameworks": {
+        "netcoreapp1.0": {
+            "dependencies": {
+                "Microsoft.NETCore.App": {
+                    "type": "platform",
+                    "version": "1.0.1"
+                }
+            },
+            "imports": [
+                "dotnet5.4",
+                "portable-net451+win8"
+            ]
+        }
+    }
+}

backend/WebSem/WebApiWebSem/Business/ArticlesBusiness.cs

@@ -0,0 +1,15 @@
+using Luticate2.Utils.Business;
+using Luticate2.Utils.Interfaces;
+using WebApiWebSem.DataAccess;
+using WebApiWebSem.Dbo.Articles;
+
+namespace WebApiWebSem.Business
+{
+    public class ArticlesBusiness : LuCrudBusiness<ArticlesDataAccess, ArticlesAddDbo, ArticlesDbo, ArticlesEditDbo, string>
+    {
+        public ArticlesBusiness(ArticlesDataAccess dataAccess, ILuNotificationsBusiness notificationsBusiness) : base(dataAccess, notificationsBusiness)
+        {
+            EntityType = "articles";
+        }
+    }
+}

backend/WebSem/WebApiWebSem/Controllers/ArticlesController.cs

@@ -0,0 +1,15 @@
+using Luticate2.Utils.Controllers;
+using Luticate2.Utils.Dbo.Basic;
+using Microsoft.Extensions.Options;
+using WebApiWebSem.Business;
+using WebApiWebSem.Dbo.Articles;
+
+namespace WebApiWebSem.Controllers
+{
+    public class ArticlesController : LuCrudController<ArticlesBusiness, ArticlesAddDbo, ArticlesDbo, ArticlesEditDbo, string>
+    {
+        public ArticlesController(ArticlesBusiness busines, IOptions<LuUtilsOptionsDbo> luUtilsOptionsDbo) : base(busines, luUtilsOptionsDbo)
+        {
+        }
+    }
+}

backend/WebSem/WebApiWebSem/Controllers/ValuesController.cs

@@ -1,44 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
-
-namespace WebApiWebSem.Controllers
-{
-    [Route("api/[controller]")]
-    public class ValuesController : Controller
-    {
-        // GET api/values
-        [HttpGet]
-        public IEnumerable<string> Get()
-        {
-            return new string[] {"value1", "value2"};
-        }
-
-        // GET api/values/5
-        [HttpGet("{id}")]
-        public string Get(int id)
-        {
-            return "value";
-        }
-
-        // POST api/values
-        [HttpPost]
-        public void Post([FromBody] string value)
-        {
-        }
-
-        // PUT api/values/5
-        [HttpPut("{id}")]
-        public void Put(int id, [FromBody] string value)
-        {
-        }
-
-        // DELETE api/values/5
-        [HttpDelete("{id}")]
-        public void Delete(int id)
-        {
-        }
-    }
-}

backend/WebSem/WebApiWebSem/DataAccess/ArticlesDataAccess.cs

@@ -0,0 +1,67 @@
+using System;
+using System.Linq;
+using Luticate2.Utils.DataAccess;
+using Microsoft.EntityFrameworkCore;
+using WebApiWebSem.DataAccess.Models;
+using WebApiWebSem.Dbo.Articles;
+
+namespace WebApiWebSem.DataAccess
+{
+    public class ArticlesDataAccess : LuEfCrudDataAccess<articles, ArticlesAddDbo, ArticlesDbo, ArticlesEditDbo, WsDbContext, string>
+    {
+        public ArticlesDataAccess(IServiceProvider serviceProvider) : base(serviceProvider)
+        {
+        }
+
+        protected override object GetId(string id)
+        {
+            return id;
+        }
+
+        protected override IQueryable<articles> GetGetQueryable(WsDbContext db, IQueryable<articles> table)
+        {
+            return table.Include(articles => articles.articles_fields_fk);
+        }
+
+        protected override DbSet<articles> GetTable(WsDbContext db)
+        {
+            return db.articles;
+        }
+
+        protected override articles GetModelFromTCreate(ArticlesAddDbo obj)
+        {
+            return new articles
+            {
+                id = obj.Id,
+                picture_caption = obj.PictureCaption,
+                picture_url = obj.PictureUrl,
+                type = obj.Type,
+                articles_fields_fk = obj.Fields.Select(dbo => new articles_fields
+                {
+                    property = dbo.Property,
+                    type = dbo.Type,
+                    value = dbo.Value
+                }).ToList(),
+                text = obj.Text
+            };
+        }
+
+        protected override void EditModelFromTUpdate(ArticlesEditDbo obj, articles model)
+        {
+            model.picture_caption = obj.PictureCaption;
+            model.picture_url = obj.PictureUrl;
+            model.articles_fields_fk = obj.Fields.Select(dbo => new articles_fields
+                {
+                    value = dbo.Value,
+                    property = dbo.Property,
+                    type = dbo.Type
+                }).ToList();
+            model.text = obj.Text;
+        }
+
+        protected override ArticlesDbo GetDboFromModel(articles model)
+        {
+            return model.ToDbo();
+        }
+    }
+}

backend/WebSem/WebApiWebSem/DataAccess/DbPediaDataAccess.cs

@@ -0,0 +1,27 @@
+using System;
+using VDS.RDF.Query;
+
+namespace WebApiWebSem.DataAccess
+{
+    public class DbPediaDataAccess
+    {
+        public void Query(string query)
+        {
+            var endpoint = new SparqlRemoteEndpoint(new Uri("http://dbpedia.org/sparql"), "http://dbpedia.org");
+
+            //Make a SELECT query against the Endpoint
+            var results = endpoint.QueryWithResultSet("SELECT DISTINCT ?Concept WHERE {[] a ?Concept} LIMIT 10");
+            foreach (SparqlResult result in results)
+            {
+                Console.WriteLine(result.ToString());
+            }
+
+            //Make a DESCRIBE query against the Endpoint
+//            var g = endpoint.QueryWithResultGraph("DESCRIBE ");
+//            foreach (var t in g.Triples)
+//            {
+//                Console.WriteLine(t.ToString());
+//            }
+        }
+    }
+}

backend/WebSem/WebApiWebSem/DataAccess/Models/articles.cs

@@ -8,9 +8,23 @@ namespace WebApiWebSem.DataAccess.Models
     public partial class articles
     {
         
-        public Guid id { get; set; }
+        public string id { get; set; }
         
+        public string text { get; set; }
         
+        public string picture_url { get; set; }
+        
+        public string picture_caption { get; set; }
+        
+        public string type { get; set; }
+        
+        public DateTime created_at { get; set; }
+        
+        public DateTime? updated_at { get; set; }
+        
+        
+        
+        public virtual IList<articles_fields> articles_fields_fk { get; set; }
         
     }
 }

backend/WebSem/WebApiWebSem/DataAccess/Models/articles_fields.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace WebApiWebSem.DataAccess.Models
+{
+    public partial class articles_fields
+    {
+        
+        public string article_id { get; set; }
+        
+        public string property { get; set; }
+        
+        public string value { get; set; }
+        
+        public string type { get; set; }
+        
+        
+        public virtual articles fk_articles { get; set; }
+        
+        
+    }
+}

backend/WebSem/WebApiWebSem/DataAccess/ModelsDbo.cs

@@ -0,0 +1,36 @@
+using System.Linq;
+using Luticate2.Utils.Utils;
+using WebApiWebSem.DataAccess.Models;
+using WebApiWebSem.Dbo.Articles;
+using WebApiWebSem.Dbo.ArticlesFields;
+
+namespace WebApiWebSem.DataAccess
+{
+    public static class ModelsDbo
+    {
+        public static ArticlesFieldsDbo ToDbo(this articles_fields model)
+        {
+            return new ArticlesFieldsDbo
+            {
+                Property = model.property,
+                Type = model.type,
+                Value = model.value
+            };
+        }
+
+        public static ArticlesDbo ToDbo(this articles model)
+        {
+            return new ArticlesDbo
+            {
+                CreatedAt = model.created_at.ToDbo(),
+                Fields = model.articles_fields_fk.Select(fields => fields.ToDbo()).ToList(),
+                Id = model.id,
+                PictureCaption = model.picture_caption,
+                PictureUrl = model.picture_url,
+                Text = model.text,
+                Type = model.type,
+                UpdatedAt = model.updated_at.ToDbo()
+            };
+        }
+    }
+}

backend/WebSem/WebApiWebSem/DataAccess/WsDbContext.cs

@@ -16,14 +16,27 @@ namespace WebApiWebSem.DataAccess
                 .HasKey(c => new { c.id });
             
             modelBuilder.Entity<articles>()
-                .Property(e => e.id)
-                .HasDefaultValueSql("get_uuid()");
+                .Property(e => e.created_at)
+                .HasDefaultValueSql("now_utc()");
             
             
             
+            modelBuilder.Entity<articles_fields>()
+                .HasKey(c => new { c.article_id, c.property });
+            
+            
+            modelBuilder.Entity<articles_fields>()
+                .HasOne(e => e.fk_articles)
+                .WithMany(e => e.articles_fields_fk)
+                .HasForeignKey("article_id")
+                .HasConstraintName("articles_fields_article_id_fkey");
+            
+            
         }
         
         public virtual DbSet<articles> articles { get; set; }
         
+        public virtual DbSet<articles_fields> articles_fields { get; set; }
+        
     }
 }

backend/WebSem/WebApiWebSem/DataAccess/code-from-ds/code-from-ds.json

@@ -5,12 +5,59 @@
     "selection": {
         "tables": [
             {
-                "columns": [{
-                    "column": "id",
-                    "selected": true
-                }],
+                "columns": [
+                    {
+                        "column": "id",
+                        "selected": true
+                    },
+                    {
+                        "column": "text",
+                        "selected": true
+                    },
+                    {
+                        "column": "picture_url",
+                        "selected": true
+                    },
+                    {
+                        "column": "picture_caption",
+                        "selected": true
+                    },
+                    {
+                        "column": "type",
+                        "selected": true
+                    },
+                    {
+                        "column": "created_at",
+                        "selected": true
+                    },
+                    {
+                        "column": "updated_at",
+                        "selected": true
+                    }
+                ],
                 "table": "articles"
             },
+            {
+                "columns": [
+                    {
+                        "column": "article_id",
+                        "selected": true
+                    },
+                    {
+                        "column": "property",
+                        "selected": true
+                    },
+                    {
+                        "column": "value",
+                        "selected": true
+                    },
+                    {
+                        "column": "type",
+                        "selected": true
+                    }
+                ],
+                "table": "articles_fields"
+            },
             {
                 "columns": [
                     {

backend/WebSem/WebApiWebSem/Dbo/Articles/ArticlesAddDbo.cs

@@ -0,0 +1,18 @@
+using System.ComponentModel.DataAnnotations;
+using WebApiWebSem.Dbo.ArticlesFields;
+
+namespace WebApiWebSem.Dbo.Articles
+{
+    public class ArticlesAddDbo<T> : ArticlesBasicDbo<T>
+    {
+        [Required]
+        public string Id { get; set; }
+
+        [Required]
+        public string Type { get; set; }
+    }
+
+    public class ArticlesAddDbo : ArticlesAddDbo<ArticlesFieldsAddDbo>
+    {
+    }
+}

backend/WebSem/WebApiWebSem/Dbo/Articles/ArticlesBasicDbo.cs

@@ -0,0 +1,18 @@
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+
+namespace WebApiWebSem.Dbo.Articles
+{
+    public class ArticlesBasicDbo<T>
+    {
+        [Required]
+        public IList<T> Fields { get; set; }
+
+        [Required]
+        public string Text { get; set; }
+
+        public string PictureUrl { get; set; }
+
+        public string PictureCaption { get; set; }
+    }
+}

backend/WebSem/WebApiWebSem/Dbo/Articles/ArticlesDbo.cs

@@ -0,0 +1,12 @@
+using System;
+using WebApiWebSem.Dbo.ArticlesFields;
+
+namespace WebApiWebSem.Dbo.Articles
+{
+    public class ArticlesDbo : ArticlesAddDbo<ArticlesFieldsDbo>
+    {
+        public DateTime CreatedAt { get; set; }
+
+        public DateTime? UpdatedAt { get; set; }
+    }
+}

backend/WebSem/WebApiWebSem/Dbo/Articles/ArticlesEditDbo.cs

@@ -0,0 +1,8 @@
+using WebApiWebSem.Dbo.ArticlesFields;
+
+namespace WebApiWebSem.Dbo.Articles
+{
+    public class ArticlesEditDbo : ArticlesBasicDbo<ArticlesFieldsEditDbo>
+    {
+    }
+}

backend/WebSem/WebApiWebSem/Dbo/ArticlesFields/ArticlesFieldsAddDbo.cs

@@ -0,0 +1,6 @@
+namespace WebApiWebSem.Dbo.ArticlesFields
+{
+    public class ArticlesFieldsAddDbo : ArticlesFieldsEditDbo
+    {
+    }
+}

backend/WebSem/WebApiWebSem/Dbo/ArticlesFields/ArticlesFieldsDbo.cs

@@ -0,0 +1,7 @@
+namespace WebApiWebSem.Dbo.ArticlesFields
+{
+    public class ArticlesFieldsDbo : ArticlesFieldsAddDbo
+    {
+
+    }
+}

backend/WebSem/WebApiWebSem/Dbo/ArticlesFields/ArticlesFieldsEditDbo.cs

@@ -0,0 +1,16 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace WebApiWebSem.Dbo.ArticlesFields
+{
+    public class ArticlesFieldsEditDbo
+    {
+        [Required]
+        public string Value { get; set; }
+
+        [Required]
+        public string Property { get; set; }
+
+        [Required]
+        public string Type { get; set; }
+    }
+}

backend/WebSem/WebApiWebSem/Startup.cs

@@ -6,6 +6,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
+using WebApiWebSem.Business;
 using WebApiWebSem.DataAccess;
 using WebApiWebSem.Dbo;
 using WebApiWebSem.Middleware;
@@ -42,6 +43,9 @@ namespace WebApiWebSem
             var version = typeof(Startup).GetTypeInfo().Assembly.GetName().Version;
             services.AddLuticateUtils(options => options.Version = version + "-dev");
 
+            services.AddTransient<ArticlesBusiness>();
+            services.AddTransient<ArticlesDataAccess>();
+
             services.Configure<AppConfigDbo>(dbo =>
             {
                 dbo.SleepTime = Env.IsProduction() ? 0 : int.Parse(Configuration["SleepTime"]);

backend/WebSem/WebApiWebSem/appsettings.Development.json

@@ -9,6 +9,7 @@
         }
     },
     "ConnectionStrings": {
-        "default": "User ID=dev;Password=dev;Host=localhost;Port=5432;Database=websem-project;Pooling=true;ApplicationName=WebSemApiDev"
-    }
+        "default": "User ID=dev;Password=dev;Host=localhost;Port=5432;Database=websem_project;Pooling=true;ApplicationName=WebSemApiDev"
+    },
+    "SleepTime": 0
 }

backend/WebSem/WebApiWebSem/project.json

@@ -14,7 +14,8 @@
       "Microsoft.Extensions.Configuration.Json": "1.0.0",
       "Microsoft.Extensions.Logging.Console": "1.0.0",
       "Microsoft.Extensions.Logging.Debug": "1.0.0",
-      "Microsoft.Extensions.Options.ConfigurationExtensions": "1.0.0"
+      "Microsoft.Extensions.Options.ConfigurationExtensions": "1.0.0",
+      "dotNetRDF": "1.0.13-pre6"
   },
 
   "tools": {

backend/WebSem/WebSem.sln

@@ -1,22 +1,28 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.0.0
-MinimumVisualStudioVersion = 10.0.0.1
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "WebApiWebSem", "WebApiWebSem/WebApiWebSem.xproj", "{E3E68AD5-B498-4104-9056-4601B101BC79}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{E3E68AD5-B498-4104-9056-4601B101BC79}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E3E68AD5-B498-4104-9056-4601B101BC79}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E3E68AD5-B498-4104-9056-4601B101BC79}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E3E68AD5-B498-4104-9056-4601B101BC79}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2013
+VisualStudioVersion = 12.0.0.0
+MinimumVisualStudioVersion = 10.0.0.1
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "WebApiWebSem", "WebApiWebSem/WebApiWebSem.xproj", "{E3E68AD5-B498-4104-9056-4601B101BC79}"
+EndProject
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Test", "Test\Test.xproj", "{E50B4EB1-252E-41AC-ADC1-E42805810777}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{E3E68AD5-B498-4104-9056-4601B101BC79}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E3E68AD5-B498-4104-9056-4601B101BC79}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E3E68AD5-B498-4104-9056-4601B101BC79}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E3E68AD5-B498-4104-9056-4601B101BC79}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E50B4EB1-252E-41AC-ADC1-E42805810777}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E50B4EB1-252E-41AC-ADC1-E42805810777}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E50B4EB1-252E-41AC-ADC1-E42805810777}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E50B4EB1-252E-41AC-ADC1-E42805810777}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

frontend/WebSem/README.md

@@ -12,10 +12,10 @@ bower install
 ```
 
 A CRUD stack is provided as an example:
-`app/controllers/pkguids.controller.js`  
-`app/controllers/pkguidsedit.controller.js`  
-`app/sdk/Business/pkguids.business.js`  
-`app/sdk/DataAccess/pkguids.dataaccess.js`
+`app/controllers/articles.controller.js`  
+`app/controllers/articlesedit.controller.js`  
+`app/sdk/Business/articles.business.js`  
+`app/sdk/DataAccess/articles.dataaccess.js`
 
 See [Luticate2-api/WebApiUtils](https://git.rthoni.com/luticate2/luticate2-api/src/master/WebApiUtils) project for the backend.
 

frontend/WebSem/app/app.js

@@ -143,56 +143,31 @@ angular.module('app', [
                 name: 'home.name',
                 type: 'heading',
                 children: [{
+                    id: 'link_1',
                     name: 'home.name',
-                    type: 'toggle',
-                    pages: [{
-                        id: 'toogle_1_link_1',
-                        name: 'home.name',
-                        state: 'home'
-                    }, {
-                        id: 'toogle_1_link_2',
-                        name: 'Home 1 2',
-                        state: 'home.1.2',
-                        hidden: true
-                    }, {
-                        id: 'toogle_1_link_3',
-                        name: 'home.name',
-                        state: 'home.1.3'
-                    }]
+                    state: 'home.2',
+                    type: 'link'
+                }, {
+                    id: 'link_1',
+                    name: 'home.name',
+                    state: 'home.2',
+                    type: 'link'
                 }]
-            }, {
-                id: 'link_1',
-                name: 'home.name',
-                state: 'home.2',
-                type: 'link',
-                icon: 'fa fa-check'
-            }, {
-                id: 'link_2',
-                name: 'home.name',
-                state: 'home.3',
-                type: 'link'
-            }, {
-                id: 'link_3',
-                name: 'home.name',
-                state: 'common.link3',
-                type: 'link',
-                hidden: true
-            },  {
+            },
+            {
                 id: 'toogle_2',
-                name: 'pkguids.name',
+                name: 'articles.name',
                 type: 'heading',
                 children: [{
-                    name: 'pkguids.name',
-                    type: 'toggle',
-                    pages: [{
-                        id: 'toogle_2_link_1',
-                        name: 'common.all',
-                        state: 'pkguids'
-                    },{
-                        id: 'toogle_2_link_1',
-                        name: 'common.new',
-                        state: 'pkguids_add'
-                    }]
+                    id: 'toogle_2_link_1',
+                    name: 'common.all',
+                    state: 'articles',
+                    type: 'link'
+                },{
+                    id: 'toogle_2_link_1',
+                    name: 'common.new',
+                    state: 'articles_add',
+                    type: 'link'
                 }]
             }]);
 
@@ -214,14 +189,14 @@ angular.module('app', [
                 controller:'HomeController'
             });
 
-            addCrudStates($stateProvider, 'pkguids');
+            addCrudStates($stateProvider, 'articles');
 
             $urlRouterProvider.otherwise('/');
     }])
     .run(['$rootScope', '$transitions', 'AppUtilsBusiness', 'ssSideNav', '$translate', 'luRequest', '$mdDialog',
-        'luNotificationsBusiness', '$mdToast', '$state', 'pkguidsBusiness',
+        'luNotificationsBusiness', '$mdToast', '$state', 'articlesBusiness',
         function ($rootScope, $transitions, AppUtilsBusiness, ssSideNav, $translate, luRequest, $mdDialog,
-                  luNotificationsBusiness, $mdToast, $state, pkguidsBusiness) {
+                  luNotificationsBusiness, $mdToast, $state, articlesBusiness) {
 
         AppUtilsBusiness.addApiVersionChangedCallback(function(oldVersion, newVersion) {
             $mdDialog.show(
@@ -233,9 +208,9 @@ angular.module('app', [
         });
 
         luNotificationsBusiness.init({
-            'pkguids': pkguidsBusiness
+            'articles': articlesBusiness
         });
-        addCrudNotifications(luNotificationsBusiness, AppUtilsBusiness, $mdToast, $state, 'pkguids');
+        addCrudNotifications(luNotificationsBusiness, AppUtilsBusiness, $mdToast, $state, 'articles');
 
         $translate('common.appName').then(function() {
             for (var i = 0; i < ssSideNav.sections.length; ++i) {

frontend/WebSem/app/controllers/articles.controller.js

@@ -0,0 +1,18 @@
+angular.module('app')
+    .controller('articlesController', ['$scope', '$stateParams', 'articlesBusiness', 'listControllerBuilder',
+        function($scope, $stateParams, articlesBusiness, listControllerBuilder) {
+
+            $scope.business = articlesBusiness;
+            $scope.itemType = 'articles';
+            $scope.defaultOrder = 'id';
+            listControllerBuilder.create($scope, $stateParams);
+
+            $scope.getAddItem = function()
+            {
+                return {
+                    title: $scope.query.filter
+                };
+            };
+
+            $scope.init();
+    }]);

frontend/WebSem/app/controllers/articlesedit.controller.js

@@ -0,0 +1,13 @@
+angular.module('app')
+    .controller('articlesEditController', ['$scope', '$stateParams', 'articlesBusiness', 'editControllerBuilder',
+        function ($scope, $stateParams, articlesBusiness, editControllerBuilder) {
+
+            $scope.business = articlesBusiness;
+            $scope.itemType = 'articles';
+            editControllerBuilder.create($scope, $stateParams);
+
+            $scope.setupExitConfirm();
+
+            $scope.init($stateParams);
+
+        }]);

frontend/WebSem/app/controllers/pkguids.controller.js

@@ -1,100 +0,0 @@
-angular.module('app')
-    .controller('pkguidsController', ['$scope', '$stateParams', 'pkguidsBusiness', 'listControllerBuilder',
-        function($scope, $stateParams, pkguidsBusiness, listControllerBuilder) {
-
-            $scope.business = pkguidsBusiness;
-            $scope.itemType = 'pkguids';
-            $scope.defaultOrder = 'someText';
-            listControllerBuilder.create($scope, $stateParams);
-
-            $scope.getAddItem = function()
-            {
-                return {
-                    someText: $scope.query.filter
-                };
-            };
-
-            $scope.init();
-
-            // $scope.selected = [];
-            //
-            // $scope.query = {
-            //     order: 'someText',
-            //     filter: '',
-            //     limit: 5,
-            //     page: 1
-            // };
-            //
-            // $scope.busy = luBusyBusiness.reset();
-            // $scope.appUtils = AppUtilsBusiness;
-            //
-            // $scope.isFilterShown = false;
-            // $scope.pkGuids = null;
-            //
-            // $scope.showFilter = function(show) {
-            //     $scope.isFilterShown = show;
-            //     if (!$scope.isFilterShown) {
-            //         if ($scope.query.filter != '') {
-            //             $scope.query.filter = '';
-            //             $scope.getPkGuids();
-            //         }
-            //     }
-            // };
-            //
-            // $scope.askRemoveOne = function (pkguid) {
-            //     var confirm = $mdDialog.confirm()
-            //         .title(AppUtilsBusiness.tr('common.confirmDelete'))
-            //         .textContent(AppUtilsBusiness.tr('pkguid.deleteOne', {text: pkguid.someText}))
-            //         .ok(AppUtilsBusiness.tr('common.delete'))
-            //         .cancel(AppUtilsBusiness.tr('common.cancel'));
-            //     $mdDialog.show(confirm).then(function() {
-            //         pkGuidBusiness.deleteDbo(pkguid.id, 'pkguid.table').then(function(data)
-            //         {
-            //             $scope.getPkGuids();
-            //         }, function(error) {});
-            //     }, function () {});
-            // };
-            //
-            // $scope.askRemoveSelected = function () {
-            //     var confirm = $mdDialog.confirm()
-            //         .title(AppUtilsBusiness.tr('common.confirmDelete'))
-            //         .textContent(AppUtilsBusiness.tr('pkguid.deleteMultiple', {count: $scope.selected.length}))
-            //         .ok(AppUtilsBusiness.tr('common.delete'))
-            //         .cancel(AppUtilsBusiness.tr('common.cancel'));
-            //     $mdDialog.show(confirm).then(function() {
-            //         $scope.removeFirstSelected();
-            //
-            //     }, function () {});
-            // };
-            //
-            // $scope.removeFirstSelected = function() {
-            //     if ($scope.selected.length == 0) {
-            //         $scope.getPkGuids();
-            //     }
-            //     else {
-            //         pkGuidBusiness.deleteDbo($scope.selected[0].id, 'pkguid.table')
-            //             .then(function(data)
-            //         {
-            //             $scope.selected = $scope.selected.splice(1);
-            //             $scope.removeFirstSelected();
-            //         }, function(error) {});
-            //     }
-            // };
-            //
-            // $scope.getPkGuids = function()
-            // {
-            //     $scope.selected = [];
-            //     var orderBy = AppUtilsBusiness.convertOrderBy($scope.query.order);
-            //     pkGuidBusiness.getMultiple(orderBy, $scope.query.filter, $scope.query.page - 1, $scope.query.limit, 'pkguid.table').then(function(data)
-            //     {
-            //         $scope.pkGuids = data;
-            //     }, function(error)
-            //     {
-            //         $scope.pkGuids = null;
-            //     });
-            // };
-            //
-            //
-            //
-            // $scope.getPkGuids();
-    }]);

frontend/WebSem/app/controllers/pkguidsedit.controller.js

@@ -1,87 +0,0 @@
-angular.module('app')
-    .controller('pkguidsEditController', ['$scope', '$stateParams', 'pkguidsBusiness', 'editControllerBuilder',
-        function ($scope, $stateParams, pkguidsBusiness, editControllerBuilder) {
-
-            $scope.business = pkguidsBusiness;
-            $scope.itemType = 'pkguids';
-            editControllerBuilder.create($scope, $stateParams);
-
-
-            $scope.setupExitConfirm();
-
-            $scope.init($stateParams);
-
-            // $scope.pkguid = null;
-            // $scope.defaultPkguid = {
-            //     id: null,
-            //     someText: "Test.",
-            //     someInt: 42
-            // };
-            //
-            // $scope.busy = luBusyBusiness.reset();
-            // $scope.appUtils = AppUtilsBusiness;
-            //
-            // $scope.setTitle = function()
-            // {
-            //     if ($scope.pkguid.id != null) {
-            //         AppUtilsBusiness.setTitle(AppUtilsBusiness.tr('pkguid.edit.title', {text: $scope.pkguid.someText}));
-            //         AppUtilsBusiness.setToolbarTitle(AppUtilsBusiness.tr('pkguid.edit.toolbarTitle', {text: $scope.pkguid.someText}));
-            //     }
-            // };
-            //
-            // $scope.submit = function () {
-            //     if ($scope.pkguid.id == null) {
-            //         pkGuidBusiness.addDbo($scope.pkguid, 'pkguid.edit').then(function (data) {
-            //             $scope.pkguid = data;
-            //             $state.go('pkguid_edit', {pkguid: $scope.pkguid, id: $scope.pkguid.id});
-            //         }, function (error) {});
-            //     }
-            //     else {
-            //         pkGuidBusiness.editSingleByIdDbo($scope.pkguid.id, $scope.pkguid, 'pkguid.edit').then(function (data) {
-            //             $scope.pkguid = data;
-            //             $scope.setTitle();
-            //         }, function (error) {});
-            //     }
-            // };
-            //
-            // $scope.askRemoveOne = function (pkguid) {
-            //     var confirm = $mdDialog.confirm()
-            //         .title(AppUtilsBusiness.tr('common.confirmDelete'))
-            //         .textContent(AppUtilsBusiness.tr('pkguid.deleteOne', {text: pkguid.someText}))
-            //         .ok(AppUtilsBusiness.tr('common.delete'))
-            //         .cancel(AppUtilsBusiness.tr('common.cancel'));
-            //     $mdDialog.show(confirm).then(function() {
-            //         pkGuidBusiness.deleteDbo(pkguid.id, 'pkguid.edit').then(function(data)
-            //         {
-            //             $state.go('pkguid');
-            //         }, function(error) {});
-            //     }, function () {});
-            // };
-            //
-            //
-            // if ($state.params != null) {
-            //     if ($state.params.pkguid != null) {
-            //         $scope.pkguid = $state.params.pkguid;
-            //         $scope.setTitle();
-            //     }
-            //     else if ($state.params.id != null) {
-            //         pkGuidBusiness.getSingleById($state.params.id, 'pkguid.edit').then(function(data)
-            //         {
-            //             $scope.pkguid = data;
-            //             $scope.setTitle();
-            //         }, function (error) {
-            //             $scope.pkguid = null;
-            //             $scope.setTitle();
-            //         });
-            //     }
-            //     else {
-            //         $scope.pkguid = angular.copy($scope.defaultPkguid);
-            //         $scope.setTitle();
-            //     }
-            // }
-            // else {
-            //     $scope.pkguid = angular.copy($scope.defaultPkguid);
-            //     $scope.setTitle();
-            // }
-
-        }]);

frontend/WebSem/app/index.html

@@ -60,8 +60,8 @@
     <script src="controllers/sidebar.controller.js"></script>
     <script src="controllers/toolbar.controller.js"></script>
     <script src="controllers/home.controller.js"></script>
-    <script src="controllers/pkguids.controller.js"></script>
-    <script src="controllers/pkguidsedit.controller.js"></script>
+    <script src="controllers/articles.controller.js"></script>
+    <script src="controllers/articlesedit.controller.js"></script>
 
     <!-- Modal Controller -->
 
@@ -73,8 +73,8 @@
     <script src="../sdk/Business/listcontrollerbuilder.business.js"></script>
     <script src="../sdk/Business/itemTracker.business.js"></script>
     <script src="../sdk/Business/items.business.js"></script>
-    <script src="../sdk/DataAccess/pkguids.dataaccess.js"></script>
-    <script src="../sdk/Business/pkguids.business.js"></script>
+    <script src="../sdk/DataAccess/articles.dataaccess.js"></script>
+    <script src="../sdk/Business/articles.business.js"></script>
 
     <!-- Directives -->
 

frontend/WebSem/app/translations/en.json

@@ -1,6 +1,6 @@
 {
   "common": {
-    "appName": "MyApp",
+    "appName": "WWII",
     "filter": "Search",
     "all": "All",
     "new": "New",
@@ -19,12 +19,12 @@
     "view": "View",
     "save": "Save",
     "back": "Back",
-    "yes": "yes",
+    "yes": "Yes",
     "unsavedChanged": "Unsaved data",
     "confirmDelete": "Confirm deletion",
     "confirmExit": {
       "title": "Unsaved data",
-      "content": "Do you really ant to leave without saving?"
+      "content": "Do you really want to leave without saving?"
     },
     "pagination": {
       "of": "of",
@@ -44,28 +44,34 @@
     "name": "Home",
     "welcome": "Welcome Home!"
   },
-  "pkguids": {
-    "name": "PkGuids",
-    "selectedItems": "{count} {count, select, 1{PkGuid} other{PkGuids}} selected",
-    "id": "Id",
-    "someText": "Some Text",
-    "someInt": "Some Int",
-    "deleteOne": "Do you really want to delete PkGuid '{text}'?",
-    "deleteMultiple": "Do you really want to delete {count} {count, select, 1{PkGuid} other{PkGuids}}?",
+  "articles": {
+    "name": "Articles",
+    "selectedItems": "{count} {count, select, 1{article} other{articles}} selected",
+    "title": "Title",
+    "type": "Type",
+    "text": "Abstract",
+    "types": {
+      "home": "Home page",
+      "persons": "Person",
+      "locations": "Location",
+      "countries": "Country"
+    },
+    "deleteOne": "Do you really want to delete article '{text}'?",
+    "deleteMultiple": "Do you really want to delete {count} {count, select, 1{article} other{articles}}?",
     "edit": {
-      "defaultTitle": "Edit PkGuid",
-      "defaultToolbarTitle": "PkGuid ~ Edit",
-      "title": "Edit PkGuid '{text}'",
-      "toolbarTitle": "PkGuids ~ Edit ~ {text}"
+      "defaultTitle": "Edit article",
+      "defaultToolbarTitle": "Article ~ Edit",
+      "title": "Edit article '{text}'",
+      "toolbarTitle": "Articles ~ Edit ~ {text}"
     },
     "add": {
-      "defaultTitle": "New PkGuid",
-      "defaultToolbarTitle": "PkGuids ~ New"
+      "defaultTitle": "New article",
+      "defaultToolbarTitle": "Articles ~ New"
     },
     "notifications": {
-      "create": "PkGuid '{text}' was added",
-      "update": "PkGuid '{text}' was updated",
-      "delete": "PkGuid '{text}' was deleted"
+      "create": "Article '{text}' was added",
+      "update": "Article '{text}' was updated",
+      "delete": "Article '{text}' was deleted"
     }
   }
 }

frontend/WebSem/app/views/pkguids.html → frontend/WebSem/app/views/articles.html

@@ -53,9 +53,8 @@
             <table md-table md-row-select multiple ng-model="selected" >
                 <thead md-head md-order="query.order" md-on-reorder="getItems">
                 <tr md-row>
-                    <th md-column md-order-by="id"><span>{{ itemType + '.id' | translate }}</span></th>
-                    <th md-column md-order-by="someText"><span>{{ itemType + '.someText' | translate }}</span></th>
-                    <th md-column md-order-by="someInt" md-numeric>{{ itemType + '.someInt' | translate }}</th>
+                    <th md-column md-order-by="id"><span>{{ itemType + '.title' | translate }}</span></th>
+                    <th md-column md-order-by="type"><span>{{ itemType + '.type' | translate }}</span></th>
                     <th md-column md-order-by="createdAt">{{ 'common.createdAt' | translate }}</th>
                     <th md-column md-order-by="updatedAt">{{ 'common.updatedAt' | translate }}</th>
                     <th class="col-icon-1" md-column>{{ 'common.actions' | translate }}</th>
@@ -63,9 +62,8 @@
                 </thead>
                 <tbody md-body>
                 <tr md-row md-select="item" md-select-id="id" ng-repeat="item in items.data">
-                    <td md-cell>{{item.id}}</td>
-                    <td md-cell>{{item.someText}}</td>
-                    <td md-cell>{{item.someInt}}</td>
+                    <td md-cell>{{item.title}}</td>
+                    <td md-cell>{{ itemType + '.types.' + item.type | translate }}</td>
                     <td md-cell>{{item.createdAt | formatDateTime}}</td>
                     <td md-cell>{{item.updatedAt == null ? ('common.never' | translate ) : (item.updatedAt | formatDateTime)}}</td>
                     <td class="col-icon-1" md-cell>

frontend/WebSem/app/views/pkguidsedit.html → frontend/WebSem/app/views/articlesedit.html

@@ -17,14 +17,22 @@
     <md-content layout-padding>
         <form name="editForm">
             <div layout-gt-sm="row">
-                <md-input-container class="md-block" flex-gt-sm>
-                    <label>{{ itemType + '.someText' | translate }}</label>
-                    <input required ng-model="item.someText">
+                <md-input-container class="md-block" flex flex-gt-sm="15">
+                    <label>{{ itemType + '.type' | translate }}</label>
+                    <md-select ng-model="item.type" required ng-readonly="item.id != null">
+                        <md-option ng-repeat="type in appUtils.articleTypes" ng-value="type">{{ itemType + '.types.' + type | translate }}</md-option>
+                    </md-select>
                 </md-input-container>
 
                 <md-input-container class="md-block" flex-gt-sm>
-                    <label>{{ itemType + '.someInt' | translate }}</label>
-                    <input required type="number" ng-model="item.someInt">
+                    <label>{{ itemType + '.title' | translate }}</label>
+                    <input required ng-model="item.title" ng-readonly="item.id != null">
+                </md-input-container>
+            </div>
+            <div layout-gt-sm="row">
+                <md-input-container class="md-block" flex-gt-sm>
+                    <label>{{ itemType + '.text' | translate }}</label>
+                    <textarea ng-model="item.text" required></textarea>
                 </md-input-container>
             </div>
             <div flex>

frontend/WebSem/sdk/Business/apputils.business.js

@@ -89,6 +89,8 @@
                 });
             };
 
+            AppUtilsBusiness.articleTypes = ['persons', 'locations', 'countries'];
+
             return AppUtilsBusiness;
         }]);
 })();

frontend/WebSem/sdk/Business/articles.business.js

@@ -0,0 +1,15 @@
+/**
+ * Created by robin on 12/12/16.
+ */
+
+(function () {
+    'use strict';
+
+    angular.module('appSdk')
+        .factory('articlesBusiness', ['luWebApiCrudBusiness', 'articlesDataAccess', function (luWebApiCrudBusiness, articlesDataAccess) {
+
+            var Business = luWebApiCrudBusiness.create(articlesDataAccess);
+
+            return Business;
+        }]);
+})();

frontend/WebSem/sdk/Business/pkguids.business.js

@@ -1,15 +0,0 @@
-/**
- * Created by robin on 12/12/16.
- */
-
-(function () {
-    'use strict';
-
-    angular.module('appSdk')
-        .factory('pkguidsBusiness', ['luWebApiCrudBusiness', 'pkguidsDataAccess', function (luWebApiCrudBusiness, pkguidsDataAccess) {
-
-            var Business = luWebApiCrudBusiness.create(pkguidsDataAccess);
-
-            return Business;
-        }]);
-})();

frontend/WebSem/sdk/DataAccess/articles.dataaccess.js

@@ -0,0 +1,79 @@
+/**
+ * Created by robin on 12/12/16.
+ */
+
+(function () {
+    'use strict';
+
+    angular.module('appSdk')
+        .factory('articlesDataAccess', ['luWebApiCrudDataAccess', 'luDataInitializer',
+            function (luWebApiCrudDataAccess, luDataInitializer) {
+
+            var DataAccess = luWebApiCrudDataAccess.create('/api/articles');
+
+            DataAccess.defaultDbo = {
+                id: null,
+                title: null,
+                type: null,
+                text: null,
+                pictureUrl: null,
+                pictureCaption: null,
+                fields: [],
+                createdAt: null,
+                updatedAt: null,
+                _itemType: 'articles',
+                toString: function () {
+                    return this.id;
+                }
+            };
+
+            DataAccess.defaultFieldDbo = {
+                value: null,
+                property: null,
+                type: 20.0
+            };
+
+            DataAccess.initFieldDbo = function (dbo, type) {
+                if (dbo == null) {
+                    return null;
+                }
+                var dboInit = DataAccess.extendDeep({}, DataAccess.defaultFieldDbo, dbo);
+                return dboInit;
+            };
+
+            DataAccess.initFieldModel = function (model, op) {
+                if (model == null) {
+                    return null;
+                }
+                var modelInit = angular.copy(model);
+                return modelInit;
+            };
+
+            DataAccess.articleFieldModelInitializer = luDataInitializer.create(DataAccess.initFieldModel);
+
+            DataAccess.articleFieldDboInitializer = luDataInitializer.create(DataAccess.initFieldDbo);
+
+            DataAccess.initDbo = function (dbo, type) {
+                if (dbo == null) {
+                    return null;
+                }
+                var dboInit = DataAccess._initDbo(dbo);
+                dboInit.fields = DataAccess.articleFieldDboInitializer.initListData(dboInit.fields, type);
+                dboInit.title = dboInit.id;
+                return dboInit;
+            };
+
+            DataAccess.initModel = function (model, op) {
+                if (model == null) {
+                    return null;
+                }
+                var modelInit = DataAccess._initModel(model, op);
+                modelInit.fields = DataAccess.articleFieldModelInitializer.initListData(modelInit.fields, op);
+                modelInit.id = modelInit.title;
+                delete modelInit.title;
+                return modelInit;
+            };
+
+            return DataAccess;
+        }]);
+})();

frontend/WebSem/sdk/DataAccess/pkguids.dataaccess.js

@@ -1,27 +0,0 @@
-/**
- * Created by robin on 12/12/16.
- */
-
-(function () {
-    'use strict';
-
-    angular.module('appSdk')
-        .factory('pkguidsDataAccess', ['luWebApiCrudDataAccess', function (luWebApiCrudDataAccess) {
-
-            var DataAccess = luWebApiCrudDataAccess.create('/api/pkguid');
-
-            DataAccess.defaultDbo = {
-                id: null,
-                someText: null,
-                someInt: null,
-                createdAt: null,
-                updatedAt: null,
-                _itemType: 'pkguids',
-                toString: function () {
-                    return (this.someText != '' && this.someText != null) ? this.someText : this.id;
-                }
-            };
-
-            return DataAccess;
-        }]);
-})();