Skip to content
Snippets Groups Projects
Commit 01c29a43 authored by Axel's avatar Axel
Browse files

fix: more dummy assessments. reworked project-student and project-docent

parent 36f8ced3
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 589 additions and 191 deletions
.idea/workspace.xml
+ 3
− 9
View file @ 01c29a43
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="b207c042-3fc9-4102-bf50-ee6c9b45c20d" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/model/Assessment.java" afterPath="$PROJECT_DIR$/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/model/Assessment.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/PeerAssessmentDummy.java" afterPath="$PROJECT_DIR$/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/PeerAssessmentDummy.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/view/QuizView.java" afterPath="$PROJECT_DIR$/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/view/QuizView.java" />
</list>
<list default="true" id="b207c042-3fc9-4102-bf50-ee6c9b45c20d" name="Default" comment="" />
<ignored path="fltrail.iws" />
<ignored path=".idea/workspace.xml" />
<ignored path="$PROJECT_DIR$/out/" />
......@@ -395,16 +390,15 @@
<workItem from="1524585513713" duration="57000" />
<workItem from="1528200793936" duration="888000" />
<workItem from="1528354427057" duration="403000" />
<workItem from="1528809757337" duration="102000" />
<workItem from="1528809757337" duration="698000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="75407000" />
<option name="totallyTimeSpent" value="76003000" />
</component>
<component name="ToolWindowManager">
<frame x="-9" y="-9" width="1938" height="1050" extended-state="6" />
<editor active="true" />
<layout>
<window_info id="Remote Host" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2125" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" x="9" y="79" width="408" height="943" />
......
gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/IPeerAssessment.java
+ 11
− 1
View file @ 01c29a43
......@@ -2,6 +2,8 @@ package unipotsdam.gf.interfaces;
import unipotsdam.gf.modules.assessment.controller.model.*;
import java.util.List;
/**
* Created by dehne on 18.05.2018.
*/
......@@ -37,7 +39,15 @@ public interface IPeerAssessment {
*
* @param totalPerformance @return
*/
Grades calculateAssessment(TotalPerformance totalPerformance); // calculates marks for every performance and writes it to an array
List<Grading> calculateAssessment(TotalPerformance totalPerformance); // calculates marks for every performance and writes it to an array
/**
*
* @param studentIdentifier
* @return
*/
TotalPerformance getTotalAssessment(StudentIdentifier studentIdentifier);
/**
* calculates the mean value of all assessments in a project.
......
gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/model/Assessment.java
+ 4
− 0
View file @ 01c29a43
......@@ -7,6 +7,7 @@ import javax.xml.bind.annotation.XmlRootElement;
public class Assessment {
private StudentIdentifier student;
private Performance performance;
private TotalPerformance totalPerformance;
public Assessment(StudentIdentifier student, Performance performance) {
this.student = student;
......@@ -15,6 +16,8 @@ public class Assessment {
public Assessment(){}
public TotalPerformance getTotalAssessment() { return totalPerformance; }
public StudentIdentifier getStudent() {
return student;
}
......@@ -36,6 +39,7 @@ public class Assessment {
return "Assessment{" +
"student=" + student +
", performance=" + performance +
", totalPerformance=" +totalPerformance +
'}';
}
}
gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/model/Grades.java deleted 100644 → 0
+ 0
− 27
View file @ 36f8ced3
package unipotsdam.gf.modules.assessment.controller.model;
public class Grades {
private Grading[] grading;
public Grades(){}
public Grades(Grading[] grading) {
this.grading = grading;
}
public Grading[] getGrading() {
return grading;
}
public void setGrading(Grading[] grading) {
this.grading = grading;
}
@Override
public String toString() {
return "Grades{" +
"grading=" + grading +
'}';
}
}
gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/model/Performance.java
+ 4
− 0
View file @ 01c29a43
......@@ -13,6 +13,10 @@ public class Performance {
this.workRating = workRating;
}
public Performance() {
}
public int[] getQuizAnswer() {
return quizAnswer;
}
......
gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/model/TotalPerformance.java
+ 4
− 0
View file @ 01c29a43
......@@ -13,6 +13,10 @@ public class TotalPerformance {
}
public TotalPerformance() {
studentIdentifier = new StudentIdentifier[3];
performances = new Performance[3];
studentIdentifier[0] = new StudentIdentifier("hello", "world");
performances[0] = new Performance();
}
public Performance[] getPerformances() {
......
gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/FBAssessement.java
+ 9
− 3
View file @ 01c29a43
......@@ -2,6 +2,8 @@ package unipotsdam.gf.modules.assessment.controller.service;
import unipotsdam.gf.modules.assessment.controller.model.*;
import java.util.List;
/**
* Created by dehne on 18.05.2018.
*/
......@@ -24,9 +26,13 @@ public class FBAssessement extends AssessmentDAO {
@Override
public Grades calculateAssessment(TotalPerformance totalPerformance){ // calculates marks for every performance and writes it to an array
Grades grades = new Grades();
return grades;
public List<Grading> calculateAssessment(TotalPerformance totalPerformance){ // calculates marks for every performance and writes it to an array
return null;
}
@Override
public TotalPerformance getTotalAssessment(StudentIdentifier studentIdentifier) {
return null;
}
public void createQuiz(StudentIdentifier student, String question, String[] answers){ //writes a new question into the DB
......
gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/PeerAssessment.java
+ 10
− 3
View file @ 01c29a43
......@@ -3,6 +3,8 @@ package unipotsdam.gf.modules.assessment.controller.service;
import unipotsdam.gf.interfaces.IPeerAssessment;
import unipotsdam.gf.modules.assessment.controller.model.*;
import java.util.List;
public class PeerAssessment implements IPeerAssessment {
@Override
public void addAssessmentDataToDB(Assessment assessment) {
......@@ -25,9 +27,14 @@ public class PeerAssessment implements IPeerAssessment {
}
@Override
public Grades calculateAssessment(TotalPerformance totalPerformance) {
Grades grades = new Grades();
return grades;
public List<Grading> calculateAssessment(TotalPerformance totalPerformance) {
return null;
}
@Override
public TotalPerformance getTotalAssessment(StudentIdentifier studentIdentifier) {
return null;
}
@Override
......
gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/PeerAssessmentDummy.java
+ 26
− 8
View file @ 01c29a43
......@@ -3,10 +3,12 @@ package unipotsdam.gf.modules.assessment.controller.service;
import unipotsdam.gf.interfaces.IPeerAssessment;
import unipotsdam.gf.modules.assessment.controller.model.*;
import java.util.Arrays;
import java.util.List;
public class PeerAssessmentDummy implements IPeerAssessment {
@Override
public void addAssessmentDataToDB(Assessment assessment) {
}
@Override
......@@ -33,15 +35,13 @@ public class PeerAssessmentDummy implements IPeerAssessment {
@Override
public void createQuiz(StudentAndQuiz studentAndQuiz) {
}
@Override
public Grades calculateAssessment(TotalPerformance totalPerformance) {
public List<Grading> calculateAssessment(TotalPerformance totalPerformance) {
Performance[] performanceOfAllStudents = totalPerformance.getPerformances();
StudentIdentifier[] allStudents = totalPerformance.getStudentIdentifier();
int[] allAssessements = new int[performanceOfAllStudents.length] ;
Grades grades = new Grades();
Grading[] grading = new Grading[performanceOfAllStudents.length];
for (int i=0; i< performanceOfAllStudents.length;i++) {
......@@ -51,12 +51,30 @@ public class PeerAssessmentDummy implements IPeerAssessment {
allAssessements[i] = allAssessements[i]/performanceOfAllStudents[i].getQuizAnswer().length;
}
for (int i=0; i<performanceOfAllStudents.length; i++){
grading[i].setStudentIdentifier(allStudents[i]);
grading[i].setGrade(allAssessements[i]);
Grading shuttle = new Grading(allStudents[i], allAssessements[i]);
grading[i]= shuttle;
}
return Arrays.asList(grading);
}
grades.setGrading(grading);
return grades;
@Override
public TotalPerformance getTotalAssessment(StudentIdentifier studentIdentifier) {
StudentIdentifier[] students = new StudentIdentifier[2];
StudentIdentifier student = new StudentIdentifier("gemeinsamForschen","Haralf");
students[0] = student;
student = new StudentIdentifier("gemeinsamForschen","Regine");
students[1] = student;
Performance[] performances = new Performance[2];
int[] quiz = {1,0,1,0,0,0,1};
int[] quiz2 = {0,1,0,1,1,1,0};
int[] work = {5,4,3,2,1};
int[] work2 = {1,2,3,4,5};
Performance performance = new Performance(quiz, "toller dude",work);
performances[0] = performance;
performance = new Performance(quiz2, "tolle dudine",work2);
performances[1] = performance;
TotalPerformance totalPerformance = new TotalPerformance(students,performances);
return totalPerformance;
}
@Override
......
gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/view/QuizView.java
+ 33
− 3
View file @ 01c29a43
......@@ -6,6 +6,8 @@ import unipotsdam.gf.modules.assessment.controller.service.PeerAssessmentDummy;
import javax.ws.rs.*;
import javax.ws.rs.core.MediaType;
import java.util.ArrayList;
import java.util.List;
@Path("/assessments")
public class QuizView implements IPeerAssessment {
......@@ -56,9 +58,8 @@ public class QuizView implements IPeerAssessment {
@Consumes(MediaType.APPLICATION_JSON)
@Path("/calculate")
@Override
public Grades calculateAssessment(TotalPerformance totalPerformance) { //todo: maybe the return variable is the problem why it doesnt work.
return peer.calculateAssessment(totalPerformance);
public List<Grading> calculateAssessment(TotalPerformance totalPerformance) { //todo: maybe the return variable is the problem why it doesnt work.
return new ArrayList<Grading>();
}
@GET
......@@ -68,4 +69,33 @@ public class QuizView implements IPeerAssessment {
public int meanOfAssessement(@PathParam("projectId") String ProjectId) {
return peer.meanOfAssessement(ProjectId);
}
@GET
@Produces(MediaType.APPLICATION_JSON)
@Path("/total/project/{projectId}/student/{student}")
public TotalPerformance getTotalAssessment(@PathParam("projectId") String ProjectId,@PathParam("student") String student){
StudentIdentifier studentIdentifier = new StudentIdentifier(ProjectId, student);
return getTotalAssessment(studentIdentifier);
};
@Override
public TotalPerformance getTotalAssessment(StudentIdentifier studentIdentifier) {
return peer.getTotalAssessment(studentIdentifier);
}
@GET
@Produces(MediaType.APPLICATION_JSON)
@Path("/dummy/totalperformance")
public List<TotalPerformance> getTotalAssessment() {
ArrayList<TotalPerformance> result = new ArrayList<>();
TotalPerformance pf = new TotalPerformance();
TotalPerformance pf2 = new TotalPerformance();
result.add(pf);
result.add(pf2);
return result;
//return peer.getTotalAssessment(studentIdentifier);
// TODO fix this
}
}
gemeinsamforschen/src/main/webapp/assets/css/Community-ChatComments.css 0 → 100644
+ 13
− 0
View file @ 01c29a43
img {
border-radius:5px;
}
img {
border-radius:5px;
}
.btn {
margin:0px 10px;
margin-bottom:20px;
}
gemeinsamforschen/src/main/webapp/assets/css/Sidebar-Menu-1.css 0 → 100644
+ 129
− 0
View file @ 01c29a43
body {
overflow-x:hidden;
}
#wrapper {
padding-left:0;
-webkit-transition:all 0.5s ease;
-moz-transition:all 0.5s ease;
-o-transition:all 0.5s ease;
transition:all 0.5s ease;
}
#wrapper.toggled {
padding-left:250px;
}
#sidebar-wrapper {
z-index:1000;
position:fixed;
left:250px;
width:0;
height:100%;
margin-left:-250px;
overflow-y:auto;
background:#000;
-webkit-transition:all 0.5s ease;
-moz-transition:all 0.5s ease;
-o-transition:all 0.5s ease;
transition:all 0.5s ease;
}
#wrapper.toggled #sidebar-wrapper {
width:250px;
}
#page-content-wrapper {
width:100%;
position:absolute;
padding:15px;
}
#wrapper.toggled #page-content-wrapper {
position:absolute;
margin-right:-250px;
}
.sidebar-nav {
position:absolute;
top:0;
width:250px;
margin:0;
padding:0;
list-style:none;
}
.sidebar-nav li {
text-indent:20px;
line-height:40px;
}
.sidebar-nav li a {
display:block;
text-decoration:none;
color:#999999;
}
.sidebar-nav li a:hover {
text-decoration:none;
color:#fff;
background:rgba(255,255,255,0.2);
}
.sidebar-nav li a:active, .sidebar-nav li a:focus {
text-decoration:none;
}
.sidebar-nav > .sidebar-brand {
height:65px;
font-size:18px;
line-height:60px;
}
.sidebar-nav > .sidebar-brand a {
color:#999999;
}
.sidebar-nav > .sidebar-brand a:hover {
color:#fff;
background:none;
}
@media (min-width:768px) {
#wrapper {
padding-left:250px;
}
}
@media (min-width:768px) {
#wrapper.toggled {
padding-left:0;
}
}
@media (min-width:768px) {
#sidebar-wrapper {
width:250px;
}
}
@media (min-width:768px) {
#wrapper.toggled #sidebar-wrapper {
width:0;
}
}
@media (min-width:768px) {
#page-content-wrapper {
padding:20px;
position:relative;
}
}
@media (min-width:768px) {
#wrapper.toggled #page-content-wrapper {
position:relative;
margin-right:0;
}
}
gemeinsamforschen/src/main/webapp/assets/css/styles.css
+ 15
− 0
View file @ 01c29a43
......@@ -95,7 +95,22 @@
opacity: 0;
}
}
#chat {
width:35%;
margin-right: 20px;
}
table ul{
justify-items: center;
}
table img{
width:200px;
}
.btn .btn-light{
margin-top:6px;
}
.checkbox {
padding-left: 20px; }
......
gemeinsamforschen/src/main/webapp/assets/js/Sidebar-Menu.js 0 → 100644
+ 4
− 0
View file @ 01c29a43
$("#menu-toggle").click(function(e) {
e.preventDefault();
$("#wrapper").toggleClass("toggled");
});
\ No newline at end of file
gemeinsamforschen/src/main/webapp/assets/js/assessmentCalculator.js
+ 66
− 31
View file @ 01c29a43
$(document).ready(function(){
$("#calculateNow").on("click", function(){
var data = [{
StudentIdentifier: {
projectId: 'gemeinsamForschn',
student: 'Max*i Mustermann*ine'
$("#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);
},
Performance: {
quizAnswers: [1,0,1,1,0,0,0,0,1],
feedback: 'ganz feiner Student war das',
workRating: [4,3,5,1,1,5,3]
error: function(a,b,c){
alert('some error'+a);
}
},{
StudentIdentifier: {
projectId: 'gemeinsamForschn',
student: 'John Doe'
})
});
$("#calculateNow").on("click", function(){
var data = {
"studentIdentifier":[{
"projectId":"gemeinsamForschen",
"studentId":"Haralf"
},
Performance: {
quizAnswers: [1,0,1,1,0,1,1,1,1],
feedback: 'ganz feiner Student war das',
workRating: [2,3,2,3,1,2,3]
}
},{
StudentIdentifier: {
projectId: 'gemeinsamForschn',
student: 'Harri Gründler'
{
"projectId":"gemeinsamForschen",
"studentId":"Regine"
}
],
"performances":[{
"quizAnswer":[1,0,1,0,0,0,1],
"feedback":"toller dude",
"workRating":[5,4,3,2,1]
},{
"quizAnswer":[0,1,0,1,1,1,0],
"feedback":"tolle dudine",
"workRating":[1,2,3,4,5]}
]
};
var datacorrect = { //todo: write it in maps instead of arrays
"studentIdentifier":[ {
"projectId": 'gemeinsamForschn',
"student": 'Max*i Mustermann*ine'
},
{
"projectId": 'gemeinsamForschn',
"student": 'John Doe'
},
Performance: {
quizAnswers: [0,0,0,0,0,0,0,0,0],
feedback: 'ganz feiner Student war das',
workRating: [1,1,1,1,1,1,1]
{
"projectId": 'gemeinsamForschn',
"student": 'Harri Gründler'
}
}
];
],
"performance":[
{
"quizAnswers": [1,0,1,1,0,0,0,0,1],
"feedback": 'ganz feiner Student war das',
"workRating": [4,3,5,1,1,5,3]
},
{
"quizAnswers": [1,0,1,1,0,1,1,1,1],
"feedback": 'ganz feiner Student war das',
"workRating": [2,3,2,3,1,2,3]
},
{
"quizAnswers": [0,0,0,0,0,0,0,0,0],
"feedback": 'ganz feiner Student war das',
"workRating": [1,1,1,1,1,1,1]
}
]
};
$.ajax({
url: "http://localhost:8080/gemeinsamforschen/rest/assessments/calculate",
type: 'POST',
contentType: 'application/json; charset=utf-8',
data: data,
success: function(data){
alert(data);
success: function(response){
alert(response);
},
error: function(a,b,c){
error: function(a){
alert('some error'+a);
}
})
......
gemeinsamforschen/src/main/webapp/pages/assessmentCalculator.html
+ 3
− 1
View file @ 01c29a43
......@@ -7,6 +7,8 @@
<script src="../assets/js/assessmentCalculator.js"></script>
</head>
<body>
<button id="calculateNow">click mich</button>
<button id="calculateNow">Post Performance</button>
<button id="giveItBack">Get TotalPerformance</button>
</body>
</html>
\ No newline at end of file
gemeinsamforschen/src/main/webapp/pages/project-docent.html
+ 116
− 61
View file @ 01c29a43
......@@ -6,72 +6,127 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>project-student (copy)</title>
<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">
</head>
<body>
<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-chat öffnen</button><button class="btn btn-default" type="button">Projekt finalisieren</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">Projekt finalisieren</button><button class="btn btn-default" type="button">Exportiere Projektergebnisse</button>
<button
class="btn btn-default" type="button">Exportiere Projektergebnisse</button><button class="btn btn-default" type="button">Exportiere Zwischenstand</button><button class="btn btn-default" type="button">Quizfrage erstellen</button>
<div class="table-responsive">
<table class="table">
<thead>
<tr>
<th>Gruppe1 </th>
<th>Beiträge </th>
</tr>
</thead>
<tbody>
<tr>
<td>student1 </td>
<td>Interfaces </td>
</tr>
<tr>
<td>student2 </td>
<td>Design </td>
</tr>
</tbody>
</table>
</div>
<div class="table-responsive">
<table class="table">
<thead>
<tr>
<th>Gruppe2 </th>
<th>Beiträge </th>
</tr>
</thead>
<tbody>
<tr>
<td>student3 </td>
<td>Interfaces </td>
</tr>
<tr>
<td>student4 </td>
<td>Design </td>
</tr>
</tbody>
</table>
</div>
<div class="table-responsive">
<table class="table">
<thead>
<tr>
<th>Gruppe3 </th>
<th>Beiträge </th>
</tr>
</thead>
<tbody>
<tr>
<td>student5 </td>
<td>Interfaces </td>
</tr>
<tr>
<td>student6 </td>
<td>Design </td>
</tr>
</tbody>
</table>
class="btn btn-default" type="button">Exportiere Zwischenstand</button><button class="btn btn-default" type="button">Quizfrage erstellen</button>
<div>
<div class="container">
<div class="row">
<div class="col-md-6">
<div class="table-responsive" style="width:294px;">
<table class="table">
<thead>
<tr>
<th>Gruppe1 </th>
<th>Beiträge </th>
</tr>
</thead>
<tbody>
<tr>
<td>student1 </td>
<td>Interfaces </td>
</tr>
<tr>
<td>student2 </td>
<td>Design </td>
</tr>
</tbody>
</table>
</div>
<div class="table-responsive" style="width:294px;">
<table class="table">
<thead>
<tr>
<th>Gruppe2 </th>
<th>Beiträge </th>
</tr>
</thead>
<tbody>
<tr>
<td>student3 </td>
<td>Interfaces </td>
</tr>
<tr>
<td>student4 </td>
<td>Design </td>
</tr>
</tbody>
</table>
</div>
<div class="table-responsive" style="width:294px;">
<table class="table">
<thead>
<tr>
<th>Gruppe3 </th>
<th>Beiträge </th>
</tr>
</thead>
<tbody>
<tr>
<td>student5 </td>
<td>Interfaces </td>
</tr>
<tr>
<td>student6 </td>
<td>Design </td>
</tr>
</tbody>
</table>
</div>
</div>
<div class="col-md-6">
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">ProjektChat</h3>
</div>
<div class="panel-body" style="height:233px;">
<ul class="list-group">
<li class="list-group-item" style="margin-bottom:6px;">
<div class="media">
<div class="media-left"><a></a></div>
<div class="media-body">
<div class="media" style="overflow:visible;">
<div class="media-left"><a><img src="../assets/img/1.jpg" class="img-rounded" style="width: 25px; height:25px;"></a></div>
<div class="media-body" style="overflow:visible;">
<div class="row">
<div class="col-md-12">
<p><a href="#">Sara Doe:</a> This guy has been going 100+ MPH on side streets. <br>
<small class="text-muted">August 6, 2016 @ 10:35am </small></p>
</div>
</div>
</div>
</div>
</div>
</div>
</li>
<li class="list-group-item" style="margin-bottom:6px;">
<div class="media">
<div class="media-left"><a></a></div>
<div class="media-body">
<div class="media" style="overflow:visible;">
<div class="media-left"><a><img src="../assets/img/1.jpg" class="img-rounded" style="width: 25px; height:25px;"></a></div>
<div class="media-body" style="overflow:visible;">
<div class="row">
<div class="col-md-12">
<p><a href="#">Brennan Prill:</a> This guy has been going 100+ MPH on side streets. <br>
<small class="text-muted">August 6, 2016 @ 10:35am </small></p>
</div>
</div>
</div>
</div>
</div>
</div>
</li>
</ul><button class="btn btn-default" type="button" style="margin-left:601px;margin-top:-9px;">Add Comment</button></div>
</div>
</div>
</div>
</div>
</div>
<script src="../assets/js/jquery.min.js"></script>
<script src="../assets/bootstrap/js/bootstrap.min.js"></script>
......
gemeinsamforschen/src/main/webapp/pages/project-student.html
+ 139
− 44
View file @ 01c29a43
......@@ -4,55 +4,150 @@
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>project-student</title>
<link rel="stylesheet" href="../assets/bootstrap/css/bootstrap.min.css">
<title>muster-gemeinsam-forschen</title>
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
<link rel="stylesheet" href="../assets/css/styles.css">
<link rel="stylesheet" href="/core/assets/css/Team-Boxed.css">
<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>
<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">
<link rel="stylesheet" href="../assets/css/Sidebar-Menu.css">
</head>
<body>
<h1>dummy Projekt1 für Student1</h1>
<div></div>
<div class="team-boxed" style="height:581px;">
<div class="container">
<div class="intro">
<h2 class="text-center">deine Gruppe</h2>
</div>
<div class="row people">
<div class="col-md-4 col-sm-6 item">
<div class="box"><img class="img-circle" src="../core/assets/img/1.jpg">
<h3 class="name">student1 </h3>
<p class="title"> </p>
<ul>
<li>Interfaces hochgeladen</li>
<li>Design erstellt</li>
</ul>
</div>
</div>
<div class="col-md-4 col-sm-6 item">
<div class="box"><img class="img-circle" src="../core/assets/img/2.jpg">
<h3 class="name">student2 </h3>
<p class="title"> </p>
<ul>
<li>Interfaces hochgeladen</li>
</ul>
</div>
</div>
<div class="col-md-4 col-sm-6 item">
<div class="box"><img class="img-circle" src="../core/assets/img/3.jpg">
<h3 class="name">student3 </h3>
</div>
<ul>
<li>Interace hochgeladen</li>
</ul>
</div>
</div>
<div id="wrapper">
<div id="sidebar-wrapper">
<ul class="sidebar-nav">
<li class="sidebar-brand"><a href="#">overview</a></li>
<li><a href="#">Quizfrage</a></li>
<li><a href="#">ePortfolio</a></li>
<li><a href="#">Beitrag</a></li>
<li><a href="#">Bewertung</a></li>
<li><a href="#">Logout</a></li>
</ul>
</div>
<div class="page-content-wrapper">
<div class="container-fluid">
<h1>gemeinsam Forschen
<a href="#">
<span class="glyphicon glyphicon-envelope"
style="font-size:27px;margin-top:-17px;margin-left:600px;"></span>
</a>
<a href="#">
<span class="glyphicon glyphicon-cog" style="font-size:29px;margin-left:5px;margin-top:-25px;"></span>
</a></h1>
</div>
</div><button class="btn btn-default" type="button">Projekt-chat starten</button><button class="btn btn-default" type="button">Quizfrage erstellen</button><button class="btn btn-default" type="button">Gruppen-chat starten</button><button class="btn btn-default"
type="button">ePortfolio </button><button class="btn btn-default" type="button">Beitrag hochladen</button><button class="btn btn-default" type="button">feedback </button><button class="btn btn-default" type="button" disabled="disabled">Bewertung </button>
<script
src="../assets/js/jquery.min.js"></script>
<script src="../assets/bootstrap/js/bootstrap.min.js"></script>
<div>
<table>
<tr>
<td id="yourContent">
<h1>your content guys and girls!</h1>
<!-- here will be all the content -->
<table>
<tr>
<td>
<h3>student1</h3>
<img src="../assets/img/1.jpg">
<a href="#">student1@uni.de</a>
<hr>
<ul>
<li>Projektübersicht hochgeladen</li>
<li>Blumen ins Hausaufgabenheft geklebt</li>
</ul>
</td>
<td> </td>
<td>
<h3>student2</h3>
<img src="../assets/img/2.jpg">
<a href="#">student2@uni.de</a>
<hr>
<ul>
<li>feedback zu Herbarium im Hausaufgabenheft gegeben</li>
<li>Blumen an Vegetarier verfüttert</li>
<li>Die armen Vegetarier</li>
</ul>
</td>
<td> </td>
<td>
<h3>student3</h3>
<img src="../assets/img/3.jpg">
<a href="#">student3@uni.de</a>
<hr>
<ul>
<li>Viva la Floristika</li>
</ul>
</td>
</tr>
</table>
</td>
<td id="chat">
<div class="card">
<div class="card-header">
<h6 class="mb-0">Gruppen+Projekt Chat</h6>
</div>
<div class="card-body">
<ul class="list-group">
<li class="list-group-item">
<div class="media">
<div></div>
<div class="media-body">
<div class="media" style="overflow:visible;">
<div><img src="../assets/img/1.jpg" class="mr-3"
style="width: 25px; height:25px;"></div>
<div class="media-body" style="overflow:visible;">
<div class="row">
<div class="col-md-12">
<p><a href="#">Sara Doe:</a> This guy has been going
100+ MPH on side streets. <br>
<small class="text-muted">August 6, 2016 @ 10:35am
</small>
</p>
</div>
</div>
</div>
</div>
</div>
</div>
</li>
<li class="list-group-item">
<div class="media">
<div></div>
<div class="media-body">
<div class="media" style="overflow:visible;">
<div><img src="../assets/img/2.jpg" class="mr-3"
style="width: 25px; height:25px;"></div>
<div class="media-body" style="overflow:visible;">
<div class="row">
<div class="col-md-12">
<p><a href="#">Brennan Prill:</a> This guy has been
going 100+ MPH on side streets. <br>
<small class="text-muted">August 6, 2016 @ 10:35am
</small>
</p>
</div>
</div>
</div>
</div>
</div>
</div>
</li>
</ul>
<button class="btn btn-light">
Add Comment
</button>
</div>
</div>
</td>
</tr>
</table>
</div>
</div>
</div>
<script src="../assets/js/jquery.min.js"></script>
<script src="../assets/bootstrap/js/bootstrap.min.js"></script>
<script src="../assets/js/Sidebar-Menu.js"></script>
</body>
</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