diff --git a/gemeinsamforschen/src/main/webapp/assets/css/researchReport.css b/gemeinsamforschen/src/main/webapp/assets/css/researchReport.css index cf10a8202a49139fc89007b19f2b3d2762e358eb..4c468fbc063d3f190b5a94c37286a290b7356256 100644 --- a/gemeinsamforschen/src/main/webapp/assets/css/researchReport.css +++ b/gemeinsamforschen/src/main/webapp/assets/css/researchReport.css @@ -32,15 +32,30 @@ html, body .researchReportTitlebar - background: #303d9b + background: #003f60 color: White grid-area: header + display: flex + justify-content: center + align-items: center .researchReportEditor grid-area: editor background: gray color: black + display: flex + justify-content: Left + align-items: Center + .editor-inhalt + margin: 6rem + padding: 6rem + font-size: 2rem + color: #fff + text-align: Left + width: 10% + + .researchReportButtons diff --git a/gemeinsamforschen/src/main/webapp/pages/researchReportTitle.html b/gemeinsamforschen/src/main/webapp/pages/researchReportTitle.html index 1fed14054c00f2b1c3b8bc2fb17e9ce118795a4a..bd89ce2dfe81d9957ddd0376566c91f2ddb8b195 100644 --- a/gemeinsamforschen/src/main/webapp/pages/researchReportTitle.html +++ b/gemeinsamforschen/src/main/webapp/pages/researchReportTitle.html @@ -27,11 +27,11 @@ </div> <div class = "researchReportTitlebar"> - <h1> Forschunhsbericht erstellen </h1> + <h1> Forschungsbericht erstellen </h1> </div> <div class ="researchReportEditor"> - <h2>Titel eingeben</h2> + <h2 class="editor-inhalt">Titel eingeben:</h2> <textarea id = "editor" name="text" form="researchReportForm" rows="20" cols="100"> </textarea> </div> diff --git a/gemeinsamforschen/src/scripts/dbschema/fltrail.sql b/gemeinsamforschen/src/scripts/dbschema/fltrail.sql index ef3ef557692ff9095a93ed4a69d1a509b34d2a6f..06b696b7709b3c241c5b97c8e76ea9719a43dd2e 100644 --- a/gemeinsamforschen/src/scripts/dbschema/fltrail.sql +++ b/gemeinsamforschen/src/scripts/dbschema/fltrail.sql @@ -65,6 +65,31 @@ CREATE TABLE learningGoals( `reportID` varchar(400) NOT NULL, )ENGINE=InnoDB DEFAULT CHARSET=utf8; +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; + /*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;