From 3fb4d80c48e1e6109e88a383b9dabb05f23dbe74 Mon Sep 17 00:00:00 2001
From: Christian <chgottsc@uni-potsdam.de>
Date: Wed, 18 Jul 2018 23:05:56 +0200
Subject: [PATCH] fix. minimale anpassungen
---
gemeinsamforschen/src/main/webapp/assets/js/grading.js | 5 +++--
.../src/main/webapp/assets/js/overview-docent.js | 4 ++--
.../src/main/webapp/pages/project-docent_CG.jsp | 4 +++-
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/grading.js b/gemeinsamforschen/src/main/webapp/assets/js/grading.js
index 25000aea..5f6823da 100644
--- a/gemeinsamforschen/src/main/webapp/assets/js/grading.js
+++ b/gemeinsamforschen/src/main/webapp/assets/js/grading.js
@@ -1,7 +1,8 @@
$(document).ready(function () {
$('#ProjektFinalisieren').on('click',function () {
- //test um ansprechen des skriptes zu garantieren
- document.getElementById("ProjektFinalisieren").style.color="magenta"
+
+ document.getElementById("ProjektFinalisieren").style.color="magenta";
+
});
});
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/overview-docent.js b/gemeinsamforschen/src/main/webapp/assets/js/overview-docent.js
index e0b78bd2..2718c1c4 100644
--- a/gemeinsamforschen/src/main/webapp/assets/js/overview-docent.js
+++ b/gemeinsamforschen/src/main/webapp/assets/js/overview-docent.js
@@ -1,9 +1,9 @@
$(document).ready(function(){
$('#project1Link').on('click', function(){
- location.href="project-docent_CG.jsp?token="+getUserTokenFromUrl();
+ window.location.href="project-docent_CG.jsp?token="+getUserTokenFromUrl();
});
$('#project2Link').on('click', function(){
- location.href="project-docent_CG.jsp?token="+getUserTokenFromUrl();
+ window.location.href="project-docent_CG.jsp?token="+getUserTokenFromUrl();
});
$('#createProject').on('click', function(){
location.href="createProject.jsp?token="+getUserTokenFromUrl();
diff --git a/gemeinsamforschen/src/main/webapp/pages/project-docent_CG.jsp b/gemeinsamforschen/src/main/webapp/pages/project-docent_CG.jsp
index 14b99a66..5924b674 100644
--- a/gemeinsamforschen/src/main/webapp/pages/project-docent_CG.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/project-docent_CG.jsp
@@ -15,6 +15,7 @@
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
<script src="../assets/js/AlertAssessmentOutlier.js"></script>
+ <script src="../assets/js/grading.js"></script>
<link rel="stylesheet" href="../assets/fonts/font-awesome.min.css">
<link rel="stylesheet" href="../assets/css/Community-ChatComments.css">
<link rel="stylesheet" href="../assets/css/Sidebar-Menu-1.css">
@@ -28,8 +29,9 @@
<div class="page-content-wrapper">
<div class="container-fluid">
- <h1>dummy Projekt1 für Dozent1</h1><button class="btn btn-default" type="button">Gruppen erstellen</button><button class="btn btn-default" type="button">Projekt finalisieren</button><button class="btn btn-default" type="button">Exportiere Projektergebnisse</button>
+ <h1>dummy Projekt1 für Dozent1</h1><button class="btn btn-default" type="button">Gruppen erstellen</button><button class="btn btn-default" type="button" id="ProjektFinalisieren">Projekt finalisieren</button><button class="btn btn-default" type="button">Exportiere Projektergebnisse</button>
</div>
+ <p hidden id="ProjektId">Projekt1</p>
<button
class="btn btn-default" type="button">Exportiere Zwischenstand</button><button class="btn btn-default" type="button">Quizfrage erstellen</button>
<div>
--
GitLab