Commit a53f30b491110032d0790d843a9056853699402c

Authored by kristinlaahneolsen
1 parent b592692b

Laget felt hvor vi kan hente ut hvem som har skrevet en hendelse/evaluering. Det…

… er lagt til som en TODO i javakoden, siden vi enda ikke har noe støtte for dette i databasen
Showing 1 changed file with 17 additions and 7 deletions   Show diff stats
restApi/.idea/workspace.xml
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <project version="4"> 2 <project version="4">
3 <component name="ChangeListManager"> 3 <component name="ChangeListManager">
4 - <list default="true" id="0e20d303-9de8-4113-bfd9-019e72b304dc" name="Default" comment="" /> 4 + <list default="true" id="0e20d303-9de8-4113-bfd9-019e72b304dc" name="Default" comment="">
  5 + <change beforePath="$PROJECT_DIR$/../Risiko/app/src/main/java/activity/Evaluations.java" afterPath="$PROJECT_DIR$/../Risiko/app/src/main/java/activity/Evaluations.java" />
  6 + <change beforePath="$PROJECT_DIR$/../Risiko/app/src/main/java/activity/Incident.java" afterPath="$PROJECT_DIR$/../Risiko/app/src/main/java/activity/Incident.java" />
  7 + <change beforePath="$PROJECT_DIR$/../Risiko/app/src/main/java/api/Endpoints.java" afterPath="$PROJECT_DIR$/../Risiko/app/src/main/java/api/Endpoints.java" />
  8 + <change beforePath="$PROJECT_DIR$/../Risiko/app/src/main/res/drawable/ic_delete.xml" afterPath="$PROJECT_DIR$/../Risiko/app/src/main/res/drawable/ic_delete.xml" />
  9 + <change beforePath="$PROJECT_DIR$/../Risiko/app/src/main/res/drawable/ic_edit.xml" afterPath="$PROJECT_DIR$/../Risiko/app/src/main/res/drawable/ic_edit.xml" />
  10 + <change beforePath="$PROJECT_DIR$/../Risiko/app/src/main/res/layout/evaluationlist.xml" afterPath="$PROJECT_DIR$/../Risiko/app/src/main/res/layout/evaluationlist.xml" />
  11 + <change beforePath="$PROJECT_DIR$/../Risiko/app/src/main/res/layout/popup_evaluation.xml" afterPath="$PROJECT_DIR$/../Risiko/app/src/main/res/layout/popup_evaluation.xml" />
  12 + <change beforePath="$PROJECT_DIR$/../Risiko/app/src/main/res/layout/popup_event.xml" afterPath="$PROJECT_DIR$/../Risiko/app/src/main/res/layout/popup_event.xml" />
  13 + <change beforePath="$PROJECT_DIR$/../Risiko/app/src/main/res/values/strings.xml" afterPath="$PROJECT_DIR$/../Risiko/app/src/main/res/values/strings.xml" />
  14 + </list>
5 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 15 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
6 <option name="TRACKING_ENABLED" value="true" /> 16 <option name="TRACKING_ENABLED" value="true" />
7 <option name="SHOW_DIALOG" value="false" /> 17 <option name="SHOW_DIALOG" value="false" />
@@ -48,8 +58,8 @@ @@ -48,8 +58,8 @@
48 <file leaf-file-name="routes.js" pinned="false" current-in-tab="true"> 58 <file leaf-file-name="routes.js" pinned="false" current-in-tab="true">
49 <entry file="file://$PROJECT_DIR$/api/routes/routes.js"> 59 <entry file="file://$PROJECT_DIR$/api/routes/routes.js">
50 <provider selected="true" editor-type-id="text-editor"> 60 <provider selected="true" editor-type-id="text-editor">
51 - <state relative-caret-position="162">  
52 - <caret line="333" column="52" lean-forward="true" selection-start-line="333" selection-start-column="52" selection-end-line="333" selection-end-column="52" /> 61 + <state relative-caret-position="416">
  62 + <caret line="161" column="28" lean-forward="false" selection-start-line="161" selection-start-column="28" selection-end-line="161" selection-end-column="28" />
53 <folding /> 63 <folding />
54 </state> 64 </state>
55 </provider> 65 </provider>
@@ -213,12 +223,12 @@ @@ -213,12 +223,12 @@
213 <workItem from="1541155443683" duration="1473000" /> 223 <workItem from="1541155443683" duration="1473000" />
214 <workItem from="1541596156631" duration="9351000" /> 224 <workItem from="1541596156631" duration="9351000" />
215 <workItem from="1541681303243" duration="9060000" /> 225 <workItem from="1541681303243" duration="9060000" />
216 - <workItem from="1542189792461" duration="2286000" /> 226 + <workItem from="1542189792461" duration="2464000" />
217 </task> 227 </task>
218 <servers /> 228 <servers />
219 </component> 229 </component>
220 <component name="TimeTrackingManager"> 230 <component name="TimeTrackingManager">
221 - <option name="totallyTimeSpent" value="24068000" /> 231 + <option name="totallyTimeSpent" value="24246000" />
222 </component> 232 </component>
223 <component name="ToolWindowManager"> 233 <component name="ToolWindowManager">
224 <frame x="0" y="23" width="1440" height="873" extended-state="1" /> 234 <frame x="0" y="23" width="1440" height="873" extended-state="1" />
@@ -281,8 +291,8 @@ @@ -281,8 +291,8 @@
281 </entry> 291 </entry>
282 <entry file="file://$PROJECT_DIR$/api/routes/routes.js"> 292 <entry file="file://$PROJECT_DIR$/api/routes/routes.js">
283 <provider selected="true" editor-type-id="text-editor"> 293 <provider selected="true" editor-type-id="text-editor">
284 - <state relative-caret-position="162">  
285 - <caret line="333" column="52" lean-forward="true" selection-start-line="333" selection-start-column="52" selection-end-line="333" selection-end-column="52" /> 294 + <state relative-caret-position="416">
  295 + <caret line="161" column="28" lean-forward="false" selection-start-line="161" selection-start-column="28" selection-end-line="161" selection-end-column="28" />
286 <folding /> 296 <folding />
287 </state> 297 </state>
288 </provider> 298 </provider>