robin.thoni
/
uqac-websem-project
Obserwuj 1
Gwiazdka 0
Forkuj 0
Kod Problemy 0 Pull Requests 0 Wydania 2 Wiki Aktywność
Przeglądaj źródła

begin home page

tags/v1.0
Robin Thoni 7 lat temu
rodzic
655ccd4795
commit
d3a3a8904c
9 zmienionych plików z 229 dodań i 320 usunięć
Widok podzielony Pokaż statystyki zmian
  1. 141
    308
      backend/WebSem/.idea/.idea.WebSem/.idea/workspace.xml
  2. 1
    1
      backend/WebSem/WebApiWebSem/DataAccess/ArticlesDataAccess.cs
  3. 16
    2
      frontend/WebSem/app/controllers/home.controller.js
  4. 24
    0
      frontend/WebSem/app/less/app.less
  5. 1
    0
      frontend/WebSem/app/translations/en.json
  6. 1
    1
      frontend/WebSem/app/views/articles.html
  7. 4
    4
      frontend/WebSem/app/views/articlesedit.html
  8. 36
    2
      frontend/WebSem/app/views/home.html
  9. 5
    2
      frontend/WebSem/sdk/DataAccess/articles.dataaccess.js

+ 141
- 308
backend/WebSem/.idea/.idea.WebSem/.idea/workspace.xml Wyświetl plik 

@@ -2,10 +2,8 @@
2 2 
 <project version="4">
3 3 
   <component name="ChangeListManager">
4 4 
     <list default="true" id="8d054e21-e284-419c-acba-f672639639a4" name="Default" comment="">
5 
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../frontend/WebSem/app/less/app.less" afterPath="$PROJECT_DIR$/../../frontend/WebSem/app/less/app.less" />
6 
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../frontend/WebSem/app/translations/en.json" afterPath="$PROJECT_DIR$/../../frontend/WebSem/app/translations/en.json" />
7 
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../frontend/WebSem/app/views/articlesedit.html" afterPath="$PROJECT_DIR$/../../frontend/WebSem/app/views/articlesedit.html" />
8 
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../frontend/WebSem/sdk/Business/apputils.business.js" afterPath="$PROJECT_DIR$/../../frontend/WebSem/sdk/Business/apputils.business.js" />
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" />
9 7 
     </list>
10 8 
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
11 9 
     <option name="TRACKING_ENABLED" value="true" />
 
@@ -41,30 +39,30 @@
41 39 
       <file leaf-file-name="ArticlesDataAccess.cs" pinned="false" current-in-tab="true">
42 40 
         <entry file="file://$PROJECT_DIR$/WebApiWebSem/DataAccess/ArticlesDataAccess.cs">
43 41 
           <provider selected="true" editor-type-id="text-editor">
44 
-            <state relative-caret-position="318">
45 
-              <caret line="86" column="57" lean-forward="true" selection-start-line="86" selection-start-column="57" selection-end-line="86" selection-end-column="57" />
42 
+            <state relative-caret-position="174">
43 
+              <caret line="15" column="72" lean-forward="false" selection-start-line="15" selection-start-column="72" selection-end-line="15" selection-end-column="72" />
46 44 
               <folding>
47 
-                <marker date="1487546558945" expanded="true" signature="6:307" ph="..." />
48 
-                <marker date="1487546558945" expanded="true" signature="342:4021" ph="{...}" />
49 
-                <marker date="1487546558945" expanded="true" signature="478:4019" ph="{...}" />
50 
-                <marker date="1487546558945" expanded="true" signature="679:699" ph="{...}" />
51 
-                <marker date="1487546558945" expanded="true" signature="751:794" ph="{...}" />
52 
-                <marker date="1487546558945" expanded="true" signature="903:998" ph="{...}" />
53 
-                <marker date="1487546558945" expanded="true" signature="1108:1175" ph="{...}" />
54 
-                <marker date="1487546558945" expanded="true" signature="1244:1296" ph="{...}" />
55 
-                <marker date="1487546558945" expanded="true" signature="1356:1594" ph="{...}" />
56 
-                <marker date="1487546558945" expanded="true" signature="1492:1549" ph="{...}" />
57 
-                <marker date="1487546558945" expanded="true" signature="1695:1831" ph="{...}" />
58 
-                <marker date="1487546558945" expanded="true" signature="1908:2432" ph="{...}" />
59 
-                <marker date="1487546558945" expanded="true" signature="1963:2421" ph="{...}" />
60 
-                <marker date="1487546558945" expanded="true" signature="2225:2364" ph="{...}" />
61 
-                <marker date="1487546558945" expanded="true" signature="2523:2682" ph="{...}" />
62 
-                <marker date="1487546558945" expanded="true" signature="2825:3887" ph="{...}" />
63 
-                <marker date="1487546558945" expanded="true" signature="3000:3086" ph="{...}" />
64 
-                <marker date="1487546558945" expanded="true" signature="3146:3379" ph="{...}" />
65 
-                <marker date="1487546558945" expanded="true" signature="3533:3833" ph="{...}" />
66 
-                <marker date="1487546558945" expanded="true" signature="3629:3817" ph="{...}" />
67 
-                <marker date="1487546558945" expanded="true" signature="3959:4013" ph="{...}" />
45 
+                <marker date="1487804389248" expanded="true" signature="6:307" ph="..." />
46 
+                <marker date="1487804389248" expanded="true" signature="342:4029" ph="{...}" />
47 
+                <marker date="1487804389248" expanded="true" signature="478:4027" ph="{...}" />
48 
+                <marker date="1487804389248" expanded="true" signature="687:707" ph="{...}" />
49 
+                <marker date="1487804389248" expanded="true" signature="759:802" ph="{...}" />
50 
+                <marker date="1487804389248" expanded="true" signature="911:1006" ph="{...}" />
51 
+                <marker date="1487804389248" expanded="true" signature="1116:1183" ph="{...}" />
52 
+                <marker date="1487804389248" expanded="true" signature="1252:1304" ph="{...}" />
53 
+                <marker date="1487804389248" expanded="true" signature="1364:1602" ph="{...}" />
54 
+                <marker date="1487804389248" expanded="true" signature="1500:1557" ph="{...}" />
55 
+                <marker date="1487804389248" expanded="true" signature="1703:1839" ph="{...}" />
56 
+                <marker date="1487804389248" expanded="true" signature="1916:2440" ph="{...}" />
57 
+                <marker date="1487804389248" expanded="true" signature="1971:2429" ph="{...}" />
58 
+                <marker date="1487804389248" expanded="true" signature="2233:2372" ph="{...}" />
59 
+                <marker date="1487804389248" expanded="true" signature="2531:2690" ph="{...}" />
60 
+                <marker date="1487804389248" expanded="true" signature="2833:3895" ph="{...}" />
61 
+                <marker date="1487804389248" expanded="true" signature="3008:3094" ph="{...}" />
62 
+                <marker date="1487804389248" expanded="true" signature="3154:3387" ph="{...}" />
63 
+                <marker date="1487804389248" expanded="true" signature="3541:3841" ph="{...}" />
64 
+                <marker date="1487804389248" expanded="true" signature="3637:3825" ph="{...}" />
65 
+                <marker date="1487804389248" expanded="true" signature="3967:4021" ph="{...}" />
68 66 
               </folding>
69 67 
             </state>
70 68 
           </provider>
 
@@ -75,7 +73,17 @@
75 73 
           <provider selected="true" editor-type-id="text-editor">
76 74 
             <state relative-caret-position="432">
77 75 
               <caret line="33" column="83" lean-forward="false" selection-start-line="33" selection-start-column="83" selection-end-line="33" selection-end-column="83" />
78 
-              <folding />
76 
+              <folding>
77 
+                <marker date="1487546211501" expanded="true" signature="6:157" ph="..." />
78 
+                <marker date="1487546211501" expanded="true" signature="192:1282" ph="{...}" />
79 
+                <marker date="1487546211501" expanded="true" signature="228:1280" ph="{...}" />
80 
+                <marker date="1487546211501" expanded="true" signature="308:600" ph="{...}" />
81 
+                <marker date="1487546211501" expanded="true" signature="349:406" ph="{...}" />
82 
+                <marker date="1487546211501" expanded="true" signature="460:589" ph="{...}" />
83 
+                <marker date="1487546211501" expanded="true" signature="662:1274" ph="{...}" />
84 
+                <marker date="1487546211501" expanded="true" signature="703:760" ph="{...}" />
85 
+                <marker date="1487546211501" expanded="true" signature="808:1263" ph="{...}" />
86 
+              </folding>
79 87 
             </state>
80 88 
           </provider>
81 89 
         </entry>
 
@@ -159,28 +167,6 @@
159 167 
               <option name="myItemId" value="WebSem (2 projects)" />
160 168 
               <option name="myItemType" value="com.jetbrains.resharper.projectView.solutionExplorer.SolutionExplorerNodeRider" />
161 169 
             </PATH_ELEMENT>
162 
-            <PATH_ELEMENT>
163 
-              <option name="myItemId" value="WebApiWebSem" />
164 
-              <option name="myItemType" value="com.jetbrains.resharper.projectView.solutionExplorer.SolutionExplorerNodeRider" />
165 
-            </PATH_ELEMENT>
166 
-          </PATH>
167 
-          <PATH>
168 
-            <PATH_ELEMENT>
169 
-              <option name="myItemId" />
170 
-              <option name="myItemType" value="com.jetbrains.resharper.projectView.solutionExplorer.SolutionExplorerViewPane$ProjectViewPaneTreeStructure$createRoot$1" />
171 
-            </PATH_ELEMENT>
172 
-            <PATH_ELEMENT>
173 
-              <option name="myItemId" value="WebSem (2 projects)" />
174 
-              <option name="myItemType" value="com.jetbrains.resharper.projectView.solutionExplorer.SolutionExplorerNodeRider" />
175 
-            </PATH_ELEMENT>
176 
-            <PATH_ELEMENT>
177 
-              <option name="myItemId" value="WebApiWebSem" />
178 
-              <option name="myItemType" value="com.jetbrains.resharper.projectView.solutionExplorer.SolutionExplorerNodeRider" />
179 
-            </PATH_ELEMENT>
180 
-            <PATH_ELEMENT>
181 
-              <option name="myItemId" value="DataAccess" />
182 
-              <option name="myItemType" value="com.jetbrains.resharper.projectView.solutionExplorer.SolutionExplorerNodeRider" />
183 
-            </PATH_ELEMENT>
184 170 
           </PATH>
185 171 
           <PATH>
186 172 
             <PATH_ELEMENT>
 
@@ -192,25 +178,7 @@
192 178 
               <option name="myItemType" value="com.jetbrains.resharper.projectView.solutionExplorer.SolutionExplorerNodeRider" />
193 179 
             </PATH_ELEMENT>
194 180 
             <PATH_ELEMENT>
195 
-              <option name="myItemId" value="WebApiWebSem" />
196 
-              <option name="myItemType" value="com.jetbrains.resharper.projectView.solutionExplorer.SolutionExplorerNodeRider" />
197 
-            </PATH_ELEMENT>
198 
-            <PATH_ELEMENT>
199 
-              <option name="myItemId" value="DataAccess" />
200 
-              <option name="myItemType" value="com.jetbrains.resharper.projectView.solutionExplorer.SolutionExplorerNodeRider" />
201 
-            </PATH_ELEMENT>
202 
-            <PATH_ELEMENT>
203 
-              <option name="myItemId" value="code-from-ds" />
204 
-              <option name="myItemType" value="com.jetbrains.resharper.projectView.solutionExplorer.SolutionExplorerNodeRider" />
205 
-            </PATH_ELEMENT>
206 
-          </PATH>
207 
-          <PATH>
208 
-            <PATH_ELEMENT>
209 
-              <option name="myItemId" />
210 
-              <option name="myItemType" value="com.jetbrains.resharper.projectView.solutionExplorer.SolutionExplorerViewPane$ProjectViewPaneTreeStructure$createRoot$1" />
211 
-            </PATH_ELEMENT>
212 
-            <PATH_ELEMENT>
213 
-              <option name="myItemId" value="WebSem (2 projects)" />
181 
+              <option name="myItemId" value="Test" />
214 182 
               <option name="myItemType" value="com.jetbrains.resharper.projectView.solutionExplorer.SolutionExplorerNodeRider" />
215 183 
             </PATH_ELEMENT>
216 184 
           </PATH>
 
@@ -224,6 +192,10 @@
224 192 
     <property name="com.intellij.database.dataSource.DataSourceTemplate" value="PostgreSQL" />
225 193 
     <property name="restartRequiresConfirmation" value="false" />
226 194 
     <property name="settings.editor.selected.configurable" value="preferences.build.unittesting" />
195 
+    <property name="RiderNuGetCacheManager.AutoClear.http-cache" value="2" />
196 
+    <property name="RiderNuGetCacheManager.AutoClear.packages-cache" value="2" />
197 
+    <property name="RiderNuGetCacheManager.AutoClear.global-packages" value="2" />
198 
+    <property name="RiderNuGetCacheManager.AutoClear.temp" value="1" />
227 199 
   </component>
228 200 
   <component name="RunManager" selected=".NET Project.Default">
229 201 
     <configuration default="true" type="DotNetProject" factoryName=".NET Project">
 
@@ -283,12 +255,13 @@
283 255 
       <workItem from="1487108080916" duration="3508000" />
284 256 
       <workItem from="1487345029610" duration="5634000" />
285 257 
       <workItem from="1487441650798" duration="14018000" />
286 
-      <workItem from="1487528667649" duration="12998000" />
258 
+      <workItem from="1487528667649" duration="13931000" />
259 
+      <workItem from="1487802391451" duration="1636000" />
287 260 
     </task>
288 261 
     <servers />
289 262 
   </component>
290 263 
   <component name="TimeTrackingManager">
291 
-    <option name="totallyTimeSpent" value="39864000" />
264 
+    <option name="totallyTimeSpent" value="42433000" />
292 265 
   </component>
293 266 
   <component name="TodoView">
294 267 
     <todo-panel id="selected-file">
 
@@ -309,11 +282,11 @@
309 282 
       <window_info id="Unit Tests" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.26963907" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
310 283 
       <window_info id="Run Dashboard" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
311 284 
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
312 
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.2282378" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
313 
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.19745223" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
314 
-      <window_info id="NuGet" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32908705" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" />
285 
+      <window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2282378" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
286 
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.19745223" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
287 
+      <window_info id="NuGet" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24258475" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" />
315 288 
       <window_info id="Change Signature" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
316 
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.21573876" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
289 
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.21841542" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
317 290 
       <window_info id="Build" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32908705" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
318 291 
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.21199143" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
319 292 
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
 
@@ -339,32 +312,62 @@
339 312 
     <watches-manager />
340 313 
   </component>
341 314 
   <component name="editorHistoryManager">
315 
+    <entry file="file://$PROJECT_DIR$/WebApiWebSem/DataAccess/ArticlesDataAccess.cs">
316 
+      <provider selected="true" editor-type-id="text-editor">
317 
+        <state relative-caret-position="1854">
318 
+          <caret line="103" column="17" lean-forward="true" selection-start-line="103" selection-start-column="17" selection-end-line="103" selection-end-column="17" />
319 
+          <folding>
320 
+            <marker date="1487804389248" expanded="true" signature="6:307" ph="..." />
321 
+            <marker date="1487804389248" expanded="true" signature="342:4029" ph="{...}" />
322 
+            <marker date="1487804389248" expanded="true" signature="478:4027" ph="{...}" />
323 
+            <marker date="1487804389248" expanded="true" signature="687:707" ph="{...}" />
324 
+            <marker date="1487804389248" expanded="true" signature="759:802" ph="{...}" />
325 
+            <marker date="1487804389248" expanded="true" signature="911:1006" ph="{...}" />
326 
+            <marker date="1487804389248" expanded="true" signature="1116:1183" ph="{...}" />
327 
+            <marker date="1487804389248" expanded="true" signature="1252:1304" ph="{...}" />
328 
+            <marker date="1487804389248" expanded="true" signature="1364:1602" ph="{...}" />
329 
+            <marker date="1487804389248" expanded="true" signature="1500:1557" ph="{...}" />
330 
+            <marker date="1487804389248" expanded="true" signature="1703:1839" ph="{...}" />
331 
+            <marker date="1487804389248" expanded="true" signature="1916:2440" ph="{...}" />
332 
+            <marker date="1487804389248" expanded="true" signature="1971:2429" ph="{...}" />
333 
+            <marker date="1487804389248" expanded="true" signature="2233:2372" ph="{...}" />
334 
+            <marker date="1487804389248" expanded="true" signature="2531:2690" ph="{...}" />
335 
+            <marker date="1487804389248" expanded="true" signature="2833:3895" ph="{...}" />
336 
+            <marker date="1487804389248" expanded="true" signature="3008:3094" ph="{...}" />
337 
+            <marker date="1487804389248" expanded="true" signature="3154:3387" ph="{...}" />
338 
+            <marker date="1487804389248" expanded="true" signature="3541:3841" ph="{...}" />
339 
+            <marker date="1487804389248" expanded="true" signature="3637:3825" ph="{...}" />
340 
+            <marker date="1487804389248" expanded="true" signature="3967:4021" ph="{...}" />
341 
+          </folding>
342 
+        </state>
343 
+      </provider>
344 
+    </entry>
342 345 
     <entry file="file://$PROJECT_DIR$/WebApiWebSem/DataAccess/ArticlesDataAccess.cs">
343 346 
       <provider selected="true" editor-type-id="text-editor">
344 347 
         <state relative-caret-position="0">
345 348 
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
346 349 
           <folding>
347 
-            <marker date="1487546558945" expanded="true" signature="6:307" ph="..." />
348 
-            <marker date="1487546558945" expanded="true" signature="342:4021" ph="{...}" />
349 
-            <marker date="1487546558945" expanded="true" signature="478:4019" ph="{...}" />
350 
-            <marker date="1487546558945" expanded="true" signature="679:699" ph="{...}" />
351 
-            <marker date="1487546558945" expanded="true" signature="751:794" ph="{...}" />
352 
-            <marker date="1487546558945" expanded="true" signature="903:998" ph="{...}" />
353 
-            <marker date="1487546558945" expanded="true" signature="1108:1175" ph="{...}" />
354 
-            <marker date="1487546558945" expanded="true" signature="1244:1296" ph="{...}" />
355 
-            <marker date="1487546558945" expanded="true" signature="1356:1594" ph="{...}" />
356 
-            <marker date="1487546558945" expanded="true" signature="1492:1549" ph="{...}" />
357 
-            <marker date="1487546558945" expanded="true" signature="1695:1831" ph="{...}" />
358 
-            <marker date="1487546558945" expanded="true" signature="1908:2432" ph="{...}" />
359 
-            <marker date="1487546558945" expanded="true" signature="1963:2421" ph="{...}" />
360 
-            <marker date="1487546558945" expanded="true" signature="2225:2364" ph="{...}" />
361 
-            <marker date="1487546558945" expanded="true" signature="2523:2682" ph="{...}" />
362 
-            <marker date="1487546558945" expanded="true" signature="2825:3887" ph="{...}" />
363 
-            <marker date="1487546558945" expanded="true" signature="3000:3086" ph="{...}" />
364 
-            <marker date="1487546558945" expanded="true" signature="3146:3379" ph="{...}" />
365 
-            <marker date="1487546558945" expanded="true" signature="3533:3833" ph="{...}" />
366 
-            <marker date="1487546558945" expanded="true" signature="3629:3817" ph="{...}" />
367 
-            <marker date="1487546558945" expanded="true" signature="3959:4013" ph="{...}" />
350 
+            <marker date="1487804389248" expanded="true" signature="6:307" ph="..." />
351 
+            <marker date="1487804389248" expanded="true" signature="342:4029" ph="{...}" />
352 
+            <marker date="1487804389248" expanded="true" signature="478:4027" ph="{...}" />
353 
+            <marker date="1487804389248" expanded="true" signature="687:707" ph="{...}" />
354 
+            <marker date="1487804389248" expanded="true" signature="759:802" ph="{...}" />
355 
+            <marker date="1487804389248" expanded="true" signature="911:1006" ph="{...}" />
356 
+            <marker date="1487804389248" expanded="true" signature="1116:1183" ph="{...}" />
357 
+            <marker date="1487804389248" expanded="true" signature="1252:1304" ph="{...}" />
358 
+            <marker date="1487804389248" expanded="true" signature="1364:1602" ph="{...}" />
359 
+            <marker date="1487804389248" expanded="true" signature="1500:1557" ph="{...}" />
360 
+            <marker date="1487804389248" expanded="true" signature="1703:1839" ph="{...}" />
361 
+            <marker date="1487804389248" expanded="true" signature="1916:2440" ph="{...}" />
362 
+            <marker date="1487804389248" expanded="true" signature="1971:2429" ph="{...}" />
363 
+            <marker date="1487804389248" expanded="true" signature="2233:2372" ph="{...}" />
364 
+            <marker date="1487804389248" expanded="true" signature="2531:2690" ph="{...}" />
365 
+            <marker date="1487804389248" expanded="true" signature="2833:3895" ph="{...}" />
366 
+            <marker date="1487804389248" expanded="true" signature="3008:3094" ph="{...}" />
367 
+            <marker date="1487804389248" expanded="true" signature="3154:3387" ph="{...}" />
368 
+            <marker date="1487804389248" expanded="true" signature="3541:3841" ph="{...}" />
369 
+            <marker date="1487804389248" expanded="true" signature="3637:3825" ph="{...}" />
370 
+            <marker date="1487804389248" expanded="true" signature="3967:4021" ph="{...}" />
368 371 
           </folding>
369 372 
         </state>
370 373 
       </provider>
 
@@ -373,29 +376,6 @@
373 376 
       <provider selected="true" editor-type-id="text-editor">
374 377 
         <state relative-caret-position="1566">
375 378 
           <caret line="87" column="21" lean-forward="false" selection-start-line="87" selection-start-column="21" selection-end-line="87" selection-end-column="21" />
376 
-          <folding>
377 
-            <marker date="1487463581315" expanded="true" signature="6:212" ph="..." />
378 
-            <marker date="1487463581315" expanded="true" signature="239:5555" ph="{...}" />
379 
-            <marker date="1487463581315" expanded="true" signature="281:5553" ph="{...}" />
380 
-            <marker date="1487463581315" expanded="true" signature="330:1383" ph="{...}" />
381 
-            <marker date="1487463581315" expanded="true" signature="399:1371" ph="{...}" />
382 
-            <marker date="1487463581315" expanded="true" signature="489:1231" ph="{...}" />
383 
-            <marker date="1487463581315" expanded="true" signature="571:844" ph="{...}" />
384 
-            <marker date="1487463581315" expanded="true" signature="646:822" ph="{...}" />
385 
-            <marker date="1487463581315" expanded="true" signature="1427:2817" ph="{...}" />
386 
-            <marker date="1487463581315" expanded="true" signature="1496:2805" ph="{...}" />
387 
-            <marker date="1487463581315" expanded="true" signature="1586:2328" ph="{...}" />
388 
-            <marker date="1487463581315" expanded="true" signature="1668:1941" ph="{...}" />
389 
-            <marker date="1487463581315" expanded="true" signature="1743:1919" ph="{...}" />
390 
-            <marker date="1487463581315" expanded="true" signature="2861:5547" ph="{...}" />
391 
-            <marker date="1487463581315" expanded="true" signature="2930:5535" ph="{...}" />
392 
-            <marker date="1487463581315" expanded="true" signature="3020:3762" ph="{...}" />
393 
-            <marker date="1487463581315" expanded="true" signature="3102:3375" ph="{...}" />
394 
-            <marker date="1487463581315" expanded="true" signature="3177:3353" ph="{...}" />
395 
-            <marker date="1487463581315" expanded="true" signature="4003:4642" ph="{...}" />
396 
-            <marker date="1487463581315" expanded="true" signature="4086:4359" ph="{...}" />
397 
-            <marker date="1487463581315" expanded="true" signature="4161:4337" ph="{...}" />
398 
-          </folding>
399 379 
         </state>
400 380 
       </provider>
401 381 
     </entry>
 
@@ -403,17 +383,6 @@
403 383 
       <provider selected="true" editor-type-id="text-editor">
404 384 
         <state relative-caret-position="0">
405 385 
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
406 
-          <folding>
407 
-            <marker date="1487539122533" expanded="true" signature="6:163" ph="..." />
408 
-            <marker date="1487539122533" expanded="true" signature="179:1618" ph="{...}" />
409 
-            <marker date="1487539122533" expanded="true" signature="204:1616" ph="{...}" />
410 
-            <marker date="1487539122533" expanded="true" signature="435:877" ph="{...}" />
411 
-            <marker date="1487539122533" expanded="true" signature="951:1388" ph="{...}" />
412 
-            <marker date="1487539122533" expanded="true" signature="1194:1261" ph="{...}" />
413 
-            <marker date="1487539122533" expanded="true" signature="1281:1378" ph="{...}" />
414 
-            <marker date="1487539122533" expanded="true" signature="1466:1610" ph="{...}" />
415 
-            <marker date="1487539122533" expanded="true" signature="1512:1598" ph="{...}" />
416 
-          </folding>
417 386 
         </state>
418 387 
       </provider>
419 388 
     </entry>
 
@@ -428,29 +397,6 @@
428 397 
       <provider selected="true" editor-type-id="text-editor">
429 398 
         <state relative-caret-position="144">
430 399 
           <caret line="8" column="20" lean-forward="false" selection-start-line="8" selection-start-column="20" selection-end-line="8" selection-end-column="20" />
431 
-          <folding>
432 
-            <marker date="1487463581315" expanded="true" signature="6:212" ph="..." />
433 
-            <marker date="1487463581315" expanded="true" signature="239:5555" ph="{...}" />
434 
-            <marker date="1487463581315" expanded="true" signature="281:5553" ph="{...}" />
435 
-            <marker date="1487463581315" expanded="true" signature="330:1383" ph="{...}" />
436 
-            <marker date="1487463581315" expanded="true" signature="399:1371" ph="{...}" />
437 
-            <marker date="1487463581315" expanded="true" signature="489:1231" ph="{...}" />
438 
-            <marker date="1487463581315" expanded="true" signature="571:844" ph="{...}" />
439 
-            <marker date="1487463581315" expanded="true" signature="646:822" ph="{...}" />
440 
-            <marker date="1487463581315" expanded="true" signature="1427:2817" ph="{...}" />
441 
-            <marker date="1487463581315" expanded="true" signature="1496:2805" ph="{...}" />
442 
-            <marker date="1487463581315" expanded="true" signature="1586:2328" ph="{...}" />
443 
-            <marker date="1487463581315" expanded="true" signature="1668:1941" ph="{...}" />
444 
-            <marker date="1487463581315" expanded="true" signature="1743:1919" ph="{...}" />
445 
-            <marker date="1487463581315" expanded="true" signature="2861:5547" ph="{...}" />
446 
-            <marker date="1487463581315" expanded="true" signature="2930:5535" ph="{...}" />
447 
-            <marker date="1487463581315" expanded="true" signature="3020:3762" ph="{...}" />
448 
-            <marker date="1487463581315" expanded="true" signature="3102:3375" ph="{...}" />
449 
-            <marker date="1487463581315" expanded="true" signature="3177:3353" ph="{...}" />
450 
-            <marker date="1487463581315" expanded="true" signature="4003:4642" ph="{...}" />
451 
-            <marker date="1487463581315" expanded="true" signature="4086:4359" ph="{...}" />
452 
-            <marker date="1487463581315" expanded="true" signature="4161:4337" ph="{...}" />
453 
-          </folding>
454 400 
         </state>
455 401 
       </provider>
456 402 
     </entry>
 
@@ -472,29 +418,6 @@
472 418 
       <provider selected="true" editor-type-id="text-editor">
473 419 
         <state relative-caret-position="162">
474 420 
           <caret line="9" column="9" lean-forward="false" selection-start-line="9" selection-start-column="9" selection-end-line="9" selection-end-column="9" />
475 
-          <folding>
476 
-            <marker date="1487463581315" expanded="true" signature="6:212" ph="..." />
477 
-            <marker date="1487463581315" expanded="true" signature="239:5555" ph="{...}" />
478 
-            <marker date="1487463581315" expanded="true" signature="281:5553" ph="{...}" />
479 
-            <marker date="1487463581315" expanded="true" signature="330:1383" ph="{...}" />
480 
-            <marker date="1487463581315" expanded="true" signature="399:1371" ph="{...}" />
481 
-            <marker date="1487463581315" expanded="true" signature="489:1231" ph="{...}" />
482 
-            <marker date="1487463581315" expanded="true" signature="571:844" ph="{...}" />
483 
-            <marker date="1487463581315" expanded="true" signature="646:822" ph="{...}" />
484 
-            <marker date="1487463581315" expanded="true" signature="1427:2817" ph="{...}" />
485 
-            <marker date="1487463581315" expanded="true" signature="1496:2805" ph="{...}" />
486 
-            <marker date="1487463581315" expanded="true" signature="1586:2328" ph="{...}" />
487 
-            <marker date="1487463581315" expanded="true" signature="1668:1941" ph="{...}" />
488 
-            <marker date="1487463581315" expanded="true" signature="1743:1919" ph="{...}" />
489 
-            <marker date="1487463581315" expanded="true" signature="2861:5547" ph="{...}" />
490 
-            <marker date="1487463581315" expanded="true" signature="2930:5535" ph="{...}" />
491 
-            <marker date="1487463581315" expanded="true" signature="3020:3762" ph="{...}" />
492 
-            <marker date="1487463581315" expanded="true" signature="3102:3375" ph="{...}" />
493 
-            <marker date="1487463581315" expanded="true" signature="3177:3353" ph="{...}" />
494 
-            <marker date="1487463581315" expanded="true" signature="4003:4642" ph="{...}" />
495 
-            <marker date="1487463581315" expanded="true" signature="4086:4359" ph="{...}" />
496 
-            <marker date="1487463581315" expanded="true" signature="4161:4337" ph="{...}" />
497 
-          </folding>
498 421 
         </state>
499 422 
       </provider>
500 423 
     </entry>
 
@@ -555,20 +478,7 @@
555 478 
         </state>
556 479 
       </provider>
557 480 
     </entry>
558 
-    <entry file="file://$PROJECT_DIR$/WebApiWebSem/Controllers/ValuesController.cs">
559 
-      <provider selected="true" editor-type-id="text-editor">
560 
-        <state relative-caret-position="72">
561 
-          <caret line="4" column="31" lean-forward="true" selection-start-line="4" selection-start-column="31" selection-end-line="4" selection-end-column="31" />
562 
-        </state>
563 
-      </provider>
564 
-    </entry>
565 
-    <entry file="file://$PROJECT_DIR$/Test/project.json">
566 
-      <provider selected="true" editor-type-id="text-editor">
567 
-        <state relative-caret-position="198">
568 
-          <caret line="11" column="26" lean-forward="true" selection-start-line="11" selection-start-column="26" selection-end-line="11" selection-end-column="26" />
569 
-        </state>
570 
-      </provider>
571 
-    </entry>
481 
+    <entry file="file://$PROJECT_DIR$/WebApiWebSem/Controllers/ValuesController.cs" />
572 482 
     <entry file="file://$PROJECT_DIR$/WebApiWebSem/project.json">
573 483 
       <provider selected="true" editor-type-id="text-editor">
574 484 
         <state relative-caret-position="324">
 
@@ -636,7 +546,6 @@
636 546 
       <provider selected="true" editor-type-id="text-editor">
637 547 
         <state relative-caret-position="489">
638 548 
           <caret line="39" column="42" lean-forward="true" selection-start-line="39" selection-start-column="42" selection-end-line="39" selection-end-column="42" />
639 
-          <folding />
640 549 
         </state>
641 550 
       </provider>
642 551 
     </entry>
 
@@ -644,29 +553,6 @@
644 553 
       <provider selected="true" editor-type-id="text-editor">
645 554 
         <state relative-caret-position="334">
646 555 
           <caret line="87" column="21" lean-forward="false" selection-start-line="87" selection-start-column="21" selection-end-line="87" selection-end-column="21" />
647 
-          <folding>
648 
-            <marker date="1487463581315" expanded="true" signature="6:212" ph="..." />
649 
-            <marker date="1487463581315" expanded="true" signature="239:5555" ph="{...}" />
650 
-            <marker date="1487463581315" expanded="true" signature="281:5553" ph="{...}" />
651 
-            <marker date="1487463581315" expanded="true" signature="330:1383" ph="{...}" />
652 
-            <marker date="1487463581315" expanded="true" signature="399:1371" ph="{...}" />
653 
-            <marker date="1487463581315" expanded="true" signature="489:1231" ph="{...}" />
654 
-            <marker date="1487463581315" expanded="true" signature="571:844" ph="{...}" />
655 
-            <marker date="1487463581315" expanded="true" signature="646:822" ph="{...}" />
656 
-            <marker date="1487463581315" expanded="true" signature="1427:2817" ph="{...}" />
657 
-            <marker date="1487463581315" expanded="true" signature="1496:2805" ph="{...}" />
658 
-            <marker date="1487463581315" expanded="true" signature="1586:2328" ph="{...}" />
659 
-            <marker date="1487463581315" expanded="true" signature="1668:1941" ph="{...}" />
660 
-            <marker date="1487463581315" expanded="true" signature="1743:1919" ph="{...}" />
661 
-            <marker date="1487463581315" expanded="true" signature="2861:5547" ph="{...}" />
662 
-            <marker date="1487463581315" expanded="true" signature="2930:5535" ph="{...}" />
663 
-            <marker date="1487463581315" expanded="true" signature="3020:3762" ph="{...}" />
664 
-            <marker date="1487463581315" expanded="true" signature="3102:3375" ph="{...}" />
665 
-            <marker date="1487463581315" expanded="true" signature="3177:3353" ph="{...}" />
666 
-            <marker date="1487463581315" expanded="true" signature="4003:4642" ph="{...}" />
667 
-            <marker date="1487463581315" expanded="true" signature="4086:4359" ph="{...}" />
668 
-            <marker date="1487463581315" expanded="true" signature="4161:4337" ph="{...}" />
669 
-          </folding>
670 556 
         </state>
671 557 
       </provider>
672 558 
     </entry>
 
@@ -674,7 +560,6 @@
674 560 
       <provider selected="true" editor-type-id="text-editor">
675 561 
         <state relative-caret-position="216">
676 562 
           <caret line="12" column="9" lean-forward="false" selection-start-line="12" selection-start-column="9" selection-end-line="12" selection-end-column="9" />
677 
-          <folding />
678 563 
         </state>
679 564 
       </provider>
680 565 
     </entry>
 
@@ -682,7 +567,6 @@
682 567 
       <provider selected="true" editor-type-id="text-editor">
683 568 
         <state relative-caret-position="0">
684 569 
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
685 
-          <folding />
686 570 
         </state>
687 571 
       </provider>
688 572 
     </entry>
 
@@ -690,18 +574,6 @@
690 574 
       <provider selected="true" editor-type-id="text-editor">
691 575 
         <state relative-caret-position="0">
692 576 
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
693 
-          <folding>
694 
-            <marker date="1487536321620" expanded="true" signature="6:409" ph="..." />
695 
-            <marker date="1487536321620" expanded="true" signature="433:3010" ph="{...}" />
696 
-            <marker date="1487536321620" expanded="true" signature="460:3008" ph="{...}" />
697 
-            <marker date="1487536321620" expanded="true" signature="563:1271" ph="{...}" />
698 
-            <marker date="1487536321620" expanded="true" signature="926:1168" ph="{...}" />
699 
-            <marker date="1487536321620" expanded="true" signature="1497:2469" ph="{...}" />
700 
-            <marker date="1487536321620" expanded="true" signature="1843:1967" ph="{...}" />
701 
-            <marker date="1487536321620" expanded="true" signature="2028:2362" ph="{...}" />
702 
-            <marker date="1487536321620" expanded="true" signature="2686:3002" ph="{...}" />
703 
-            <marker date="1487536321620" expanded="true" signature="2883:2965" ph="{...}" />
704 
-          </folding>
705 577 
         </state>
706 578 
       </provider>
707 579 
     </entry>
 
@@ -709,12 +581,6 @@
709 581 
       <provider selected="true" editor-type-id="text-editor">
710 582 
         <state relative-caret-position="252">
711 583 
           <caret line="14" column="1" lean-forward="false" selection-start-line="14" selection-start-column="1" selection-end-line="14" selection-end-column="1" />
712 
-          <folding>
713 
-            <marker date="1487535688084" expanded="true" signature="6:129" ph="..." />
714 
-            <marker date="1487535688084" expanded="true" signature="162:513" ph="{...}" />
715 
-            <marker date="1487535688084" expanded="true" signature="289:511" ph="{...}" />
716 
-            <marker date="1487535688084" expanded="true" signature="448:505" ph="{...}" />
717 
-          </folding>
718 584 
         </state>
719 585 
       </provider>
720 586 
     </entry>
 
@@ -722,10 +588,6 @@
722 588 
       <provider selected="true" editor-type-id="text-editor">
723 589 
         <state relative-caret-position="36">
724 590 
           <caret line="2" column="43" lean-forward="false" selection-start-line="2" selection-start-column="43" selection-end-line="2" selection-end-column="43" />
725 
-          <folding>
726 
-            <marker date="1487461391707" expanded="true" signature="41:119" ph="{...}" />
727 
-            <marker date="1487461391707" expanded="true" signature="105:117" ph="{...}" />
728 
-          </folding>
729 591 
         </state>
730 592 
       </provider>
731 593 
     </entry>
 
@@ -733,12 +595,6 @@
733 595 
       <provider selected="true" editor-type-id="text-editor">
734 596 
         <state relative-caret-position="144">
735 597 
           <caret line="8" column="38" lean-forward="true" selection-start-line="8" selection-start-column="38" selection-end-line="8" selection-end-column="38" />
736 
-          <folding>
737 
-            <marker date="1487458480259" expanded="true" signature="6:83" ph="..." />
738 
-            <marker date="1487458480259" expanded="true" signature="120:396" ph="{...}" />
739 
-            <marker date="1487458480259" expanded="true" signature="179:310" ph="{...}" />
740 
-            <marker date="1487458480259" expanded="true" signature="382:394" ph="{...}" />
741 
-          </folding>
742 598 
         </state>
743 599 
       </provider>
744 600 
     </entry>
 
@@ -746,10 +602,6 @@
746 602 
       <provider selected="true" editor-type-id="text-editor">
747 603 
         <state relative-caret-position="90">
748 604 
           <caret line="5" column="5" lean-forward="true" selection-start-line="5" selection-start-column="5" selection-end-line="5" selection-end-column="5" />
749 
-          <folding>
750 
-            <marker date="1487458480231" expanded="true" signature="75:166" ph="{...}" />
751 
-            <marker date="1487458480231" expanded="true" signature="152:164" ph="{...}" />
752 
-          </folding>
753 605 
         </state>
754 606 
       </provider>
755 607 
     </entry>
 
@@ -757,17 +609,6 @@
757 609 
       <provider selected="true" editor-type-id="text-editor">
758 610 
         <state relative-caret-position="180">
759 611 
           <caret line="10" column="52" lean-forward="true" selection-start-line="10" selection-start-column="52" selection-end-line="10" selection-end-column="52" />
760 
-          <folding>
761 
-            <marker date="1487539122533" expanded="true" signature="6:163" ph="..." />
762 
-            <marker date="1487539122533" expanded="true" signature="179:1618" ph="{...}" />
763 
-            <marker date="1487539122533" expanded="true" signature="204:1616" ph="{...}" />
764 
-            <marker date="1487539122533" expanded="true" signature="435:877" ph="{...}" />
765 
-            <marker date="1487539122533" expanded="true" signature="951:1388" ph="{...}" />
766 
-            <marker date="1487539122533" expanded="true" signature="1194:1261" ph="{...}" />
767 
-            <marker date="1487539122533" expanded="true" signature="1281:1378" ph="{...}" />
768 
-            <marker date="1487539122533" expanded="true" signature="1466:1610" ph="{...}" />
769 
-            <marker date="1487539122533" expanded="true" signature="1512:1598" ph="{...}" />
770 
-          </folding>
771 612 
         </state>
772 613 
       </provider>
773 614 
     </entry>
 
@@ -775,11 +616,6 @@
775 616 
       <provider selected="true" editor-type-id="text-editor">
776 617 
         <state relative-caret-position="90">
777 618 
           <caret line="5" column="39" lean-forward="false" selection-start-line="5" selection-start-column="39" selection-end-line="5" selection-end-column="39" />
778 
-          <folding>
779 
-            <marker date="1487458480243" expanded="true" signature="6:52" ph="..." />
780 
-            <marker date="1487458480243" expanded="true" signature="89:268" ph="{...}" />
781 
-            <marker date="1487458480243" expanded="true" signature="156:266" ph="{...}" />
782 
-          </folding>
783 619 
         </state>
784 620 
       </provider>
785 621 
     </entry>
 
@@ -787,10 +623,6 @@
787 623 
       <provider selected="true" editor-type-id="text-editor">
788 624 
         <state relative-caret-position="234">
789 625 
           <caret line="13" column="40" lean-forward="false" selection-start-line="13" selection-start-column="40" selection-end-line="13" selection-end-column="40" />
790 
-          <folding>
791 
-            <marker date="1487461391719" expanded="true" signature="87:329" ph="{...}" />
792 
-            <marker date="1487461391719" expanded="true" signature="128:327" ph="{...}" />
793 
-          </folding>
794 626 
         </state>
795 627 
       </provider>
796 628 
     </entry>
 
@@ -798,10 +630,6 @@
798 630 
       <provider selected="true" editor-type-id="text-editor">
799 631 
         <state relative-caret-position="36">
800 632 
           <caret line="2" column="43" lean-forward="false" selection-start-line="2" selection-start-column="43" selection-end-line="2" selection-end-column="43" />
801 
-          <folding>
802 
-            <marker date="1487458004959" expanded="true" signature="41:116" ph="{...}" />
803 
-            <marker date="1487458004959" expanded="true" signature="101:114" ph="{...}" />
804 
-          </folding>
805 633 
         </state>
806 634 
       </provider>
807 635 
     </entry>
 
@@ -809,11 +637,6 @@
809 637 
       <provider selected="true" editor-type-id="text-editor">
810 638 
         <state relative-caret-position="144">
811 639 
           <caret line="8" column="44" lean-forward="false" selection-start-line="8" selection-start-column="44" selection-end-line="8" selection-end-column="44" />
812 
-          <folding>
813 
-            <marker date="1487458868439" expanded="true" signature="6:78" ph="..." />
814 
-            <marker date="1487458868439" expanded="true" signature="115:393" ph="{...}" />
815 
-            <marker date="1487458868439" expanded="true" signature="154:391" ph="{...}" />
816 
-          </folding>
817 640 
         </state>
818 641 
       </provider>
819 642 
     </entry>
 
@@ -821,12 +644,6 @@
821 644 
       <provider selected="true" editor-type-id="text-editor">
822 645 
         <state relative-caret-position="198">
823 646 
           <caret line="11" column="86" lean-forward="false" selection-start-line="11" selection-start-column="86" selection-end-line="11" selection-end-column="86" />
824 
-          <folding>
825 
-            <marker date="1487539113101" expanded="true" signature="0:490" ph="{...}" />
826 
-            <marker date="1487539113101" expanded="true" signature="17:297" ph="{...}" />
827 
-            <marker date="1487539113101" expanded="true" signature="71:291" ph="{...}" />
828 
-            <marker date="1487539113101" expanded="true" signature="324:468" ph="{...}" />
829 
-          </folding>
830 647 
         </state>
831 648 
       </provider>
832 649 
     </entry>
 
@@ -834,7 +651,13 @@
834 651 
       <provider selected="true" editor-type-id="text-editor">
835 652 
         <state relative-caret-position="180">
836 653 
           <caret line="10" column="15" lean-forward="false" selection-start-line="10" selection-start-column="15" selection-end-line="10" selection-end-column="15" />
837 
-          <folding />
654 
+        </state>
655 
+      </provider>
656 
+    </entry>
657 
+    <entry file="file://$PROJECT_DIR$/Test/project.json">
658 
+      <provider selected="true" editor-type-id="text-editor">
659 
+        <state relative-caret-position="0">
660 
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
838 661 
         </state>
839 662 
       </provider>
840 663 
     </entry>
 
@@ -842,36 +665,46 @@
842 665 
       <provider selected="true" editor-type-id="text-editor">
843 666 
         <state relative-caret-position="432">
844 667 
           <caret line="33" column="83" lean-forward="false" selection-start-line="33" selection-start-column="83" selection-end-line="33" selection-end-column="83" />
845 
-          <folding />
668 
+          <folding>
669 
+            <marker date="1487546211501" expanded="true" signature="6:157" ph="..." />
670 
+            <marker date="1487546211501" expanded="true" signature="192:1282" ph="{...}" />
671 
+            <marker date="1487546211501" expanded="true" signature="228:1280" ph="{...}" />
672 
+            <marker date="1487546211501" expanded="true" signature="308:600" ph="{...}" />
673 
+            <marker date="1487546211501" expanded="true" signature="349:406" ph="{...}" />
674 
+            <marker date="1487546211501" expanded="true" signature="460:589" ph="{...}" />
675 
+            <marker date="1487546211501" expanded="true" signature="662:1274" ph="{...}" />
676 
+            <marker date="1487546211501" expanded="true" signature="703:760" ph="{...}" />
677 
+            <marker date="1487546211501" expanded="true" signature="808:1263" ph="{...}" />
678 
+          </folding>
846 679 
         </state>
847 680 
       </provider>
848 681 
     </entry>
849 682 
     <entry file="file://$PROJECT_DIR$/WebApiWebSem/DataAccess/ArticlesDataAccess.cs">
850 683 
       <provider selected="true" editor-type-id="text-editor">
851 
-        <state relative-caret-position="318">
852 
-          <caret line="86" column="57" lean-forward="true" selection-start-line="86" selection-start-column="57" selection-end-line="86" selection-end-column="57" />
684 
+        <state relative-caret-position="174">
685 
+          <caret line="15" column="72" lean-forward="false" selection-start-line="15" selection-start-column="72" selection-end-line="15" selection-end-column="72" />
853 686 
           <folding>
854 
-            <marker date="1487546558945" expanded="true" signature="6:307" ph="..." />
855 
-            <marker date="1487546558945" expanded="true" signature="342:4021" ph="{...}" />
856 
-            <marker date="1487546558945" expanded="true" signature="478:4019" ph="{...}" />
857 
-            <marker date="1487546558945" expanded="true" signature="679:699" ph="{...}" />
858 
-            <marker date="1487546558945" expanded="true" signature="751:794" ph="{...}" />
859 
-            <marker date="1487546558945" expanded="true" signature="903:998" ph="{...}" />
860 
-            <marker date="1487546558945" expanded="true" signature="1108:1175" ph="{...}" />
861 
-            <marker date="1487546558945" expanded="true" signature="1244:1296" ph="{...}" />
862 
-            <marker date="1487546558945" expanded="true" signature="1356:1594" ph="{...}" />
863 
-            <marker date="1487546558945" expanded="true" signature="1492:1549" ph="{...}" />
864 
-            <marker date="1487546558945" expanded="true" signature="1695:1831" ph="{...}" />
865 
-            <marker date="1487546558945" expanded="true" signature="1908:2432" ph="{...}" />
866 
-            <marker date="1487546558945" expanded="true" signature="1963:2421" ph="{...}" />
867 
-            <marker date="1487546558945" expanded="true" signature="2225:2364" ph="{...}" />
868 
-            <marker date="1487546558945" expanded="true" signature="2523:2682" ph="{...}" />
869 
-            <marker date="1487546558945" expanded="true" signature="2825:3887" ph="{...}" />
870 
-            <marker date="1487546558945" expanded="true" signature="3000:3086" ph="{...}" />
871 
-            <marker date="1487546558945" expanded="true" signature="3146:3379" ph="{...}" />
872 
-            <marker date="1487546558945" expanded="true" signature="3533:3833" ph="{...}" />
873 
-            <marker date="1487546558945" expanded="true" signature="3629:3817" ph="{...}" />
874 
-            <marker date="1487546558945" expanded="true" signature="3959:4013" ph="{...}" />
687 
+            <marker date="1487804389248" expanded="true" signature="6:307" ph="..." />
688 
+            <marker date="1487804389248" expanded="true" signature="342:4029" ph="{...}" />
689 
+            <marker date="1487804389248" expanded="true" signature="478:4027" ph="{...}" />
690 
+            <marker date="1487804389248" expanded="true" signature="687:707" ph="{...}" />
691 
+            <marker date="1487804389248" expanded="true" signature="759:802" ph="{...}" />
692 
+            <marker date="1487804389248" expanded="true" signature="911:1006" ph="{...}" />
693 
+            <marker date="1487804389248" expanded="true" signature="1116:1183" ph="{...}" />
694 
+            <marker date="1487804389248" expanded="true" signature="1252:1304" ph="{...}" />
695 
+            <marker date="1487804389248" expanded="true" signature="1364:1602" ph="{...}" />
696 
+            <marker date="1487804389248" expanded="true" signature="1500:1557" ph="{...}" />
697 
+            <marker date="1487804389248" expanded="true" signature="1703:1839" ph="{...}" />
698 
+            <marker date="1487804389248" expanded="true" signature="1916:2440" ph="{...}" />
699 
+            <marker date="1487804389248" expanded="true" signature="1971:2429" ph="{...}" />
700 
+            <marker date="1487804389248" expanded="true" signature="2233:2372" ph="{...}" />
701 
+            <marker date="1487804389248" expanded="true" signature="2531:2690" ph="{...}" />
702 
+            <marker date="1487804389248" expanded="true" signature="2833:3895" ph="{...}" />
703 
+            <marker date="1487804389248" expanded="true" signature="3008:3094" ph="{...}" />
704 
+            <marker date="1487804389248" expanded="true" signature="3154:3387" ph="{...}" />
705 
+            <marker date="1487804389248" expanded="true" signature="3541:3841" ph="{...}" />
706 
+            <marker date="1487804389248" expanded="true" signature="3637:3825" ph="{...}" />
707 
+            <marker date="1487804389248" expanded="true" signature="3967:4021" ph="{...}" />
875 708 
           </folding>
876 709 
         </state>
877 710 
       </provider>

+ 1
- 1
backend/WebSem/WebApiWebSem/DataAccess/ArticlesDataAccess.cs Wyświetl plik 

@@ -13,7 +13,7 @@ namespace WebApiWebSem.DataAccess
13 13 
 {
14 14 
     public class ArticlesDataAccess : LuEfCrudDataAccess<articles, ArticlesAddDbo, ArticlesDbo, ArticlesEditDbo, WsDbContext, string>
15 15 
     {
16 
-        protected static IList<string> Types = new List<string>{"persons", "locations", "countries"};
16 
+        protected static IList<string> Types = new List<string>{"home", "persons", "locations", "countries"};
17 17
18 18 
         public ArticlesDataAccess(IServiceProvider serviceProvider) : base(serviceProvider)
19 19 
         {

+ 16
- 2
frontend/WebSem/app/controllers/home.controller.js Wyświetl plik 

@@ -1,4 +1,18 @@
1 1 
 angular.module('app')
2 
-    .controller('HomeController', ['$scope', '$state', '$mdDialog',
3 
-        function($scope, $state, $mdDialog) {
2 
+    .controller('HomeController', ['$scope', '$state', '$mdDialog', 'articlesBusiness', 'luBusyBusiness',
3 
+        function($scope, $state, $mdDialog, articlesBusiness, luBusyBusiness) {
4 
+
5 
+        luBusyBusiness.reset();
6 
+        $scope.item = null;
7 
+        $scope.itemType = 'articles';
8 
+
9 
+        $scope.load = function()
10 
+        {
11 
+            articlesBusiness.getMultiple('id', 'type: home', 0, 1, 'home.home').then(function(data)
12 
+            {
13 
+                $scope.item = data.data[0];
14 
+            }, function (error) {});
15 
+        };
16 
+
17 
+        $scope.load();
4 18 
     }]);

+ 24
- 0
frontend/WebSem/app/less/app.less Wyświetl plik 

@@ -140,6 +140,30 @@ md-table-container tbody tr {
140 140 
   }
141 141 
 }
142 142
143 
+.newline-text {
144 
+  white-space: pre-line;
145 
+}
146 
+
147 
+.justify-text {
148 
+  text-align: justify;
149 
+  margin-right: 15px;
150 
+}
151 
+
152 
+.article-text {
153 
+  .justify-text();
154 
+}
155 
+
156 
+.article-picture {
157 
+  max-width: 300px;
158 
+  max-height: 300px;
159 
+}
160 
+
161 
+.article-picture-caption {
162 
+  font-size: 0.8em;
163 
+  text-align: justify;
164 
+  .justify-text();
165 
+}
166 
+
143 167 
 /**
144 168 
 ========================================================
145 169 
 **/

+ 1
- 0
frontend/WebSem/app/translations/en.json Wyświetl plik 

@@ -62,6 +62,7 @@
62 62 
     "text": "Abstract",
63 63 
     "pictureUrl": "Picture URL",
64 64 
     "pictureCaption": "Picture caption",
65 
+    "value": "Value",
65 66 
     "types": {
66 67 
       "home": "Home page",
67 68 
       "persons": "Person",

+ 1
- 1
frontend/WebSem/app/views/articles.html Wyświetl plik 

@@ -68,7 +68,7 @@
68 68 
                     <td md-cell>{{item.updatedAt == null ? ('common.never' | translate ) : (item.updatedAt | formatDateTime)}}</td>
69 69 
                     <td class="col-icon-1" md-cell>
70 70 
                         <md-menu ng-show="!isModal">
71 
-                            <md-button class="md-icon-button" ng-click="$mdOpenMenu($event)">
71 
+                            <md-button class="md-icon-button" ng-click="$mdMenu.open($event)">
72 72 
                                 <md-icon class="material-icons">more_vert</md-icon>
73 73 
                             </md-button>
74 74 
                             <md-menu-content>

+ 4
- 4
frontend/WebSem/app/views/articlesedit.html Wyświetl plik 

@@ -43,7 +43,7 @@
43 43 
                 </md-input-container>
44 44 
             </div>
45 45 
             <div layout="column" layout-align=" center">
46 
-                <img ng-src="{{item.pictureUrl}}" />
46 
+                <img class="article-picture" ng-src="{{item.pictureUrl}}" />
47 47 
             </div>
48 48 
             <div layout-gt-sm="row">
49 49 
                 <md-input-container class="md-block" flex>
 
@@ -80,7 +80,7 @@
80 80 
                     <tr md-row ng-repeat="field in item.fields track by $index">
81 81 
                         <td md-cell>
82 82 
                             <md-input-container class="md-block md-input-small" flex>
83 
-                                <md-select ng-model="field.type">
83 
+                                <md-select aria-label="{{ itemType + '.fields.type' | translate }}" ng-model="field.type">
84 84 
                                     <md-option ng-repeat="type in appUtils.articleFieldTypes" ng-value="type">{{ itemType + '.fields.types.' + type | translate }}</md-option>
85 85 
                                 </md-select>
86 86 
                             </md-input-container>
 
@@ -88,7 +88,7 @@
88 88 
                         <td md-cell>
89 89 
                             <md-input-container class="md-block md-input-small" flex>
90 90 
                                 <md-input-container class="md-block md-input-small" flex>
91 
-                                    <md-select ng-model="field.property">
91 
+                                    <md-select aria-label="{{ itemType + '.fields.property' | translate }}" ng-model="field.property">
92 92 
                                         <md-option ng-repeat="prop in appUtils.articleFieldProperties" ng-value="prop">{{ itemType + '.fields.properties.' + prop | translate }}</md-option>
93 93 
                                     </md-select>
94 94 
                                 </md-input-container>
 
@@ -96,7 +96,7 @@
96 96 
                         </td>
97 97 
                         <td md-cell>
98 98 
                             <md-input-container class="md-block md-input-small" flex>
99 
-                                <input ng-model="field.value" >
99 
+                                <input aria-label="{{ itemType + '.fields.value' | translate }}" ng-model="field.value" >
100 100 
                             </md-input-container>
101 101 
                         </td>
102 102 
                         <td class="col-icon-1" md-cell>

+ 36
- 2
frontend/WebSem/app/views/home.html Wyświetl plik 

@@ -1,3 +1,37 @@
1 
-<div layout="column" layout-fill layout-align="top">
2 
-    <p>{{ 'home.welcome' | translate }}</p>
1 
+<div layout="column" layout-fill layout-align="top" angular-busy="appUtils.cgBusy('home.home')">
2 
+    <div layout="column" layout-align=" center">
3 
+        <p class="newline-text article-text">{{ item.text }}</p>
4 
+    </div>
5 
+    <div layout="row">
6 
+        <div flex="70">
7 
+            <md-table-container>
8 
+                <table md-table>
9 
+                    <thead md-head>
10 
+                    <tr md-row>
11 
+                        <th md-column>{{ itemType + '.fields.property' | translate }}</th>
12 
+                        <th md-column>{{ itemType + '.fields.value' | translate }}</th>
13 
+                    </tr>
14 
+                    </thead>
15 
+                    <tbody md-body>
16 
+                    <tr md-row ng-repeat="field in item.fields track by $index">
17 
+                        <td md-cell>
18 
+                            {{ itemType + '.fields.properties.' + field.property | translate }}
19 
+                        </td>
20 
+                        <td md-cell>
21 
+                            {{ field.value }}
22 
+                        </td>
23 
+                    </tr>
24 
+                    </tbody>
25 
+                </table>
26 
+            </md-table-container>
27 
+        </div>
28 
+        <div flex="30">
29 
+            <div layout="column" layout-align=" center">
30 
+                <img class="article-picture" ng-src="{{item.pictureUrl}}" />
31 
+            </div>
32 
+            <div layout="column" layout-align=" center">
33 
+                <p class="newline-text article-picture-caption">{{ item.pictureCaption }}</p>
34 
+            </div>
35 
+        </div>
36 
+    </div>
3 37 
 </div>

+ 5
- 2
frontend/WebSem/sdk/DataAccess/articles.dataaccess.js Wyświetl plik 

@@ -59,7 +59,10 @@
59 59 
                 }
60 60 
                 var dboInit = DataAccess._initDbo(dbo);
61 61 
                 dboInit.fields = DataAccess.articleFieldDboInitializer.initListData(dboInit.fields, type);
62 
-                dboInit.title = dboInit.id;
62 
+                if (type == DataAccess.TYPE_MODEL)
63 
+                {
64 
+                    dboInit.title = dboInit.id.replace(new RegExp('_', 'g'), ' ');
65 
+                }
63 66 
                 return dboInit;
64 67 
             };
65 68 
 
@@ -69,7 +72,7 @@
69 72 
                 }
70 73 
                 var modelInit = DataAccess._initModel(model, op);
71 74 
                 modelInit.fields = DataAccess.articleFieldModelInitializer.initListData(modelInit.fields, op);
72 
-                modelInit.id = modelInit.title;
75 
+                modelInit.id = modelInit.title.replace(new RegExp(' ', 'g'), '_');
73 76 
                 delete modelInit.title;
74 77 
                 return modelInit;
75 78 
             };

Napisz Podgląd
Ładowanie…
Anuluj
Zapisz