diff --git a/gemeinsamforschen/src/main/webapp/annotation/js/unstructuredRest.js b/gemeinsamforschen/src/main/webapp/annotation/js/unstructuredRest.js
index 42fc6ba239826cfa1af82914fefb784d410f0c41..e640790def8e1edc1fabc4ab2b7cd8dc9b04ef15 100644
--- a/gemeinsamforschen/src/main/webapp/annotation/js/unstructuredRest.js
+++ b/gemeinsamforschen/src/main/webapp/annotation/js/unstructuredRest.js
@@ -5,8 +5,8 @@
* @param responseHandler The response handler
*/
function createFullSubmission(fullSubmissionPostRequest, responseHandler) {
- var url = "../rest/submissions/full";
- var json = JSON.stringify(fullSubmissionPostRequest);
+ let url = "../rest/submissions/full";
+ let json = JSON.stringify(fullSubmissionPostRequest);
$.ajax({
url: url,
type: "POST",
diff --git a/gemeinsamforschen/src/main/webapp/annotation/js/unstructuredUpload.js b/gemeinsamforschen/src/main/webapp/annotation/js/unstructuredUpload.js
index 36aa903bb826d376003ea24eb8a02bf4e9d1a1db..f85f6f746e5cd1f9d4b6103c61270203ff581432 100644
--- a/gemeinsamforschen/src/main/webapp/annotation/js/unstructuredUpload.js
+++ b/gemeinsamforschen/src/main/webapp/annotation/js/unstructuredUpload.js
@@ -11,10 +11,10 @@ $(document).ready(function () {
let text = $('#upload-textarea').val();
// build request
- var fullSubmissionPostRequest = {
+ let fullSubmissionPostRequest = {
user: user,
text: text,
- projectName: getQueryVariable("projectName")
+ projectName: $('#projectName').text().trim()
};
// save request in database
@@ -23,7 +23,7 @@ $(document).ready(function () {
$('#upload-textarea').val("");
// 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;
});
}
});
diff --git a/gemeinsamforschen/src/main/webapp/annotation/upload-unstructured-dossier.jsp b/gemeinsamforschen/src/main/webapp/annotation/upload-unstructured-dossier.jsp
index 1ff748840a73c5c6ae742a638a200e8a1c3c8297..566f771f57719b149c6384e8a61fa7b34176f56d 100644
--- a/gemeinsamforschen/src/main/webapp/annotation/upload-unstructured-dossier.jsp
+++ b/gemeinsamforschen/src/main/webapp/annotation/upload-unstructured-dossier.jsp
@@ -2,6 +2,7 @@
<%@ taglib uri="../taglibs/gemeinsamForschen.tld" prefix="menu" %>
<%@ taglib uri="../taglibs/gemeinsamForschen.tld" prefix="headLine" %>
<%@ taglib uri="../taglibs/gemeinsamForschen.tld" prefix="omniDependencies" %>
+<%@ taglib uri="../taglibs/gemeinsamForschen.tld" prefix="footer" %>
<!DOCTYPE html>
@@ -27,37 +28,28 @@
<body>
<menu:menu hierarchy="1"/>
-<div id="wrapper">
- <div class="page-content-wrapper full-height">
- <div class="container-fluid full-height">
- <div class="container-fluid-content">
- <div class="flex">
- <headLine:headLine/>
- </div>
- <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 class="col span_l_of_2"> <!-- col right-->
+ <headLine:headLine/>
+ <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>
+<footer:footer/>
</body>
</html>
diff --git a/gemeinsamforschen/src/main/webapp/project/tasks-student.jsp b/gemeinsamforschen/src/main/webapp/project/tasks-student.jsp
index d56eb5756c191cafd703845eb78b977f0a37c580..c57e6d5960a786d493373dde547648af6b87983f 100644
--- a/gemeinsamforschen/src/main/webapp/project/tasks-student.jsp
+++ b/gemeinsamforschen/src/main/webapp/project/tasks-student.jsp
@@ -55,133 +55,6 @@
</script>
</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>
- <i class="fas fa-check-circle"></i>
- <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/>
</body>