From 4e5ae2c61a304c3dfa81e5464262708d88c4234e Mon Sep 17 00:00:00 2001
From: quark <zeisse@uni-potsdam.de>
Date: Tue, 26 Jun 2018 20:11:42 +0200
Subject: [PATCH] added researchReportPage
---
.../main/webapp/assets/css/researchReport.css | 41 +++++++++++++++++++
.../main/webapp/pages/researchReportOne.html | 41 +++++++++++++++++++
.../src/scripts/dbschema/fltrail.sql | 24 +++++++++++
.../researchreports/ResearchReportTest.java | 3 +-
4 files changed, 108 insertions(+), 1 deletion(-)
create mode 100644 gemeinsamforschen/src/main/webapp/assets/css/researchReport.css
create mode 100644 gemeinsamforschen/src/main/webapp/pages/researchReportOne.html
diff --git a/gemeinsamforschen/src/main/webapp/assets/css/researchReport.css b/gemeinsamforschen/src/main/webapp/assets/css/researchReport.css
new file mode 100644
index 00000000..b184e379
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/assets/css/researchReport.css
@@ -0,0 +1,41 @@
+html, body {
+width: 100%;
+height: 100%;
+margin: 0;
+padding: 0;
+}
+
+.researchReportForm{
+display: grid;
+grid-gap: 10px;
+grid-template-columns: 1fr 1fr 1fr;
+grid-template-areas:
+"sidebar header ."
+"sidebar editor editor"
+"sidebar editor buttons"
+}
+
+.researchReportMenu{
+background: gray;
+color: White;
+grid-area: sidebar;
+}
+
+.researchReportTitlebar{
+background: white;
+color: black;
+grid-area: header;
+}
+
+.researchReportEditor{
+grid-area: editor;
+background: white;
+color: black;
+}
+
+.researchReportButtons{
+grid-area: buttons;
+background: gray;
+color: black;
+}
+
diff --git a/gemeinsamforschen/src/main/webapp/pages/researchReportOne.html b/gemeinsamforschen/src/main/webapp/pages/researchReportOne.html
new file mode 100644
index 00000000..1bc7c16c
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/pages/researchReportOne.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<html>
+<head>
+ <script src="https://cdn.jsdelivr.net/npm/inscrybmde@1.11.3/dist/inscrybmde.min.js"></script>
+ <link rel="stylesheet" type="text/css" href="../assets/css/researchReport.css">
+ <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/inscrybmde@1.11.3/dist/inscrybmde.min.css">
+ <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
+ <script src="../assets/js/utility.js"></script>
+
+ <title>Forschungsbericht erstellen</title>
+</head>
+<body>
+
+<h1> Forschunhsbericht erstellen </h1>
+
+<form id="researchReportform" class="form-researchReport" method="POST" action="../rest/researchReport/save">
+
+ <input type="hidden" name="student" value="0">
+ <input type="hidden" name="project" value="0">
+
+ <div class="researchReportForm">
+ <div class = "researchReportMenu"></div>
+ <div class = "researchReportTitlebar"></div>
+ <div class ="researchReportEditor">
+ <textarea id = "editor" name="text" form="researchReportForm" >
+ </textarea>
+ </div>
+ <div class="ResearchReportButtons">
+ <input type="submit">
+ <button> Zurück </button>
+ </div>
+
+ </div>
+</form>
+
+<script>
+
+</script>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/gemeinsamforschen/src/scripts/dbschema/fltrail.sql b/gemeinsamforschen/src/scripts/dbschema/fltrail.sql
index d7978655..ef3ef557 100644
--- a/gemeinsamforschen/src/scripts/dbschema/fltrail.sql
+++ b/gemeinsamforschen/src/scripts/dbschema/fltrail.sql
@@ -40,6 +40,30 @@ CREATE TABLE projectuser
alter table users
add isStudent tinyint(1) default '1' null;
+CREATE TABLE researchReport (
+ `title` varchar(400) NOT NULL,
+ `method` varchar(10000) NOT NULL,
+ `research` varchar(10000) NOT NULL,
+ `researchResult` varchar(10000) NOT NULL,
+ `evaluation` varchar(10000) NOT NULL,
+)ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+//ToDo
+CREATE TABLE timeplan(
+ `reportID` varchar(400) NOT NULL,
+)ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+CREATE TABLE researchQuestion(
+ `reportID` varchar(400) NOT NULL,
+)ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+CREATE TABLE bibliography(
+ `reportID` varchar(400) NOT NULL,
+)ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+CREATE TABLE learningGoals(
+ `reportID` varchar(400) NOT NULL,
+)ENGINE=InnoDB DEFAULT CHARSET=utf8;
diff --git a/gemeinsamforschen/src/test/java/unipotsdam/gf/modules/researchreports/ResearchReportTest.java b/gemeinsamforschen/src/test/java/unipotsdam/gf/modules/researchreports/ResearchReportTest.java
index 7dbb2559..52a96f7d 100644
--- a/gemeinsamforschen/src/test/java/unipotsdam/gf/modules/researchreports/ResearchReportTest.java
+++ b/gemeinsamforschen/src/test/java/unipotsdam/gf/modules/researchreports/ResearchReportTest.java
@@ -1,4 +1,4 @@
-package unipotsdam.gf.modules.researchreports;
+/* package unipotsdam.gf.modules.researchreports;
@@ -24,3 +24,4 @@ public class ResearchReportTest {
}
}
+*/
\ No newline at end of file
--
GitLab