From 3c9d1ee49769cd6931cdfe1235326933bb2105f8 Mon Sep 17 00:00:00 2001
From: quark <zeisse@uni-potsdam.de>
Date: Wed, 11 Jul 2018 00:10:10 +0200
Subject: [PATCH] Added File Upload (in Progress)
---
.../webapp/assets/js/researchReportUpload.js | 21 +++++++++
.../main/webapp/pages/researchReportBibo.jsp | 14 ++++--
.../webapp/pages/researchReportRecherche.jsp | 29 ++++++------
.../main/webapp/pages/researchReportTitle.jsp | 46 ++++++++++++++++---
4 files changed, 86 insertions(+), 24 deletions(-)
create mode 100644 gemeinsamforschen/src/main/webapp/assets/js/researchReportUpload.js
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/researchReportUpload.js b/gemeinsamforschen/src/main/webapp/assets/js/researchReportUpload.js
new file mode 100644
index 00000000..80d05b74
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/assets/js/researchReportUpload.js
@@ -0,0 +1,21 @@
+import * as FilePond from 'filepond';
+import FilepondPluginImagePreview from 'filepond-plugin-image-preview';
+
+FilePond.registerPlugin(
+ FilepondPluginImagePreview
+);
+
+const inputElement = document.querySelector('input[type="file"]');
+const filepondTest = FilePond.create(
+ inputElement,
+ {
+ allowImagePreview: true,
+ labelIdle: 'Bitte Datei wählen <span class="filepond--label-action"> Browse </span>>'
+ }
+);
+
+FilePond._setOptions(
+ {
+ server: 'test/' //Here insert server
+ }
+);
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/pages/researchReportBibo.jsp b/gemeinsamforschen/src/main/webapp/pages/researchReportBibo.jsp
index d3813867..fc7c9aa0 100644
--- a/gemeinsamforschen/src/main/webapp/pages/researchReportBibo.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/researchReportBibo.jsp
@@ -7,6 +7,11 @@
<meta charset="utf-8">
<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 href="https://unpkg.com/filepond/dist/filepond.css" rel="stylesheet"> <!--FilePond -->
+ <link href="https://unpkg.com/filepond-plugin-image-preview/dist/filepond-plugin-image-preview.css" rel="stylesheet">
+ <script src="https://unpkg.com/filepond/dist/filepond.js"></script> <!--FilePond -->
+ <script src="https://unpkg.com/filepond-plugin-image-preview/dist/filepond-plugin-image-preview.js"></script> <!--FilePond -->
+
<script src="https://cdn.jsdelivr.net/npm/inscrybmde@1.11.3/dist/inscrybmde.min.js"></script>
<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>
@@ -50,6 +55,10 @@
<button class="researchReportButtons"><a href="researchReportQuestion.jsp">Speichern & weiter</a></button>
<button class="researchReportButtons"><a href="researchReportRecherche.jsp"> Zurück </a></button>
</div>
+ <div class="ResearchReportUpload">
+ <input type="file" class="filepond" name="filepond"> </input>
+ </div>
+
<div class="researchReportProgress">
<nav>
<menu>
@@ -67,9 +76,8 @@
</form>
-<script>
-
-</script>
+<script src="../assets/js/createReport.js"></script>
+<script src="../assets/js/researchReportUpload.js.js"></script>
</body>
</html>
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/pages/researchReportRecherche.jsp b/gemeinsamforschen/src/main/webapp/pages/researchReportRecherche.jsp
index e9d3d76b..54c4ac81 100644
--- a/gemeinsamforschen/src/main/webapp/pages/researchReportRecherche.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/researchReportRecherche.jsp
@@ -7,6 +7,11 @@
<meta charset="utf-8">
<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 href="https://unpkg.com/filepond/dist/filepond.css" rel="stylesheet"> <!--FilePond -->
+ <link href="https://unpkg.com/filepond-plugin-image-preview/dist/filepond-plugin-image-preview.css" rel="stylesheet">
+ <script src="https://unpkg.com/filepond/dist/filepond.js"></script> <!--FilePond -->
+ <script src="https://unpkg.com/filepond-plugin-image-preview/dist/filepond-plugin-image-preview.js"></script> <!--FilePond -->
+
<script src="https://cdn.jsdelivr.net/npm/inscrybmde@1.11.3/dist/inscrybmde.min.js"></script>
<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>
@@ -25,17 +30,6 @@
<form id="researchReportform" class="researchReportForm" method="POST" action="../rest/researchReport/save">
- <div class = "researchReportMenu">
- <nav>
- <menu>
- <menuitem><p><a href="">Gruppe</a></p> </menuitem>
- <menuitem><p><a href="">Projekt erstellen</a> </p></menuitem>
- <menuitem><p><a href="">Forschungsbericht erstellen</a></p></menuitem>
- <menuitem><p><a href="">Review</a></p></menuitem>
- <menuitem><p><a href="">User</a></p></menuitem>
- </menu>
- </nav>
- </div>
<div class = "researchReportTitlebar">
<h1> Forschungsbericht erstellen 2/8</h1>
@@ -50,6 +44,11 @@
<button class="researchReportButtons"><a href="researchReportBibo.jsp">Speichern & weiter</a></button>
<button class="researchReportButtons"><a href="researchReportTitle.jsp"> Zurück </a></button>
</div>
+
+ <div class="ResearchReportUpload">
+ <input type="file" class="filepond" name="filepond"> </input>
+ </div>
+
<div class="researchReportProgress">
<nav>
<menu>
@@ -67,9 +66,11 @@
</form>
-<script>
-
-</script>
+<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>
+<script src="../assets/js/createReport.js"></script>
+<script src="../assets/js/researchReportUpload.js.js"></script>
</body>
</html>
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/pages/researchReportTitle.jsp b/gemeinsamforschen/src/main/webapp/pages/researchReportTitle.jsp
index a4bdcacf..50b93250 100644
--- a/gemeinsamforschen/src/main/webapp/pages/researchReportTitle.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/researchReportTitle.jsp
@@ -1,4 +1,5 @@
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu"%>
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu" %>
<!DOCTYPE html>
@@ -7,6 +8,9 @@
<meta charset="utf-8">
<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 href="https://unpkg.com/filepond/dist/filepond.css" rel="stylesheet"> <!--FilePond -->
+ <script src="https://unpkg.com/filepond/dist/filepond.js"></script> <!--FilePond -->
+
<script src="https://cdn.jsdelivr.net/npm/inscrybmde@1.11.3/dist/inscrybmde.min.js"></script>
<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>
@@ -21,11 +25,27 @@
</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">
+ <form id="researchReportform" class="researchReportForm" method="POST" action="../rest/researchReport/save">
-<form id="researchReportform" class="researchReportForm" method="POST" action="../rest/researchReport/save">
-
- <div class = "researchReportMenu">
+ <!-- <div class = "researchReportMenu">
<nav>
<menu>
<menuitem><p><a href="">Gruppe</a></p> </menuitem>
@@ -35,7 +55,7 @@
<menuitem><p><a href="">User</a></p></menuitem>
</menu>
</nav>
- </div>
+ </div> -->
<div class = "researchReportTitlebar">
<h1> Forschungsbericht erstellen 1/8</h1>
@@ -51,6 +71,10 @@
<button class="researchReportButtons"><a href="project-student.jsp"> Zurück </a></button>
</div>
+ <div class="ResearchReportUpload">
+ <input type="file" class="filepond" name="filepond"> </input>
+ </div>
+
<div class="researchReportProgress">
<nav>
<menu>
@@ -67,10 +91,18 @@
</div>
</form>
+ </td>
+ </tr>
+ </table>
+ </div>
+ </div>
+</div>
-<script>
+<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>
+<script src="../assets/js/createReport.js"></script>
-</script>
</body>
</html>
\ No newline at end of file
--
GitLab