Browse Source

added properties and data types

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

+ 3
- 13
backend/WebSem/.idea/.idea.WebSem/.idea/workspace.xml View File

@@ -1,17 +1,7 @@
1 1
 <?xml version="1.0" encoding="UTF-8"?>
2 2
 <project version="4">
3 3
   <component name="ChangeListManager">
4
-    <list default="true" id="8d054e21-e284-419c-acba-f672639639a4" name="Default" comment="">
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" />
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" />
12
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../frontend/WebSem/app/views/articlesCategory.html" afterPath="$PROJECT_DIR$/../../frontend/WebSem/app/views/articlesCategory.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" />
14
-    </list>
4
+    <list default="true" id="8d054e21-e284-419c-acba-f672639639a4" name="Default" comment="" />
15 5
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
16 6
     <option name="TRACKING_ENABLED" value="true" />
17 7
     <option name="SHOW_DIALOG" value="false" />
@@ -312,12 +302,12 @@
312 302
       <workItem from="1487345029610" duration="5634000" />
313 303
       <workItem from="1487441650798" duration="14018000" />
314 304
       <workItem from="1487528667649" duration="13931000" />
315
-      <workItem from="1487802391451" duration="7174000" />
305
+      <workItem from="1487802391451" duration="7822000" />
316 306
     </task>
317 307
     <servers />
318 308
   </component>
319 309
   <component name="TimeTrackingManager">
320
-    <option name="totallyTimeSpent" value="47971000" />
310
+    <option name="totallyTimeSpent" value="48619000" />
321 311
   </component>
322 312
   <component name="TodoView">
323 313
     <todo-panel id="selected-file">

+ 7
- 2
frontend/WebSem/app/translations/en.json View File

@@ -77,11 +77,16 @@
77 77
       "property": "Property",
78 78
       "types": {
79 79
         "date/date": "Date",
80
-        "text/plain": "Text"
80
+        "text/plain": "Text",
81
+        "number/number": "Number"
81 82
       },
82 83
       "properties": {
83 84
         "birthDate": "Birth date",
84
-        "deathDate": "Death date"
85
+        "deathDate": "Death date",
86
+        "capital": "Capital",
87
+        "language": "Language",
88
+        "area": "Area",
89
+        "population": "Population"
85 90
       }
86 91
     },
87 92
     "deleteOne": "Do you really want to delete article '{text}'?",

+ 2
- 2
frontend/WebSem/sdk/Business/apputils.business.js View File

@@ -91,9 +91,9 @@
91 91
 
92 92
             AppUtilsBusiness.articleTypes = ['persons', 'locations', 'countries'];
93 93
 
94
-            AppUtilsBusiness.articleFieldTypes = ['date/date', 'text/plain'];
94
+            AppUtilsBusiness.articleFieldTypes = ['date/date', 'text/plain', 'number/number'];
95 95
 
96
-            AppUtilsBusiness.articleFieldProperties = ['birthDate', 'deathDate'];
96
+            AppUtilsBusiness.articleFieldProperties = ['birthDate', 'deathDate', 'capital', 'language', 'area', 'population'];
97 97
 
98 98
             return AppUtilsBusiness;
99 99
         }]);

Loading…
Cancel
Save