Commit 315cfe82bd26a563df581e6f731c42203fbdca7c

Authored by kristinlaahneolsen
1 parent c4be2ce9

Liten fiks på å hente ut tittel

Risiko/app/src/main/java/activity/Incident.java
... ... @@ -81,13 +81,15 @@ public class Incident extends AppCompatActivity {
81 81 AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(this);
82 82 alertDialogBuilder.setView(promptView);
83 83  
  84 +
  85 + TextView tvTitle = promptView.findViewById(R.id.pop_headline);
84 86 TextView tvDate = promptView.findViewById(R.id.pop_date);
85 87 TextView tvLocation = promptView.findViewById(R.id.pop_place);
86 88 TextView tvDescription = promptView.findViewById(R.id.pop_description);
87 89 TextView tvAssociatedRisk = promptView.findViewById(R.id.pop_associated_risk);
88 90 Button deleteEvent = promptView.findViewById(R.id.pop_delete_event);
89 91 Button editEvent = promptView.findViewById(R.id.pop_edit_event);
90   - System.out.println("SE HIT" + chosenItem.getDescription() + chosenItem.getId());
  92 +
91 93  
92 94 //TODO: IMPLEMENTERE DET SLIK AT VI FÅR HENTET UT HVILKEN BRUKER SOM HAR SKREVET SAKEN
93 95 TextView addedBy = promptView.findViewById(R.id.tv_added_by);
... ... @@ -95,7 +97,7 @@ public class Incident extends AppCompatActivity {
95 97 deleteEvent.setOnClickListener(view -> deleteEventDialog());
96 98 editEvent.setOnClickListener(view -> editIncident(chosenItem.getId(), chosenItem.getTitle(), chosenItem.getDate(), chosenItem.getDescription(), chosenItem.getLocation()) );
97 99  
98   -
  100 + tvTitle.setText(chosenItem.getTitle());
99 101 tvDate.setText(chosenItem.getDate());
100 102 tvLocation.setText(chosenItem.getLocation());
101 103 tvDescription.setText(chosenItem.getDescription());
... ...
restApi/.idea/workspace.xml
1 1 <?xml version="1.0" encoding="UTF-8"?>
2 2 <project version="4">
3 3 <component name="ChangeListManager">
4   - <list default="true" id="0e20d303-9de8-4113-bfd9-019e72b304dc" name="Default" comment="">
5   - <change beforePath="" afterPath="$PROJECT_DIR$/../Risiko/app/src/main/java/activity/EditIncident.java" />
6   - <change beforePath="" afterPath="$PROJECT_DIR$/../Risiko/app/src/main/res/layout/activity_edit_incident.xml" />
7   - <change beforePath="$PROJECT_DIR$/../Risiko/app/src/main/AndroidManifest.xml" afterPath="$PROJECT_DIR$/../Risiko/app/src/main/AndroidManifest.xml" />
8   - <change beforePath="$PROJECT_DIR$/../Risiko/app/src/main/java/activity/Incident.java" afterPath="$PROJECT_DIR$/../Risiko/app/src/main/java/activity/Incident.java" />
9   - <change beforePath="$PROJECT_DIR$/../Risiko/app/src/main/java/api/Endpoints.java" afterPath="$PROJECT_DIR$/../Risiko/app/src/main/java/api/Endpoints.java" />
10   - <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
11   - </list>
  4 + <list default="true" id="0e20d303-9de8-4113-bfd9-019e72b304dc" name="Default" comment="" />
12 5 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
13 6 <option name="TRACKING_ENABLED" value="true" />
14 7 <option name="SHOW_DIALOG" value="false" />
... ... @@ -55,8 +48,8 @@
55 48 <file leaf-file-name="routes.js" pinned="false" current-in-tab="true">
56 49 <entry file="file://$PROJECT_DIR$/api/routes/routes.js">
57 50 <provider selected="true" editor-type-id="text-editor">
58   - <state relative-caret-position="321">
59   - <caret line="80" column="45" lean-forward="false" selection-start-line="80" selection-start-column="45" selection-end-line="80" selection-end-column="45" />
  51 + <state relative-caret-position="216">
  52 + <caret line="76" column="125" lean-forward="true" selection-start-line="76" selection-start-column="125" selection-end-line="76" selection-end-column="125" />
60 53 <folding />
61 54 </state>
62 55 </provider>
... ... @@ -225,21 +218,22 @@
225 218 <workItem from="1541155443683" duration="1473000" />
226 219 <workItem from="1541596156631" duration="9351000" />
227 220 <workItem from="1541681303243" duration="9060000" />
228   - <workItem from="1542189792461" duration="4683000" />
  221 + <workItem from="1542189792461" duration="4744000" />
229 222 </task>
230 223 <servers />
231 224 </component>
232 225 <component name="TimeTrackingManager">
233   - <option name="totallyTimeSpent" value="26465000" />
  226 + <option name="totallyTimeSpent" value="26526000" />
234 227 </component>
235 228 <component name="ToolWindowManager">
236 229 <frame x="0" y="23" width="1440" height="873" extended-state="0" />
  230 + <editor active="true" />
237 231 <layout>
238 232 <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.20014094" sideWeight="0.71128106" order="0" side_tool="false" content_ui="combo" />
239 233 <window_info id="TODO" 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="6" side_tool="false" content_ui="tabs" />
240 234 <window_info id="Docker" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
241 235 <window_info id="Event Log" 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="true" content_ui="tabs" />
242   - <window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3277635" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
  236 + <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3277635" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
243 237 <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="8" side_tool="false" content_ui="tabs" />
244 238 <window_info id="npm" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.20014094" sideWeight="0.28871894" order="2" side_tool="true" content_ui="tabs" />
245 239 <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" />
... ... @@ -292,8 +286,8 @@
292 286 </entry>
293 287 <entry file="file://$PROJECT_DIR$/api/routes/routes.js">
294 288 <provider selected="true" editor-type-id="text-editor">
295   - <state relative-caret-position="321">
296   - <caret line="80" column="45" lean-forward="false" selection-start-line="80" selection-start-column="45" selection-end-line="80" selection-end-column="45" />
  289 + <state relative-caret-position="216">
  290 + <caret line="76" column="125" lean-forward="true" selection-start-line="76" selection-start-column="125" selection-end-line="76" selection-end-column="125" />
297 291 <folding />
298 292 </state>
299 293 </provider>
... ...