Skip to content
Snippets Groups Projects
Commit 0903dbe4 authored by Christian's avatar Christian
Browse files

Merge remote-tracking branch 'origin/development_master' into development_master

parents 2bfcc2de 8e958114
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 81 additions and 809 deletions
.gitignore
+ 2
− 1
View file @ 0903dbe4
......@@ -19,4 +19,5 @@
**/.classpath
/.idea/vcs.xml
/.idea/workspace.xml
/.idea/workspace.xml
\ No newline at end of file
/.idea/workspace.xml
/.idea/workspace.xml
.idea/workspace.xml deleted 100644 → 0
+ 0
− 752
View file @ 2bfcc2de
This diff is collapsed.
gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/Menu.java
+ 2
− 2
View file @ 0903dbe4
......@@ -8,13 +8,13 @@ import javax.servlet.jsp.JspWriter;
import javax.servlet.jsp.PageContext;
import javax.servlet.jsp.tagext.SimpleTagSupport;
import java.io.IOException;
//todo: isStudent is false for docents. use this for dynamic menus
public class Menu extends SimpleTagSupport {
public void doTag() throws JspException, IOException {
JspWriter out = getJspContext().getOut();
out.println("<div id=\"sidebar-wrapper\">\n" +
" <ul class=\"sidebar-nav\">\n" +
" <li class=\"sidebar-brand\"><a href=\"project-student.jspjsp\">overview</a></li>\n" +
" <li class=\"sidebar-brand\"><a href=\"project-student.jsp\">overview</a></li>\n" +
" <li><a href=\"takeQuiz.jsp\">Quizfrage</a></li>\n" +
" <li><a href=\"#\">ePortfolio</a></li>\n" +
" <li><a href=\"#\">Beitrag</a></li>\n" +
......
gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/IJournal.java
+ 2
− 1
View file @ 0903dbe4
package unipotsdam.gf.interfaces;
import unipotsdam.gf.modules.assessment.controller.StudentIdentifier;
import unipotsdam.gf.modules.assessment.controller.model.StudentIdentifier;
/**
* Interface for learning journal
......
gemeinsamforschen/src/main/webapp/assets/js/assessmentCalculator.js
+ 3
− 1
View file @ 0903dbe4
$(document).ready(function () {
$(document).ready(function () { //todo: paths should be relative
$("#giveItBack").on("click", function () {
$.ajax({
url: "http://localhost:8080/gemeinsamforschen/rest/assessments/total/project/" + "gemeinsamForschen" + "/student/" + "Bela",
type: 'GET',
success: function (data) {
alert("here is the TotalPerformance: " + data);
location.href="http://localhost:8080/gemeinsamforschen/pages/project-student.jsp?token="+getUserTokenFromUrl();
},
error: function (a, b, c) {
alert('some error' + a);
......
gemeinsamforschen/src/main/webapp/pages/assessmentCalculator.jsp
+ 2
− 1
View file @ 0903dbe4
......@@ -3,10 +3,11 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta charset="utf-8">
<title>assessment calculator</title>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
<script src="../assets/js/assessmentCalculator.js"></script>
<script src="../assets/js/utility.js"></script>
</head>
<body>
<button id="calculateNow">Post Performance</button>
......
gemeinsamforschen/src/scripts/dbschema/fltrail.sql
+ 70
− 51
View file @ 0903dbe4
SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO";
SET time_zone = "+00:00";
CREATE DATABASE IF NOT EXISTS `fltrail`
DEFAULT CHARACTER SET utf8
COLLATE utf8_general_ci;
USE `fltrail`;
/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
/*!40101 SET NAMES utf8mb4 */;
CREATE TABLE if not exists `projects` (
`id` varchar(400) NOT NULL,
`password` varchar(400) NOT NULL,
`active` tinyint(1) NOT NULL,
`timecreated` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
ON UPDATE CURRENT_TIMESTAMP,
`author` varchar(400) NOT NULL,
`adminPassword` varchar(400) NOT NULL,
`token` varchar(400) NOT NULL
)
ENGINE = InnoDB
DEFAULT CHARSET = utf8;
CREATE DATABASE IF NOT EXISTS `fltrail` DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;
USE `fltrail`;
CREATE TABLE if not exists `groups` (
`id` int NOT NULL AUTO_INCREMENT,
`projectId` varchar(400) NOT NULL,
`chatRoomId` varchar(400) NOT NULL,
PRIMARY KEY (id)
)
ENGINE = InnoDB
DEFAULT CHARSET = utf8;
CREATE TABLE `projects` (
`id` varchar(400) NOT NULL,
`password` varchar(400) NOT NULL,
`activ` tinyint(1) NOT NULL,
`timecreated` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
`author` varchar(400) NOT NULL,
`adminpassword` varchar(400) NOT NULL,
`token` varchar(400) NOT NULL
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
CREATE TABLE `tags` (
`projectId` varchar(400) NOT NULL,
`tag` varchar(400) NOT NULL
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
CREATE TABLE `users` (
`name` varchar(400) NOT NULL,
`password` varchar(200) NOT NULL,
`email` varchar(400) NOT NULL,
`token` varchar(800) NOT NULL
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
CREATE TABLE projectuser
(
projectId varchar(400) NOT NULL,
userId varchar(400) NOT NULL
) ENGINE=InnoDB 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;
CREATE TABLE if not exists groupuser
(
userEmail varchar(400) NOT NULL,
groupId int NOT NULL
)
ENGINE = InnoDB
DEFAULT CHARSET = utf8;
alter table users
add isStudent tinyint(1) default '1' null;
CREATE TABLE if not exists `tags` (
`projectId` varchar(400) NOT NULL,
`tag` varchar(400) NOT NULL
)
ENGINE = InnoDB
DEFAULT CHARSET = utf8;
CREATE TABLE if not exists `users` (
`name` varchar(400) NOT NULL,
`password` varchar(200) NOT NULL,
`email` varchar(255) NOT NULL,
`token` varchar(800) NOT NULL,
`rocketChatId` varchar(400) NOT NULL,
`rocketChatAuthToken` varchar(800) NOT NULL,
UNIQUE (email)
)
ENGINE = InnoDB
DEFAULT CHARSET = utf8;
CREATE TABLE if not exists projectuser
(
projectId varchar(400) NOT NULL,
userId varchar(400) NOT NULL
)
ENGINE = InnoDB
DEFAULT CHARSET = utf8;
CREATE TABLE if not exists `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;
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
alter table users
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