Skip to content
Snippets Groups Projects
Commit c5364829 authored by Christian's avatar Christian
Browse files

versuch 2

parent 9cf05ee3
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/model/Assessment.java
+ 3
− 2
View file @ c5364829
package unipotsdam.gf.modules.assessment.controller;
package unipotsdam.gf.modules.assessment.controller.model; package unipotsdam.gf.modules.assessment.controller.model;
import unipotsdam.gf.core.database.mysql.MysqlConnect; import unipotsdam.gf.core.database.mysql.MysqlConnect;
import unipotsdam.gf.core.database.mysql.VereinfachtesResultSet; import unipotsdam.gf.core.database.mysql.VereinfachtesResultSet;
import unipotsdam.gf.core.management.project.Project; import unipotsdam.gf.core.management.project.Project;
import unipotsdam.gf.core.management.user.User; import unipotsdam.gf.core.management.user.User;
import unipotsdam.gf.modules.assessment.controller.model.Performance;
import unipotsdam.gf.modules.assessment.controller.model.StudentIdentifier;
import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlRootElement;
import java.security.acl.Group; import java.security.acl.Group;
...@@ -51,7 +52,7 @@ public class Assessment { ...@@ -51,7 +52,7 @@ public class Assessment {
MysqlConnect connect = new MysqlConnect(); MysqlConnect connect = new MysqlConnect();
connect.connect(); connect.connect();
String mysqlRequest = "INSERT INTO assessments ( `BewertenderId`, `BewerteterId`, `Bewertung`,`StuoGrp`) values (?,?,?,?)"; String mysqlRequest = "INSERT INTO assessments ( `BewertenderId`, `BewerteterId`, `Bewertung`,`StuoGrp`) values (?,?,?,?)";
connect.issueInsertOrDeleteStatement(mysqlRequest, "tom" ,user.getName() , assessment.getPerformance().getWorkRating()[0], user.istStudent()); connect.issueInsertOrDeleteStatement(mysqlRequest, "tom" ,user.getName() , assessment.getPerformance().getWorkRating()[0], user.getStudent());
connect.close(); connect.close();
} }
@Override @Override
......
gemeinsamforschen/src/main/webapp/assets/js/AlertAssessmentOutlier.js
+ 7
− 0
View file @ c5364829
$(document).ready(function () {
$('#ProblemGrp1').on('click',function () {
var alarm = prompt("hier gibt es Unstimmigeiten","Vorgeschlagene Note:")
document.getElementById("demo").innerHTML = "Wurde übernommen";
});
});
gemeinsamforschen/src/main/webapp/assets/js/overview-docent.js
+ 1
− 1
View file @ c5364829
...@@ -2,4 +2,4 @@ $(document).ready(function(){ ...@@ -2,4 +2,4 @@ $(document).ready(function(){
$('#project1Link').on('click', function(){ $('#project1Link').on('click', function(){
location.href="project-docent.jsp?token="+getUserTokenFromUrl(); location.href="project-docent.jsp?token="+getUserTokenFromUrl();
}); });
}); });
\ No newline at end of file
gemeinsamforschen/src/main/webapp/pages/project-docent.jsp
+ 12
− 4
View file @ c5364829
...@@ -9,6 +9,10 @@ ...@@ -9,6 +9,10 @@
<link rel="stylesheet" href="../assets/bootstrap/css/bootstrap.min.css"> <link rel="stylesheet" href="../assets/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" href="../assets/css/Community-ChatComments.css"> <link rel="stylesheet" href="../assets/css/Community-ChatComments.css">
<link rel="stylesheet" href="../assets/css/styles.css"> <link rel="stylesheet" href="../assets/css/styles.css">
<script src="../assets/js/jquery.min.js"></script>
<script src="../assets/bootstrap/js/bootstrap.min.js"></script>
<script src="../assets/js/AlertAssessmentOutlier.js"></script>
</head> </head>
<body> <body>
...@@ -18,13 +22,15 @@ ...@@ -18,13 +22,15 @@
<div> <div>
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-4">
<div class="table-responsive" style="width:294px;"> <div class="table-responsive" style="width:294px;">
<table class="table"> <table class="table">
<thead> <thead>
<tr> <tr>
<th>Gruppe1 </th> <th>Gruppe1 </th>
<th>Beiträge </th> <th>Beiträge </th>
<th> <button id="ProblemGrp1">!</button> </th>
<p id="demo"></p>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
...@@ -80,7 +86,10 @@ ...@@ -80,7 +86,10 @@
</table> </table>
</div> </div>
</div> </div>
<div class="col-md-6"> <div class="col-md-4">
<img src="https://upload.wikimedia.org/wikipedia/commons/thumb/7/74/Liniendiagramm-Beispiel.svg/750px-Liniendiagramm-Beispiel.svg.png", width="280">
</div>
<div class="col-md-4">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"> <div class="panel-heading">
<h3 class="panel-title">ProjektChat</h3> <h3 class="panel-title">ProjektChat</h3>
...@@ -130,8 +139,7 @@ ...@@ -130,8 +139,7 @@
</div> </div>
</div> </div>
<communication:chatWindow orientation="right"></communication:chatWindow> <communication:chatWindow orientation="right"></communication:chatWindow>
<script src="../assets/js/jquery.min.js"></script>
<script src="../assets/bootstrap/js/bootstrap.min.js"></script>
</body> </body>
</html> </html>
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment