article edit UI

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

@@ -8,7 +8,7 @@
       <case-sensitivity plain-identifiers="lower" quoted-identifiers="exact" />
       <secret-storage>master_key</secret-storage>
       <user-name>dev</user-name>
-      <introspection-schemas>websem-project:public</introspection-schemas>
+      <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>

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

@@ -5,7 +5,7 @@
       <driver-ref>postgresql</driver-ref>
       <synchronize>true</synchronize>
       <jdbc-driver>org.postgresql.Driver</jdbc-driver>
-      <jdbc-url>jdbc:postgresql://localhost:5432/websem-project</jdbc-url>
+      <jdbc-url>jdbc:postgresql://localhost:5432/websem_project</jdbc-url>
     </data-source>
   </component>
 </project>

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

@@ -2,31 +2,17 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="8d054e21-e284-419c-acba-f672639639a4" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/../../frontend/WebSem/app/controllers/articles.controller.js" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/../../frontend/WebSem/app/controllers/articlesedit.controller.js" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/WebApiWebSem/Controllers/ValuesController.cs" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/../../frontend/WebSem/app/controllers/pkguids.controller.js" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/../../frontend/WebSem/app/controllers/pkguidsedit.controller.js" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/../../frontend/WebSem/sdk/DataAccess/.gitkeep" afterPath="" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/../../frontend/WebSem/app/views/pkguids.html" afterPath="$PROJECT_DIR$/../../frontend/WebSem/app/views/articles.html" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/../../frontend/WebSem/app/views/pkguidsedit.html" afterPath="$PROJECT_DIR$/../../frontend/WebSem/app/views/articlesedit.html" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/../../frontend/WebSem/sdk/Business/pkguids.business.js" afterPath="$PROJECT_DIR$/../../frontend/WebSem/sdk/Business/articles.business.js" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/../../frontend/WebSem/sdk/DataAccess/pkguids.dataaccess.js" afterPath="$PROJECT_DIR$/../../frontend/WebSem/sdk/DataAccess/articles.dataaccess.js" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../frontend/WebSem/favicon.ico" afterPath="$PROJECT_DIR$/../../frontend/WebSem/favicon.ico" />
       <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$/.idea/.idea.WebSem/riderModule.iml" afterPath="$PROJECT_DIR$/.idea/.idea.WebSem/riderModule.iml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/WebApiWebSem/DataAccess/Models/articles.cs" afterPath="$PROJECT_DIR$/WebApiWebSem/DataAccess/Models/articles.cs" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/WebApiWebSem/DataAccess/WsDbContext.cs" afterPath="$PROJECT_DIR$/WebApiWebSem/DataAccess/WsDbContext.cs" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/WebApiWebSem/DataAccess/code-from-ds/code-from-ds.json" afterPath="$PROJECT_DIR$/WebApiWebSem/DataAccess/code-from-ds/code-from-ds.json" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/WebApiWebSem/Startup.cs" afterPath="$PROJECT_DIR$/WebApiWebSem/Startup.cs" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/WebApiWebSem/appsettings.Development.json" afterPath="$PROJECT_DIR$/WebApiWebSem/appsettings.Development.json" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/WebApiWebSem/project.json" afterPath="$PROJECT_DIR$/WebApiWebSem/project.json" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/WebSem.sln" afterPath="$PROJECT_DIR$/WebSem.sln" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../frontend/WebSem/README.md" afterPath="$PROJECT_DIR$/../../frontend/WebSem/README.md" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../frontend/WebSem/app/app.js" afterPath="$PROJECT_DIR$/../../frontend/WebSem/app/app.js" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../frontend/WebSem/app/index.html" afterPath="$PROJECT_DIR$/../../frontend/WebSem/app/index.html" />
+      <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/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" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -55,125 +41,32 @@
         <option name="myItemType" value="com.intellij.database.view.DbNodeDescriptor" />
       </PATH_ELEMENT>
     </PATH>
-    <PATH>
-      <PATH_ELEMENT>
-        <option name="myItemId" />
-        <option name="myItemType" value="com.intellij.database.view.DatabaseStructure$Root" />
-      </PATH_ELEMENT>
-      <PATH_ELEMENT>
-        <option name="myItemId" value="websem-project" />
-        <option name="myItemType" value="com.intellij.database.view.DbNodeDescriptor" />
-      </PATH_ELEMENT>
-      <PATH_ELEMENT>
-        <option name="myItemId" />
-        <option name="myItemType" value="com.intellij.database.view.DatabaseStructure$GroupNode" />
-      </PATH_ELEMENT>
-    </PATH>
-    <PATH>
-      <PATH_ELEMENT>
-        <option name="myItemId" />
-        <option name="myItemType" value="com.intellij.database.view.DatabaseStructure$Root" />
-      </PATH_ELEMENT>
-      <PATH_ELEMENT>
-        <option name="myItemId" value="websem-project" />
-        <option name="myItemType" value="com.intellij.database.view.DbNodeDescriptor" />
-      </PATH_ELEMENT>
-      <PATH_ELEMENT>
-        <option name="myItemId" />
-        <option name="myItemType" value="com.intellij.database.view.DatabaseStructure$GroupNode" />
-      </PATH_ELEMENT>
-      <PATH_ELEMENT>
-        <option name="myItemId" value="articles_fields" />
-        <option name="myItemType" value="com.intellij.database.view.DbNodeDescriptor" />
-      </PATH_ELEMENT>
-    </PATH>
   </component>
   <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="ArticlesDbo.cs" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/WebApiWebSem/Dbo/Articles/ArticlesDbo.cs">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="90">
-              <caret line="5" column="39" lean-forward="false" selection-start-line="5" selection-start-column="39" selection-end-line="5" selection-end-column="39" />
-              <folding>
-                <marker date="1487458480243" expanded="true" signature="6:52" ph="..." />
-                <marker date="1487458480243" expanded="true" signature="89:268" ph="{...}" />
-                <marker date="1487458480243" expanded="true" signature="156:266" ph="{...}" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="Tests.cs" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/Test/Tests.cs">
+      <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="180">
-              <caret line="10" column="52" lean-forward="true" selection-start-line="10" selection-start-column="52" selection-end-line="10" selection-end-column="52" />
+            <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" />
               <folding>
-                <marker date="1487539122533" expanded="true" signature="6:163" ph="..." />
-                <marker date="1487539122533" expanded="true" signature="179:1618" ph="{...}" />
-                <marker date="1487539122533" expanded="true" signature="204:1616" ph="{...}" />
-                <marker date="1487539122533" expanded="true" signature="435:877" ph="{...}" />
-                <marker date="1487539122533" expanded="true" signature="951:1388" ph="{...}" />
-                <marker date="1487539122533" expanded="true" signature="1194:1261" ph="{...}" />
-                <marker date="1487539122533" expanded="true" signature="1281:1378" ph="{...}" />
-                <marker date="1487539122533" expanded="true" signature="1466:1610" ph="{...}" />
-                <marker date="1487539122533" expanded="true" signature="1512:1598" ph="{...}" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="ArticlesAddDbo.cs" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/WebApiWebSem/Dbo/Articles/ArticlesAddDbo.cs">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="144">
-              <caret line="8" column="38" lean-forward="true" selection-start-line="8" selection-start-column="38" selection-end-line="8" selection-end-column="38" />
-              <folding>
-                <marker date="1487458480259" expanded="true" signature="6:83" ph="..." />
-                <marker date="1487458480259" expanded="true" signature="120:396" ph="{...}" />
-                <marker date="1487458480259" expanded="true" signature="179:310" ph="{...}" />
-                <marker date="1487458480259" expanded="true" signature="382:394" ph="{...}" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="ArticlesEditDbo.cs" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/WebApiWebSem/Dbo/Articles/ArticlesEditDbo.cs">
-          <provider selected="true" editor-type-id="text-editor">
-            <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="1487458480231" expanded="true" signature="75:166" ph="{...}" />
-                <marker date="1487458480231" expanded="true" signature="152:164" ph="{...}" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="ArticlesFieldsAddDbo.cs" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/WebApiWebSem/Dbo/ArticlesFields/ArticlesFieldsAddDbo.cs">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="36">
-              <caret line="2" column="43" lean-forward="false" selection-start-line="2" selection-start-column="43" selection-end-line="2" selection-end-column="43" />
-              <folding>
-                <marker date="1487461391707" expanded="true" signature="41:119" ph="{...}" />
-                <marker date="1487461391707" expanded="true" signature="105:117" ph="{...}" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="ArticlesFieldsEditDbo.cs" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/WebApiWebSem/Dbo/ArticlesFields/ArticlesFieldsEditDbo.cs">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="234">
-              <caret line="13" column="40" lean-forward="false" selection-start-line="13" selection-start-column="40" selection-end-line="13" selection-end-column="40" />
-              <folding>
-                <marker date="1487461391719" expanded="true" signature="87:329" ph="{...}" />
-                <marker date="1487461391719" expanded="true" signature="128:327" ph="{...}" />
+                <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="{...}" />
               </folding>
             </state>
           </provider>
@@ -182,58 +75,18 @@
       <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="270">
-              <caret line="15" column="34" lean-forward="false" selection-start-line="15" selection-start-column="34" selection-end-line="15" selection-end-column="34" />
-              <folding>
-                <marker date="1487538892461" expanded="true" signature="6:157" ph="..." />
-                <marker date="1487538892461" expanded="true" signature="192:1071" ph="{...}" />
-                <marker date="1487538892461" expanded="true" signature="228:1069" ph="{...}" />
-                <marker date="1487538892461" expanded="true" signature="308:512" ph="{...}" />
-                <marker date="1487538892461" expanded="true" signature="372:501" ph="{...}" />
-                <marker date="1487538892461" expanded="true" signature="574:1063" ph="{...}" />
-                <marker date="1487538892461" expanded="true" signature="632:1052" ph="{...}" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="ArticlesFieldsDbo.cs" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/WebApiWebSem/Dbo/ArticlesFields/ArticlesFieldsDbo.cs">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="36">
-              <caret line="2" column="43" lean-forward="false" selection-start-line="2" selection-start-column="43" selection-end-line="2" selection-end-column="43" />
+            <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="1487458004959" expanded="true" signature="41:116" ph="{...}" />
-                <marker date="1487458004959" expanded="true" signature="101:114" ph="{...}" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="ArticlesBasicDbo.cs" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/WebApiWebSem/Dbo/Articles/ArticlesBasicDbo.cs">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="144">
-              <caret line="8" column="44" lean-forward="false" selection-start-line="8" selection-start-column="44" selection-end-line="8" selection-end-column="44" />
-              <folding>
-                <marker date="1487458868439" expanded="true" signature="6:78" ph="..." />
-                <marker date="1487458868439" expanded="true" signature="115:393" ph="{...}" />
-                <marker date="1487458868439" expanded="true" signature="154:391" ph="{...}" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="appsettings.Development.json" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/WebApiWebSem/appsettings.Development.json">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="198">
-              <caret line="11" column="86" lean-forward="false" selection-start-line="11" selection-start-column="86" selection-end-line="11" selection-end-column="86" />
-              <folding>
-                <marker date="1487539113101" expanded="true" signature="0:490" ph="{...}" />
-                <marker date="1487539113101" expanded="true" signature="17:297" ph="{...}" />
-                <marker date="1487539113101" expanded="true" signature="71:291" ph="{...}" />
-                <marker date="1487539113101" expanded="true" signature="324:468" ph="{...}" />
+                <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>
           </provider>
@@ -274,14 +127,14 @@
         <option value="$USER_HOME$/.local/share/JetBrains/Shared/v08/DecompilerCache/decompiler/68A505D3-EE90-4B2D-8432-759050F70CC3/27/e8d84624/LuCrudInterfaceExtensions.cs" />
         <option value="$USER_HOME$/.local/share/JetBrains/Shared/v08/DecompilerCache/decompiler/68A505D3-EE90-4B2D-8432-759050F70CC3/20/5bcc5074/ILuCrudInterface`4.cs" />
         <option value="$USER_HOME$/.local/share/JetBrains/Shared/v08/DecompilerCache/decompiler/B004CFF6-238D-4ED0-8011-AF53475172BF/ef/575d29a5/EntityFrameworkQueryableExtensions.cs" />
-        <option value="$PROJECT_DIR$/WebApiWebSem/DataAccess/ArticlesDataAccess.cs" />
         <option value="$PROJECT_DIR$/WebApiWebSem/Business/ArticlesBusiness.cs" />
         <option value="$PROJECT_DIR$/WebApiWebSem/Controllers/ArticlesBusiness.cs" />
         <option value="$PROJECT_DIR$/WebApiWebSem/Controllers/ArticlesController.cs" />
         <option value="$PROJECT_DIR$/WebApiWebSem/Startup.cs" />
-        <option value="$PROJECT_DIR$/WebApiWebSem/DataAccess/ModelsDbo.cs" />
         <option value="$PROJECT_DIR$/WebApiWebSem/appsettings.Development.json" />
         <option value="$PROJECT_DIR$/Test/Tests.cs" />
+        <option value="$PROJECT_DIR$/WebApiWebSem/DataAccess/ModelsDbo.cs" />
+        <option value="$PROJECT_DIR$/WebApiWebSem/DataAccess/ArticlesDataAccess.cs" />
       </list>
     </option>
   </component>
@@ -323,68 +176,6 @@
               <option name="myItemType" value="com.jetbrains.resharper.projectView.solutionExplorer.SolutionExplorerNodeRider" />
             </PATH_ELEMENT>
           </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" />
-              <option name="myItemType" value="com.jetbrains.resharper.projectView.solutionExplorer.SolutionExplorerViewPane$ProjectViewPaneTreeStructure$createRoot$1" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="WebSem (2 projects)" />
-              <option name="myItemType" value="com.jetbrains.resharper.projectView.solutionExplorer.SolutionExplorerNodeRider" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="WebApiWebSem" />
-              <option name="myItemType" value="com.jetbrains.resharper.projectView.solutionExplorer.SolutionExplorerNodeRider" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Dbo" />
-              <option name="myItemType" value="com.jetbrains.resharper.projectView.solutionExplorer.SolutionExplorerNodeRider" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" />
-              <option name="myItemType" value="com.jetbrains.resharper.projectView.solutionExplorer.SolutionExplorerViewPane$ProjectViewPaneTreeStructure$createRoot$1" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="WebSem (2 projects)" />
-              <option name="myItemType" value="com.jetbrains.resharper.projectView.solutionExplorer.SolutionExplorerNodeRider" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="WebApiWebSem" />
-              <option name="myItemType" value="com.jetbrains.resharper.projectView.solutionExplorer.SolutionExplorerNodeRider" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Dbo" />
-              <option name="myItemType" value="com.jetbrains.resharper.projectView.solutionExplorer.SolutionExplorerNodeRider" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="ArticlesFields" />
-              <option name="myItemType" value="com.jetbrains.resharper.projectView.solutionExplorer.SolutionExplorerNodeRider" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" />
-              <option name="myItemType" value="com.jetbrains.resharper.projectView.solutionExplorer.SolutionExplorerViewPane$ProjectViewPaneTreeStructure$createRoot$1" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="WebSem (2 projects)" />
-              <option name="myItemType" value="com.jetbrains.resharper.projectView.solutionExplorer.SolutionExplorerNodeRider" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="WebApiWebSem" />
-              <option name="myItemType" value="com.jetbrains.resharper.projectView.solutionExplorer.SolutionExplorerNodeRider" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Dbo" />
-              <option name="myItemType" value="com.jetbrains.resharper.projectView.solutionExplorer.SolutionExplorerNodeRider" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Articles" />
-              <option name="myItemType" value="com.jetbrains.resharper.projectView.solutionExplorer.SolutionExplorerNodeRider" />
-            </PATH_ELEMENT>
-          </PATH>
           <PATH>
             <PATH_ELEMENT>
               <option name="myItemId" />
@@ -417,25 +208,11 @@
               <option name="myItemType" value="com.jetbrains.resharper.projectView.solutionExplorer.SolutionExplorerNodeRider" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="Controllers" />
-              <option name="myItemType" value="com.jetbrains.resharper.projectView.solutionExplorer.SolutionExplorerNodeRider" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" />
-              <option name="myItemType" value="com.jetbrains.resharper.projectView.solutionExplorer.SolutionExplorerViewPane$ProjectViewPaneTreeStructure$createRoot$1" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="WebSem (2 projects)" />
-              <option name="myItemType" value="com.jetbrains.resharper.projectView.solutionExplorer.SolutionExplorerNodeRider" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="WebApiWebSem" />
+              <option name="myItemId" value="DataAccess" />
               <option name="myItemType" value="com.jetbrains.resharper.projectView.solutionExplorer.SolutionExplorerNodeRider" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="Business" />
+              <option name="myItemId" value="code-from-ds" />
               <option name="myItemType" value="com.jetbrains.resharper.projectView.solutionExplorer.SolutionExplorerNodeRider" />
             </PATH_ELEMENT>
           </PATH>
@@ -448,10 +225,6 @@
               <option name="myItemId" value="WebSem (2 projects)" />
               <option name="myItemType" value="com.jetbrains.resharper.projectView.solutionExplorer.SolutionExplorerNodeRider" />
             </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Test" />
-              <option name="myItemType" value="com.jetbrains.resharper.projectView.solutionExplorer.SolutionExplorerNodeRider" />
-            </PATH_ELEMENT>
           </PATH>
         </subPane>
         <option name="show-file-system" value="false" />
@@ -522,12 +295,12 @@
       <workItem from="1487108080916" duration="3508000" />
       <workItem from="1487345029610" duration="5634000" />
       <workItem from="1487441650798" duration="14018000" />
-      <workItem from="1487528667649" duration="5658000" />
+      <workItem from="1487528667649" duration="8537000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="32524000" />
+    <option name="totallyTimeSpent" value="35403000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -582,7 +355,24 @@
       <provider selected="true" editor-type-id="text-editor">
         <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 />
+          <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="{...}" />
+          </folding>
         </state>
       </provider>
     </entry>
@@ -894,14 +684,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/WebApiWebSem/DataAccess/ArticlesDataAccess.cs">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="10" column="5" lean-forward="false" selection-start-line="10" selection-start-column="5" selection-end-line="10" selection-end-column="5" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/WebApiWebSem/Program.cs">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
@@ -942,48 +724,67 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/WebApiWebSem/Dbo/Articles/ArticlesBasicDbo.cs">
+    <entry file="file://$PROJECT_DIR$/WebApiWebSem/Dbo/ArticlesFields/ArticlesFieldsAddDbo.cs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="36">
+          <caret line="2" column="43" lean-forward="false" selection-start-line="2" selection-start-column="43" selection-end-line="2" selection-end-column="43" />
+          <folding>
+            <marker date="1487461391707" expanded="true" signature="41:119" ph="{...}" />
+            <marker date="1487461391707" expanded="true" signature="105:117" ph="{...}" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/WebApiWebSem/Dbo/Articles/ArticlesAddDbo.cs">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="144">
-          <caret line="8" column="44" lean-forward="false" selection-start-line="8" selection-start-column="44" selection-end-line="8" selection-end-column="44" />
+          <caret line="8" column="38" lean-forward="true" selection-start-line="8" selection-start-column="38" selection-end-line="8" selection-end-column="38" />
           <folding>
-            <marker date="1487458868439" expanded="true" signature="6:78" ph="..." />
-            <marker date="1487458868439" expanded="true" signature="115:393" ph="{...}" />
-            <marker date="1487458868439" expanded="true" signature="154:391" ph="{...}" />
+            <marker date="1487458480259" expanded="true" signature="6:83" ph="..." />
+            <marker date="1487458480259" expanded="true" signature="120:396" ph="{...}" />
+            <marker date="1487458480259" expanded="true" signature="179:310" ph="{...}" />
+            <marker date="1487458480259" expanded="true" signature="382:394" ph="{...}" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/WebApiWebSem/Dbo/Articles/ArticlesDbo.cs">
+    <entry file="file://$PROJECT_DIR$/WebApiWebSem/Dbo/Articles/ArticlesEditDbo.cs">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="90">
-          <caret line="5" column="39" lean-forward="false" selection-start-line="5" selection-start-column="39" selection-end-line="5" selection-end-column="39" />
+          <caret line="5" column="5" lean-forward="true" selection-start-line="5" selection-start-column="5" selection-end-line="5" selection-end-column="5" />
           <folding>
-            <marker date="1487458480243" expanded="true" signature="6:52" ph="..." />
-            <marker date="1487458480243" expanded="true" signature="89:268" ph="{...}" />
-            <marker date="1487458480243" expanded="true" signature="156:266" ph="{...}" />
+            <marker date="1487458480231" expanded="true" signature="75:166" ph="{...}" />
+            <marker date="1487458480231" expanded="true" signature="152:164" ph="{...}" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/WebApiWebSem/Dbo/ArticlesFields/ArticlesFieldsDbo.cs">
+    <entry file="file://$PROJECT_DIR$/Test/Tests.cs">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="36">
-          <caret line="2" column="43" lean-forward="false" selection-start-line="2" selection-start-column="43" selection-end-line="2" selection-end-column="43" />
+        <state relative-caret-position="180">
+          <caret line="10" column="52" lean-forward="true" selection-start-line="10" selection-start-column="52" selection-end-line="10" selection-end-column="52" />
           <folding>
-            <marker date="1487458004959" expanded="true" signature="41:116" ph="{...}" />
-            <marker date="1487458004959" expanded="true" signature="101:114" ph="{...}" />
+            <marker date="1487539122533" expanded="true" signature="6:163" ph="..." />
+            <marker date="1487539122533" expanded="true" signature="179:1618" ph="{...}" />
+            <marker date="1487539122533" expanded="true" signature="204:1616" ph="{...}" />
+            <marker date="1487539122533" expanded="true" signature="435:877" ph="{...}" />
+            <marker date="1487539122533" expanded="true" signature="951:1388" ph="{...}" />
+            <marker date="1487539122533" expanded="true" signature="1194:1261" ph="{...}" />
+            <marker date="1487539122533" expanded="true" signature="1281:1378" ph="{...}" />
+            <marker date="1487539122533" expanded="true" signature="1466:1610" ph="{...}" />
+            <marker date="1487539122533" expanded="true" signature="1512:1598" ph="{...}" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/WebApiWebSem/Dbo/ArticlesFields/ArticlesFieldsAddDbo.cs">
+    <entry file="file://$PROJECT_DIR$/WebApiWebSem/Dbo/Articles/ArticlesDbo.cs">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="36">
-          <caret line="2" column="43" lean-forward="false" selection-start-line="2" selection-start-column="43" selection-end-line="2" selection-end-column="43" />
+        <state relative-caret-position="90">
+          <caret line="5" column="39" lean-forward="false" selection-start-line="5" selection-start-column="39" selection-end-line="5" selection-end-column="39" />
           <folding>
-            <marker date="1487461391707" expanded="true" signature="41:119" ph="{...}" />
-            <marker date="1487461391707" expanded="true" signature="105:117" ph="{...}" />
+            <marker date="1487458480243" expanded="true" signature="6:52" ph="..." />
+            <marker date="1487458480243" expanded="true" signature="89:268" ph="{...}" />
+            <marker date="1487458480243" expanded="true" signature="156:266" ph="{...}" />
           </folding>
         </state>
       </provider>
@@ -999,18 +800,25 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/WebApiWebSem/DataAccess/ModelsDbo.cs">
+    <entry file="file://$PROJECT_DIR$/WebApiWebSem/Dbo/ArticlesFields/ArticlesFieldsDbo.cs">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="270">
-          <caret line="15" column="34" lean-forward="false" selection-start-line="15" selection-start-column="34" selection-end-line="15" selection-end-column="34" />
+        <state relative-caret-position="36">
+          <caret line="2" column="43" lean-forward="false" selection-start-line="2" selection-start-column="43" selection-end-line="2" selection-end-column="43" />
+          <folding>
+            <marker date="1487458004959" expanded="true" signature="41:116" ph="{...}" />
+            <marker date="1487458004959" expanded="true" signature="101:114" ph="{...}" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/WebApiWebSem/Dbo/Articles/ArticlesBasicDbo.cs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="144">
+          <caret line="8" column="44" lean-forward="false" selection-start-line="8" selection-start-column="44" selection-end-line="8" selection-end-column="44" />
           <folding>
-            <marker date="1487538892461" expanded="true" signature="6:157" ph="..." />
-            <marker date="1487538892461" expanded="true" signature="192:1071" ph="{...}" />
-            <marker date="1487538892461" expanded="true" signature="228:1069" ph="{...}" />
-            <marker date="1487538892461" expanded="true" signature="308:512" ph="{...}" />
-            <marker date="1487538892461" expanded="true" signature="372:501" ph="{...}" />
-            <marker date="1487538892461" expanded="true" signature="574:1063" ph="{...}" />
-            <marker date="1487538892461" expanded="true" signature="632:1052" ph="{...}" />
+            <marker date="1487458868439" expanded="true" signature="6:78" ph="..." />
+            <marker date="1487458868439" expanded="true" signature="115:393" ph="{...}" />
+            <marker date="1487458868439" expanded="true" signature="154:391" ph="{...}" />
           </folding>
         </state>
       </provider>
@@ -1028,44 +836,45 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Test/Tests.cs">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="10" column="52" lean-forward="true" selection-start-line="10" selection-start-column="52" selection-end-line="10" selection-end-column="52" />
-          <folding>
-            <marker date="1487539122533" expanded="true" signature="6:163" ph="..." />
-            <marker date="1487539122533" expanded="true" signature="179:1618" ph="{...}" />
-            <marker date="1487539122533" expanded="true" signature="204:1616" ph="{...}" />
-            <marker date="1487539122533" expanded="true" signature="435:877" ph="{...}" />
-            <marker date="1487539122533" expanded="true" signature="951:1388" ph="{...}" />
-            <marker date="1487539122533" expanded="true" signature="1194:1261" ph="{...}" />
-            <marker date="1487539122533" expanded="true" signature="1281:1378" ph="{...}" />
-            <marker date="1487539122533" expanded="true" signature="1466:1610" ph="{...}" />
-            <marker date="1487539122533" expanded="true" signature="1512:1598" ph="{...}" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/WebApiWebSem/Dbo/Articles/ArticlesAddDbo.cs">
+    <entry file="file://$PROJECT_DIR$/WebApiWebSem/DataAccess/ModelsDbo.cs">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="144">
-          <caret line="8" column="38" lean-forward="true" selection-start-line="8" selection-start-column="38" selection-end-line="8" selection-end-column="38" />
+        <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="1487458480259" expanded="true" signature="6:83" ph="..." />
-            <marker date="1487458480259" expanded="true" signature="120:396" ph="{...}" />
-            <marker date="1487458480259" expanded="true" signature="179:310" ph="{...}" />
-            <marker date="1487458480259" expanded="true" signature="382:394" ph="{...}" />
+            <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>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/WebApiWebSem/Dbo/Articles/ArticlesEditDbo.cs">
+    <entry file="file://$PROJECT_DIR$/WebApiWebSem/DataAccess/ArticlesDataAccess.cs">
       <provider selected="true" editor-type-id="text-editor">
-        <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" />
+        <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" />
           <folding>
-            <marker date="1487458480231" expanded="true" signature="75:166" ph="{...}" />
-            <marker date="1487458480231" expanded="true" signature="152:164" ph="{...}" />
+            <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="{...}" />
           </folding>
         </state>
       </provider>

backend/WebSem/WebApiWebSem/DataAccess/ArticlesDataAccess.cs

@@ -1,6 +1,9 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
+using System.Linq.Expressions;
 using Luticate2.Utils.DataAccess;
+using Luticate2.Utils.Dbo.Filter;
 using Microsoft.EntityFrameworkCore;
 using WebApiWebSem.DataAccess.Models;
 using WebApiWebSem.Dbo.Articles;
@@ -9,6 +12,8 @@ namespace WebApiWebSem.DataAccess
 {
     public class ArticlesDataAccess : LuEfCrudDataAccess<articles, ArticlesAddDbo, ArticlesDbo, ArticlesEditDbo, WsDbContext, string>
     {
+        protected static IList<string> Types = new List<string>{"persons", "locations", "countries"};
+
         public ArticlesDataAccess(IServiceProvider serviceProvider) : base(serviceProvider)
         {
         }
@@ -28,6 +33,22 @@ namespace WebApiWebSem.DataAccess
             return db.articles;
         }
 
+        protected string GetFilterType(LuFilterDbo filter)
+        {
+            var type = filter.GetFilterString("type", null);
+            if (type == null || !Types.Contains(type.ToLower()))
+            {
+                return null;
+            }
+            return type.ToLower();
+        }
+
+        protected override Expression<Func<articles, bool>> GetFilterExpression(LuFilterDbo filter)
+        {
+            var type = GetFilterType(filter);
+            return articles => type == null || articles.type == type;
+        }
+
         protected override articles GetModelFromTCreate(ArticlesAddDbo obj)
         {
             return new articles

backend/WebSem/WebApiWebSem/DataAccess/ModelsDbo.cs

@@ -10,6 +10,10 @@ namespace WebApiWebSem.DataAccess
     {
         public static ArticlesFieldsDbo ToDbo(this articles_fields model)
         {
+            if (model == null)
+            {
+                return null;
+            }
             return new ArticlesFieldsDbo
             {
                 Property = model.property,
@@ -20,6 +24,10 @@ namespace WebApiWebSem.DataAccess
 
         public static ArticlesDbo ToDbo(this articles model)
         {
+            if (model == null)
+            {
+                return null;
+            }
             return new ArticlesDbo
             {
                 CreatedAt = model.created_at.ToDbo(),

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

@@ -14,5 +14,23 @@ angular.module('app')
                 };
             };
 
+            $scope.getFilter = function (filter) {
+                var label = $scope.appUtils.tr('articles.type').toLowerCase();
+                return filter.replace(new RegExp(label + ': *([a-zA-Z0-9]*)'), function(match, p1)
+                {
+                    var type = null;
+                    for (var t in $scope.appUtils.articleTypes)
+                    {
+                        var str = $scope.appUtils.articleTypes[t];
+                        if ($scope.appUtils.tr('articles.types.' + str).toLowerCase() == p1.toLowerCase())
+                        {
+                            type = str;
+                            break;
+                        }
+                    }
+                    return type == null ? '' : 'type:' + type;
+                });
+            };
+
             $scope.init();
     }]);

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

@@ -6,6 +6,12 @@ angular.module('app')
             $scope.itemType = 'articles';
             editControllerBuilder.create($scope, $stateParams);
 
+            $scope.addField = function()
+            {
+                var field = $scope.business.initFieldDbo({});
+                $scope.item.fields.push(field);
+            };
+
             $scope.setupExitConfirm();
 
             $scope.init($stateParams);

frontend/WebSem/app/translations/en.json

@@ -50,12 +50,16 @@
     "title": "Title",
     "type": "Type",
     "text": "Abstract",
+    "pictureUrl": "Picture URL",
+    "pictureCaption": "Picture caption",
     "types": {
       "home": "Home page",
       "persons": "Person",
       "locations": "Location",
       "countries": "Country"
     },
+    "general": "General",
+    "fields": "Data",
     "deleteOne": "Do you really want to delete article '{text}'?",
     "deleteMultiple": "Do you really want to delete {count} {count, select, 1{article} other{articles}}?",
     "edit": {

frontend/WebSem/app/views/articles.html

@@ -107,7 +107,7 @@
     <md-table-pagination md-label="{{appUtils.mdTableLabels()}}" class="col-xs-11" md-limit="query.limit" md-limit-options="[5, 10, 20]"
                          md-page="query.page" md-total="{{items.count}}" md-on-paginate="getItems" md-page-select></md-table-pagination>
 
-    <div ng-repeat="error in busy.errors('intra.' + itemType + '.table')" class="isa_error">
+    <div ng-repeat="error in busy.errors(itemType + '.table')" class="isa_error">
         <i class="fa fa-times-circle"></i>
         {{ error.data.message }}
     </div>

frontend/WebSem/app/views/articlesedit.html

@@ -16,6 +16,9 @@
     </md-toolbar>
     <md-content layout-padding>
         <form name="editForm">
+
+            <h4 class="md-title">{{ itemType + '.general' | translate }}</h4>
+
             <div layout-gt-sm="row">
                 <md-input-container class="md-block" flex flex-gt-sm="15">
                     <label>{{ itemType + '.type' | translate }}</label>
@@ -29,12 +32,41 @@
                     <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>
+                    <label>{{ itemType + '.pictureUrl' | translate }}</label>
+                    <input ng-model="item.pictureUrl" >
+                </md-input-container>
+            </div>
+            <div layout="column" layout-align=" center">
+                <img ng-src="{{item.pictureUrl}}" />
+            </div>
+            <div layout-gt-sm="row">
+                <md-input-container class="md-block" flex>
+                    <label>{{ itemType + '.pictureCaption' | translate }}</label>
+                    <input ng-model="item.pictureCaption" >
+                </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 layout="row" layout-align=" center">
+                <h4 class="md-title">{{ itemType + '.fields' | translate }}</h4>
+                <md-button class="md-icon-button no-margin" ng-click="addField()" title="{{ 'common.new' | translate }}">
+                    <md-icon class="material-icons">playlist_add</md-icon>
+                </md-button>
+            </div>
+
+            <div layout-gt-sm="row">
+                <div ng-repeat="field in item.fields">{{field}}</div>
+            </div>
+
+
             <div flex>
                 <md-progress-linear ng-disabled="!running" md-mode="indeterminate"></md-progress-linear>
             </div>

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

@@ -10,6 +10,11 @@
 
             var Business = luWebApiCrudBusiness.create(articlesDataAccess);
 
+            Business.initFieldDbo = function(dbo)
+            {
+                return Business.dataAccess.articleFieldDboInitializer.initData(dbo, Business.dataAccess.TYPE_DBO);
+            };
+
             return Business;
         }]);
 })();

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

@@ -117,11 +117,15 @@
                         return orderBy;
                     };
 
+                    $scope.getFilter = function (filter) {
+                        return filter;
+                    };
+
                     $scope.getItems = function()
                     {
                         $scope.selected = [];
                         var orderBy = AppUtilsBusiness.convertOrderBy($scope.query.order);
-                        $scope.business.getMultiple($scope.getOrderBy(orderBy), $scope.query.filter, $scope.query.page - 1, $scope.query.limit, $scope.itemType + '.table').then(function(data)
+                        $scope.business.getMultiple($scope.getOrderBy(orderBy), $scope.getFilter($scope.query.filter), $scope.query.page - 1, $scope.query.limit, $scope.itemType + '.table').then(function(data)
                         {
                             $scope.items = data;
                         }, function(error)

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

@@ -23,14 +23,14 @@
                 updatedAt: null,
                 _itemType: 'articles',
                 toString: function () {
-                    return this.id;
+                    return this.title == null ? this.id : this.title;
                 }
             };
 
             DataAccess.defaultFieldDbo = {
                 value: null,
                 property: null,
-                type: 20.0
+                type: null
             };
 
             DataAccess.initFieldDbo = function (dbo, type) {