Skip to content
Snippets Groups Projects
Commit 30ec9de0 authored by Axel's avatar Axel
Browse files

feat: rate contributions.jsp 

feat: footer with progress bar on project-student
parent 3662911e
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 234 additions and 7 deletions
gemeinsamforschen/src/main/webapp/assets/css/footer.css 0 → 100644
+ 43
− 0
View file @ 30ec9de0
.pg-rest{
background:#DDDDDD;
}
.pg-enrollment {
background: #777777;
width:5%;
}
.pg-groups {
background: #AAAA77;
width:15%;
}
.pg-dossier {
background: #AA77AA;
width:30%;
}
.pg-feedback {
background: #77AAAA;
width:45%;
}
.pg-reflection {
background: #55AA55;
width:60%;
}
.pg-presentation {
background: #5555AA;
width:70%;
}
.pg-assessment {
background: #AA5555;
width:85%;
}
.pg-done {
background: #34DD44;
width:100%;
}
gemeinsamforschen/src/main/webapp/assets/js/finalAssessment.js
+ 1
− 2
View file @ 30ec9de0
......@@ -33,8 +33,7 @@ function assessPeer(){
},
data: JSON.stringify(dataP),
success: function(){
alert("hier bin ich richtig");
location.href="takeQuiz.jsp?"+getUserTokenFromUrl();
location.href="takeQuiz.jsp?token="+getUserTokenFromUrl();
},
error: function(a,b,c){
......
gemeinsamforschen/src/main/webapp/assets/js/footer.js 0 → 100644
+ 35
− 0
View file @ 30ec9de0
$(document).ready(function(){
$('#nextPhase').click(function(){
var progressbar =$('#progressbar');
switch (progressbar.attr('class')){
case 'progress-bar pg-enrollment':
progressbar.removeClass('pg-enrollment');
progressbar.addClass('pg-groups');
break;
case 'progress-bar pg-groups':
progressbar.removeClass('pg-groups');
progressbar.addClass('pg-dossier');
break;
case 'progress-bar pg-dossier':
progressbar.removeClass('pg-dossier');
progressbar.addClass('pg-feedback');
break;
case 'progress-bar pg-feedback':
progressbar.removeClass('pg-feedback');
progressbar.addClass('pg-reflection');
break;
case 'progress-bar pg-reflection':
progressbar.removeClass('pg-reflection');
progressbar.addClass('pg-presentation');
break;
case 'progress-bar pg-presentation':
progressbar.removeClass('pg-presentation');
progressbar.addClass('pg-assessment');
break;
case 'progress-bar pg-assessment':
progressbar.removeClass('pg-assessment');
progressbar.addClass('pg-done');
break;
}
});
});
gemeinsamforschen/src/main/webapp/assets/js/takeQuiz.js
+ 1
− 1
View file @ 30ec9de0
......@@ -68,7 +68,7 @@ $(document).ready(function () {
}
});
$("#submitQuiz").on("click", function () {
location.href="rateContribution.jsp?token="+getUserTokenFromUrl();
});
});
......
gemeinsamforschen/src/main/webapp/pages/finalAssessments.jsp
+ 0
− 1
View file @ 30ec9de0
......@@ -42,7 +42,6 @@
<h1>Assessment for project1 </h1>
<!-- here will be all the content -->
<div class="container">
<h2>Carousel Example</h2>
<div id="myCarousel" class="carousel slide" data-ride="carousel" data-interval="false">
<!-- Indicators -->
<ol class="carousel-indicators">
......
gemeinsamforschen/src/main/webapp/pages/project-student.jsp
+ 19
− 3
View file @ 30ec9de0
......@@ -11,12 +11,17 @@
<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="../assets/css/footer.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">
<script src="../assets/js/jquery.min.js"></script>
<script src="../assets/js/footer.js"></script>
<script src="../assets/bootstrap/js/bootstrap.min.js"></script>
<script src="../assets/js/Sidebar-Menu.js"></script>
</head>
<body>
......@@ -139,11 +144,22 @@
</table>
</div>
</div>
<footer>
<div class="container">
<div class="progress">
<div class="progress-bar pg-enrollment" role="progressbar" id="progressbar">
</div>
<div>
Assessment - Präsentationsphase - Dossier - Reflexionsphase - Feedbackphase - Gruppenbildung - Kursanmeldung
</div>
<div class="progress-bar pg-rest" role="progressbar">
</div>
</div>
<button id="nextPhase" class="btn btn-light">nächste Phase</button>
</div>
</footer>
</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
gemeinsamforschen/src/main/webapp/pages/rateContribution.jsp 0 → 100644
+ 135
− 0
View file @ 30ec9de0
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<html>
<head>
<title>Title</title>
</head>
<body>
</body>
</html>
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu"%>
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<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">
<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>
<div id="wrapper">
<menu:menu></menu:menu>
<div class="page-content-wrapper">
<div class="container-fluid">
<h1 id="projectId">project1
<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>
<table>
<tr>
<td id="yourContent">
<h1>letzter Schritt im Projekt1 </h1>
<table class="table-striped peerStudent"
style="width:70%;border:1px solid; margin:auto;" id="student1">
<tr>
<td align="center">
<img src="../assets/img/1.jpg" alt="student1"
style="width:20%;">
</td>
</tr>
<tr>
<td>
Lernzieltagebuch:
</td>
<td>
Dossier:
</td>
<td>
villt Präsentation:
</td>
</tr>
</table>
<button id="submit" class="btn btn-success">Feedback hochladen</button>
</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>
</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