fixed one to many sync

backend/WebSem/.idea/.idea.WebSem/.idea/workspace.xml

@@ -2,17 +2,13 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="8d054e21-e284-419c-acba-f672639639a4" name="Default" comment="">
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/.idea.WebSem/.idea/dataSources.local.xml" afterPath="$PROJECT_DIR$/.idea/.idea.WebSem/.idea/dataSources.local.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/.idea.WebSem/.idea/dataSources.xml" afterPath="$PROJECT_DIR$/.idea/.idea.WebSem/.idea/dataSources.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/.idea.WebSem/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/.idea.WebSem/.idea/workspace.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/WebApiWebSem/DataAccess/ArticlesDataAccess.cs" afterPath="$PROJECT_DIR$/WebApiWebSem/DataAccess/ArticlesDataAccess.cs" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/WebApiWebSem/DataAccess/ModelsDbo.cs" afterPath="$PROJECT_DIR$/WebApiWebSem/DataAccess/ModelsDbo.cs" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../frontend/WebSem/app/controllers/articles.controller.js" afterPath="$PROJECT_DIR$/../../frontend/WebSem/app/controllers/articles.controller.js" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../frontend/WebSem/app/less/app.less" afterPath="$PROJECT_DIR$/../../frontend/WebSem/app/less/app.less" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../frontend/WebSem/app/translations/en.json" afterPath="$PROJECT_DIR$/../../frontend/WebSem/app/translations/en.json" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../frontend/WebSem/app/views/articles.html" afterPath="$PROJECT_DIR$/../../frontend/WebSem/app/views/articles.html" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../frontend/WebSem/app/views/articlesedit.html" afterPath="$PROJECT_DIR$/../../frontend/WebSem/app/views/articlesedit.html" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../frontend/WebSem/sdk/Business/listcontrollerbuilder.business.js" afterPath="$PROJECT_DIR$/../../frontend/WebSem/sdk/Business/listcontrollerbuilder.business.js" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../frontend/WebSem/sdk/DataAccess/articles.dataaccess.js" afterPath="$PROJECT_DIR$/../../frontend/WebSem/sdk/DataAccess/articles.dataaccess.js" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../frontend/WebSem/sdk/Business/apputils.business.js" afterPath="$PROJECT_DIR$/../../frontend/WebSem/sdk/Business/apputils.business.js" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -48,25 +44,30 @@
       <file leaf-file-name="ArticlesDataAccess.cs" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/WebApiWebSem/DataAccess/ArticlesDataAccess.cs">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-113">
-              <caret line="48" column="69" lean-forward="true" selection-start-line="48" selection-start-column="69" selection-end-line="48" selection-end-column="69" />
+            <state relative-caret-position="445">
+              <caret line="105" column="43" lean-forward="true" selection-start-line="105" selection-start-column="43" selection-end-line="105" selection-end-column="43" />
               <folding>
-                <marker date="1487541118573" expanded="true" signature="6:273" ph="..." />
-                <marker date="1487541118573" expanded="true" signature="308:2856" ph="{...}" />
-                <marker date="1487541118573" expanded="true" signature="444:2854" ph="{...}" />
-                <marker date="1487541118573" expanded="true" signature="645:665" ph="{...}" />
-                <marker date="1487541118573" expanded="true" signature="717:760" ph="{...}" />
-                <marker date="1487541118573" expanded="true" signature="869:964" ph="{...}" />
-                <marker date="1487541118573" expanded="true" signature="1033:1085" ph="{...}" />
-                <marker date="1487541118573" expanded="true" signature="1145:1383" ph="{...}" />
-                <marker date="1487541118573" expanded="true" signature="1281:1338" ph="{...}" />
-                <marker date="1487541118573" expanded="true" signature="1484:1620" ph="{...}" />
-                <marker date="1487541118573" expanded="true" signature="1697:2221" ph="{...}" />
-                <marker date="1487541118573" expanded="true" signature="1752:2210" ph="{...}" />
-                <marker date="1487541118573" expanded="true" signature="2014:2153" ph="{...}" />
-                <marker date="1487541118573" expanded="true" signature="2312:2722" ph="{...}" />
-                <marker date="1487541118573" expanded="true" signature="2527:2666" ph="{...}" />
-                <marker date="1487541118573" expanded="true" signature="2794:2848" ph="{...}" />
+                <marker date="1487546558945" expanded="true" signature="6:307" ph="..." />
+                <marker date="1487546558945" expanded="true" signature="342:4021" ph="{...}" />
+                <marker date="1487546558945" expanded="true" signature="478:4019" ph="{...}" />
+                <marker date="1487546558945" expanded="true" signature="679:699" ph="{...}" />
+                <marker date="1487546558945" expanded="true" signature="751:794" ph="{...}" />
+                <marker date="1487546558945" expanded="true" signature="903:998" ph="{...}" />
+                <marker date="1487546558945" expanded="true" signature="1108:1175" ph="{...}" />
+                <marker date="1487546558945" expanded="true" signature="1244:1296" ph="{...}" />
+                <marker date="1487546558945" expanded="true" signature="1356:1594" ph="{...}" />
+                <marker date="1487546558945" expanded="true" signature="1492:1549" ph="{...}" />
+                <marker date="1487546558945" expanded="true" signature="1695:1831" ph="{...}" />
+                <marker date="1487546558945" expanded="true" signature="1908:2432" ph="{...}" />
+                <marker date="1487546558945" expanded="true" signature="1963:2421" ph="{...}" />
+                <marker date="1487546558945" expanded="true" signature="2225:2364" ph="{...}" />
+                <marker date="1487546558945" expanded="true" signature="2523:2682" ph="{...}" />
+                <marker date="1487546558945" expanded="true" signature="2825:3887" ph="{...}" />
+                <marker date="1487546558945" expanded="true" signature="3000:3086" ph="{...}" />
+                <marker date="1487546558945" expanded="true" signature="3146:3379" ph="{...}" />
+                <marker date="1487546558945" expanded="true" signature="3533:3833" ph="{...}" />
+                <marker date="1487546558945" expanded="true" signature="3629:3817" ph="{...}" />
+                <marker date="1487546558945" expanded="true" signature="3959:4013" ph="{...}" />
               </folding>
             </state>
           </provider>
@@ -75,19 +76,9 @@
       <file leaf-file-name="ModelsDbo.cs" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/WebApiWebSem/DataAccess/ModelsDbo.cs">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="450">
-              <caret line="34" column="30" lean-forward="false" selection-start-line="34" selection-start-column="30" selection-end-line="34" selection-end-column="30" />
-              <folding>
-                <marker date="1487540897085" expanded="true" signature="6:157" ph="..." />
-                <marker date="1487540897085" expanded="true" signature="192:1247" ph="{...}" />
-                <marker date="1487540897085" expanded="true" signature="228:1245" ph="{...}" />
-                <marker date="1487540897085" expanded="true" signature="308:600" ph="{...}" />
-                <marker date="1487540897085" expanded="true" signature="349:406" ph="{...}" />
-                <marker date="1487540897085" expanded="true" signature="460:589" ph="{...}" />
-                <marker date="1487540897085" expanded="true" signature="662:1239" ph="{...}" />
-                <marker date="1487540897085" expanded="true" signature="703:760" ph="{...}" />
-                <marker date="1487540897085" expanded="true" signature="808:1228" ph="{...}" />
-              </folding>
+            <state relative-caret-position="432">
+              <caret line="33" column="83" lean-forward="false" selection-start-line="33" selection-start-column="83" selection-end-line="33" selection-end-column="83" />
+              <folding />
             </state>
           </provider>
         </entry>
@@ -295,12 +286,12 @@
       <workItem from="1487108080916" duration="3508000" />
       <workItem from="1487345029610" duration="5634000" />
       <workItem from="1487441650798" duration="14018000" />
-      <workItem from="1487528667649" duration="8537000" />
+      <workItem from="1487528667649" duration="11486000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="35403000" />
+    <option name="totallyTimeSpent" value="38352000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -356,22 +347,27 @@
         <state relative-caret-position="0">
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
           <folding>
-            <marker date="1487541118573" expanded="true" signature="6:273" ph="..." />
-            <marker date="1487541118573" expanded="true" signature="308:2856" ph="{...}" />
-            <marker date="1487541118573" expanded="true" signature="444:2854" ph="{...}" />
-            <marker date="1487541118573" expanded="true" signature="645:665" ph="{...}" />
-            <marker date="1487541118573" expanded="true" signature="717:760" ph="{...}" />
-            <marker date="1487541118573" expanded="true" signature="869:964" ph="{...}" />
-            <marker date="1487541118573" expanded="true" signature="1033:1085" ph="{...}" />
-            <marker date="1487541118573" expanded="true" signature="1145:1383" ph="{...}" />
-            <marker date="1487541118573" expanded="true" signature="1281:1338" ph="{...}" />
-            <marker date="1487541118573" expanded="true" signature="1484:1620" ph="{...}" />
-            <marker date="1487541118573" expanded="true" signature="1697:2221" ph="{...}" />
-            <marker date="1487541118573" expanded="true" signature="1752:2210" ph="{...}" />
-            <marker date="1487541118573" expanded="true" signature="2014:2153" ph="{...}" />
-            <marker date="1487541118573" expanded="true" signature="2312:2722" ph="{...}" />
-            <marker date="1487541118573" expanded="true" signature="2527:2666" ph="{...}" />
-            <marker date="1487541118573" expanded="true" signature="2794:2848" ph="{...}" />
+            <marker date="1487546558945" expanded="true" signature="6:307" ph="..." />
+            <marker date="1487546558945" expanded="true" signature="342:4021" ph="{...}" />
+            <marker date="1487546558945" expanded="true" signature="478:4019" ph="{...}" />
+            <marker date="1487546558945" expanded="true" signature="679:699" ph="{...}" />
+            <marker date="1487546558945" expanded="true" signature="751:794" ph="{...}" />
+            <marker date="1487546558945" expanded="true" signature="903:998" ph="{...}" />
+            <marker date="1487546558945" expanded="true" signature="1108:1175" ph="{...}" />
+            <marker date="1487546558945" expanded="true" signature="1244:1296" ph="{...}" />
+            <marker date="1487546558945" expanded="true" signature="1356:1594" ph="{...}" />
+            <marker date="1487546558945" expanded="true" signature="1492:1549" ph="{...}" />
+            <marker date="1487546558945" expanded="true" signature="1695:1831" ph="{...}" />
+            <marker date="1487546558945" expanded="true" signature="1908:2432" ph="{...}" />
+            <marker date="1487546558945" expanded="true" signature="1963:2421" ph="{...}" />
+            <marker date="1487546558945" expanded="true" signature="2225:2364" ph="{...}" />
+            <marker date="1487546558945" expanded="true" signature="2523:2682" ph="{...}" />
+            <marker date="1487546558945" expanded="true" signature="2825:3887" ph="{...}" />
+            <marker date="1487546558945" expanded="true" signature="3000:3086" ph="{...}" />
+            <marker date="1487546558945" expanded="true" signature="3146:3379" ph="{...}" />
+            <marker date="1487546558945" expanded="true" signature="3533:3833" ph="{...}" />
+            <marker date="1487546558945" expanded="true" signature="3629:3817" ph="{...}" />
+            <marker date="1487546558945" expanded="true" signature="3959:4013" ph="{...}" />
           </folding>
         </state>
       </provider>
@@ -643,6 +639,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="489">
           <caret line="39" column="42" lean-forward="true" selection-start-line="39" selection-start-column="42" selection-end-line="39" selection-end-column="42" />
+          <folding />
         </state>
       </provider>
     </entry>
@@ -836,45 +833,48 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$USER_HOME$/.local/share/JetBrains/Shared/v08/DecompilerCache/decompiler/68A505D3-EE90-4B2D-8432-759050F70CC3/8e/cee9fac8/LuResult`1.cs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="180">
+          <caret line="10" column="15" lean-forward="false" selection-start-line="10" selection-start-column="15" selection-end-line="10" selection-end-column="15" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/WebApiWebSem/DataAccess/ModelsDbo.cs">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="450">
-          <caret line="34" column="30" lean-forward="false" selection-start-line="34" selection-start-column="30" selection-end-line="34" selection-end-column="30" />
-          <folding>
-            <marker date="1487540897085" expanded="true" signature="6:157" ph="..." />
-            <marker date="1487540897085" expanded="true" signature="192:1247" ph="{...}" />
-            <marker date="1487540897085" expanded="true" signature="228:1245" ph="{...}" />
-            <marker date="1487540897085" expanded="true" signature="308:600" ph="{...}" />
-            <marker date="1487540897085" expanded="true" signature="349:406" ph="{...}" />
-            <marker date="1487540897085" expanded="true" signature="460:589" ph="{...}" />
-            <marker date="1487540897085" expanded="true" signature="662:1239" ph="{...}" />
-            <marker date="1487540897085" expanded="true" signature="703:760" ph="{...}" />
-            <marker date="1487540897085" expanded="true" signature="808:1228" ph="{...}" />
-          </folding>
+        <state relative-caret-position="432">
+          <caret line="33" column="83" lean-forward="false" selection-start-line="33" selection-start-column="83" selection-end-line="33" selection-end-column="83" />
+          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/WebApiWebSem/DataAccess/ArticlesDataAccess.cs">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-113">
-          <caret line="48" column="69" lean-forward="true" selection-start-line="48" selection-start-column="69" selection-end-line="48" selection-end-column="69" />
+        <state relative-caret-position="445">
+          <caret line="105" column="43" lean-forward="true" selection-start-line="105" selection-start-column="43" selection-end-line="105" selection-end-column="43" />
           <folding>
-            <marker date="1487541118573" expanded="true" signature="6:273" ph="..." />
-            <marker date="1487541118573" expanded="true" signature="308:2856" ph="{...}" />
-            <marker date="1487541118573" expanded="true" signature="444:2854" ph="{...}" />
-            <marker date="1487541118573" expanded="true" signature="645:665" ph="{...}" />
-            <marker date="1487541118573" expanded="true" signature="717:760" ph="{...}" />
-            <marker date="1487541118573" expanded="true" signature="869:964" ph="{...}" />
-            <marker date="1487541118573" expanded="true" signature="1033:1085" ph="{...}" />
-            <marker date="1487541118573" expanded="true" signature="1145:1383" ph="{...}" />
-            <marker date="1487541118573" expanded="true" signature="1281:1338" ph="{...}" />
-            <marker date="1487541118573" expanded="true" signature="1484:1620" ph="{...}" />
-            <marker date="1487541118573" expanded="true" signature="1697:2221" ph="{...}" />
-            <marker date="1487541118573" expanded="true" signature="1752:2210" ph="{...}" />
-            <marker date="1487541118573" expanded="true" signature="2014:2153" ph="{...}" />
-            <marker date="1487541118573" expanded="true" signature="2312:2722" ph="{...}" />
-            <marker date="1487541118573" expanded="true" signature="2527:2666" ph="{...}" />
-            <marker date="1487541118573" expanded="true" signature="2794:2848" ph="{...}" />
+            <marker date="1487546558945" expanded="true" signature="6:307" ph="..." />
+            <marker date="1487546558945" expanded="true" signature="342:4021" ph="{...}" />
+            <marker date="1487546558945" expanded="true" signature="478:4019" ph="{...}" />
+            <marker date="1487546558945" expanded="true" signature="679:699" ph="{...}" />
+            <marker date="1487546558945" expanded="true" signature="751:794" ph="{...}" />
+            <marker date="1487546558945" expanded="true" signature="903:998" ph="{...}" />
+            <marker date="1487546558945" expanded="true" signature="1108:1175" ph="{...}" />
+            <marker date="1487546558945" expanded="true" signature="1244:1296" ph="{...}" />
+            <marker date="1487546558945" expanded="true" signature="1356:1594" ph="{...}" />
+            <marker date="1487546558945" expanded="true" signature="1492:1549" ph="{...}" />
+            <marker date="1487546558945" expanded="true" signature="1695:1831" ph="{...}" />
+            <marker date="1487546558945" expanded="true" signature="1908:2432" ph="{...}" />
+            <marker date="1487546558945" expanded="true" signature="1963:2421" ph="{...}" />
+            <marker date="1487546558945" expanded="true" signature="2225:2364" ph="{...}" />
+            <marker date="1487546558945" expanded="true" signature="2523:2682" ph="{...}" />
+            <marker date="1487546558945" expanded="true" signature="2825:3887" ph="{...}" />
+            <marker date="1487546558945" expanded="true" signature="3000:3086" ph="{...}" />
+            <marker date="1487546558945" expanded="true" signature="3146:3379" ph="{...}" />
+            <marker date="1487546558945" expanded="true" signature="3533:3833" ph="{...}" />
+            <marker date="1487546558945" expanded="true" signature="3629:3817" ph="{...}" />
+            <marker date="1487546558945" expanded="true" signature="3959:4013" ph="{...}" />
           </folding>
         </state>
       </provider>

backend/WebSem/WebApiWebSem/DataAccess/ArticlesDataAccess.cs

@@ -4,6 +4,7 @@ using System.Linq;
 using System.Linq.Expressions;
 using Luticate2.Utils.DataAccess;
 using Luticate2.Utils.Dbo.Filter;
+using Luticate2.Utils.Dbo.Result;
 using Microsoft.EntityFrameworkCore;
 using WebApiWebSem.DataAccess.Models;
 using WebApiWebSem.Dbo.Articles;
@@ -28,6 +29,11 @@ namespace WebApiWebSem.DataAccess
             return table.Include(articles => articles.articles_fields_fk);
         }
 
+        protected override IQueryable<articles> GetEditQueryable(WsDbContext db, IQueryable<articles> table)
+        {
+            return GetGetQueryable(db, table);
+        }
+
         protected override DbSet<articles> GetTable(WsDbContext db)
         {
             return db.articles;
@@ -71,15 +77,35 @@ namespace WebApiWebSem.DataAccess
         {
             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 LuResult<bool> _EditSingleById(articles model, ArticlesEditDbo update, WsDbContext db, IQueryable<articles> table)
+        {
+            foreach (var removed in model.articles_fields_fk.Where(fields => update.Fields.FirstOrDefault(dbo => dbo.Property == fields.property) == null).ToList())
+            {
+                model.articles_fields_fk.Remove(removed);
+            }
+            foreach (var field in model.articles_fields_fk)
+            {
+                var f = update.Fields.First(dbo => dbo.Property == field.property);
+                field.value = f.Value;
+                field.property = f.Property;
+                field.type = f.Type;
+            }
+            foreach (var added in update.Fields.Where(dbo => model.articles_fields_fk.FirstOrDefault(fields => dbo.Property == fields.property) == null))
+            {
+                model.articles_fields_fk.Add(new articles_fields
+                {
+                    value = added.Value,
+                    property = added.Property,
+                    type = added.Type,
+                    article_id = model.id
+                });
+            }
+            return LuResult<bool>.Ok(true);
+        }
+
         protected override ArticlesDbo GetDboFromModel(articles model)
         {
             return model.ToDbo();

backend/WebSem/WebApiWebSem/DataAccess/ModelsDbo.cs

@@ -31,7 +31,7 @@ namespace WebApiWebSem.DataAccess
             return new ArticlesDbo
             {
                 CreatedAt = model.created_at.ToDbo(),
-                Fields = model.articles_fields_fk.Select(fields => fields.ToDbo()).ToList(),
+                Fields = model.articles_fields_fk.OrderBy(fields => fields.property).Select(fields => fields.ToDbo()).ToList(),
                 Id = model.id,
                 PictureCaption = model.picture_caption,
                 PictureUrl = model.picture_url,