gitignore. sry guys for losing settings =D

2e9d400f · Axel · 711bb130 · 2e9d400f · 711bb130 · 2e9d400f
Commit 2e9d400f authored 6 years ago by Axel
--- 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
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
--- 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" +

--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/IJournal.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/IJournal.java
 package unipotsdam.gf.interfaces;
-import unipotsdam.gf.modules.assessment.controller.StudentIdentifier;
+import unipotsdam.gf.modules.assessment.controller.model.StudentIdentifier;
 /**
 * Interface for learning journal

--- a/gemeinsamforschen/src/main/webapp/assets/js/assessmentCalculator.js
+++ b/gemeinsamforschen/src/main/webapp/assets/js/assessmentCalculator.js
-$(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);

--- 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>