Skip to content
Snippets Groups Projects
Commit 004425d5 authored by Axel's avatar Axel
Browse files

fixed all clickpaths. DummyCourseSql creates Kaleo and gemeinsamForschen

parent 967634ec
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 24 additions and 27 deletions
gemeinsamforschen/src/main/webapp/core/footer.js
+ 3
− 0
View file @ 004425d5
$(document).ready(function(){
$('#btnUnstructuredUpload').click(function () {
location.href="annotation/upload-unstructured-annotation.jsp?token=" + getUserTokenFromUrl() + "&projectId=" + getQueryVariable("projectId");
});
});
gemeinsamforschen/src/main/webapp/core/project-student.js
+ 4
− 8
View file @ 004425d5
......@@ -11,7 +11,7 @@ $(document).ready(function(){
$('.annotationview').click(function () {
let fullSubmissionId = $(this).closest("li").data("fullSubmissionId");
let category = $(this).closest("li").data("category");
location.href="/annotation/annotation-document.jsp?token=" + getUserTokenFromUrl() +
location.href="annotation/annotation-document.jsp?token=" + getUserTokenFromUrl() +
"&projectId=" + getQueryVariable("projectId") +
"&fullSubmissionId=" + fullSubmissionId +
"&category=" + category;
......@@ -30,20 +30,16 @@ $(document).ready(function(){
});
*/
$('.givefeedback').click(function () {
location.href="givefeedback.jsp?token="+getUserTokenFromUrl();
location.href="feedback/give-feedback.jsp?token="+getUserTokenFromUrl();
});
$('.viewfeedback').click(function () {
location.href="viewfeedback.jsp?token="+getUserTokenFromUrl();
location.href="feedback/view-feedback.jsp?token="+getUserTokenFromUrl();
});
$('.annotationview').click(function () {
location.href="annotation-document.jsp?token="+getUserTokenFromUrl();
location.href="annotation/annotation-document.jsp?token="+getUserTokenFromUrl();
});
$('#btnUnstructuredUpload').click(function () {
location.href="/annotation/upload-unstructured-annotation.jsp?token=" + getUserTokenFromUrl() + "&projectId=" + getQueryVariable("projectId");
})
$('.viewprojectstudent').click(function () {
location.href="project-student.jsp?token="+getUserTokenFromUrl();
})
......
gemeinsamforschen/src/main/webapp/core/utility.js
+ 7
− 6
View file @ 004425d5
function changeLocationTo(target) {
let level = $('#hierarchyLevel').html().trim();
let link = calculateHierachy(level) + target;
return link;
}
$(document).ready(function(){
$('#headLineProject').html($('#projectId').html());
$('#logout').click(function(){
......@@ -20,6 +14,13 @@ $(document).ready(function(){
});
});
function changeLocationTo(target) {
let level = $('#hierarchyLevel').html().trim();
let link = calculateHierachy(level) + target;
return link;
}
function goBack() {
window.history.back();
}
......
gemeinsamforschen/src/main/webapp/feedback/give-feedback.jsp
+ 2
− 5
View file @ 004425d5
......@@ -2,6 +2,7 @@
<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="menu" %>
<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="headLine" %>
<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="omniDependencies" %>
<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="footer" %>
<!DOCTYPE html>
<html>
......@@ -135,12 +136,8 @@
</table>
</div>
</div>
<footer:footer/>
</div>
<script src="js/jquery.min.js"></script>
<script src="../assets/bootstrap/js/bootstrap.min.js"></script>
<script src="js/Sidebar-Menu.js"></script>
<script src="js/createJournal.js"></script>
</body>
</html>
\ No newline at end of file
gemeinsamforschen/src/main/webapp/feedback/view-feedback.jsp
+ 4
− 6
View file @ 004425d5
......@@ -2,6 +2,7 @@
<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="menu" %>
<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="headLine" %>
<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="omniDependencies" %>
<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="footer" %>
<!DOCTYPE html>
<html>
......@@ -113,7 +114,7 @@
<div></div>
<div class="media-body">
<div class="media" style="overflow:visible;">
<div><img src="../assets/img/1.jpg" class="mr-3"
<div><img src="../libs/img/1.jpg" class="mr-3"
style="width: 25px; height:25px;"></div>
<div class="media-body" style="overflow:visible;">
<div class="row">
......@@ -135,7 +136,7 @@
<div></div>
<div class="media-body">
<div class="media" style="overflow:visible;">
<div><img src="../assets/img/2.jpg" class="mr-3"
<div><img src="../libs/img/2.jpg" class="mr-3"
style="width: 25px; height:25px;"></div>
<div class="media-body" style="overflow:visible;">
<div class="row">
......@@ -163,11 +164,8 @@
</table>
</div>
</div>
<footer:footer/>
</div>
<script src="js/jquery.min.js"></script>
<script src="../assets/bootstrap/js/bootstrap.min.js"></script>
<script src="js/Sidebar-Menu.js"></script>
</body>
</html>
gemeinsamforschen/src/main/webapp/project-student.jsp
+ 0
− 2
View file @ 004425d5
......@@ -102,8 +102,6 @@
</tr>
</table>
<button onclick="goBack()" class="btn btn-secondary">Zur&uuml;ck</button>
</td>
</tr>
</table>
......
gemeinsamforschen/src/scripts/dbschema/createDummyCourses.sql 0 → 100644
+ 4
− 0
View file @ 004425d5
INSERT INTO `projects` (`id`, `password`, `active`, `timecreated`, `author`, `adminPassword`, `token`, `phase`) VALUES
('Kaleo', 'password', 1, '2018-09-07 12:13:21', 'axel', '1234', '4pingsfelmf4', 'CourseCreation'),
('gemeinsamForschen', 'password', 1, '2018-09-13 08:55:02', 'axel', '1234', '32ptng45g9', 'Execution');
COMMIT;
\ No newline at end of file
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