From d2e2cd8de3372ff28cb9a6b5043d6c82af575f38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sven=20K=C3=A4stle?= <sven.kaestle@gmx.de>
Date: Wed, 4 Jul 2018 00:03:51 +0200
Subject: [PATCH] feat: Implement click path to upload-unstructured

---
 .../src/main/webapp/assets/css/upload-unstructured.css |  3 +++
 .../src/main/webapp/assets/js/project-student.js       |  4 ++++
 .../src/main/webapp/assets/js/uploadUnstructured.js    | 10 +++++++---
 .../src/main/webapp/pages/project-student.jsp          |  1 +
 .../src/main/webapp/pages/upload-unstructured.jsp      |  5 ++++-
 5 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/gemeinsamforschen/src/main/webapp/assets/css/upload-unstructured.css b/gemeinsamforschen/src/main/webapp/assets/css/upload-unstructured.css
index 4acd0827..16ff7e4c 100644
--- a/gemeinsamforschen/src/main/webapp/assets/css/upload-unstructured.css
+++ b/gemeinsamforschen/src/main/webapp/assets/css/upload-unstructured.css
@@ -134,6 +134,9 @@ ol {
 .document-text-buttons-lock {
     float: left;
 }
+.document-text-buttons-back {
+    float: left;
+}
 .document-text-buttons-save {
     float: right;
 }
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/project-student.js b/gemeinsamforschen/src/main/webapp/assets/js/project-student.js
index 9a7b01bf..ffc7facb 100644
--- a/gemeinsamforschen/src/main/webapp/assets/js/project-student.js
+++ b/gemeinsamforschen/src/main/webapp/assets/js/project-student.js
@@ -16,4 +16,8 @@ $(document).ready(function(){
     $('.annotationview').click(function () {
         location.href="annotation-document.jsp?token="+getUserTokenFromUrl();
     });
+
+    $('#btnUnstructuredUpload').click(function () {
+        location.href="upload-unstructured.jsp?token="+getUserTokenFromUrl();
+    })
 });
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/uploadUnstructured.js b/gemeinsamforschen/src/main/webapp/assets/js/uploadUnstructured.js
index ac630c6d..dd85243d 100644
--- a/gemeinsamforschen/src/main/webapp/assets/js/uploadUnstructured.js
+++ b/gemeinsamforschen/src/main/webapp/assets/js/uploadUnstructured.js
@@ -51,9 +51,13 @@ $(document).ready(function() {
         }
     });
 
-    /*
-     *   PAGE LOADED
-     */
+    $('#btnSave').click(function () {
+        location.href="project-student.jsp?token="+getUserTokenFromUrl();
+    });
+
+    $('#btnBack').click(function () {
+        location.href="project-student.jsp?token="+getUserTokenFromUrl();
+    });
 
     documentText = $('#documentText').html();
 
diff --git a/gemeinsamforschen/src/main/webapp/pages/project-student.jsp b/gemeinsamforschen/src/main/webapp/pages/project-student.jsp
index 5e04db86..99969f2b 100644
--- a/gemeinsamforschen/src/main/webapp/pages/project-student.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/project-student.jsp
@@ -213,6 +213,7 @@
                 </div>
             </div>
             <button id="nextPhase" class="btn btn-light">nächste Phase</button>
+            <button id="btnUnstructuredUpload" class="btn btn-light">Unstrukturierte Abgabe</button>
         </div>
     </footer>
 </div>
diff --git a/gemeinsamforschen/src/main/webapp/pages/upload-unstructured.jsp b/gemeinsamforschen/src/main/webapp/pages/upload-unstructured.jsp
index cc3d48da..98dba6d3 100644
--- a/gemeinsamforschen/src/main/webapp/pages/upload-unstructured.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/upload-unstructured.jsp
@@ -30,6 +30,8 @@
     <script src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js" type="text/javascript"></script>
     <!-- js - contextMenu script -->
     <script src="https://swisnl.github.io/jQuery-contextMenu/dist/jquery.contextMenu.js" type="text/javascript"></script>
+    <!-- js - utility script -->
+    <script src="../assets/js/utility.js"></script>
     <!-- js - annotationScript -->
     <script src="../assets/js/uploadUnstructured.js"></script>
 
@@ -68,7 +70,8 @@ At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergr
                             </div>
                         <div class="document-text-buttons">
                             <button onclick="lockButtonHandler()" type="button" class="btn btn-secondary document-text-buttons-lock" id="btnLock"><i class="fas fa-lock-open" id="lock"></i></button>
-                            <button type="button" class="btn btn-secondary document-text-buttons-save" id="btnSave">Speichern</i></button>
+                            <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-save" id="btnSave">Speichern</button>
                         </div>
                     </div>
                 </div>
-- 
GitLab