Skip to content
Snippets Groups Projects
Commit 52cce980 authored by Sven Kästle's avatar Sven Kästle
Browse files

Merge branch 'annotation_#47_rework_1' into pages_overview

parents 4437c7ee 6e615097
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 31 additions and 21 deletions
gemeinsamforschen/src/main/webapp/assets/js/annotationScript.js
+ 3
− 3
View file @ 52cce980
...@@ -52,10 +52,10 @@ $(document).ready(function() { ...@@ -52,10 +52,10 @@ $(document).ready(function() {
}); });
/** /**
* next button * continue button
*/ */
$('#btnSave').click(function () { $('#btnContinue').click(function () {
location.href="#" location.href="givefeedback.jsp?token=" + getUserTokenFromUrl();
}); });
documentText = $('#documentText').html(); documentText = $('#documentText').html();
......
gemeinsamforschen/src/main/webapp/assets/js/project-student.js
+ 4
− 0
View file @ 52cce980
...@@ -2,4 +2,8 @@ $(document).ready(function(){ ...@@ -2,4 +2,8 @@ $(document).ready(function(){
$('#projectId').on('click', function(){ $('#projectId').on('click', function(){
location.href="project-student.jsp?token="+getUserTokenFromUrl(); location.href="project-student.jsp?token="+getUserTokenFromUrl();
}); });
$('.givefeedback').click(function () {
location.href="annotation-document.jsp?token="+getUserTokenFromUrl();
})
}); });
\ No newline at end of file
gemeinsamforschen/src/main/webapp/pages/annotation_document.html → gemeinsamforschen/src/main/webapp/pages/annotation-document.jsp
+ 6
− 11
View file @ 52cce980
<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu"%>
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
...@@ -27,6 +29,8 @@ ...@@ -27,6 +29,8 @@
<script src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js" type="text/javascript"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js" type="text/javascript"></script>
<!-- js - contextMenu script --> <!-- js - contextMenu script -->
<script src="https://swisnl.github.io/jQuery-contextMenu/dist/jquery.contextMenu.js" type="text/javascript"></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 --> <!-- js - annotationScript -->
<script src="../assets/js/annotationScript.js"></script> <script src="../assets/js/annotationScript.js"></script>
...@@ -34,16 +38,7 @@ ...@@ -34,16 +38,7 @@
<body> <body>
<div id="wrapper" class="full-height"> <div id="wrapper" class="full-height">
<div id="sidebar-wrapper"> <menu:menu></menu:menu>
<ul class="sidebar-nav">
<li class="sidebar-brand"><a href="#">overview</a></li>
<li><a href="#">Quizfrage</a></li>
<li><a href="#">ePortfolio</a></li>
<li><a href="#">Beitrag</a></li>
<li><a href="#">Bewertung</a></li>
<li><a href="#">Logout</a></li>
</ul>
</div>
<div class="page-content-wrapper full-height"> <div class="page-content-wrapper full-height">
<div class="container-fluid full-height"> <div class="container-fluid full-height">
<div class="container-fluid-content"> <div class="container-fluid-content">
...@@ -67,7 +62,7 @@ ...@@ -67,7 +62,7 @@
</div> </div>
<div class="leftcontent-buttons"> <div class="leftcontent-buttons">
<div class="leftcontent-buttons-next"> <div class="leftcontent-buttons-next">
<button id="btnSave" type="button" class="btn btn-secondary">Weiter</button> <button id="btnContinue" type="button" class="btn btn-secondary">Weiter</button>
</div> </div>
</div> </div>
</div> </div>
......
gemeinsamforschen/src/main/webapp/pages/project-student.jsp
+ 7
− 7
View file @ 52cce980
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.1.0/css/all.css" integrity="sha384-lKuwvrZot6UHsBSfcMvOkWwlCMgc0TaWr+30HWe3a4ltaBwTZhyTEggF5tJv8tbt" crossorigin="anonymous"> <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.1.0/css/all.css" integrity="sha384-lKuwvrZot6UHsBSfcMvOkWwlCMgc0TaWr+30HWe3a4ltaBwTZhyTEggF5tJv8tbt" crossorigin="anonymous">
<script src="../assets/js/utility.js"></script> <script src="../assets/js/utility.js"></script>
<script src="../assets/js/viewfeedback.js"></script> <script src="../assets/js/viewfeedback.js"></script>
<script src="../assets/js/givefeedback.js"></script> <script src="../assets/js/project-student.js"></script>
</head> </head>
<body> <body>
...@@ -63,12 +63,12 @@ ...@@ -63,12 +63,12 @@
<hr> <hr>
<ul> <ul>
<li><a role="button" onclick="getUserTokenFromUrl()" > <li><a class="givefeedback" role="button">
Projektuebersicht hochgeladen Projektuebersicht hochgeladen
<i class="far fa-comments"></i> <i class="far fa-comments"></i>
</a> </a>
</li> </li>
<li><a role="button" onclick="getUserTokenFromUrl()"> <li><a class="givefeedback" role="button">
Blumen ins Hausaufgabenheft geklebt Blumen ins Hausaufgabenheft geklebt
<i class="far fa-comments"></i> <i class="far fa-comments"></i>
</a> </a>
...@@ -84,15 +84,15 @@ ...@@ -84,15 +84,15 @@
<a href="#">student2@uni.de</a> <a href="#">student2@uni.de</a>
<hr> <hr>
<ul> <ul>
<li><a id="givefeedback" role="button"> <li><a class="givefeedback" role="button">
feedback zu Herbarium im Hausaufgabenheft gegeben feedback zu Herbarium im Hausaufgabenheft gegeben
<i class="far fa-comments"></i> <i class="far fa-comments"></i>
</a></li> </a></li>
<li><a id="givefeedback" role="button"> <li><a class="givefeedback" role="button">
Blumen an Vegetarier verfuettert Blumen an Vegetarier verfuettert
<i class="far fa-comments"></i> <i class="far fa-comments"></i>
</a></li> </a></li>
<li><a id="givefeedback" role="button"> <li><a class="givefeedback" role="button">
Die armen Vegetarier Die armen Vegetarier
<i class="far fa-comments"></i> <i class="far fa-comments"></i>
</a></li> </a></li>
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
<a href="#">student3@uni.de</a> <a href="#">student3@uni.de</a>
<hr> <hr>
<ul> <ul>
<li><a id="givefeedback" role="button"> <li><a class="givefeedback" role="button">
Viva la Floristika Viva la Floristika
<i class="far fa-comments"></i> <i class="far fa-comments"></i>
</a> </a>
......
gemeinsamforschen/src/scripts/dbschema/fltrail.sql
+ 11
− 0
View file @ 52cce980
...@@ -61,6 +61,17 @@ CREATE TABLE if not exists projectuser ...@@ -61,6 +61,17 @@ CREATE TABLE if not exists projectuser
ENGINE = InnoDB ENGINE = InnoDB
DEFAULT CHARSET = utf8; DEFAULT CHARSET = utf8;
CREATE TABLE `annotations` (
`id` varchar(120) NOT NULL,
`timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
`userId` int(11) DEFAULT NULL,
`targetId` int(11) DEFAULT NULL,
`body` varchar(280) DEFAULT NULL,
`startCharacter` int(11) DEFAULT NULL,
`endCharacter` int(11) DEFAULT NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
alter table users alter table users
add isStudent tinyint(1) default '1' null; add isStudent tinyint(1) default '1' null;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment