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

WIP on single-user-project: 6e19e34d assess-work works again

parents 6e19e34d d64809bf
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
gemeinsamforschen/src/main/webapp/annotation/js/unstructuredRest.js
+ 2
− 2
View file @ d43f0681
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
* @param responseHandler The response handler * @param responseHandler The response handler
*/ */
function createFullSubmission(fullSubmissionPostRequest, responseHandler) { function createFullSubmission(fullSubmissionPostRequest, responseHandler) {
var url = "../rest/submissions/full"; let url = "../rest/submissions/full";
var json = JSON.stringify(fullSubmissionPostRequest); let json = JSON.stringify(fullSubmissionPostRequest);
$.ajax({ $.ajax({
url: url, url: url,
type: "POST", type: "POST",
......
gemeinsamforschen/src/main/webapp/annotation/js/unstructuredUpload.js
+ 3
− 3
View file @ d43f0681
...@@ -11,10 +11,10 @@ $(document).ready(function () { ...@@ -11,10 +11,10 @@ $(document).ready(function () {
let text = $('#upload-textarea').val(); let text = $('#upload-textarea').val();
// build request // build request
var fullSubmissionPostRequest = { let fullSubmissionPostRequest = {
user: user, user: user,
text: text, text: text,
projectName: getQueryVariable("projectName") projectName: $('#projectName').text().trim()
}; };
// save request in database // save request in database
...@@ -23,7 +23,7 @@ $(document).ready(function () { ...@@ -23,7 +23,7 @@ $(document).ready(function () {
$('#upload-textarea').val(""); $('#upload-textarea').val("");
// jump to next page // jump to next page
location.href = "create-unstructured-annotation.jsp?projectName=" + getQueryVariable("projectName") + "&submissionId=" + response.id; location.href = "create-unstructured-annotation.jsp?projectName=" + $('#projectName').text().trim() + "&submissionId=" + response.id;
}); });
} }
}); });
......
gemeinsamforschen/src/main/webapp/annotation/upload-unstructured-dossier.jsp
+ 20
− 28
View file @ d43f0681
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
<%@ taglib uri="../taglibs/gemeinsamForschen.tld" prefix="menu" %> <%@ taglib uri="../taglibs/gemeinsamForschen.tld" prefix="menu" %>
<%@ taglib uri="../taglibs/gemeinsamForschen.tld" prefix="headLine" %> <%@ taglib uri="../taglibs/gemeinsamForschen.tld" prefix="headLine" %>
<%@ taglib uri="../taglibs/gemeinsamForschen.tld" prefix="omniDependencies" %> <%@ taglib uri="../taglibs/gemeinsamForschen.tld" prefix="omniDependencies" %>
<%@ taglib uri="../taglibs/gemeinsamForschen.tld" prefix="footer" %>
<!DOCTYPE html> <!DOCTYPE html>
...@@ -27,37 +28,28 @@ ...@@ -27,37 +28,28 @@
<body> <body>
<menu:menu hierarchy="1"/> <menu:menu hierarchy="1"/>
<div id="wrapper"> <div class="col span_l_of_2"> <!-- col right-->
<div class="page-content-wrapper full-height"> <headLine:headLine/>
<div class="container-fluid full-height"> <form id="upload-textarea-form">
<div class="container-fluid-content"> <div class="form-group upload-text" id="documentText">
<div class="flex"> <label for="upload-textarea">Texteingabe</label>
<headLine:headLine/> <textarea class="upload-text-textarea form-control" placeholder="Text einfügen..."
</div> id="upload-textarea" name="uploadtextarea"></textarea>
<div class="content-mainpage">
<form id="upload-textarea-form">
<div class="form-group upload-text" id="documentText">
<label for="upload-textarea">Texteingabe</label>
<textarea class="upload-text-textarea form-control" placeholder="Text einfügen..."
id="upload-textarea" name="uploadtextarea"></textarea>
</div>
</form>
<div>
<label for="file">Alternativ bitte Datei wählen</label>
<input type="file" id="file" name="file">
</div>
<div class="document-text-buttons">
<%--<button type="button" class="btn btn-secondary document-text-buttons-back" id="btnBack">Zurück
</button>--%>
<button type="button" class="btn btn-primary document-text-buttons-next" id="btnNext">Weiter
</button>
</div>
</div>
</div>
</div> </div>
</form>
<div>
<label for="file">Alternativ bitte Datei wählen</label>
<input type="file" id="file" name="file">
</div>
<div class="document-text-buttons">
<%--<button type="button" class="btn btn-secondary document-text-buttons-back" id="btnBack">Zurück
</button>--%>
<button type="button" class="btn btn-primary document-text-buttons-next" id="btnNext">Weiter
</button>
</div> </div>
</div> </div>
<footer:footer/>
</body> </body>
</html> </html>
gemeinsamforschen/src/main/webapp/project/tasks-student.jsp
+ 0
− 127
View file @ d43f0681
...@@ -55,133 +55,6 @@ ...@@ -55,133 +55,6 @@
</script> </script>
</div> </div>
<!-- Aufgabe -->
<%--
<!-- Aufgabe -->
<div class="card card-draft">
<div class="col span_s_of_2 icon grouptask">
</div>
<div class="col span_l_of_2">
<button class="primary" id="create-feedback">Schreibe ein Feedback</button>
</div>
<div class="status icon"><p>Noch drei Tage Zeit</p></div>
<div style="clear:left"></div>
</div>
<!-- Aufgabe -->
<div class="card card-draft">
<div class="col span_s_of_2 icon grouptask">
</div>
<div class="col span_l_of_2">
<a href="#">Gib Feedback zu einem Forschungsdossier</a>
</div>
<div class="status icon"><p>Noch drei Tage Zeit</p></div>
<div style="clear:left"></div>
</div>
<div class="card card-feedback">
<div class="col span_s_of_2 icon infotask">
</div>
<div class="col span_l_of_2">
<h4> Erhalte 3 Feedbacks </h4>
<div class="shoulds">
<i class="fas fa-check-circle"></i>&nbsp;
<i class="fas fa-check-circle"></i>&nbsp;
<i class="far fa-circle"></i>
</div>
<ul class="list">
<li><a href="#">Feedback 1</a></li>
<li><a href="#">Feedback 2</a></li>
</ul>
</div>
<div class="status icon"><p>Noch drei Tage Zeit</p></div>
<div style="clear:left"></div>
</div>
<!-- Aufgabe -->
<div class="card card-grouping">
<div class="col span_s_of_2 icon usertask">
</div>
<div class="col span_l_of_2">
<button class="primary">Schreibe ein Feedback</button>
<a href="#">Regeln fürs Feedback schreiben</a>
</div>
<div class="status alert icon"><p>Du bist zu spät.</p></div>
<div style="clear:left"></div>
</div>
<!-- Aufgabe -->
<div class="card card-execution">
<div class="col span_s_of_2 icon grouptask ">
</div>
<div class="col span_l_of_2">
<button class="primary">Schließe das Dossier ab</button>
<p>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore
et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea
rebum.</p>
</div>
<div class="status icon"></div>
<div style="clear:left"></div>
</div>
<!-- Aufgabe -->
<div class="card card-assessment">
<div class="col span_s_of_2 icon grouptask ">
</div>
<div class="col span_l_of_2">
<button class="primary">Schließe das Dossier ab</button>
<p>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore
et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea
rebum.</p>
</div>
<div class="status icon"><p>Noch drei Tage Zeit</p></div>
<div style="clear:left"></div>
</div>
<!-- Aufgabe -->
<div class="card card-grades">
<div class="col span_s_of_2 icon grouptask ">
</div>
<div class="col span_l_of_2">
<button class="primary">Schließe das Dossier ab</button>
<br>
<input type="checkbox" name="vehicle1" value="Bike"> Is erledigt <br>
<p>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore
et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea
rebum.</p>
</div>
<div class="status icon"></div>
<div style="clear:left"></div>
</div>--%>
</div>
<footer:footer/> <footer:footer/>
</body> </body>
......
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