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

task template with buttons and extra TaskNames.

parent a8ec0c35
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 72 additions and 77 deletions
gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/model/StudentAndQuiz.java
+ 5
− 5
View file @ aaf8fba4
......@@ -6,12 +6,12 @@ package unipotsdam.gf.modules.assessment.controller.model;
*/
public class StudentAndQuiz {
private Quiz quiz;
private StudentIdentifier userNameentifier;
private StudentIdentifier userIdentifier;
@Override
public String toString() {
return "StudentAndQuiz{" +
"userNameentifier=" + userNameentifier +
"userIdentifier=" + userIdentifier +
", quiz=" + quiz +
'}';
}
......@@ -19,11 +19,11 @@ public class StudentAndQuiz {
public StudentAndQuiz(){}
public StudentIdentifier getStudentIdentifier() {
return userNameentifier;
return userIdentifier;
}
public void setStudentIdentifier(StudentIdentifier userNameentifier) {
this.userNameentifier = userNameentifier;
this.userIdentifier = userNameentifier;
}
public Quiz getQuiz() {
......@@ -35,7 +35,7 @@ public class StudentAndQuiz {
}
public StudentAndQuiz(StudentIdentifier userNameentifier, Quiz quiz) {
this.userNameentifier = userNameentifier;
this.userIdentifier = userNameentifier;
this.quiz = quiz;
}
}
gemeinsamforschen/src/main/java/unipotsdam/gf/modules/tasks/TaskName.java
+ 11
− 1
View file @ aaf8fba4
package unipotsdam.gf.modules.tasks;
public enum TaskName {
//Docent Tasks
WAIT_FOR_PARTICPANTS,
BUILD_GROUPS,
CLOSE_GROUP_FINDING_PHASE
CLOSE_GROUP_FINDING_PHASE,
//Student Tasks
UPLOAD_DOSSIER,
GIVE_FEEDBACK,
CREATE_QUIZ,
WRITE_EJOURNAL,
FINALIZE_DOSSIER,
FINALIZE_EJOURNAL,
ASSESSMENT
}
gemeinsamforschen/src/main/webapp/assessment/assess-work.jsp
+ 0
− 51
View file @ aaf8fba4
......@@ -363,57 +363,6 @@
<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>
......
gemeinsamforschen/src/main/webapp/assessment/js/Quiz.js
+ 2
− 1
View file @ aaf8fba4
$(document).ready(function () {
let projectName = document.getElementById('projectName').innerText.trim();
let userName = document.getElementById('user').innerText.trim();
let userName = document.getElementById('userEmail').innerText.trim();
$.ajax({
url: '../rest/assessments/project/'+projectName+'/quiz/author/'+userName,
projectName: projectName,
......@@ -14,6 +14,7 @@ $(document).ready(function () {
trQuestion.className = "pageChanger";
trQuestion.innerHTML = '<td colspan="' + colspan + '"><h3>' +
'<a href="view-quiz.jsp' +
'?projectName=' + projectName+
'&quizId=' + encodeURIComponent(data[quiz].question) + '"</a>' +
data[quiz].question + '</h3></td>';
table.appendChild(trQuestion);
......
gemeinsamforschen/src/main/webapp/assessment/js/assess-work.js
+ 1
− 1
View file @ aaf8fba4
......@@ -15,7 +15,7 @@ $(document).ready(function () {
function buildTablesForPeers() {
let userName = $('#user').html().trim();
let userName = $('#userEmail').html().trim();
let projectName = $('#projectName').html().trim();
$.ajax({
url: '../rest/group/project/' + projectName + '/student/' + userName,
......
gemeinsamforschen/src/main/webapp/assessment/js/create-quiz.js
+ 5
− 5
View file @ aaf8fba4
......@@ -42,12 +42,12 @@ $(document).ready(function () {
correctAnswers: correctAnswers,
incorrectAnswers: incorrectAnswers
};
let userNameentifier = {
userName: $('#user').html().trim(),
let userIdentifier = {
userEmail: $('#userEmail').html().trim(),
projectName: $('#projectName').html().trim()
};
let data = JSON.stringify({
userNameentifier: userNameentifier,
studentIdentifier: userIdentifier,
quiz: quiz
});
$.ajax({
......@@ -60,10 +60,10 @@ $(document).ready(function () {
type: 'POST',
success: function (response) {
if (response === "student") {
location.href = "Quiz.jsp?projectName="+projectName;
location.href = "Quiz.jsp?projectName="+$('#projectName').html().trim();
}
if (response === "docent") {
location.href = "Quiz-docent.jsp?projectName="+projectName;
location.href = "Quiz-docent.jsp?projectName="+$('#projectName').html().trim();
}
},
......
gemeinsamforschen/src/main/webapp/assessment/js/view-quiz.js
+ 2
− 2
View file @ aaf8fba4
......@@ -34,8 +34,8 @@ $(document).ready(function () {
$_GET[decodeURIComponent(temp[0])] = decodeURIComponent(temp[1]);
}
let quizId = encodeURIComponent($_GET['quizId']);
let author = $('#user').html().trim();
let projectName = document.getElementById('projectName').innerText.trim();
let author = $('#userEmail').html().trim();
let projectName = $('#projectName').html().trim();
$.ajax({
url: '../rest/assessments/project/' + projectName + '/quiz/' + quizId + '/author/' + author,
type: 'GET',
......
gemeinsamforschen/src/main/webapp/project/js/tasks-student.js
+ 42
− 7
View file @ aaf8fba4
$(document).ready(function(){
let userEmail = $('#userEmail').html().trim();
let projectName = $('#projectName').html().trim();
fillTasks(projectName, userEmail);
//fillTasks(projectName, userEmail);
let object = [{
taskType: "ONSITE", //
taskData: "",
......@@ -17,15 +17,15 @@ $(document).ready(function(){
projectName: projectName,
progress: "JUSTSTARTED"
}, {
taskType: "INFO", //
taskType: "LINKED", //
taskData: "",
taskName: "BUILD_GROUPS", //
taskName: "ASSESSMENT", //
hasRenderModel: false,
eventCreated: Date.now()-410,
deadline: Date.now() + 17223613, //
groupTask: false,//
importance: "",
phase: "CourseCreation", //
phase: "Assessment", //
link: "www.youtube.de", //
userEmail: userEmail,
projectName: projectName,
......@@ -102,8 +102,11 @@ function fitObjectInTmpl(object){
if (object.link !=="")
result.helpLink = object.link;
if (object.deadline != null){
let daysLeft = (object.deadline - Date.now())/1000/60/60/24;
result.timeFrame="Noch "+daysLeft+" Tage Zeit";
let daysLeft = Math.round((object.deadline - Date.now())/1000/60/60/24);
if (daysLeft>=1)
result.timeFrame="<div class='status icon'><p>Noch "+daysLeft+" Tage Zeit</p></div>";
else
result.timeFrame="<div class='status alert icon'><p>Du bist zu spät.</p></div>";
}else {result.timeFrame="";}
switch (object.taskName){
case "WAIT_FOR_PARTICPANTS":
......@@ -120,7 +123,39 @@ function fitObjectInTmpl(object){
}
if (object.taskType!=="INFO"){
//todo: implement rest
result.solveTaskWith="Lege ein Dossier an"
switch (object.taskName) {
case "UPLOAD_DOSSIER":
result.solveTaskWith="Lege ein Dossier an";
result.solveTaskWithLink="../annotation/annotation-document.jsp?projectName="+object.projectName;
break;
case "GIVE_FEEDBACK":
result.solveTaskWith="Erteile Feedback";
result.solveTaskWithLink="../feedback/give-feedback.jsp?projectName="+object.projectName;
break;
case "CREATE_QUIZ":
result.solveTaskWith="Erstelle ein Quiz";
result.solveTaskWithLink="../assessment/create-quiz.jsp?projectName="+object.projectName;
break;
case "WRITE_EJOURNAL":
result.solveTaskWith="Lege ein EJournal an";
result.solveTaskWithLink="../journal/create-journal.jsp?projectName="+object.projectName;
break;
case "FINALIZE_DOSSIER":
result.solveTaskWith="Finalisiere das Dossier";
result.solveTaskWithLink="../annotation/annotation-document.jsp?projectName="+object.projectName;
break;
case "FINALIZE_EJOURNAL":
result.solveTaskWith="Finalisiere dein EJournal";
result.solveTaskWithLink="../journal/edit-description.jsp?projectName="+object.projectName;
break;
case "ASSESSMENT":
result.solveTaskWith="Starte Bewertung";
result.solveTaskWithLink="../assessment/assess-work.jsp?projectName="+object.projectName;
break;
default:
result.solveTaskWith=null;
}
}
return result;
}
......
gemeinsamforschen/src/main/webapp/project/tasks-student.jsp
+ 2
− 2
View file @ aaf8fba4
......@@ -40,14 +40,14 @@
<h4>${infoText}</h4>
{{/if}}
{{if solveTaskWith}}
<button class='primary'>${solveTaskWith}</button>
<a href="${solveTaskWithLink}"><button class='primary'>${solveTaskWith}</button></a>
{{/if}}
{{if helpLink}}
<div style="width:100%"><a href='${helpLink}'>Hier</a> bekommst du Hilfe.</div>
{{/if}}
</div>
{{if timeFrame}}
<div class="status icon"><p>${timeFrame}</p></div>
{{html timeFrame}}
{{/if}}
<div style="clear:left"></div>
</div>
......
gemeinsamforschen/src/main/webapp/taglibs/js/utility.js
+ 2
− 2
View file @ aaf8fba4
......@@ -25,10 +25,10 @@ function goBack() {
}
function checkAssessementPhase() {
let userName = $('#user').html().trim();
let userName = $('#userEmail').html().trim();
let projectName = $('#projectName').html().trim();
$.ajax({
url: 'rest/assessments/whatToRate/project/' + projectName + '/student/' + userName,
url: '../rest/assessments/whatToRate/project/' + projectName + '/student/' + userName,
type: 'GET',
headers: {
"Content-Type": "application/json",
......
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