Browse Source

article filter; article view; fixed error display;

tags/v1.0
Robin Thoni 7 years ago
parent
commit
c2bfbe66fc

+ 211
- 159
backend/WebSem/.idea/.idea.WebSem/.idea/workspace.xml View File

2
 <project version="4">
2
 <project version="4">
3
   <component name="ChangeListManager">
3
   <component name="ChangeListManager">
4
     <list default="true" id="8d054e21-e284-419c-acba-f672639639a4" name="Default" comment="">
4
     <list default="true" id="8d054e21-e284-419c-acba-f672639639a4" name="Default" comment="">
5
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/../../frontend/WebSem/app/img/blank.gif" />
6
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/../../frontend/WebSem/app/img/flags.png" />
7
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/../../frontend/WebSem/app/less/flags.css" />
8
-      <change type="DELETED" beforePath="$PROJECT_DIR$/../../frontend/WebSem/app/img/.gitkeep" afterPath="" />
9
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/.idea.WebSem/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/.idea.WebSem/.idea/workspace.xml" />
5
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/.idea.WebSem/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/.idea.WebSem/.idea/workspace.xml" />
6
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/WebApiWebSem/DataAccess/ArticlesDataAccess.cs" afterPath="$PROJECT_DIR$/WebApiWebSem/DataAccess/ArticlesDataAccess.cs" />
7
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/WebApiWebSem/appsettings.Development.json" afterPath="$PROJECT_DIR$/WebApiWebSem/appsettings.Development.json" />
8
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../frontend/WebSem/app/app.js" afterPath="$PROJECT_DIR$/../../frontend/WebSem/app/app.js" />
10
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../frontend/WebSem/app/controllers/articleCategory.controller.js" afterPath="$PROJECT_DIR$/../../frontend/WebSem/app/controllers/articleCategory.controller.js" />
9
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../frontend/WebSem/app/controllers/articleCategory.controller.js" afterPath="$PROJECT_DIR$/../../frontend/WebSem/app/controllers/articleCategory.controller.js" />
10
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../frontend/WebSem/app/controllers/home.controller.js" afterPath="$PROJECT_DIR$/../../frontend/WebSem/app/controllers/home.controller.js" />
11
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../frontend/WebSem/app/index.html" afterPath="$PROJECT_DIR$/../../frontend/WebSem/app/index.html" />
11
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../frontend/WebSem/app/index.html" afterPath="$PROJECT_DIR$/../../frontend/WebSem/app/index.html" />
12
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../frontend/WebSem/app/less/app.less" afterPath="$PROJECT_DIR$/../../frontend/WebSem/app/less/app.less" />
13
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../frontend/WebSem/app/views/articlesCategory.html" afterPath="$PROJECT_DIR$/../../frontend/WebSem/app/views/articlesCategory.html" />
12
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../frontend/WebSem/app/views/articlesCategory.html" afterPath="$PROJECT_DIR$/../../frontend/WebSem/app/views/articlesCategory.html" />
14
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../frontend/WebSem/app/views/home.html" afterPath="$PROJECT_DIR$/../../frontend/WebSem/app/views/home.html" />
15
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../frontend/WebSem/app/views/toolbar.html" afterPath="$PROJECT_DIR$/../../frontend/WebSem/app/views/toolbar.html" />
13
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../frontend/WebSem/app/views/directives/article.html" afterPath="$PROJECT_DIR$/../../frontend/WebSem/app/views/directives/article.html" />
16
     </list>
14
     </list>
17
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
15
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
18
     <option name="TRACKING_ENABLED" value="true" />
16
     <option name="TRACKING_ENABLED" value="true" />
45
   <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
43
   <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
46
   <component name="FileEditorManager">
44
   <component name="FileEditorManager">
47
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
45
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
48
-      <file leaf-file-name="ArticlesDataAccess.cs" pinned="false" current-in-tab="true">
46
+      <file leaf-file-name="ArticlesDataAccess.cs" pinned="false" current-in-tab="false">
49
         <entry file="file://$PROJECT_DIR$/WebApiWebSem/DataAccess/ArticlesDataAccess.cs">
47
         <entry file="file://$PROJECT_DIR$/WebApiWebSem/DataAccess/ArticlesDataAccess.cs">
50
           <provider selected="true" editor-type-id="text-editor">
48
           <provider selected="true" editor-type-id="text-editor">
51
-            <state relative-caret-position="534">
52
-              <caret line="35" column="0" lean-forward="true" selection-start-line="35" selection-start-column="0" selection-end-line="35" selection-end-column="0" />
49
+            <state relative-caret-position="498">
50
+              <caret line="57" column="87" lean-forward="false" selection-start-line="57" selection-start-column="87" selection-end-line="57" selection-end-column="87" />
53
               <folding>
51
               <folding>
54
-                <marker date="1487804389248" expanded="true" signature="6:307" ph="..." />
55
-                <marker date="1487804389248" expanded="true" signature="342:4029" ph="{...}" />
56
-                <marker date="1487804389248" expanded="true" signature="478:4027" ph="{...}" />
57
-                <marker date="1487804389248" expanded="true" signature="687:707" ph="{...}" />
58
-                <marker date="1487804389248" expanded="true" signature="759:802" ph="{...}" />
59
-                <marker date="1487804389248" expanded="true" signature="911:1006" ph="{...}" />
60
-                <marker date="1487804389248" expanded="true" signature="1116:1183" ph="{...}" />
61
-                <marker date="1487804389248" expanded="true" signature="1252:1304" ph="{...}" />
62
-                <marker date="1487804389248" expanded="true" signature="1364:1602" ph="{...}" />
63
-                <marker date="1487804389248" expanded="true" signature="1500:1557" ph="{...}" />
64
-                <marker date="1487804389248" expanded="true" signature="1703:1839" ph="{...}" />
65
-                <marker date="1487804389248" expanded="true" signature="1916:2440" ph="{...}" />
66
-                <marker date="1487804389248" expanded="true" signature="1971:2429" ph="{...}" />
67
-                <marker date="1487804389248" expanded="true" signature="2233:2372" ph="{...}" />
68
-                <marker date="1487804389248" expanded="true" signature="2531:2690" ph="{...}" />
69
-                <marker date="1487804389248" expanded="true" signature="2833:3895" ph="{...}" />
70
-                <marker date="1487804389248" expanded="true" signature="3008:3094" ph="{...}" />
71
-                <marker date="1487804389248" expanded="true" signature="3154:3387" ph="{...}" />
72
-                <marker date="1487804389248" expanded="true" signature="3541:3841" ph="{...}" />
73
-                <marker date="1487804389248" expanded="true" signature="3637:3825" ph="{...}" />
74
-                <marker date="1487804389248" expanded="true" signature="3967:4021" ph="{...}" />
52
+                <marker date="1487814627815" expanded="true" signature="6:307" ph="..." />
53
+                <marker date="1487814627815" expanded="true" signature="342:4297" ph="{...}" />
54
+                <marker date="1487814627815" expanded="true" signature="478:4295" ph="{...}" />
55
+                <marker date="1487814627815" expanded="true" signature="687:707" ph="{...}" />
56
+                <marker date="1487814627815" expanded="true" signature="759:802" ph="{...}" />
57
+                <marker date="1487814627815" expanded="true" signature="911:1006" ph="{...}" />
58
+                <marker date="1487814627815" expanded="true" signature="1116:1183" ph="{...}" />
59
+                <marker date="1487814627815" expanded="true" signature="1252:1304" ph="{...}" />
60
+                <marker date="1487814627815" expanded="true" signature="1364:1602" ph="{...}" />
61
+                <marker date="1487814627815" expanded="true" signature="1500:1557" ph="{...}" />
62
+                <marker date="1487814627815" expanded="true" signature="1703:2107" ph="{...}" />
63
+                <marker date="1487814627815" expanded="true" signature="2184:2708" ph="{...}" />
64
+                <marker date="1487814627815" expanded="true" signature="2239:2697" ph="{...}" />
65
+                <marker date="1487814627815" expanded="true" signature="2501:2640" ph="{...}" />
66
+                <marker date="1487814627815" expanded="true" signature="2799:2958" ph="{...}" />
67
+                <marker date="1487814627815" expanded="true" signature="3101:4163" ph="{...}" />
68
+                <marker date="1487814627815" expanded="true" signature="3276:3362" ph="{...}" />
69
+                <marker date="1487814627815" expanded="true" signature="3422:3655" ph="{...}" />
70
+                <marker date="1487814627815" expanded="true" signature="3809:4109" ph="{...}" />
71
+                <marker date="1487814627815" expanded="true" signature="3905:4093" ph="{...}" />
72
+                <marker date="1487814627815" expanded="true" signature="4235:4289" ph="{...}" />
75
               </folding>
73
               </folding>
76
             </state>
74
             </state>
77
           </provider>
75
           </provider>
78
         </entry>
76
         </entry>
79
       </file>
77
       </file>
80
-      <file leaf-file-name="appsettings.Development.json" pinned="false" current-in-tab="false">
81
-        <entry file="file://$PROJECT_DIR$/WebApiWebSem/appsettings.Development.json">
78
+      <file leaf-file-name="appsettings.json" pinned="false" current-in-tab="false">
79
+        <entry file="file://$PROJECT_DIR$/WebApiWebSem/appsettings.json">
82
           <provider selected="true" editor-type-id="text-editor">
80
           <provider selected="true" editor-type-id="text-editor">
83
-            <state relative-caret-position="234">
84
-              <caret line="13" column="20" lean-forward="false" selection-start-line="13" selection-start-column="20" selection-end-line="13" selection-end-column="20" />
81
+            <state relative-caret-position="0">
82
+              <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
85
               <folding>
83
               <folding>
86
-                <marker date="1487806459172" expanded="true" signature="0:493" ph="{...}" />
87
-                <marker date="1487806459172" expanded="true" signature="17:297" ph="{...}" />
88
-                <marker date="1487806459172" expanded="true" signature="71:291" ph="{...}" />
89
-                <marker date="1487806459172" expanded="true" signature="324:468" ph="{...}" />
84
+                <marker date="1487088044437" expanded="true" signature="0:654" ph="{...}" />
85
+                <marker date="1487088044437" expanded="true" signature="17:459" ph="{...}" />
86
+                <marker date="1487088044437" expanded="true" signature="71:453" ph="{...}" />
87
+                <marker date="1487088044437" expanded="true" signature="486:650" ph="{...}" />
90
               </folding>
88
               </folding>
91
             </state>
89
             </state>
92
           </provider>
90
           </provider>
93
         </entry>
91
         </entry>
94
       </file>
92
       </file>
95
-      <file leaf-file-name="ModelsDbo.cs" pinned="false" current-in-tab="false">
96
-        <entry file="file://$PROJECT_DIR$/WebApiWebSem/DataAccess/ModelsDbo.cs">
93
+      <file leaf-file-name="WsDbContext.cs" pinned="false" current-in-tab="false">
94
+        <entry file="file://$PROJECT_DIR$/WebApiWebSem/DataAccess/WsDbContext.cs">
97
           <provider selected="true" editor-type-id="text-editor">
95
           <provider selected="true" editor-type-id="text-editor">
98
-            <state relative-caret-position="432">
99
-              <caret line="33" column="83" lean-forward="false" selection-start-line="33" selection-start-column="83" selection-end-line="33" selection-end-column="83" />
96
+            <state relative-caret-position="90">
97
+              <caret line="5" column="36" lean-forward="false" selection-start-line="5" selection-start-column="25" selection-end-line="5" selection-end-column="36" />
98
+              <folding>
99
+                <marker date="1487541008405" expanded="true" signature="6:74" ph="..." />
100
+                <marker date="1487541008405" expanded="true" signature="109:1246" ph="{...}" />
101
+                <marker date="1487541008405" expanded="true" signature="160:1244" ph="{...}" />
102
+                <marker date="1487541008405" expanded="true" signature="234:254" ph="{...}" />
103
+                <marker date="1487541008405" expanded="true" signature="330:1073" ph="{...}" />
104
+              </folding>
105
+            </state>
106
+          </provider>
107
+        </entry>
108
+      </file>
109
+      <file leaf-file-name="appsettings.Development.json" pinned="false" current-in-tab="true">
110
+        <entry file="file://$PROJECT_DIR$/WebApiWebSem/appsettings.Development.json">
111
+          <provider selected="true" editor-type-id="text-editor">
112
+            <state relative-caret-position="234">
113
+              <caret line="13" column="17" lean-forward="false" selection-start-line="13" selection-start-column="17" selection-end-line="13" selection-end-column="17" />
100
               <folding>
114
               <folding>
101
-                <marker date="1487546211501" expanded="true" signature="6:157" ph="..." />
102
-                <marker date="1487546211501" expanded="true" signature="192:1282" ph="{...}" />
103
-                <marker date="1487546211501" expanded="true" signature="228:1280" ph="{...}" />
104
-                <marker date="1487546211501" expanded="true" signature="308:600" ph="{...}" />
105
-                <marker date="1487546211501" expanded="true" signature="349:406" ph="{...}" />
106
-                <marker date="1487546211501" expanded="true" signature="460:589" ph="{...}" />
107
-                <marker date="1487546211501" expanded="true" signature="662:1274" ph="{...}" />
108
-                <marker date="1487546211501" expanded="true" signature="703:760" ph="{...}" />
109
-                <marker date="1487546211501" expanded="true" signature="808:1263" ph="{...}" />
115
+                <marker date="1487815982463" expanded="true" signature="0:490" ph="{...}" />
116
+                <marker date="1487815982463" expanded="true" signature="17:297" ph="{...}" />
117
+                <marker date="1487815982463" expanded="true" signature="71:291" ph="{...}" />
118
+                <marker date="1487815982463" expanded="true" signature="324:468" ph="{...}" />
110
               </folding>
119
               </folding>
111
             </state>
120
             </state>
112
           </provider>
121
           </provider>
153
         <option value="$PROJECT_DIR$/WebApiWebSem/Startup.cs" />
162
         <option value="$PROJECT_DIR$/WebApiWebSem/Startup.cs" />
154
         <option value="$PROJECT_DIR$/Test/Tests.cs" />
163
         <option value="$PROJECT_DIR$/Test/Tests.cs" />
155
         <option value="$PROJECT_DIR$/WebApiWebSem/DataAccess/ModelsDbo.cs" />
164
         <option value="$PROJECT_DIR$/WebApiWebSem/DataAccess/ModelsDbo.cs" />
165
+        <option value="$PROJECT_DIR$/WebApiWebSem/DataAccess/WsDbContextPartial.cs" />
156
         <option value="$PROJECT_DIR$/WebApiWebSem/DataAccess/ArticlesDataAccess.cs" />
166
         <option value="$PROJECT_DIR$/WebApiWebSem/DataAccess/ArticlesDataAccess.cs" />
157
         <option value="$PROJECT_DIR$/WebApiWebSem/appsettings.Development.json" />
167
         <option value="$PROJECT_DIR$/WebApiWebSem/appsettings.Development.json" />
158
       </list>
168
       </list>
196
               <option name="myItemType" value="com.jetbrains.resharper.projectView.solutionExplorer.SolutionExplorerNodeRider" />
206
               <option name="myItemType" value="com.jetbrains.resharper.projectView.solutionExplorer.SolutionExplorerNodeRider" />
197
             </PATH_ELEMENT>
207
             </PATH_ELEMENT>
198
           </PATH>
208
           </PATH>
209
+          <PATH>
210
+            <PATH_ELEMENT>
211
+              <option name="myItemId" />
212
+              <option name="myItemType" value="com.jetbrains.resharper.projectView.solutionExplorer.SolutionExplorerViewPane$ProjectViewPaneTreeStructure$createRoot$1" />
213
+            </PATH_ELEMENT>
214
+            <PATH_ELEMENT>
215
+              <option name="myItemId" value="WebSem (2 projects)" />
216
+              <option name="myItemType" value="com.jetbrains.resharper.projectView.solutionExplorer.SolutionExplorerNodeRider" />
217
+            </PATH_ELEMENT>
218
+            <PATH_ELEMENT>
219
+              <option name="myItemId" value="WebApiWebSem" />
220
+              <option name="myItemType" value="com.jetbrains.resharper.projectView.solutionExplorer.SolutionExplorerNodeRider" />
221
+            </PATH_ELEMENT>
222
+            <PATH_ELEMENT>
223
+              <option name="myItemId" value="DataAccess" />
224
+              <option name="myItemType" value="com.jetbrains.resharper.projectView.solutionExplorer.SolutionExplorerNodeRider" />
225
+            </PATH_ELEMENT>
226
+          </PATH>
199
           <PATH>
227
           <PATH>
200
             <PATH_ELEMENT>
228
             <PATH_ELEMENT>
201
               <option name="myItemId" />
229
               <option name="myItemId" />
284
       <workItem from="1487345029610" duration="5634000" />
312
       <workItem from="1487345029610" duration="5634000" />
285
       <workItem from="1487441650798" duration="14018000" />
313
       <workItem from="1487441650798" duration="14018000" />
286
       <workItem from="1487528667649" duration="13931000" />
314
       <workItem from="1487528667649" duration="13931000" />
287
-      <workItem from="1487802391451" duration="5525000" />
315
+      <workItem from="1487802391451" duration="7174000" />
288
     </task>
316
     </task>
289
     <servers />
317
     <servers />
290
   </component>
318
   </component>
291
   <component name="TimeTrackingManager">
319
   <component name="TimeTrackingManager">
292
-    <option name="totallyTimeSpent" value="46322000" />
320
+    <option name="totallyTimeSpent" value="47971000" />
293
   </component>
321
   </component>
294
   <component name="TodoView">
322
   <component name="TodoView">
295
     <todo-panel id="selected-file">
323
     <todo-panel id="selected-file">
345
         <state relative-caret-position="1854">
373
         <state relative-caret-position="1854">
346
           <caret line="103" column="17" lean-forward="true" selection-start-line="103" selection-start-column="17" selection-end-line="103" selection-end-column="17" />
374
           <caret line="103" column="17" lean-forward="true" selection-start-line="103" selection-start-column="17" selection-end-line="103" selection-end-column="17" />
347
           <folding>
375
           <folding>
348
-            <marker date="1487804389248" expanded="true" signature="6:307" ph="..." />
349
-            <marker date="1487804389248" expanded="true" signature="342:4029" ph="{...}" />
350
-            <marker date="1487804389248" expanded="true" signature="478:4027" ph="{...}" />
351
-            <marker date="1487804389248" expanded="true" signature="687:707" ph="{...}" />
352
-            <marker date="1487804389248" expanded="true" signature="759:802" ph="{...}" />
353
-            <marker date="1487804389248" expanded="true" signature="911:1006" ph="{...}" />
354
-            <marker date="1487804389248" expanded="true" signature="1116:1183" ph="{...}" />
355
-            <marker date="1487804389248" expanded="true" signature="1252:1304" ph="{...}" />
356
-            <marker date="1487804389248" expanded="true" signature="1364:1602" ph="{...}" />
357
-            <marker date="1487804389248" expanded="true" signature="1500:1557" ph="{...}" />
358
-            <marker date="1487804389248" expanded="true" signature="1703:1839" ph="{...}" />
359
-            <marker date="1487804389248" expanded="true" signature="1916:2440" ph="{...}" />
360
-            <marker date="1487804389248" expanded="true" signature="1971:2429" ph="{...}" />
361
-            <marker date="1487804389248" expanded="true" signature="2233:2372" ph="{...}" />
362
-            <marker date="1487804389248" expanded="true" signature="2531:2690" ph="{...}" />
363
-            <marker date="1487804389248" expanded="true" signature="2833:3895" ph="{...}" />
364
-            <marker date="1487804389248" expanded="true" signature="3008:3094" ph="{...}" />
365
-            <marker date="1487804389248" expanded="true" signature="3154:3387" ph="{...}" />
366
-            <marker date="1487804389248" expanded="true" signature="3541:3841" ph="{...}" />
367
-            <marker date="1487804389248" expanded="true" signature="3637:3825" ph="{...}" />
368
-            <marker date="1487804389248" expanded="true" signature="3967:4021" ph="{...}" />
376
+            <marker date="1487814627815" expanded="true" signature="6:307" ph="..." />
377
+            <marker date="1487814627815" expanded="true" signature="342:4297" ph="{...}" />
378
+            <marker date="1487814627815" expanded="true" signature="478:4295" ph="{...}" />
379
+            <marker date="1487814627815" expanded="true" signature="687:707" ph="{...}" />
380
+            <marker date="1487814627815" expanded="true" signature="759:802" ph="{...}" />
381
+            <marker date="1487814627815" expanded="true" signature="911:1006" ph="{...}" />
382
+            <marker date="1487814627815" expanded="true" signature="1116:1183" ph="{...}" />
383
+            <marker date="1487814627815" expanded="true" signature="1252:1304" ph="{...}" />
384
+            <marker date="1487814627815" expanded="true" signature="1364:1602" ph="{...}" />
385
+            <marker date="1487814627815" expanded="true" signature="1500:1557" ph="{...}" />
386
+            <marker date="1487814627815" expanded="true" signature="1703:2107" ph="{...}" />
387
+            <marker date="1487814627815" expanded="true" signature="2184:2708" ph="{...}" />
388
+            <marker date="1487814627815" expanded="true" signature="2239:2697" ph="{...}" />
389
+            <marker date="1487814627815" expanded="true" signature="2501:2640" ph="{...}" />
390
+            <marker date="1487814627815" expanded="true" signature="2799:2958" ph="{...}" />
391
+            <marker date="1487814627815" expanded="true" signature="3101:4163" ph="{...}" />
392
+            <marker date="1487814627815" expanded="true" signature="3276:3362" ph="{...}" />
393
+            <marker date="1487814627815" expanded="true" signature="3422:3655" ph="{...}" />
394
+            <marker date="1487814627815" expanded="true" signature="3809:4109" ph="{...}" />
395
+            <marker date="1487814627815" expanded="true" signature="3905:4093" ph="{...}" />
396
+            <marker date="1487814627815" expanded="true" signature="4235:4289" ph="{...}" />
369
           </folding>
397
           </folding>
370
         </state>
398
         </state>
371
       </provider>
399
       </provider>
375
         <state relative-caret-position="0">
403
         <state relative-caret-position="0">
376
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
404
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
377
           <folding>
405
           <folding>
378
-            <marker date="1487804389248" expanded="true" signature="6:307" ph="..." />
379
-            <marker date="1487804389248" expanded="true" signature="342:4029" ph="{...}" />
380
-            <marker date="1487804389248" expanded="true" signature="478:4027" ph="{...}" />
381
-            <marker date="1487804389248" expanded="true" signature="687:707" ph="{...}" />
382
-            <marker date="1487804389248" expanded="true" signature="759:802" ph="{...}" />
383
-            <marker date="1487804389248" expanded="true" signature="911:1006" ph="{...}" />
384
-            <marker date="1487804389248" expanded="true" signature="1116:1183" ph="{...}" />
385
-            <marker date="1487804389248" expanded="true" signature="1252:1304" ph="{...}" />
386
-            <marker date="1487804389248" expanded="true" signature="1364:1602" ph="{...}" />
387
-            <marker date="1487804389248" expanded="true" signature="1500:1557" ph="{...}" />
388
-            <marker date="1487804389248" expanded="true" signature="1703:1839" ph="{...}" />
389
-            <marker date="1487804389248" expanded="true" signature="1916:2440" ph="{...}" />
390
-            <marker date="1487804389248" expanded="true" signature="1971:2429" ph="{...}" />
391
-            <marker date="1487804389248" expanded="true" signature="2233:2372" ph="{...}" />
392
-            <marker date="1487804389248" expanded="true" signature="2531:2690" ph="{...}" />
393
-            <marker date="1487804389248" expanded="true" signature="2833:3895" ph="{...}" />
394
-            <marker date="1487804389248" expanded="true" signature="3008:3094" ph="{...}" />
395
-            <marker date="1487804389248" expanded="true" signature="3154:3387" ph="{...}" />
396
-            <marker date="1487804389248" expanded="true" signature="3541:3841" ph="{...}" />
397
-            <marker date="1487804389248" expanded="true" signature="3637:3825" ph="{...}" />
398
-            <marker date="1487804389248" expanded="true" signature="3967:4021" ph="{...}" />
406
+            <marker date="1487814627815" expanded="true" signature="6:307" ph="..." />
407
+            <marker date="1487814627815" expanded="true" signature="342:4297" ph="{...}" />
408
+            <marker date="1487814627815" expanded="true" signature="478:4295" ph="{...}" />
409
+            <marker date="1487814627815" expanded="true" signature="687:707" ph="{...}" />
410
+            <marker date="1487814627815" expanded="true" signature="759:802" ph="{...}" />
411
+            <marker date="1487814627815" expanded="true" signature="911:1006" ph="{...}" />
412
+            <marker date="1487814627815" expanded="true" signature="1116:1183" ph="{...}" />
413
+            <marker date="1487814627815" expanded="true" signature="1252:1304" ph="{...}" />
414
+            <marker date="1487814627815" expanded="true" signature="1364:1602" ph="{...}" />
415
+            <marker date="1487814627815" expanded="true" signature="1500:1557" ph="{...}" />
416
+            <marker date="1487814627815" expanded="true" signature="1703:2107" ph="{...}" />
417
+            <marker date="1487814627815" expanded="true" signature="2184:2708" ph="{...}" />
418
+            <marker date="1487814627815" expanded="true" signature="2239:2697" ph="{...}" />
419
+            <marker date="1487814627815" expanded="true" signature="2501:2640" ph="{...}" />
420
+            <marker date="1487814627815" expanded="true" signature="2799:2958" ph="{...}" />
421
+            <marker date="1487814627815" expanded="true" signature="3101:4163" ph="{...}" />
422
+            <marker date="1487814627815" expanded="true" signature="3276:3362" ph="{...}" />
423
+            <marker date="1487814627815" expanded="true" signature="3422:3655" ph="{...}" />
424
+            <marker date="1487814627815" expanded="true" signature="3809:4109" ph="{...}" />
425
+            <marker date="1487814627815" expanded="true" signature="3905:4093" ph="{...}" />
426
+            <marker date="1487814627815" expanded="true" signature="4235:4289" ph="{...}" />
399
           </folding>
427
           </folding>
400
         </state>
428
         </state>
401
       </provider>
429
       </provider>
478
       </provider>
506
       </provider>
479
     </entry>
507
     </entry>
480
     <entry file="file://$PROJECT_DIR$/WebApiWebSem/DataAccess/Models/lu_entities_history.cs" />
508
     <entry file="file://$PROJECT_DIR$/WebApiWebSem/DataAccess/Models/lu_entities_history.cs" />
481
-    <entry file="file://$PROJECT_DIR$/WebApiWebSem/appsettings.json">
482
-      <provider selected="true" editor-type-id="text-editor">
483
-        <state relative-caret-position="234">
484
-          <caret line="13" column="155" lean-forward="false" selection-start-line="13" selection-start-column="146" selection-end-line="13" selection-end-column="155" />
485
-        </state>
486
-      </provider>
487
-    </entry>
488
     <entry file="file://$PROJECT_DIR$/WebApiWebSem/NuGet.Config">
509
     <entry file="file://$PROJECT_DIR$/WebApiWebSem/NuGet.Config">
489
       <provider selected="true" editor-type-id="text-editor">
510
       <provider selected="true" editor-type-id="text-editor">
490
         <state relative-caret-position="0">
511
         <state relative-caret-position="0">
556
         </state>
577
         </state>
557
       </provider>
578
       </provider>
558
     </entry>
579
     </entry>
559
-    <entry file="file://$PROJECT_DIR$/WebApiWebSem/DataAccess/DbPediaDataAccess.cs">
560
-      <provider selected="true" editor-type-id="text-editor">
561
-        <state relative-caret-position="0">
562
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
563
-        </state>
564
-      </provider>
565
-    </entry>
566
-    <entry file="file://$PROJECT_DIR$/WebApiWebSem/DataAccess/WsDbContext.cs">
567
-      <provider selected="true" editor-type-id="text-editor">
568
-        <state relative-caret-position="388">
569
-          <caret line="24" column="44" lean-forward="false" selection-start-line="24" selection-start-column="44" selection-end-line="24" selection-end-column="44" />
570
-        </state>
571
-      </provider>
572
-    </entry>
573
     <entry file="file://$USER_HOME$/.local/share/JetBrains/Shared/v08/DecompilerCache/decompiler/68A505D3-EE90-4B2D-8432-759050F70CC3/f5/6ff48199/LuEfCrudDataAccess`6.cs">
580
     <entry file="file://$USER_HOME$/.local/share/JetBrains/Shared/v08/DecompilerCache/decompiler/68A505D3-EE90-4B2D-8432-759050F70CC3/f5/6ff48199/LuEfCrudDataAccess`6.cs">
574
       <provider selected="true" editor-type-id="text-editor">
581
       <provider selected="true" editor-type-id="text-editor">
575
         <state relative-caret-position="489">
582
         <state relative-caret-position="489">
576
           <caret line="39" column="42" lean-forward="true" selection-start-line="39" selection-start-column="42" selection-end-line="39" selection-end-column="42" />
583
           <caret line="39" column="42" lean-forward="true" selection-start-line="39" selection-start-column="42" selection-end-line="39" selection-end-column="42" />
584
+          <folding />
577
         </state>
585
         </state>
578
       </provider>
586
       </provider>
579
     </entry>
587
     </entry>
682
         </state>
690
         </state>
683
       </provider>
691
       </provider>
684
     </entry>
692
     </entry>
685
-    <entry file="file://$PROJECT_DIR$/WebApiWebSem/appsettings.Development.json">
693
+    <entry file="file://$PROJECT_DIR$/WebApiWebSem/DataAccess/ModelsDbo.cs">
686
       <provider selected="true" editor-type-id="text-editor">
694
       <provider selected="true" editor-type-id="text-editor">
687
-        <state relative-caret-position="234">
688
-          <caret line="13" column="20" lean-forward="false" selection-start-line="13" selection-start-column="20" selection-end-line="13" selection-end-column="20" />
695
+        <state relative-caret-position="432">
696
+          <caret line="33" column="83" lean-forward="false" selection-start-line="33" selection-start-column="83" selection-end-line="33" selection-end-column="83" />
697
+          <folding />
698
+        </state>
699
+      </provider>
700
+    </entry>
701
+    <entry file="file://$PROJECT_DIR$/WebApiWebSem/DataAccess/DbPediaDataAccess.cs">
702
+      <provider selected="true" editor-type-id="text-editor">
703
+        <state relative-caret-position="0">
704
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
689
           <folding>
705
           <folding>
690
-            <marker date="1487806459172" expanded="true" signature="0:493" ph="{...}" />
691
-            <marker date="1487806459172" expanded="true" signature="17:297" ph="{...}" />
692
-            <marker date="1487806459172" expanded="true" signature="71:291" ph="{...}" />
693
-            <marker date="1487806459172" expanded="true" signature="324:468" ph="{...}" />
706
+            <marker date="1487109102942" expanded="true" signature="6:34" ph="..." />
707
+            <marker date="1487109102942" expanded="true" signature="69:848" ph="{...}" />
708
+            <marker date="1487109102942" expanded="true" signature="106:846" ph="{...}" />
709
+            <marker date="1487109102942" expanded="true" signature="152:840" ph="{...}" />
710
+            <marker date="1487109102942" expanded="true" signature="498:580" ph="{...}" />
711
+            <marker date="1487109102942" expanded="true" signature="594:830" ph="/* Make a DESCRIBE query against the Endpoint ... */" />
694
           </folding>
712
           </folding>
695
         </state>
713
         </state>
696
       </provider>
714
       </provider>
697
     </entry>
715
     </entry>
698
-    <entry file="file://$PROJECT_DIR$/WebApiWebSem/DataAccess/ModelsDbo.cs">
716
+    <entry file="file://$PROJECT_DIR$/WebApiWebSem/DataAccess/WsDbContext.cs">
699
       <provider selected="true" editor-type-id="text-editor">
717
       <provider selected="true" editor-type-id="text-editor">
700
-        <state relative-caret-position="432">
701
-          <caret line="33" column="83" lean-forward="false" selection-start-line="33" selection-start-column="83" selection-end-line="33" selection-end-column="83" />
718
+        <state relative-caret-position="90">
719
+          <caret line="5" column="36" lean-forward="false" selection-start-line="5" selection-start-column="25" selection-end-line="5" selection-end-column="36" />
702
           <folding>
720
           <folding>
703
-            <marker date="1487546211501" expanded="true" signature="6:157" ph="..." />
704
-            <marker date="1487546211501" expanded="true" signature="192:1282" ph="{...}" />
705
-            <marker date="1487546211501" expanded="true" signature="228:1280" ph="{...}" />
706
-            <marker date="1487546211501" expanded="true" signature="308:600" ph="{...}" />
707
-            <marker date="1487546211501" expanded="true" signature="349:406" ph="{...}" />
708
-            <marker date="1487546211501" expanded="true" signature="460:589" ph="{...}" />
709
-            <marker date="1487546211501" expanded="true" signature="662:1274" ph="{...}" />
710
-            <marker date="1487546211501" expanded="true" signature="703:760" ph="{...}" />
711
-            <marker date="1487546211501" expanded="true" signature="808:1263" ph="{...}" />
721
+            <marker date="1487541008405" expanded="true" signature="6:74" ph="..." />
722
+            <marker date="1487541008405" expanded="true" signature="109:1246" ph="{...}" />
723
+            <marker date="1487541008405" expanded="true" signature="160:1244" ph="{...}" />
724
+            <marker date="1487541008405" expanded="true" signature="234:254" ph="{...}" />
725
+            <marker date="1487541008405" expanded="true" signature="330:1073" ph="{...}" />
726
+          </folding>
727
+        </state>
728
+      </provider>
729
+    </entry>
730
+    <entry file="file://$PROJECT_DIR$/WebApiWebSem/DataAccess/WsDbContextPartial.cs">
731
+      <provider selected="true" editor-type-id="text-editor">
732
+        <state relative-caret-position="126">
733
+          <caret line="7" column="9" lean-forward="true" selection-start-line="7" selection-start-column="9" selection-end-line="7" selection-end-column="9" />
734
+          <folding>
735
+            <marker date="1487814476755" expanded="true" signature="48:239" ph="{...}" />
736
+            <marker date="1487814476755" expanded="true" signature="87:237" ph="{...}" />
737
+            <marker date="1487814476755" expanded="true" signature="162:231" ph="{...}" />
712
           </folding>
738
           </folding>
713
         </state>
739
         </state>
714
       </provider>
740
       </provider>
715
     </entry>
741
     </entry>
716
     <entry file="file://$PROJECT_DIR$/WebApiWebSem/DataAccess/ArticlesDataAccess.cs">
742
     <entry file="file://$PROJECT_DIR$/WebApiWebSem/DataAccess/ArticlesDataAccess.cs">
717
       <provider selected="true" editor-type-id="text-editor">
743
       <provider selected="true" editor-type-id="text-editor">
718
-        <state relative-caret-position="534">
719
-          <caret line="35" column="0" lean-forward="true" selection-start-line="35" selection-start-column="0" selection-end-line="35" selection-end-column="0" />
744
+        <state relative-caret-position="498">
745
+          <caret line="57" column="87" lean-forward="false" selection-start-line="57" selection-start-column="87" selection-end-line="57" selection-end-column="87" />
746
+          <folding>
747
+            <marker date="1487814627815" expanded="true" signature="6:307" ph="..." />
748
+            <marker date="1487814627815" expanded="true" signature="342:4297" ph="{...}" />
749
+            <marker date="1487814627815" expanded="true" signature="478:4295" ph="{...}" />
750
+            <marker date="1487814627815" expanded="true" signature="687:707" ph="{...}" />
751
+            <marker date="1487814627815" expanded="true" signature="759:802" ph="{...}" />
752
+            <marker date="1487814627815" expanded="true" signature="911:1006" ph="{...}" />
753
+            <marker date="1487814627815" expanded="true" signature="1116:1183" ph="{...}" />
754
+            <marker date="1487814627815" expanded="true" signature="1252:1304" ph="{...}" />
755
+            <marker date="1487814627815" expanded="true" signature="1364:1602" ph="{...}" />
756
+            <marker date="1487814627815" expanded="true" signature="1500:1557" ph="{...}" />
757
+            <marker date="1487814627815" expanded="true" signature="1703:2107" ph="{...}" />
758
+            <marker date="1487814627815" expanded="true" signature="2184:2708" ph="{...}" />
759
+            <marker date="1487814627815" expanded="true" signature="2239:2697" ph="{...}" />
760
+            <marker date="1487814627815" expanded="true" signature="2501:2640" ph="{...}" />
761
+            <marker date="1487814627815" expanded="true" signature="2799:2958" ph="{...}" />
762
+            <marker date="1487814627815" expanded="true" signature="3101:4163" ph="{...}" />
763
+            <marker date="1487814627815" expanded="true" signature="3276:3362" ph="{...}" />
764
+            <marker date="1487814627815" expanded="true" signature="3422:3655" ph="{...}" />
765
+            <marker date="1487814627815" expanded="true" signature="3809:4109" ph="{...}" />
766
+            <marker date="1487814627815" expanded="true" signature="3905:4093" ph="{...}" />
767
+            <marker date="1487814627815" expanded="true" signature="4235:4289" ph="{...}" />
768
+          </folding>
769
+        </state>
770
+      </provider>
771
+    </entry>
772
+    <entry file="file://$PROJECT_DIR$/WebApiWebSem/appsettings.json">
773
+      <provider selected="true" editor-type-id="text-editor">
774
+        <state relative-caret-position="0">
775
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
776
+          <folding>
777
+            <marker date="1487088044437" expanded="true" signature="0:654" ph="{...}" />
778
+            <marker date="1487088044437" expanded="true" signature="17:459" ph="{...}" />
779
+            <marker date="1487088044437" expanded="true" signature="71:453" ph="{...}" />
780
+            <marker date="1487088044437" expanded="true" signature="486:650" ph="{...}" />
781
+          </folding>
782
+        </state>
783
+      </provider>
784
+    </entry>
785
+    <entry file="file://$PROJECT_DIR$/WebApiWebSem/appsettings.Development.json">
786
+      <provider selected="true" editor-type-id="text-editor">
787
+        <state relative-caret-position="234">
788
+          <caret line="13" column="17" lean-forward="false" selection-start-line="13" selection-start-column="17" selection-end-line="13" selection-end-column="17" />
720
           <folding>
789
           <folding>
721
-            <marker date="1487804389248" expanded="true" signature="6:307" ph="..." />
722
-            <marker date="1487804389248" expanded="true" signature="342:4029" ph="{...}" />
723
-            <marker date="1487804389248" expanded="true" signature="478:4027" ph="{...}" />
724
-            <marker date="1487804389248" expanded="true" signature="687:707" ph="{...}" />
725
-            <marker date="1487804389248" expanded="true" signature="759:802" ph="{...}" />
726
-            <marker date="1487804389248" expanded="true" signature="911:1006" ph="{...}" />
727
-            <marker date="1487804389248" expanded="true" signature="1116:1183" ph="{...}" />
728
-            <marker date="1487804389248" expanded="true" signature="1252:1304" ph="{...}" />
729
-            <marker date="1487804389248" expanded="true" signature="1364:1602" ph="{...}" />
730
-            <marker date="1487804389248" expanded="true" signature="1500:1557" ph="{...}" />
731
-            <marker date="1487804389248" expanded="true" signature="1703:1839" ph="{...}" />
732
-            <marker date="1487804389248" expanded="true" signature="1916:2440" ph="{...}" />
733
-            <marker date="1487804389248" expanded="true" signature="1971:2429" ph="{...}" />
734
-            <marker date="1487804389248" expanded="true" signature="2233:2372" ph="{...}" />
735
-            <marker date="1487804389248" expanded="true" signature="2531:2690" ph="{...}" />
736
-            <marker date="1487804389248" expanded="true" signature="2833:3895" ph="{...}" />
737
-            <marker date="1487804389248" expanded="true" signature="3008:3094" ph="{...}" />
738
-            <marker date="1487804389248" expanded="true" signature="3154:3387" ph="{...}" />
739
-            <marker date="1487804389248" expanded="true" signature="3541:3841" ph="{...}" />
740
-            <marker date="1487804389248" expanded="true" signature="3637:3825" ph="{...}" />
741
-            <marker date="1487804389248" expanded="true" signature="3967:4021" ph="{...}" />
790
+            <marker date="1487815982463" expanded="true" signature="0:490" ph="{...}" />
791
+            <marker date="1487815982463" expanded="true" signature="17:297" ph="{...}" />
792
+            <marker date="1487815982463" expanded="true" signature="71:291" ph="{...}" />
793
+            <marker date="1487815982463" expanded="true" signature="324:468" ph="{...}" />
742
           </folding>
794
           </folding>
743
         </state>
795
         </state>
744
       </provider>
796
       </provider>

+ 4
- 1
backend/WebSem/WebApiWebSem/DataAccess/ArticlesDataAccess.cs View File

52
         protected override Expression<Func<articles, bool>> GetFilterExpression(LuFilterDbo filter)
52
         protected override Expression<Func<articles, bool>> GetFilterExpression(LuFilterDbo filter)
53
         {
53
         {
54
             var type = GetFilterType(filter);
54
             var type = GetFilterType(filter);
55
-            return articles => type == null || articles.type == type;
55
+            var q = string.IsNullOrEmpty(filter.Query) ? null : filter.Query;
56
+            return articles => (type == null || articles.type == type) &&
57
+                               (q == null || (WsDbContext.lu_texts_match(q, articles.text) ||
58
+                                              WsDbContext.lu_texts_match(q, articles.id)));
56
         }
59
         }
57
 
60
 
58
         protected override articles GetModelFromTCreate(ArticlesAddDbo obj)
61
         protected override articles GetModelFromTCreate(ArticlesAddDbo obj)

+ 12
- 0
backend/WebSem/WebApiWebSem/DataAccess/WsDbContextPartial.cs View File

1
+using System;
2
+
3
+namespace WebApiWebSem.DataAccess
4
+{
5
+    public partial class WsDbContext
6
+    {
7
+        public static bool lu_texts_match(string query, string data)
8
+        {
9
+            throw new NotImplementedException();
10
+        }
11
+    }
12
+}

+ 1
- 1
backend/WebSem/WebApiWebSem/appsettings.Development.json View File

11
     "ConnectionStrings": {
11
     "ConnectionStrings": {
12
         "default": "User ID=dev;Password=dev;Host=localhost;Port=5432;Database=websem_project;Pooling=true;ApplicationName=WebSemApiDev"
12
         "default": "User ID=dev;Password=dev;Host=localhost;Port=5432;Database=websem_project;Pooling=true;ApplicationName=WebSemApiDev"
13
     },
13
     },
14
-    "SleepTime": 1000
14
+    "SleepTime": 0
15
 }
15
 }

+ 18
- 5
frontend/WebSem/app/app.js View File

106
             //     .primaryPalette('blue')
106
             //     .primaryPalette('blue')
107
             //     .accentPalette('pink');
107
             //     .accentPalette('pink');
108
 
108
 
109
-            $provide.decorator("$mdDialog", ['$delegate', function ($delegate) {
109
+            $provide.decorator('$mdDialog', ['$delegate', function ($delegate) {
110
                 // Get a handle of the show method
110
                 // Get a handle of the show method
111
                 var c = $delegate.show;
111
                 var c = $delegate.show;
112
 
112
 
188
             $stateProvider.state('home', {
188
             $stateProvider.state('home', {
189
                 url:'/',
189
                 url:'/',
190
                 parent: 'root',
190
                 parent: 'root',
191
-                title: "home.name",
191
+                title: 'home.name',
192
                 reloadOnSearch: false,
192
                 reloadOnSearch: false,
193
                 templateUrl:'views/home.html',
193
                 templateUrl:'views/home.html',
194
                 controller:'HomeController'
194
                 controller:'HomeController'
197
             $stateProvider.state('locations', {
197
             $stateProvider.state('locations', {
198
                 url:'/locations',
198
                 url:'/locations',
199
                 parent: 'root',
199
                 parent: 'root',
200
-                title: "locations.name",
200
+                title: 'locations.name',
201
                 reloadOnSearch: false,
201
                 reloadOnSearch: false,
202
                 templateUrl:'views/articlesCategory.html',
202
                 templateUrl:'views/articlesCategory.html',
203
                 controller:'articleCategoryController',
203
                 controller:'articleCategoryController',
209
             $stateProvider.state('persons', {
209
             $stateProvider.state('persons', {
210
                 url:'/persons',
210
                 url:'/persons',
211
                 parent: 'root',
211
                 parent: 'root',
212
-                title: "persons.name",
212
+                title: 'persons.name',
213
                 reloadOnSearch: false,
213
                 reloadOnSearch: false,
214
                 templateUrl:'views/articlesCategory.html',
214
                 templateUrl:'views/articlesCategory.html',
215
                 controller:'articleCategoryController',
215
                 controller:'articleCategoryController',
221
             $stateProvider.state('countries', {
221
             $stateProvider.state('countries', {
222
                 url:'/countries',
222
                 url:'/countries',
223
                 parent: 'root',
223
                 parent: 'root',
224
-                title: "countries.name",
224
+                title: 'countries.name',
225
                 reloadOnSearch: false,
225
                 reloadOnSearch: false,
226
                 templateUrl:'views/articlesCategory.html',
226
                 templateUrl:'views/articlesCategory.html',
227
                 controller:'articleCategoryController',
227
                 controller:'articleCategoryController',
230
                 }
230
                 }
231
             });
231
             });
232
 
232
 
233
+            $stateProvider.state('articles_view', {
234
+                url:'/articles/:id',
235
+                parent: 'root',
236
+                title: 'articles.name',
237
+                reloadOnSearch: false,
238
+                templateUrl:'views/articlesview.html',
239
+                controller:'articlesViewController',
240
+                params: {
241
+                    id: null,
242
+                    item: null
243
+                }
244
+            });
245
+
233
             addCrudStates($stateProvider, 'articles');
246
             addCrudStates($stateProvider, 'articles');
234
 
247
 
235
             $urlRouterProvider.otherwise('/');
248
             $urlRouterProvider.otherwise('/');

+ 9
- 1
frontend/WebSem/app/controllers/articleCategory.controller.js View File

2
     .controller('articleCategoryController', ['$scope', '$stateParams', 'articlesBusiness', 'AppUtilsBusiness', 'luBusyBusiness',
2
     .controller('articleCategoryController', ['$scope', '$stateParams', 'articlesBusiness', 'AppUtilsBusiness', 'luBusyBusiness',
3
         function($scope, $stateParams, articlesBusiness, AppUtilsBusiness, luBusyBusiness) {
3
         function($scope, $stateParams, articlesBusiness, AppUtilsBusiness, luBusyBusiness) {
4
 
4
 
5
-            luBusyBusiness.reset();
5
+            $scope.busy = luBusyBusiness.reset();
6
             $scope.items = null;
6
             $scope.items = null;
7
             $scope.appUtils = AppUtilsBusiness;
7
             $scope.appUtils = AppUtilsBusiness;
8
             $scope.itemType = $stateParams.type;
8
             $scope.itemType = $stateParams.type;
14
                 page: 1
14
                 page: 1
15
             };
15
             };
16
 
16
 
17
+            $scope.resetFilter = function()
18
+            {
19
+                if ($scope.query.filter != '') {
20
+                    $scope.query.filter = '';
21
+                    $scope.load();
22
+                }
23
+            };
24
+
17
             $scope.load = function()
25
             $scope.load = function()
18
             {
26
             {
19
                 articlesBusiness.getMultiple($scope.query.order, 'type: ' + $scope.itemType + ' ' + $scope.query.filter,
27
                 articlesBusiness.getMultiple($scope.query.order, 'type: ' + $scope.itemType + ' ' + $scope.query.filter,

+ 23
- 0
frontend/WebSem/app/controllers/articlesview.controller.js View File

1
+angular.module('app')
2
+    .controller('articlesViewController', ['$scope', '$stateParams', '$mdDialog', 'articlesBusiness', 'luBusyBusiness', 'AppUtilsBusiness',
3
+        function($scope, $stateParams, $mdDialog, articlesBusiness, luBusyBusiness, AppUtilsBusiness) {
4
+
5
+        $scope.busy = luBusyBusiness.reset();
6
+        $scope.item = null;
7
+        $scope.appUtils = AppUtilsBusiness;
8
+
9
+        $scope.load = function()
10
+        {
11
+            articlesBusiness.getSingleById($stateParams.id, 'articles.view').then(function(data)
12
+            {
13
+                $scope.item = data;
14
+            }, function (error) {});
15
+        };
16
+
17
+        if ($stateParams.item == null) {
18
+            $scope.load();
19
+        }
20
+        else {
21
+            $scope.item = $stateParams.item;
22
+        }
23
+    }]);

+ 1
- 1
frontend/WebSem/app/controllers/home.controller.js View File

2
     .controller('HomeController', ['$scope', '$state', '$mdDialog', 'articlesBusiness', 'luBusyBusiness', 'AppUtilsBusiness',
2
     .controller('HomeController', ['$scope', '$state', '$mdDialog', 'articlesBusiness', 'luBusyBusiness', 'AppUtilsBusiness',
3
         function($scope, $state, $mdDialog, articlesBusiness, luBusyBusiness, AppUtilsBusiness) {
3
         function($scope, $state, $mdDialog, articlesBusiness, luBusyBusiness, AppUtilsBusiness) {
4
 
4
 
5
-        luBusyBusiness.reset();
5
+        $scope.busy = luBusyBusiness.reset();
6
         $scope.item = null;
6
         $scope.item = null;
7
         $scope.appUtils = AppUtilsBusiness;
7
         $scope.appUtils = AppUtilsBusiness;
8
 
8
 

+ 1
- 0
frontend/WebSem/app/index.html View File

64
     <script src="controllers/articles.controller.js"></script>
64
     <script src="controllers/articles.controller.js"></script>
65
     <script src="controllers/articlesedit.controller.js"></script>
65
     <script src="controllers/articlesedit.controller.js"></script>
66
     <script src="controllers/articleCategory.controller.js"></script>
66
     <script src="controllers/articleCategory.controller.js"></script>
67
+    <script src="controllers/articlesview.controller.js"></script>
67
 
68
 
68
     <!-- Modal Controller -->
69
     <!-- Modal Controller -->
69
 
70
 

+ 22
- 1
frontend/WebSem/app/views/articlesCategory.html View File

1
 <div layout="column" layout-fill layout-align="top" angular-busy="appUtils.cgBusy('articleCategory.articleCategory')">
1
 <div layout="column" layout-fill layout-align="top" angular-busy="appUtils.cgBusy('articleCategory.articleCategory')">
2
 
2
 
3
+    <div flex>
4
+        <md-toolbar class="md-table-toolbar md-default">
5
+            <div class="md-toolbar-tools">
6
+                <md-icon class="material-icons">search</md-icon>
7
+                <form autocomplete="off">
8
+                    <md-input-container class="md-block" flex-gt-sm>
9
+                        <label>{{ 'common.filter' | translate }}</label>
10
+                        <input type="text" ng-model="query.filter" ng-model-options="{debounce: 750}" ng-change="load()">
11
+                    </md-input-container>
12
+
13
+                </form>
14
+                <md-button ng-show="!isModal" class="md-icon-button" ng-click="resetFilter()" title="{{ 'common.close' | translate }}">
15
+                    <md-icon class="material-icons">close</md-icon>
16
+                </md-button>
17
+                <md-button class="md-icon-button" ng-click="load()" title="{{ 'common.refresh' | translate }}">
18
+                    <md-icon class="material-icons">refresh</md-icon>
19
+                </md-button>
20
+            </div>
21
+        </md-toolbar>
22
+    </div>
23
+
3
     <div layout="row">
24
     <div layout="row">
4
         <span flex="15"></span>
25
         <span flex="15"></span>
5
         <md-grid-list class="image-grid" md-cols="4" md-row-height="200px" md-row-height-gt-sm="300px"
26
         <md-grid-list class="image-grid" md-cols="4" md-row-height="200px" md-row-height-gt-sm="300px"
6
                       md-row-height-gt-md="450px" md-gutter="4px" flex="60">
27
                       md-row-height-gt-md="450px" md-gutter="4px" flex="60">
7
             <md-grid-tile ng-repeat="item in items.data" class="red" md-colspan="{{$index < 2 ? 2 : 1}}" md-rowspan="1">
28
             <md-grid-tile ng-repeat="item in items.data" class="red" md-colspan="{{$index < 2 ? 2 : 1}}" md-rowspan="1">
8
-                <a ui-sref="{{itemType}}">
29
+                <a ui-sref="articles_view({id: item.id, item: item})">
9
                     <img class="article-picture" ng-src="{{item.pictureUrl}}">
30
                     <img class="article-picture" ng-src="{{item.pictureUrl}}">
10
                     <md-grid-tile-footer><h3>{{ item.title }}</h3></md-grid-tile-footer>
31
                     <md-grid-tile-footer><h3>{{ item.title }}</h3></md-grid-tile-footer>
11
                 </a>
32
                 </a>

+ 10
- 0
frontend/WebSem/app/views/articlesview.html View File

1
+<div layout="column" layout-fill layout-align="top" angular-busy="appUtils.cgBusy('articles.view')">
2
+    <div layout="row" ng-show="item != null">
3
+        <article ng-model="item"></article>
4
+    </div>
5
+
6
+    <div ng-repeat="error in busy.errors('articles.view')" class="isa_error">
7
+        <i class="fa fa-times-circle"></i>
8
+        {{ error.data.message }}
9
+    </div>
10
+</div>

+ 1
- 1
frontend/WebSem/app/views/directives/article.html View File

3
 </div>
3
 </div>
4
 <div layout="row">
4
 <div layout="row">
5
     <div flex="70">
5
     <div flex="70">
6
-        <md-table-container ng-show="ngModel != null">
6
+        <md-table-container ng-show="ngModel != null && ngModel.fields.length > 0">
7
             <table md-table>
7
             <table md-table>
8
                 <thead md-head>
8
                 <thead md-head>
9
                 <tr md-row>
9
                 <tr md-row>

Loading…
Cancel
Save