diff --git a/gemeinsamforschen/src/main/webapp/assets/js/grading.js b/gemeinsamforschen/src/main/webapp/assets/js/grading.js index 25000aeaa6706b335e4a27c0062a7d30bc3a80e4..5f6823dab004b402bdb5e4eccbb87a88c8541f53 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 e0b78bd2beb99e2e0a1b8e84e8dccc9483049cae..2718c1c4e4ae5731200f42423d0fb3b370257ae9 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 14b99a66c580135cfd3561c411a19e961c4d9125..5924b6747af2311b7570a3e241ee99db20673b82 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>