Commit 7d5a5a40852400e5c60b5f646eccb84aba987e1d

Authored by kristinlaahneolsen
1 parent 18a5674a

Ali og Kristin har jobbet fra Kristins maskin og har fått til å hente ned alle e…

…valueringer/hendelser/aktiviteter i applikasjonen over mobilnettet. Vi har oppdaget utfordringer knyttet til at cql ikke har en auto_increment-metode. Neste steg er å få på post til å fungere
Showing 2 changed files with 201 additions and 1 deletions   Show diff stats
restApi/.idea/workspace.xml 0 → 100644
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<project version="4">
  3 + <component name="ChangeListManager">
  4 + <list default="true" id="0e20d303-9de8-4113-bfd9-019e72b304dc" name="Default" comment="">
  5 + <change beforePath="$PROJECT_DIR$/api/routes/routes.js" afterPath="$PROJECT_DIR$/api/routes/routes.js" />
  6 + </list>
  7 + <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
  8 + <option name="TRACKING_ENABLED" value="true" />
  9 + <option name="SHOW_DIALOG" value="false" />
  10 + <option name="HIGHLIGHT_CONFLICTS" value="true" />
  11 + <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
  12 + <option name="LAST_RESOLUTION" value="IGNORE" />
  13 + </component>
  14 + <component name="FileEditorManager">
  15 + <leaf>
  16 + <file leaf-file-name="routes.js" pinned="false" current-in-tab="true">
  17 + <entry file="file://$PROJECT_DIR$/api/routes/routes.js">
  18 + <provider selected="true" editor-type-id="text-editor">
  19 + <state relative-caret-position="385">
  20 + <caret line="179" column="83" lean-forward="false" selection-start-line="179" selection-start-column="83" selection-end-line="179" selection-end-column="83" />
  21 + <folding />
  22 + </state>
  23 + </provider>
  24 + </entry>
  25 + </file>
  26 + <file leaf-file-name="evaluation.js" pinned="false" current-in-tab="false">
  27 + <entry file="file://$PROJECT_DIR$/api/modules/evaluation.js">
  28 + <provider selected="true" editor-type-id="text-editor">
  29 + <state relative-caret-position="0">
  30 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  31 + <folding />
  32 + </state>
  33 + </provider>
  34 + </entry>
  35 + </file>
  36 + </leaf>
  37 + </component>
  38 + <component name="Git.Settings">
  39 + <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
  40 + </component>
  41 + <component name="IdeDocumentHistory">
  42 + <option name="CHANGED_PATHS">
  43 + <list>
  44 + <option value="$PROJECT_DIR$/api/routes/routes.js" />
  45 + </list>
  46 + </option>
  47 + </component>
  48 + <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
  49 + <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER">
  50 + <package-json value="$PROJECT_DIR$/package.json" />
  51 + </component>
  52 + <component name="JsGulpfileManager">
  53 + <detection-done>true</detection-done>
  54 + <sorting>DEFINITION_ORDER</sorting>
  55 + </component>
  56 + <component name="NodeModulesDirectoryManager">
  57 + <handled-path value="$PROJECT_DIR$/node_modules" />
  58 + </component>
  59 + <component name="ProjectFrameBounds" fullScreen="true">
  60 + <option name="x" value="1" />
  61 + <option name="y" value="23" />
  62 + <option name="width" value="1440" />
  63 + <option name="height" value="873" />
  64 + </component>
  65 + <component name="ProjectView">
  66 + <navigator currentView="ProjectPane" proportions="" version="1">
  67 + <flattenPackages />
  68 + <showMembers />
  69 + <showModules />
  70 + <showLibraryContents />
  71 + <hideEmptyPackages />
  72 + <abbreviatePackageNames />
  73 + <autoscrollToSource />
  74 + <autoscrollFromSource />
  75 + <sortByType />
  76 + <manualOrder />
  77 + <foldersAlwaysOnTop value="true" />
  78 + </navigator>
  79 + <panes>
  80 + <pane id="ProjectPane">
  81 + <subPane>
  82 + <expand>
  83 + <path>
  84 + <item name="restApi" type="b2602c69:ProjectViewProjectNode" />
  85 + <item name="restApi" type="462c0819:PsiDirectoryNode" />
  86 + </path>
  87 + <path>
  88 + <item name="restApi" type="b2602c69:ProjectViewProjectNode" />
  89 + <item name="restApi" type="462c0819:PsiDirectoryNode" />
  90 + <item name="api" type="462c0819:PsiDirectoryNode" />
  91 + </path>
  92 + <path>
  93 + <item name="restApi" type="b2602c69:ProjectViewProjectNode" />
  94 + <item name="restApi" type="462c0819:PsiDirectoryNode" />
  95 + <item name="api" type="462c0819:PsiDirectoryNode" />
  96 + <item name="modules" type="462c0819:PsiDirectoryNode" />
  97 + </path>
  98 + <path>
  99 + <item name="restApi" type="b2602c69:ProjectViewProjectNode" />
  100 + <item name="restApi" type="462c0819:PsiDirectoryNode" />
  101 + <item name="api" type="462c0819:PsiDirectoryNode" />
  102 + <item name="routes" type="462c0819:PsiDirectoryNode" />
  103 + </path>
  104 + </expand>
  105 + <select />
  106 + </subPane>
  107 + </pane>
  108 + <pane id="Scope" />
  109 + <pane id="Scratches" />
  110 + </panes>
  111 + </component>
  112 + <component name="PropertiesComponent">
  113 + <property name="WebServerToolWindowFactoryState" value="false" />
  114 + </component>
  115 + <component name="RunDashboard">
  116 + <option name="ruleStates">
  117 + <list>
  118 + <RuleState>
  119 + <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
  120 + </RuleState>
  121 + <RuleState>
  122 + <option name="name" value="StatusDashboardGroupingRule" />
  123 + </RuleState>
  124 + </list>
  125 + </option>
  126 + </component>
  127 + <component name="ShelveChangesManager" show_recycled="false">
  128 + <option name="remove_strategy" value="false" />
  129 + </component>
  130 + <component name="SvnConfiguration">
  131 + <configuration />
  132 + </component>
  133 + <component name="TaskManager">
  134 + <task active="true" id="Default" summary="Default task">
  135 + <changelist id="0e20d303-9de8-4113-bfd9-019e72b304dc" name="Default" comment="" />
  136 + <created>1541088603899</created>
  137 + <option name="number" value="Default" />
  138 + <option name="presentableId" value="Default" />
  139 + <updated>1541088603899</updated>
  140 + <workItem from="1541088608198" duration="134000" />
  141 + <workItem from="1541088784358" duration="1764000" />
  142 + </task>
  143 + <servers />
  144 + </component>
  145 + <component name="TimeTrackingManager">
  146 + <option name="totallyTimeSpent" value="1898000" />
  147 + </component>
  148 + <component name="ToolWindowManager">
  149 + <frame x="0" y="0" width="1440" height="900" extended-state="0" />
  150 + <editor active="true" />
  151 + <layout>
  152 + <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.5" order="0" side_tool="false" content_ui="combo" />
  153 + <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" />
  154 + <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" />
  155 + <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" />
  156 + <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" />
  157 + <window_info id="Run" 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="2" side_tool="false" content_ui="tabs" />
  158 + <window_info id="npm" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
  159 + <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" />
  160 + <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" />
  161 + <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
  162 + <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
  163 + <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
  164 + <window_info id="Message" 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="0" side_tool="false" content_ui="tabs" />
  165 + <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
  166 + <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
  167 + <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
  168 + <window_info id="Find" 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="1" side_tool="false" content_ui="tabs" />
  169 + <window_info id="Ant Build" active="false" anchor="right" 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" />
  170 + </layout>
  171 + </component>
  172 + <component name="TypeScriptGeneratedFilesManager">
  173 + <option name="version" value="1" />
  174 + </component>
  175 + <component name="VcsContentAnnotationSettings">
  176 + <option name="myLimit" value="2678400000" />
  177 + </component>
  178 + <component name="XDebuggerManager">
  179 + <breakpoint-manager />
  180 + <watches-manager />
  181 + </component>
  182 + <component name="editorHistoryManager">
  183 + <entry file="file://$PROJECT_DIR$/api/modules/evaluation.js">
  184 + <provider selected="true" editor-type-id="text-editor">
  185 + <state relative-caret-position="0">
  186 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  187 + <folding />
  188 + </state>
  189 + </provider>
  190 + </entry>
  191 + <entry file="file://$PROJECT_DIR$/api/routes/routes.js">
  192 + <provider selected="true" editor-type-id="text-editor">
  193 + <state relative-caret-position="385">
  194 + <caret line="179" column="83" lean-forward="false" selection-start-line="179" selection-start-column="83" selection-end-line="179" selection-end-column="83" />
  195 + <folding />
  196 + </state>
  197 + </provider>
  198 + </entry>
  199 + </component>
  200 +</project>
0 201 \ No newline at end of file
... ...
restApi/api/routes/routes.js
... ... @@ -177,7 +177,7 @@ var appRouter = function(app) {
177 177  
178 178 if (err) {
179 179 console.log(err);
180   - return res.status(400).send("Bad Request");
  180 + return res.status(400).send("Bad Request with error:\n" + err);
181 181 }
182 182 return res.status(200).send("Evaluation Created");
183 183  
... ...