diff --git a/.gitignore b/.gitignore
index 752b62227757a94748b9aa58ebf0b27a0b4187b1..d66d90c0bfd70f829b3fc63b5e9055659c86d7ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,4 +19,5 @@
**/.classpath
/.idea/vcs.xml
/.idea/workspace.xml
-/.idea/workspace.xml
\ No newline at end of file
+/.idea/workspace.xml
+/.idea/workspace.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
deleted file mode 100644
index 05d70227a277e0f89311784fbf3f7f8a0bfd9240..0000000000000000000000000000000000000000
--- a/.idea/workspace.xml
+++ /dev/null
@@ -1,752 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="ChangeListManager">
- <list default="true" id="b207c042-3fc9-4102-bf50-ee6c9b45c20d" name="Default" comment="">
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/IPeerAssessment.java" afterPath="$PROJECT_DIR$/gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/IPeerAssessment.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/FBAssessement.java" afterPath="$PROJECT_DIR$/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/FBAssessement.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/PeerAssessment.java" afterPath="$PROJECT_DIR$/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/PeerAssessment.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/PeerAssessmentDummy.java" afterPath="$PROJECT_DIR$/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/PeerAssessmentDummy.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/view/QuizView.java" afterPath="$PROJECT_DIR$/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/view/QuizView.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/gemeinsamforschen/src/main/webapp/assets/css/styles.css" afterPath="$PROJECT_DIR$/gemeinsamforschen/src/main/webapp/assets/css/styles.css" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/gemeinsamforschen/src/main/webapp/pages/project-student.html" afterPath="$PROJECT_DIR$/gemeinsamforschen/src/main/webapp/pages/project-student.html" />
- </list>
- <ignored path="fltrail.iws" />
- <ignored path=".idea/workspace.xml" />
- <ignored path="$PROJECT_DIR$/out/" />
- <ignored path=".idea/dataSources.local.xml" />
- <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
- <option name="TRACKING_ENABLED" value="true" />
- <option name="SHOW_DIALOG" value="false" />
- <option name="HIGHLIGHT_CONFLICTS" value="true" />
- <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
- <option name="LAST_RESOLUTION" value="IGNORE" />
- </component>
- <component name="CreatePatchCommitExecutor">
- <option name="PATCH_PATH" value="" />
- </component>
- <component name="DatabaseView">
- <option name="SHOW_INTERMEDIATE" value="true" />
- <option name="GROUP_SCHEMA" value="true" />
- <option name="GROUP_CONTENTS" value="false" />
- <option name="SORT_POSITIONED" value="false" />
- <option name="SHOW_TABLE_DETAILS" value="true" />
- <option name="SHOW_EMPTY_GROUPS" value="false" />
- <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
- </component>
- <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
- <component name="FavoritesManager">
- <favorites_list name="fltrail" />
- </component>
- <component name="FileEditorManager">
- <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
- <file leaf-file-name="ResearchReport.java" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/ResearchReport.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="693">
- <caret line="33" column="39" lean-forward="false" selection-start-line="33" selection-start-column="39" selection-end-line="33" selection-end-column="39" />
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="projects.php" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/studentview/pages/projects.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="2331">
- <caret line="111" column="34" lean-forward="false" selection-start-line="111" selection-start-column="34" selection-end-line="111" selection-end-column="34" />
- <folding>
- <marker date="1528377403200" expanded="true" signature="10969:10996" ph="..." />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="newProject.js" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/studentview/assets/js/newProject.js">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="21">
- <caret line="20" column="7" lean-forward="false" selection-start-line="20" selection-start-column="7" selection-end-line="20" selection-end-column="7" />
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="showProjects.js" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/studentview/assets/js/showProjects.js">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="651">
- <caret line="31" column="38" lean-forward="false" selection-start-line="31" selection-start-column="38" selection-end-line="31" selection-end-column="38" />
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="overview.js" pinned="false" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/studentview/assets/js/overview.js">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="357">
- <caret line="103" column="33" lean-forward="true" selection-start-line="103" selection-start-column="33" selection-end-line="103" selection-end-column="33" />
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- </leaf>
- </component>
- <component name="FileTemplateManagerImpl">
- <option name="RECENT_TEMPLATES">
- <list>
- <option value="CSS File" />
- <option value="JavaScript File" />
- </list>
- </option>
- </component>
- <component name="Git.Settings">
- <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
- <option name="RECENT_BRANCH_BY_REPOSITORY">
- <map>
- <entry key="$PROJECT_DIR$" value="master" />
- </map>
- </option>
- </component>
- <component name="GradleLocalSettings">
- <option name="externalProjectsViewState">
- <projects_view />
- </option>
- </component>
- <component name="IdeDocumentHistory">
- <option name="CHANGED_PATHS">
- <list>
- <option value="$USER_HOME$/php/php.ini" />
- <option value="$PROJECT_DIR$/studentview/database/getProjects.php" />
- <option value="$PROJECT_DIR$/studentview/database/getProjectsOfAuthor.php" />
- <option value="$PROJECT_DIR$/studentview/assets/css/projects.css" />
- <option value="$APPLICATION_CONFIG_DIR$/consoles/db/14340c2c-ac4b-492f-ac4f-18c0853598a8/console_1.sql" />
- <option value="$PROJECT_DIR$/studentview/database/deleteProject.php" />
- <option value="$PROJECT_DIR$/studentview/assets/js/getProjects.js" />
- <option value="$PROJECT_DIR$/studentview/database/createUser.php" />
- <option value="$PROJECT_DIR$/studentview/assets/css/Sidebar-Menu1.css" />
- <option value="$PROJECT_DIR$/studentview/database/tokenSetter.php" />
- <option value="$PROJECT_DIR$/studentview/pages/menu.php" />
- <option value="dbtable:/fc3764cf/14340c2c-ac4b-492f-ac4f-18c0853598a8/fltrail.projects" />
- <option value="$PROJECT_DIR$/studentview/assets/css/styles.css" />
- <option value="$PROJECT_DIR$/dbschema/fltrail.sql" />
- <option value="$PROJECT_DIR$/dbschema/createDummyUser.sql" />
- <option value="$PROJECT_DIR$/studentview/database/getAdresses.php" />
- <option value="$PROJECT_DIR$/studentview/pages/mygroups.php" />
- <option value="$PROJECT_DIR$/studentview/assets/js/myGroupsInit.js" />
- <option value="$PROJECT_DIR$/studentview/assets/js/createPreferences.js" />
- <option value="$PROJECT_DIR$/studentview/assets/js/deleteProject.js" />
- <option value="$PROJECT_DIR$/studentview/assets/js/newProject.js" />
- <option value="$PROJECT_DIR$/studentview/pages/deleteProject.php" />
- <option value="$PROJECT_DIR$/studentview/pages/enrollment.php" />
- <option value="$PROJECT_DIR$/studentview/pages/newproject.php" />
- <option value="$PROJECT_DIR$/studentview/register.php" />
- <option value="$PROJECT_DIR$/studentview/pages/preferences.php" />
- <option value="$PROJECT_DIR$/studentview/assets/js/config.js" />
- <option value="$PROJECT_DIR$/studentview/database/config.php" />
- <option value="$PROJECT_DIR$/studentview/assets/js/overview.js" />
- <option value="$PROJECT_DIR$/gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/ResearchReport.java" />
- <option value="$PROJECT_DIR$/studentview/pages/projects.php" />
- </list>
- </option>
- </component>
- <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
- <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
- <component name="JsGulpfileManager">
- <detection-done>true</detection-done>
- <sorting>DEFINITION_ORDER</sorting>
- </component>
- <component name="PhpDebugGeneral" notify_if_session_was_finished_without_being_paused="false" />
- <component name="PhpServers">
- <servers>
- <server host="localhost/fltrail/studentview" id="0689838e-2d6d-4149-9413-e6535e936a72" name="Localhost">
- <path_mappings>
- <mapping local-root="$PROJECT_DIR$" remote-root="/fltrail/studentview" />
- </path_mappings>
- </server>
- <server host="localhost" id="75f2248a-2fea-4485-9fd7-0dc130516437" name="localhost" />
- <server host="141.89.159.250" id="a7129b24-16e0-4988-abb2-c07e26d5f743" name="141.89.159.250" port="443" use_path_mappings="true">
- <path_mappings>
- <mapping local-root="$PROJECT_DIR$/studentview" remote-root="C:/dev/amp/htdocs" />
- </path_mappings>
- </server>
- </servers>
- </component>
- <component name="PhpWebServerValidation" path_to_validation_script="C:\dev\amp\htdocs\" selected_validation_type="LOCAL" web_path_to_validation_script="http://127.0.0.1/" />
- <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" interpreter_name="PHP" />
- <component name="ProjectFrameBounds">
- <option name="x" value="1" />
- <option name="y" value="1" />
- <option name="width" value="1918" />
- <option name="height" value="1030" />
- </component>
- <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
- <component name="ProjectView">
- <navigator currentView="ProjectPane" proportions="" version="1">
- <flattenPackages />
- <showMembers />
- <showModules />
- <showLibraryContents />
- <hideEmptyPackages ProjectPane="true" />
- <abbreviatePackageNames />
- <autoscrollToSource />
- <autoscrollFromSource />
- <sortByType />
- <manualOrder />
- <foldersAlwaysOnTop value="true" />
- </navigator>
- <panes>
- <pane id="Scratches" />
- <pane id="ProjectPane">
- <subPane>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="fltrail" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="fltrail" />
- <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="fltrail" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="fltrail" />
- <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="studentview" />
- <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="fltrail" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="fltrail" />
- <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="studentview" />
- <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="pages" />
- <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="fltrail" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="fltrail" />
- <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="studentview" />
- <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="assets" />
- <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="js" />
- <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="fltrail" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="fltrail" />
- <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="studentview" />
- <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="assets" />
- <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
- </PATH_ELEMENT>
- </PATH>
- </subPane>
- </pane>
- <pane id="Scope" />
- <pane id="PackagesPane" />
- <pane id="AndroidView" />
- </panes>
- </component>
- <component name="PropertiesComponent">
- <property name="aspect.path.notification.shown" value="true" />
- <property name="WebServerToolWindowFactoryState" value="true" />
- <property name="js-jscs-nodeInterpreter" value="C:\Program Files\nodejs\node.exe" />
- <property name="settings.editor.selected.configurable" value="database.main" />
- <property name="settings.editor.splitter.proportion" value="0.2" />
- <property name="last_opened_file_path" value="$PROJECT_DIR$/gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces" />
- <property name="list.type.of.created.stylesheet" value="CSS" />
- <property name="SearchEverywhereHistoryKey" value="	FILE	dbDummy://dbtable:/fc3764cf/14340c2c-ac4b-492f-ac4f-18c0853598a8/fltrail.users" />
- </component>
- <component name="RecentsManager">
- <key name="CopyFile.RECENT_KEYS">
- <recent name="C:\Users\quark\IdeaProjects\fltrail\gemeinsamforschen\src\main\java\unipotsdam\gf\interfaces" />
- <recent name="C:\dev\amp\htdocs\fltrail\studentview\pages" />
- </key>
- </component>
- <component name="RunDashboard">
- <option name="ruleStates">
- <list>
- <RuleState>
- <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
- </RuleState>
- <RuleState>
- <option name="name" value="StatusDashboardGroupingRule" />
- </RuleState>
- </list>
- </option>
- </component>
- <component name="RunManager">
- <configuration default="true" type="JavascriptDebugType" factoryName="JavaScript Debug">
- <method />
- </configuration>
- <configuration default="true" type="PHPUnitRunConfigurationType" factoryName="PHPUnit">
- <TestRunner />
- <method />
- </configuration>
- <configuration default="true" type="PhpLocalRunConfigurationType" factoryName="PHP Console">
- <method />
- </configuration>
- <configuration default="true" type="PhpWebAppRunConfigurationType" factoryName="PHP Web Application" server_name="Localhost">
- <method />
- </configuration>
- <configuration default="true" type="js.build_tools.gulp" factoryName="Gulp.js">
- <node-interpreter>project</node-interpreter>
- <node-options />
- <gulpfile />
- <tasks />
- <arguments />
- <envs />
- <method />
- </configuration>
- <configuration default="true" type="js.build_tools.npm" factoryName="npm">
- <command value="run" />
- <scripts />
- <node-interpreter value="project" />
- <envs />
- <method />
- </configuration>
- <configuration default="false" name="phpserver" type="PhpWebAppRunConfigurationType" factoryName="PHP Web Application" server_name="Localhost" start_url="/index.php">
- <method />
- </configuration>
- <configuration default="false" name="test" type="PhpWebAppRunConfigurationType" factoryName="PHP Web Application" server_name="Localhost" start_url="/test.php">
- <method />
- </configuration>
- <list size="2">
- <item index="0" class="java.lang.String" itemvalue="PHP Web Application.phpserver" />
- <item index="1" class="java.lang.String" itemvalue="PHP Web Application.test" />
- </list>
- </component>
- <component name="SbtLocalSettings">
- <option name="externalProjectsViewState">
- <projects_view />
- </option>
- </component>
- <component name="ShelveChangesManager" show_recycled="false">
- <option name="remove_strategy" value="false" />
- </component>
- <component name="SvnConfiguration">
- <configuration />
- </component>
- <component name="TaskManager">
- <task active="true" id="Default" summary="Default task">
- <changelist id="b207c042-3fc9-4102-bf50-ee6c9b45c20d" name="Default" comment="" />
- <created>1522142632208</created>
- <option name="number" value="Default" />
- <option name="presentableId" value="Default" />
- <updated>1522142632208</updated>
- <workItem from="1522142635858" duration="32910000" />
- <workItem from="1522918322507" duration="37691000" />
- <workItem from="1524484938943" duration="3356000" />
- <workItem from="1524585513713" duration="57000" />
- <workItem from="1528200793936" duration="888000" />
- <workItem from="1528354427057" duration="403000" />
- <workItem from="1528809757337" duration="698000" />
- <workItem from="1529393931294" duration="714000" />
- </task>
- <servers />
- </component>
- <component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="76717000" />
- </component>
- <component name="ToolWindowManager">
- <frame x="1" y="1" width="1918" height="1030" extended-state="6" />
- <layout>
- <window_info id="Remote Host" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
- <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.21473685" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" x="9" y="79" width="408" height="943" />
- <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" />
- <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.23455825" sideWeight="0.47734374" order="8" side_tool="true" content_ui="tabs" />
- <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.15894736" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
- <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="10" side_tool="false" content_ui="tabs" />
- <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.35496482" sideWeight="0.71510416" order="2" side_tool="false" content_ui="tabs" />
- <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="4" side_tool="false" content_ui="tabs" />
- <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="9" side_tool="false" content_ui="tabs" />
- <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="5" side_tool="true" content_ui="tabs" />
- <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.331509" sideWeight="0.52265626" order="3" side_tool="false" content_ui="tabs" />
- <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" />
- <window_info id="Palette" active="false" anchor="right" 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" />
- <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" />
- <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="3" side_tool="false" content_ui="tabs" />
- <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3297062" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
- <window_info id="Maven Projects" active="false" anchor="right" 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" />
- <window_info id="Capture Tool" 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="0" side_tool="false" content_ui="tabs" />
- <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="5" side_tool="false" content_ui="combo" />
- <window_info id="Designer" active="false" anchor="right" 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" />
- <window_info id="JSF" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
- <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="4" side_tool="false" content_ui="tabs" />
- <window_info id="UI Designer" 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="1" side_tool="false" content_ui="tabs" />
- <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.36247173" sideWeight="0.57851565" order="7" side_tool="false" content_ui="tabs" />
- <window_info id="Palette	" 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="7" side_tool="false" content_ui="tabs" />
- <window_info id="Image Layers" 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="3" side_tool="false" content_ui="tabs" />
- <window_info id="Java Enterprise" 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="12" side_tool="false" content_ui="tabs" />
- <window_info id="Capture Analysis" active="false" anchor="right" 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" />
- <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" />
- <window_info id="Sequence" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.45516202" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" />
- <window_info id="Database Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32994527" sideWeight="0.4984375" order="14" side_tool="false" content_ui="tabs" />
- <window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
- <window_info id="Web" 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="6" side_tool="true" content_ui="tabs" />
- <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2736513" sideWeight="0.6203125" order="1" side_tool="false" content_ui="tabs" />
- <window_info id="Theme Preview" active="false" anchor="right" 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" />
- </layout>
- </component>
- <component name="TypeScriptGeneratedFilesManager">
- <option name="processedProjectFiles" value="true" />
- </component>
- <component name="Vcs.Log.UiProperties">
- <option name="RECENTLY_FILTERED_USER_GROUPS">
- <collection />
- </option>
- <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
- <collection />
- </option>
- </component>
- <component name="VcsContentAnnotationSettings">
- <option name="myLimit" value="2678400000" />
- </component>
- <component name="XDebuggerManager">
- <breakpoint-manager>
- <option name="time" value="47" />
- </breakpoint-manager>
- <watches-manager />
- </component>
- <component name="antWorkspaceConfiguration">
- <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
- <option name="FILTER_TARGETS" value="false" />
- </component>
- <component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/studentview/assets/js/jquery.min.js">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/studentview/database/getProjectsOfAuthor.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="16" column="29" lean-forward="false" selection-start-line="15" selection-start-column="0" selection-end-line="16" selection-end-column="29" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/studentview/database/putTagsAndPW.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/studentview/database/getTags.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="25" column="5" lean-forward="false" selection-start-line="25" selection-start-column="5" selection-end-line="25" selection-end-column="5" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/studentview/assets/css/projects.css">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="25" column="0" lean-forward="false" selection-start-line="25" selection-start-column="0" selection-end-line="25" selection-end-column="0" />
- </state>
- </provider>
- </entry>
- <entry file="file://$APPLICATION_CONFIG_DIR$/consoles/db/14340c2c-ac4b-492f-ac4f-18c0853598a8/console_1.sql" />
- <entry file="dbDummy://dbtable:/fc3764cf/14340c2c-ac4b-492f-ac4f-18c0853598a8/fltrail.tags" />
- <entry file="file://$PROJECT_DIR$/studentview/assets/js/register.js">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/studentview/assets/js/getProjects.js">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="4" column="9" lean-forward="false" selection-start-line="4" selection-start-column="9" selection-end-line="4" selection-end-column="9" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/studentview/assets/css/Sidebar-Menu1.css">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="49" column="13" lean-forward="false" selection-start-line="49" selection-start-column="13" selection-end-line="49" selection-end-column="13" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/studentview/assets/js/Sidebar-Menu.js">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/studentview/database/tokenSetter.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="17" column="2" lean-forward="false" selection-start-line="17" selection-start-column="2" selection-end-line="17" selection-end-column="2" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/studentview/database/deleteProject.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="35" column="42" lean-forward="false" selection-start-line="35" selection-start-column="42" selection-end-line="35" selection-end-column="42" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/studentview/database/putProject.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="21" column="44" lean-forward="false" selection-start-line="21" selection-start-column="44" selection-end-line="21" selection-end-column="44" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/studentview/database/getProjects.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="21" column="4" lean-forward="false" selection-start-line="21" selection-start-column="4" selection-end-line="21" selection-end-column="60" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/studentview/assets/css/styles.css">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="349" column="57" lean-forward="false" selection-start-line="349" selection-start-column="57" selection-end-line="349" selection-end-column="57" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/studentview/database/userExists.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="24" column="44" lean-forward="false" selection-start-line="24" selection-start-column="44" selection-end-line="24" selection-end-column="44" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/studentview/database/createUser.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="12" column="0" lean-forward="false" selection-start-line="33" selection-start-column="16" selection-end-line="34" selection-end-column="34" />
- </state>
- </provider>
- </entry>
- <entry file="file://$USER_HOME$/phpMyAdmin/index.php" />
- <entry file="file://$USER_HOME$/phpMyAdmin/js/get_scripts.js.php" />
- <entry file="file://$PROJECT_DIR$/dbschema/fltrail.sql" />
- <entry file="file://$PROJECT_DIR$/dbschema/createDummyUser.sql" />
- <entry file="file://$PROJECT_DIR$/studentview/database/getAdresses.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="60" column="20" lean-forward="false" selection-start-line="60" selection-start-column="20" selection-end-line="60" selection-end-column="20" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/studentview/assets/js/myGroupsInit.js">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="31" column="13" lean-forward="false" selection-start-line="31" selection-start-column="12" selection-end-line="31" selection-end-column="13" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/studentview/assets/js/utility.js">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="0" column="9" lean-forward="false" selection-start-line="0" selection-start-column="9" selection-end-line="0" selection-end-column="9" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/studentview/assets/js/deleteProject.js">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="29" column="45" lean-forward="false" selection-start-line="29" selection-start-column="45" selection-end-line="29" selection-end-column="45" />
- </state>
- </provider>
- </entry>
- <entry file="dbDummy://dbtable:/fc3764cf/14340c2c-ac4b-492f-ac4f-18c0853598a8/fltrail.projects" />
- <entry file="file://$PROJECT_DIR$/studentview/assets/js/createPreferences.js">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="124" column="28" lean-forward="false" selection-start-line="124" selection-start-column="28" selection-end-line="124" selection-end-column="28" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/studentview/pages/deleteProject.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="19" column="50" lean-forward="false" selection-start-line="19" selection-start-column="50" selection-end-line="19" selection-end-column="50" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/studentview/pages/enrollment.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="19" column="50" lean-forward="false" selection-start-line="19" selection-start-column="50" selection-end-line="19" selection-end-column="50" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/studentview/pages/menu.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="20" column="6" lean-forward="false" selection-start-line="20" selection-start-column="6" selection-end-line="20" selection-end-column="6" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/studentview/pages/mygroups.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="19" column="4" lean-forward="false" selection-start-line="19" selection-start-column="4" selection-end-line="19" selection-end-column="50" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/studentview/pages/newproject.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="21" column="50" lean-forward="false" selection-start-line="21" selection-start-column="50" selection-end-line="21" selection-end-column="50" />
- </state>
- </provider>
- </entry>
- <entry file="dbDummy://dbtable:/fc3764cf/14340c2c-ac4b-492f-ac4f-18c0853598a8/fltrail.users" />
- <entry file="file://$APPLICATION_CONFIG_DIR$/consoles/db/85944065-0254-4a61-b256-d3493cdb0a4f/console.sql" />
- <entry file="file://$PROJECT_DIR$/studentview/pages/preferences.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="725">
- <caret line="112" column="0" lean-forward="false" selection-start-line="112" selection-start-column="0" selection-end-line="112" selection-end-column="0" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/studentview/database/config.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="160">
- <caret line="8" column="0" lean-forward="false" selection-start-line="8" selection-start-column="0" selection-end-line="8" selection-end-column="0" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/studentview/assets/js/config.js">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="40">
- <caret line="2" column="71" lean-forward="false" selection-start-line="2" selection-start-column="71" selection-end-line="2" selection-end-column="71" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/studentview/index.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="520">
- <caret line="26" column="45" lean-forward="false" selection-start-line="26" selection-start-column="45" selection-end-line="26" selection-end-column="45" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/studentview/register.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="425">
- <caret line="24" column="98" lean-forward="false" selection-start-line="24" selection-start-column="98" selection-end-line="24" selection-end-column="98" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/.gitignore">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/gemeinsamforschen/out/artifacts/gemeinsamforschen_war_exploded/META-INF/MANIFEST.MF" />
- <entry file="file://$PROJECT_DIR$/gemeinsamforschen/src/scripts/munschkins.sql">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/gemeinsamforschen/src/main/java/unipotsdam/gf/munchkin/IMunschkin.java" />
- <entry file="file://$PROJECT_DIR$/gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/ResearchReport" />
- <entry file="file://$PROJECT_DIR$/gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/IMunschkin.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="240">
- <caret line="12" column="0" lean-forward="true" selection-start-line="12" selection-start-column="0" selection-end-line="12" selection-end-column="0" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/ResearchReport.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="693">
- <caret line="33" column="39" lean-forward="false" selection-start-line="33" selection-start-column="39" selection-end-line="33" selection-end-column="39" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/studentview/pages/projects.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="2331">
- <caret line="111" column="34" lean-forward="false" selection-start-line="111" selection-start-column="34" selection-end-line="111" selection-end-column="34" />
- <folding>
- <marker date="1528377403200" expanded="true" signature="10969:10996" ph="..." />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/studentview/assets/js/newProject.js">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="21">
- <caret line="20" column="7" lean-forward="false" selection-start-line="20" selection-start-column="7" selection-end-line="20" selection-end-column="7" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/studentview/assets/js/showProjects.js">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="651">
- <caret line="31" column="38" lean-forward="false" selection-start-line="31" selection-start-column="38" selection-end-line="31" selection-end-column="38" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/studentview/assets/js/overview.js">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="357">
- <caret line="103" column="33" lean-forward="true" selection-start-line="103" selection-start-column="33" selection-end-line="103" selection-end-column="33" />
- <folding />
- </state>
- </provider>
- </entry>
- </component>
-</project>
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/Menu.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/Menu.java
index 1ded761071f6686132b340d010ba6fc10018af74..631dbf76980b6b93e996a700e40369a5f6860cd7 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/Menu.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/Menu.java
@@ -8,13 +8,13 @@ import javax.servlet.jsp.JspWriter;
import javax.servlet.jsp.PageContext;
import javax.servlet.jsp.tagext.SimpleTagSupport;
import java.io.IOException;
-
+ //todo: isStudent is false for docents. use this for dynamic menus
public class Menu extends SimpleTagSupport {
public void doTag() throws JspException, IOException {
JspWriter out = getJspContext().getOut();
out.println("<div id=\"sidebar-wrapper\">\n" +
" <ul class=\"sidebar-nav\">\n" +
- " <li class=\"sidebar-brand\"><a href=\"project-student.jspjsp\">overview</a></li>\n" +
+ " <li class=\"sidebar-brand\"><a href=\"project-student.jsp\">overview</a></li>\n" +
" <li><a href=\"takeQuiz.jsp\">Quizfrage</a></li>\n" +
" <li><a href=\"#\">ePortfolio</a></li>\n" +
" <li><a href=\"#\">Beitrag</a></li>\n" +
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/IJournal.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/IJournal.java
index af66e583b5f0e93479c44b98e3fb1fdb5145113f..4da8b21c8ed3871d6824944e2f90b1a19315724e 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/IJournal.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/IJournal.java
@@ -1,6 +1,7 @@
package unipotsdam.gf.interfaces;
-import unipotsdam.gf.modules.assessment.controller.StudentIdentifier;
+
+import unipotsdam.gf.modules.assessment.controller.model.StudentIdentifier;
/**
* Interface for learning journal
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/assessmentCalculator.js b/gemeinsamforschen/src/main/webapp/assets/js/assessmentCalculator.js
index 0cc6abce4347fd4db6317ab94808c61c8bf32162..915c863f9c20a70c94106e35cfd9d186e9fbcf8c 100644
--- a/gemeinsamforschen/src/main/webapp/assets/js/assessmentCalculator.js
+++ b/gemeinsamforschen/src/main/webapp/assets/js/assessmentCalculator.js
@@ -1,10 +1,12 @@
-$(document).ready(function () {
+$(document).ready(function () { //todo: paths should be relative
$("#giveItBack").on("click", function () {
$.ajax({
url: "http://localhost:8080/gemeinsamforschen/rest/assessments/total/project/" + "gemeinsamForschen" + "/student/" + "Bela",
type: 'GET',
success: function (data) {
alert("here is the TotalPerformance: " + data);
+
+ location.href="http://localhost:8080/gemeinsamforschen/pages/project-student.jsp?token="+getUserTokenFromUrl();
},
error: function (a, b, c) {
alert('some error' + a);
diff --git a/gemeinsamforschen/src/main/webapp/pages/assessmentCalculator.jsp b/gemeinsamforschen/src/main/webapp/pages/assessmentCalculator.jsp
index 5ce82ab35daafbda393fc1f8e8a91441347635e4..ded714cfe627d8250322e7a0e1e1bc4b915cc5a1 100644
--- a/gemeinsamforschen/src/main/webapp/pages/assessmentCalculator.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/assessmentCalculator.jsp
@@ -3,10 +3,11 @@
<!DOCTYPE html>
<html lang="en">
<head>
- <meta charset="UTF-8">
+ <meta charset="utf-8">
<title>assessment calculator</title>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
<script src="../assets/js/assessmentCalculator.js"></script>
+ <script src="../assets/js/utility.js"></script>
</head>
<body>
<button id="calculateNow">Post Performance</button>