Commit a47f7da0f639db2bc990d038d312d010f970b29d

Authored by kristinlaahneolsen
1 parent 2ea847ae

dette skulle egentlig pushes FREDAG, men source.uit var nede fram til tirsdag

Rapport - Distribuert server-klient.docx
No preview for this file type
Risiko/app/src/main/java/activity/Evaluations.java
... ... @@ -39,6 +39,10 @@ public class Evaluations extends AppCompatActivity {
39 39  
40 40 dbs = new DatabaseSource(this);
41 41  
  42 + Intent intent = getIntent();
  43 + String activityName = intent.getStringExtra("NAME_OF_CHOSEN_ACTIVITY");
  44 + int activityId = intent.getIntExtra("ID_OF_CHOSEN_ACTIVITY", -1);
  45 + System.out.println(activityId);
42 46  
43 47 //TESTING AV RETROFIT: FUNKER KUN VED Å BRUKE DELING AV MOBILNETT
44 48  
... ... @@ -48,7 +52,13 @@ public class Evaluations extends AppCompatActivity {
48 52 public void onResponse(Call<List<Evaluation>> call, Response<List<Evaluation>> response) {
49 53 if (response.isSuccessful()) {
50 54 List<Evaluation> evaluations = response.body();
51   - insertEvaluations(evaluations);
  55 + List<Evaluation> associatedEvaluations = new ArrayList<>();
  56 + for (Evaluation e : evaluations) {
  57 + System.out.println(e.getAssociatedactivity());
  58 + if (e.getAssociatedactivity() == activityId)
  59 + associatedEvaluations.add(e);
  60 + }
  61 + insertEvaluations(associatedEvaluations);
52 62 }
53 63 }
54 64  
... ... @@ -60,9 +70,7 @@ public class Evaluations extends AppCompatActivity {
60 70 });
61 71  
62 72  
63   - Intent intent = getIntent();
64   - String activityName = intent.getStringExtra("NAME_OF_CHOSEN_ACTIVITY");
65   - int activityId = intent.getIntExtra("ID_OF_CHOSEN_ACTIVITY", -1);
  73 +
66 74  
67 75 tvNameOfActivity = findViewById(R.id.tv_nameOfActivity);
68 76 tvNameOfActivity.setText(activityName);
... ...
Risiko/app/src/main/java/activity/Incident.java
... ... @@ -6,7 +6,6 @@ import android.os.Bundle;
6 6 import android.util.Log;
7 7 import android.view.LayoutInflater;
8 8 import android.view.View;
9   -import android.widget.AdapterView;
10 9 import android.widget.ListView;
11 10 import android.widget.TextView;
12 11  
... ... @@ -82,9 +81,9 @@ public class Incident extends AppCompatActivity {
82 81 TextView tvAssociatedRisk = promptView.findViewById(R.id.pop_associated_risk);
83 82  
84 83 tvDate.setText(chosenItem.getDate());
85   - tvLocation.setText(chosenItem.getPlaceOfEvent());
  84 + tvLocation.setText(chosenItem.getLocation());
86 85 tvDescription.setText(chosenItem.getDescription());
87   - Evaluation associatedEvaluation = dbs.getEvaluationById(chosenItem.getAssociatedEvaluation());
  86 + Evaluation associatedEvaluation = dbs.getEvaluationById(chosenItem.getAssociatedeval());
88 87 tvAssociatedRisk.setText(associatedEvaluation.getTitle());
89 88  
90 89 alertDialogBuilder.setCancelable(false)
... ...
Risiko/app/src/main/java/activity/NewEvaluation.java
... ... @@ -10,8 +10,14 @@ import android.widget.Spinner;
10 10  
11 11 import com.risiko.risiko.R;
12 12  
  13 +import java.util.HashMap;
  14 +
  15 +import api.Api;
13 16 import database.DatabaseSource;
14 17 import dataclasses.Evaluation;
  18 +import retrofit2.Call;
  19 +import retrofit2.Callback;
  20 +import retrofit2.Response;
15 21  
16 22 public class NewEvaluation extends AppCompatActivity {
17 23  
... ... @@ -47,8 +53,20 @@ public class NewEvaluation extends AppCompatActivity {
47 53 int consequenceValue = getConsequenceValue(consequence);
48 54 int probabilityValue = getProbabilityValue(probability);
49 55  
50   - Evaluation newEval = new Evaluation(activityId, title, outcome, action, consequenceValue, probabilityValue);
51   - dbs.insertEvaluation(newEval);
  56 + Api.get().newEvaluation(title, (int) (Math.random()*1000000),activityId,consequenceValue,action,outcome,probabilityValue).enqueue(new Callback<String>() {
  57 + @Override
  58 + public void onResponse(Call<String> call, Response<String> response) {
  59 + System.out.println(response);
  60 + }
  61 +
  62 + @Override
  63 + public void onFailure(Call<String> call, Throwable t) {
  64 + t.printStackTrace();
  65 + }
  66 + });
  67 +
  68 + //Evaluation newEval = new Evaluation(activityId, title, outcome, action, consequenceValue, probabilityValue);
  69 + //dbs.insertEvaluation(newEval);
52 70 finish();
53 71 }
54 72 });
... ...
Risiko/app/src/main/java/activity/NewIncident.java
... ... @@ -12,9 +12,13 @@ import com.risiko.risiko.R;
12 12 import java.util.ArrayList;
13 13 import java.util.HashMap;
14 14  
  15 +import api.Api;
15 16 import database.DatabaseSource;
16 17 import dataclasses.Evaluation;
17 18 import dataclasses.Incident;
  19 +import retrofit2.Call;
  20 +import retrofit2.Callback;
  21 +import retrofit2.Response;
18 22  
19 23 public class NewIncident extends AppCompatActivity {
20 24  
... ... @@ -55,6 +59,22 @@ public class NewIncident extends AppCompatActivity {
55 59 int associatedRisk = evalMap.get(associatedRiskTitle);
56 60  
57 61 dataclasses.Incident newIncident = new Incident(date, location, title, description, associatedRisk);
  62 +
  63 +
  64 + Api.get().newIncident(date, title, (int) (Math.random()*1000000), associatedRisk, description, location).enqueue(new Callback<String>() {
  65 + @Override
  66 + public void onResponse(Call<String> call, Response<String> response) {
  67 + System.out.println(response);
  68 + }
  69 +
  70 + @Override
  71 + public void onFailure(Call<String> call, Throwable t) {
  72 + t.printStackTrace();
  73 +
  74 + }
  75 + });
  76 +
  77 +
58 78 dbs.insertIncident(newIncident);
59 79 finish();
60 80 }
... ...
Risiko/app/src/main/java/api/Endpoints.java
1 1 package api;
2 2  
  3 +import java.util.Date;
  4 +import java.util.HashMap;
3 5 import java.util.List;
4 6  
5 7 import dataclasses.Activity;
6 8 import dataclasses.Evaluation;
7 9 import dataclasses.Incident;
8 10 import retrofit2.Call;
  11 +import retrofit2.http.Body;
9 12 import retrofit2.http.Field;
  13 +import retrofit2.http.FormUrlEncoded;
10 14 import retrofit2.http.GET;
11 15 import retrofit2.http.POST;
12 16 import retrofit2.http.Path;
... ... @@ -20,27 +24,29 @@ public interface Endpoints {
20 24 // THE BASEURL HAS TO BE CHANGE TO THE IP-ADDRESS YOU ARE CONNECTED TO AT LOCALHOST
21 25 String BASEURL = "http://172.20.10.2:3000/";
22 26  
23   - @GET("getAllEvaluations")
  27 + @GET("evaluation")
24 28 Call<List<Evaluation>> getAllEvaluations();
25 29  
26   - @GET("getEvaluation/{id}")
  30 + @GET("evaluation/{id}")
27 31 Call<List<Evaluation>> getEvaluation(@Path("id") int id);
28 32  
29   - @GET("getAllActivities")
  33 + @GET("activity")
30 34 Call<List<Activity>> getAllActivities();
31 35  
32   - @GET("getAllIncidents")
  36 + @GET("incident")
33 37 Call<List<Incident>> getAllIncidents();
34 38  
35   - @GET("getIncident/{id}")
  39 + @GET("incident/{id}")
36 40 Call<List<Incident>> getIncident(@Path("id") int id);
37 41  
38   - @POST("newIncident")
39   - Call<List<Incident>> newIncident(@Field("title") String title, @Field("id") int id, @Field("associatedeval") int associatedeval,
40   - @Field("description") String description, @Field("location") String location);
  42 + @FormUrlEncoded
  43 + @POST("incident")
  44 + Call<String> newIncident(@Field("date") String date, @Field("title") String title, @Field("id") int id, @Field("associatedEval") int associatedEval,
  45 + @Field("description") String description, @Field("location") String location);
41 46  
42   - @POST("newEvaluation")
43   - Call<List<Evaluation>> newEvaluation(@Field("title") String title, @Field("id") int id, @Field("associatedactivity") int associatedactivity,
  47 + @FormUrlEncoded
  48 + @POST("evaluation")
  49 + Call<String> newEvaluation(@Field("title") String title, @Field("id") int id, @Field("associatedActivity") int associatedactivity,
44 50 @Field("consequence") int consequence, @Field("measures") String measures, @Field("outcome") String outcome, @Field("probability") int probability);
45 51  
46 52  
... ...
Risiko/app/src/main/java/database/DatabaseSource.java
... ... @@ -20,7 +20,7 @@ public class DatabaseSource {
20 20  
21 21 public boolean insertEvaluation (Evaluation evaluation) {
22 22 ContentValues values = new ContentValues();
23   - values.put(EvaluationTable.EVALUATION_COL_ASSOCIATED_ACTIVITY, evaluation.getAssociatedActivity());
  23 + values.put(EvaluationTable.EVALUATION_COL_ASSOCIATED_ACTIVITY, evaluation.getAssociatedactivity());
24 24 values.put(EvaluationTable.EVALUATION_COL_TITLE, evaluation.getTitle());
25 25 values.put(EvaluationTable.EVALUATION_COL_OUTCOME, evaluation.getOutcome());
26 26 values.put(EvaluationTable.EVALUATION_COL_ACTION, evaluation.getMeasures());
... ... @@ -36,10 +36,10 @@ public class DatabaseSource {
36 36  
37 37 public boolean insertIncident(Incident incident) {
38 38 ContentValues values = new ContentValues();
39   - values.put(IncidentTable.INCIDENT_COL_ASSOCIATED_EVALUATION, incident.getAssociatedEvaluation());
  39 + values.put(IncidentTable.INCIDENT_COL_ASSOCIATED_EVALUATION, incident.getAssociatedeval());
40 40 values.put(IncidentTable.INCIDENT_COL_TITLE, incident.getTitle());
41 41 values.put(IncidentTable.INCIDENT_COL_DATE, incident.getDate().toString());
42   - values.put(IncidentTable.INCIDENT_COL_LOCATION, incident.getPlaceOfEvent());
  42 + values.put(IncidentTable.INCIDENT_COL_LOCATION, incident.getLocation());
43 43 values.put(IncidentTable.INCIDENT_COL_DESCRIPTION, incident.getDescription());
44 44  
45 45 SQLiteDatabase database = helper.getWritableDatabase();
... ... @@ -109,7 +109,7 @@ public class DatabaseSource {
109 109 int probabilityIndex = cursor.getColumnIndexOrThrow(EvaluationTable.EVALUATION_COL_PROBABILITY);
110 110  
111 111 data.setId(cursor.getInt(idIndex));
112   - data.setAssociatedActivity(cursor.getInt(associatedActivityIndex));
  112 + data.setAssociatedactivity(cursor.getInt(associatedActivityIndex));
113 113 data.setTitle(cursor.getString(titleIndex));
114 114 data.setOutcome(cursor.getString(outcomeIndex));
115 115 data.setMeasures(cursor.getString(actionIndex));
... ... @@ -129,10 +129,10 @@ public class DatabaseSource {
129 129 int descriptionIndex = cursor.getColumnIndexOrThrow(IncidentTable.INCIDENT_COL_DESCRIPTION);
130 130  
131 131 data.setId(cursor.getInt(idIndex));
132   - data.setAssociatedEvaluation(cursor.getInt(associatedEvaluationIndex));
  132 + data.setAssociatedeval(cursor.getInt(associatedEvaluationIndex));
133 133 data.setTitle(cursor.getString(titleIndex));
134 134 data.setDate(cursor.getString(dateIndex));
135   - data.setPlaceOfEvent(cursor.getString(locationIndex));
  135 + data.setLocation(cursor.getString(locationIndex));
136 136 data.setDescription(cursor.getString(descriptionIndex));
137 137  
138 138 return data;
... ...
Risiko/app/src/main/java/dataclasses/Evaluation.java
... ... @@ -13,7 +13,7 @@ public class Evaluation {
13 13  
14 14 UUID uuid;
15 15 int id;
16   - int associatedActivity;
  16 + int associatedactivity;
17 17 String title;
18 18 String outcome;
19 19 String measures;
... ... @@ -24,9 +24,9 @@ public class Evaluation {
24 24 uuid = UUID.randomUUID();
25 25 }
26 26  
27   - public Evaluation(int associatedActivity, String title, String outcome, String measures, int consequence, int probability) {
  27 + public Evaluation(int associatedactivity, String title, String outcome, String measures, int consequence, int probability) {
28 28 this.title = title;
29   - this.associatedActivity = associatedActivity;
  29 + this.associatedactivity = associatedactivity;
30 30 this.outcome = outcome;
31 31 this.measures = measures;
32 32 this.consequence = consequence;
... ... @@ -42,12 +42,12 @@ public class Evaluation {
42 42 this.id = id;
43 43 }
44 44  
45   - public int getAssociatedActivity() {
46   - return associatedActivity;
  45 + public int getAssociatedactivity() {
  46 + return associatedactivity;
47 47 }
48 48  
49   - public void setAssociatedActivity(int associatedActivity) {
50   - this.associatedActivity = associatedActivity;
  49 + public void setAssociatedactivity(int associatedactivity) {
  50 + this.associatedactivity = associatedactivity;
51 51 }
52 52  
53 53 public String getTitle() {
... ...
Risiko/app/src/main/java/dataclasses/Incident.java
... ... @@ -9,23 +9,23 @@ public class Incident {
9 9  
10 10 UUID uuid;
11 11 private String date;
12   - private String placeOfEvent;
  12 + private String location;
13 13 private String title;
14 14 private String description;
15 15 private int id;
16   - private int associatedEvaluation;
  16 + private int associatedeval;
17 17  
18 18  
19 19 public Incident() {
20 20 uuid = UUID.randomUUID();
21 21 }
22 22  
23   - public Incident(String date, String place, String title, String description, int associatedEvaluation) {
  23 + public Incident(String date, String place, String title, String description, int associatedeval) {
24 24 this.date = date;
25   - this.placeOfEvent = place;
  25 + this.location = place;
26 26 this.title = title;
27 27 this.description = description;
28   - this.associatedEvaluation = associatedEvaluation;
  28 + this.associatedeval = associatedeval;
29 29 uuid = UUID.randomUUID();
30 30 }
31 31  
... ... @@ -33,12 +33,12 @@ public class Incident {
33 33 this.title = title;
34 34 }
35 35  
36   - public int getAssociatedEvaluation() {
37   - return associatedEvaluation;
  36 + public int getAssociatedeval() {
  37 + return associatedeval;
38 38 }
39 39  
40   - public void setAssociatedEvaluation(int associatedEvaluation) {
41   - this.associatedEvaluation = associatedEvaluation;
  40 + public void setAssociatedeval(int associatedeval) {
  41 + this.associatedeval = associatedeval;
42 42 }
43 43  
44 44 public String getDate() {
... ... @@ -49,12 +49,12 @@ public class Incident {
49 49 this.date = date;
50 50 }
51 51  
52   - public String getPlaceOfEvent() {
53   - return placeOfEvent;
  52 + public String getLocation() {
  53 + return location;
54 54 }
55 55  
56   - public void setPlaceOfEvent(String placeOfEvent) {
57   - this.placeOfEvent = placeOfEvent;
  56 + public void setLocation(String location) {
  57 + this.location = location;
58 58 }
59 59  
60 60 public String getTitle() {
... ...
Risiko/app/src/main/res/layout/activity_new_evaluation.xml
... ... @@ -10,7 +10,8 @@
10 10 android:layout_width="match_parent"
11 11 android:layout_height="match_parent"
12 12 android:orientation="vertical"
13   -
  13 + android:background="@color/colorWhite"
  14 + android:padding="10dp"
14 15 android:layout_margin="15dp">
15 16  
16 17  
... ...
Risiko/app/src/main/res/layout/activity_new_incident.xml
... ... @@ -27,7 +27,7 @@
27 27 android:id="@+id/et_newIncident_date"
28 28 android:layout_width="match_parent"
29 29 android:layout_height="wrap_content"
30   - android:hint="Dato (dd.mm.yyyy):"
  30 + android:hint="Dato (2015-07-08):"
31 31 android:inputType="date" />
32 32  
33 33 <EditText
... ...
restApi/.idea/workspace.xml
... ... @@ -2,13 +2,12 @@
2 2 <project version="4">
3 3 <component name="ChangeListManager">
4 4 <list default="true" id="0e20d303-9de8-4113-bfd9-019e72b304dc" name="Default" comment="">
  5 + <change beforePath="$PROJECT_DIR$/../Rapport - Distribuert server-klient.docx" afterPath="$PROJECT_DIR$/../Rapport - Distribuert server-klient.docx" />
5 6 <change beforePath="$PROJECT_DIR$/../Risiko/app/src/main/java/activity/Evaluations.java" afterPath="$PROJECT_DIR$/../Risiko/app/src/main/java/activity/Evaluations.java" />
6 7 <change beforePath="$PROJECT_DIR$/../Risiko/app/src/main/java/activity/NewEvaluation.java" afterPath="$PROJECT_DIR$/../Risiko/app/src/main/java/activity/NewEvaluation.java" />
7 8 <change beforePath="$PROJECT_DIR$/../Risiko/app/src/main/java/api/Endpoints.java" afterPath="$PROJECT_DIR$/../Risiko/app/src/main/java/api/Endpoints.java" />
8 9 <change beforePath="$PROJECT_DIR$/../Risiko/app/src/main/java/database/DatabaseSource.java" afterPath="$PROJECT_DIR$/../Risiko/app/src/main/java/database/DatabaseSource.java" />
9 10 <change beforePath="$PROJECT_DIR$/../Risiko/app/src/main/java/dataclasses/Evaluation.java" afterPath="$PROJECT_DIR$/../Risiko/app/src/main/java/dataclasses/Evaluation.java" />
10   - <change beforePath="$PROJECT_DIR$/api/routes/routes.js" afterPath="$PROJECT_DIR$/api/routes/routes.js" />
11   - <change beforePath="$PROJECT_DIR$/package.json" afterPath="$PROJECT_DIR$/package.json" />
12 11 </list>
13 12 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
14 13 <option name="TRACKING_ENABLED" value="true" />
... ... @@ -19,11 +18,11 @@
19 18 </component>
20 19 <component name="FileEditorManager">
21 20 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
22   - <file leaf-file-name="routes.js" pinned="false" current-in-tab="true">
  21 + <file leaf-file-name="routes.js" pinned="false" current-in-tab="false">
23 22 <entry file="file://$PROJECT_DIR$/api/routes/routes.js">
24 23 <provider selected="true" editor-type-id="text-editor">
25   - <state relative-caret-position="180">
26   - <caret line="182" column="16" lean-forward="false" selection-start-line="182" selection-start-column="16" selection-end-line="182" selection-end-column="16" />
  24 + <state relative-caret-position="308">
  25 + <caret line="71" column="52" lean-forward="true" selection-start-line="71" selection-start-column="52" selection-end-line="71" selection-end-column="52" />
27 26 <folding />
28 27 </state>
29 28 </provider>
... ... @@ -49,6 +48,16 @@
49 48 </provider>
50 49 </entry>
51 50 </file>
  51 + <file leaf-file-name="incident.js" pinned="false" current-in-tab="true">
  52 + <entry file="file://$PROJECT_DIR$/api/modules/incident.js">
  53 + <provider selected="true" editor-type-id="text-editor">
  54 + <state relative-caret-position="0">
  55 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  56 + <folding />
  57 + </state>
  58 + </provider>
  59 + </entry>
  60 + </file>
52 61 </leaf>
53 62 </component>
54 63 <component name="Git.Settings">
... ... @@ -189,23 +198,22 @@
189 198 <updated>1541088603899</updated>
190 199 <workItem from="1541088608198" duration="134000" />
191 200 <workItem from="1541088784358" duration="1764000" />
192   - <workItem from="1541155443683" duration="818000" />
  201 + <workItem from="1541155443683" duration="1473000" />
193 202 </task>
194 203 <servers />
195 204 </component>
196 205 <component name="TimeTrackingManager">
197   - <option name="totallyTimeSpent" value="2716000" />
  206 + <option name="totallyTimeSpent" value="3371000" />
198 207 </component>
199 208 <component name="ToolWindowManager">
200 209 <frame x="0" y="0" width="1440" height="900" extended-state="0" />
201   - <editor active="true" />
202 210 <layout>
203 211 <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24947146" sideWeight="0.49369368" order="0" side_tool="false" content_ui="combo" />
204 212 <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" />
205 213 <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" />
206 214 <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="7" side_tool="true" content_ui="tabs" />
207 215 <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="7" side_tool="false" content_ui="tabs" />
208   - <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32889965" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
  216 + <window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32889965" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
209 217 <window_info id="npm" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24947146" sideWeight="0.5063063" order="2" side_tool="true" content_ui="tabs" />
210 218 <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" />
211 219 <window_info id="Terminal" 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" />
... ... @@ -268,26 +276,34 @@
268 276 </state>
269 277 </provider>
270 278 </entry>
271   - <entry file="file://$PROJECT_DIR$/api/modules/evaluation.js">
  279 + <entry file="file://$PROJECT_DIR$/package.json">
272 280 <provider selected="true" editor-type-id="text-editor">
273   - <state relative-caret-position="0">
274   - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  281 + <state relative-caret-position="120">
  282 + <caret line="8" column="38" lean-forward="false" selection-start-line="8" selection-start-column="38" selection-end-line="8" selection-end-column="38" />
275 283 <folding />
276 284 </state>
277 285 </provider>
278 286 </entry>
279   - <entry file="file://$PROJECT_DIR$/package.json">
  287 + <entry file="file://$PROJECT_DIR$/api/routes/routes.js">
280 288 <provider selected="true" editor-type-id="text-editor">
281   - <state relative-caret-position="120">
282   - <caret line="8" column="38" lean-forward="false" selection-start-line="8" selection-start-column="38" selection-end-line="8" selection-end-column="38" />
  289 + <state relative-caret-position="308">
  290 + <caret line="71" column="52" lean-forward="true" selection-start-line="71" selection-start-column="52" selection-end-line="71" selection-end-column="52" />
283 291 <folding />
284 292 </state>
285 293 </provider>
286 294 </entry>
287   - <entry file="file://$PROJECT_DIR$/api/routes/routes.js">
  295 + <entry file="file://$PROJECT_DIR$/api/modules/evaluation.js">
  296 + <provider selected="true" editor-type-id="text-editor">
  297 + <state relative-caret-position="0">
  298 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  299 + <folding />
  300 + </state>
  301 + </provider>
  302 + </entry>
  303 + <entry file="file://$PROJECT_DIR$/api/modules/incident.js">
288 304 <provider selected="true" editor-type-id="text-editor">
289   - <state relative-caret-position="180">
290   - <caret line="182" column="16" lean-forward="false" selection-start-line="182" selection-start-column="16" selection-end-line="182" selection-end-column="16" />
  305 + <state relative-caret-position="0">
  306 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
291 307 <folding />
292 308 </state>
293 309 </provider>
... ...