From c5364829396bb8cb11e37f01649fbdbd3a30c7af Mon Sep 17 00:00:00 2001
From: Christian <chgottsc@uni-potsdam.de>
Date: Wed, 11 Jul 2018 14:27:27 +0200
Subject: [PATCH] versuch 2
---
.../assessment/controller/model/Assessment.java | 5 +++--
.../webapp/assets/js/AlertAssessmentOutlier.js | 7 +++++++
.../src/main/webapp/assets/js/overview-docent.js | 2 +-
.../src/main/webapp/pages/project-docent.jsp | 16 ++++++++++++----
4 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/model/Assessment.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/model/Assessment.java
index b9b71f2f..1e6abcd3 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/model/Assessment.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/model/Assessment.java
@@ -1,10 +1,11 @@
-package unipotsdam.gf.modules.assessment.controller;
package unipotsdam.gf.modules.assessment.controller.model;
import unipotsdam.gf.core.database.mysql.MysqlConnect;
import unipotsdam.gf.core.database.mysql.VereinfachtesResultSet;
import unipotsdam.gf.core.management.project.Project;
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 java.security.acl.Group;
@@ -51,7 +52,7 @@ public class Assessment {
MysqlConnect connect = new MysqlConnect();
connect.connect();
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();
}
@Override
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/AlertAssessmentOutlier.js b/gemeinsamforschen/src/main/webapp/assets/js/AlertAssessmentOutlier.js
index e69de29b..713944d4 100644
--- a/gemeinsamforschen/src/main/webapp/assets/js/AlertAssessmentOutlier.js
+++ b/gemeinsamforschen/src/main/webapp/assets/js/AlertAssessmentOutlier.js
@@ -0,0 +1,7 @@
+$(document).ready(function () {
+ $('#ProblemGrp1').on('click',function () {
+ var alarm = prompt("hier gibt es Unstimmigeiten","Vorgeschlagene Note:")
+ document.getElementById("demo").innerHTML = "Wurde übernommen";
+ });
+});
+
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/overview-docent.js b/gemeinsamforschen/src/main/webapp/assets/js/overview-docent.js
index a0daa5f0..f762ed70 100644
--- a/gemeinsamforschen/src/main/webapp/assets/js/overview-docent.js
+++ b/gemeinsamforschen/src/main/webapp/assets/js/overview-docent.js
@@ -2,4 +2,4 @@ $(document).ready(function(){
$('#project1Link').on('click', function(){
location.href="project-docent.jsp?token="+getUserTokenFromUrl();
});
-});
\ No newline at end of file
+});
diff --git a/gemeinsamforschen/src/main/webapp/pages/project-docent.jsp b/gemeinsamforschen/src/main/webapp/pages/project-docent.jsp
index a67e7611..bd4a51d7 100644
--- a/gemeinsamforschen/src/main/webapp/pages/project-docent.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/project-docent.jsp
@@ -9,6 +9,10 @@
<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/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>
<body>
@@ -18,13 +22,15 @@
<div>
<div class="container">
<div class="row">
- <div class="col-md-6">
+ <div class="col-md-4">
<div class="table-responsive" style="width:294px;">
<table class="table">
<thead>
<tr>
<th>Gruppe1 </th>
<th>Beiträge </th>
+ <th> <button id="ProblemGrp1">!</button> </th>
+ <p id="demo"></p>
</tr>
</thead>
<tbody>
@@ -80,7 +86,10 @@
</table>
</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-heading">
<h3 class="panel-title">ProjektChat</h3>
@@ -130,8 +139,7 @@
</div>
</div>
<communication:chatWindow orientation="right"></communication:chatWindow>
- <script src="../assets/js/jquery.min.js"></script>
- <script src="../assets/bootstrap/js/bootstrap.min.js"></script>
+
</body>
</html>
\ No newline at end of file
--
GitLab