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

teacherTask and update tasks

parent e46d4a2a
No related branches found
No related tags found
No related merge requests found
...@@ -197,7 +197,10 @@ public class TaskDAO { ...@@ -197,7 +197,10 @@ public class TaskDAO {
connect.connect(); connect.connect();
String query = String query =
"INSERT INTO fltrail.tasks (userEmail, projectName, taskName, " + "groupTask, importance, progress, phase, created, due, taskMode, taskMode2, taskMode3) " + "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"; "INSERT IGNORE INTO fltrail.tasks (userEmail, projectName, taskName, " +
"groupTask, importance, progress, phase, created, due, " +
"taskMode, taskMode2, taskMode3)" +
"VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
if (task.getTaskType() == null || task.getTaskType().length == 0) { if (task.getTaskType() == null || task.getTaskType().length == 0) {
try { try {
......
...@@ -128,9 +128,9 @@ CREATE TABLE `tags` ( ...@@ -128,9 +128,9 @@ CREATE TABLE `tags` (
) ENGINE=InnoDB DEFAULT CHARSET=utf8; ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
CREATE TABLE `tasks` ( CREATE TABLE `tasks` (
`userEmail` varchar(400) NOT NULL, `userEmail` varchar(100) NOT NULL,
`projectName` varchar(400) NOT NULL, `projectName` varchar(200) NOT NULL,
`taskName` varchar(400) DEFAULT NULL, `taskName` varchar(100) DEFAULT NULL,
`groupTask` tinyint(4) DEFAULT NULL, `groupTask` tinyint(4) DEFAULT NULL,
`importance` varchar(100) DEFAULT NULL, `importance` varchar(100) DEFAULT NULL,
`progress` varchar(100) DEFAULT NULL, `progress` varchar(100) DEFAULT NULL,
...@@ -172,6 +172,9 @@ ALTER TABLE `fullsubmissions` ...@@ -172,6 +172,9 @@ ALTER TABLE `fullsubmissions`
ALTER TABLE `groups` ALTER TABLE `groups`
ADD PRIMARY KEY (`id`); ADD PRIMARY KEY (`id`);
ALTER TABLE `tasks`
ADD PRIMARY KEY (`id`);
ALTER TABLE `groupuser` ALTER TABLE `groupuser`
ADD KEY `userEmail` (`userEmail`), ADD KEY `userEmail` (`userEmail`),
ADD KEY `groupId` (`groupId`); ADD KEY `groupId` (`groupId`);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment