diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/config/GFApplicationBinder.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/config/GFApplicationBinder.java
index 6ffde6e89fef8ca74e399b2a63461e2feb9e6c0c..e81dba7f42a13d78c672f2bf4fc73faa327ec64c 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/config/GFApplicationBinder.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/config/GFApplicationBinder.java
@@ -7,16 +7,11 @@ import unipotsdam.gf.core.states.PhasesImpl;
import unipotsdam.gf.core.testsandbox.TestList;
import unipotsdam.gf.core.testsandbox.TestListInterface;
import unipotsdam.gf.interfaces.*;
-import unipotsdam.gf.modules.assessment.controller.service.PeerAssessment;
import unipotsdam.gf.modules.assessment.controller.service.PeerAssessmentDummy;
import unipotsdam.gf.modules.communication.service.CommunicationDummyService;
import unipotsdam.gf.modules.groupfinding.DummyGroupfinding;
-import unipotsdam.gf.modules.journal.DummyJournalImpl;
-import unipotsdam.gf.modules.journal.model.Journal;
-import unipotsdam.gf.modules.journal.service.DummyJournalService;
import unipotsdam.gf.modules.peer2peerfeedback.DummyFeedback;
import unipotsdam.gf.modules.researchreport.DummyResearchReportManagement;
-import unipotsdam.gf.modules.researchreport.ResearchReport;
import unipotsdam.gf.modules.researchreport.ResearchReportManagement;
public class GFApplicationBinder extends AbstractBinder {
@@ -29,7 +24,6 @@ public class GFApplicationBinder extends AbstractBinder {
bind(CommunicationDummyService.class).to(ICommunication.class);
bind(ManagementImpl.class).to(Management.class);
bind(DummyFeedback.class).to(Feedback.class);
- bind(DummyJournalImpl.class).to(IJournal.class);
bind(PeerAssessmentDummy.class).to(IPeerAssessment.class);
bind(PhasesImpl.class).to(IPhases.class);
bind(ManagementImpl.class).to(Management.class);
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/config/GFDatabaseConfig.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/config/GFDatabaseConfig.java
index cefe2e289c2727db459f27dc5606aa0ceb9f9d6b..252905102d2472eaa125f06499bbdfe1663ea254 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/config/GFDatabaseConfig.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/config/GFDatabaseConfig.java
@@ -7,7 +7,7 @@ public class GFDatabaseConfig {
public static final String JDBC_DRIVER = "com.mysql.jdbc.Driver";
public static final String DB_URL = "jdbc:mysql://localhost";
// Database credentials
- public static final String USER = "root2";
- public static final String PASS = "voyager2";
+ public static final String USER = "root";
+ public static final String PASS = "";
public static final String DB_NAME = "fltrail";
}
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/model/Journal.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/model/Journal.java
index 87d775b8873508d183b0aab58962b95c9f616f1f..499c53d55036a3618d391d74052d0524c1d3be19 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/model/Journal.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/model/Journal.java
@@ -1,12 +1,12 @@
package unipotsdam.gf.modules.journal.model;
-import unipotsdam.gf.core.management.utils.Category;
import unipotsdam.gf.modules.assessment.controller.model.StudentIdentifier;
+import unipotsdam.gf.modules.peer2peerfeedback.Category;
import java.util.Date;
-import static unipotsdam.gf.core.management.utils.MarkdownUtils.convertMarkdownToHtml;
+import static unipotsdam.gf.view.MarkdownUtils.convertMarkdownToHtml;
/**
* Model Class for the learnig journal of the e-portfolio
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/model/ProjectDescriptionDAO.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/model/ProjectDescriptionDAO.java
deleted file mode 100644
index b0d5959864f404ae80e5cc06741dcd3201fe775b..0000000000000000000000000000000000000000
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/model/ProjectDescriptionDAO.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package unipotsdam.gf.modules.journal.model;
-
-public interface ProjectDescriptionDAO {
-
- void createDescription(ProjectDescription projectDescription);
- void updateDescription(ProjectDescription projectDescription);
- ProjectDescription getDescription(String projectDescription);
- void deleteDescription(String projectDescription);
- void closeDescription(String projectDescription);
-}
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/model/JournalDAO.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/model/dao/JournalDAO.java
similarity index 72%
rename from gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/model/JournalDAO.java
rename to gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/model/dao/JournalDAO.java
index 81074a2d9abb40237c0e1cda6451e033b07c227a..f9ff960168c8515ae8c188aa2e3d87bb85d74be6 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/model/JournalDAO.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/model/dao/JournalDAO.java
@@ -1,4 +1,7 @@
-package unipotsdam.gf.modules.journal.model;
+package unipotsdam.gf.modules.journal.model.dao;
+
+import unipotsdam.gf.modules.journal.model.Journal;
+import unipotsdam.gf.modules.journal.model.JournalFilter;
import java.util.ArrayList;
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/model/JournalDAOImpl.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/model/dao/JournalDAOImpl.java
similarity index 97%
rename from gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/model/JournalDAOImpl.java
rename to gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/model/dao/JournalDAOImpl.java
index 37a897debce25e528c736736d3e40bed0fb8c4aa..1c5ce831a639be436e37f2cbc7dce58bd1eebc34 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/model/JournalDAOImpl.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/model/dao/JournalDAOImpl.java
@@ -1,8 +1,10 @@
-package unipotsdam.gf.modules.journal.model;
+package unipotsdam.gf.modules.journal.model.dao;
import unipotsdam.gf.core.database.mysql.MysqlConnect;
import unipotsdam.gf.core.database.mysql.VereinfachtesResultSet;
import unipotsdam.gf.modules.assessment.controller.model.StudentIdentifier;
+import unipotsdam.gf.modules.journal.model.Journal;
+import unipotsdam.gf.modules.journal.model.JournalFilter;
import unipotsdam.gf.modules.journal.util.JournalUtils;
import java.util.ArrayList;
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/model/LinkDAO.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/model/dao/LinkDAO.java
similarity index 68%
rename from gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/model/LinkDAO.java
rename to gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/model/dao/LinkDAO.java
index eef4eeccb3f2799539bbf105138304d60b2fafff..be43ba44bf7706b582fdfdd2f07d460ab94c13bd 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/model/LinkDAO.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/model/dao/LinkDAO.java
@@ -1,4 +1,6 @@
-package unipotsdam.gf.modules.journal.model;
+package unipotsdam.gf.modules.journal.model.dao;
+
+import unipotsdam.gf.modules.journal.model.Link;
import java.util.ArrayList;
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/model/LinkDAOImpl.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/model/dao/LinkDAOImpl.java
similarity index 96%
rename from gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/model/LinkDAOImpl.java
rename to gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/model/dao/LinkDAOImpl.java
index 189607a873ddf7a3c7266811ae9ce7b73113871d..704af8d7aa725517322ea40f5a9fae77a86ef59d 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/model/LinkDAOImpl.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/model/dao/LinkDAOImpl.java
@@ -1,7 +1,8 @@
-package unipotsdam.gf.modules.journal.model;
+package unipotsdam.gf.modules.journal.model.dao;
import unipotsdam.gf.core.database.mysql.MysqlConnect;
import unipotsdam.gf.core.database.mysql.VereinfachtesResultSet;
+import unipotsdam.gf.modules.journal.model.Link;
import unipotsdam.gf.modules.journal.util.JournalUtils;
import java.util.ArrayList;
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/model/dao/ProjectDescriptionDAO.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/model/dao/ProjectDescriptionDAO.java
new file mode 100644
index 0000000000000000000000000000000000000000..ca6eba6df6be8623af892b5738188acf08ac5804
--- /dev/null
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/model/dao/ProjectDescriptionDAO.java
@@ -0,0 +1,13 @@
+package unipotsdam.gf.modules.journal.model.dao;
+
+import unipotsdam.gf.modules.assessment.controller.model.StudentIdentifier;
+import unipotsdam.gf.modules.journal.model.ProjectDescription;
+
+public interface ProjectDescriptionDAO {
+
+ void createDescription(ProjectDescription projectDescription);
+ void updateDescription(ProjectDescription projectDescription);
+ ProjectDescription getDescription(StudentIdentifier projectDescription);
+ void deleteDescription(StudentIdentifier projectDescription);
+ void closeDescription(String projectDescriptionId);
+}
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/model/ProjectDescriptionDAOImpl.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/model/dao/ProjectDescriptionDAOImpl.java
similarity index 78%
rename from gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/model/ProjectDescriptionDAOImpl.java
rename to gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/model/dao/ProjectDescriptionDAOImpl.java
index 6089ec8d84a8a1ca5ebe5f7bcfa28921b6eee534..3aa876f555ef8447638342f3e187c79def664768 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/model/ProjectDescriptionDAOImpl.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/model/dao/ProjectDescriptionDAOImpl.java
@@ -1,12 +1,14 @@
-package unipotsdam.gf.modules.journal.model;
+package unipotsdam.gf.modules.journal.model.dao;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import unipotsdam.gf.core.database.mysql.MysqlConnect;
import unipotsdam.gf.core.database.mysql.VereinfachtesResultSet;
+import unipotsdam.gf.modules.assessment.controller.model.StudentIdentifier;
+import unipotsdam.gf.modules.journal.model.ProjectDescription;
import unipotsdam.gf.modules.journal.util.JournalUtils;
-import unipotsdam.gf.modules.journal.view.ProjectDescriptionView;
+import java.util.ArrayList;
import java.util.UUID;
public class ProjectDescriptionDAOImpl implements ProjectDescriptionDAO {
@@ -50,14 +52,14 @@ public class ProjectDescriptionDAOImpl implements ProjectDescriptionDAO {
}
@Override
- public ProjectDescription getDescription(String projectDescription) {
+ public ProjectDescription getDescription(StudentIdentifier studentIdentifier) {
// establish connection
MysqlConnect connection = new MysqlConnect();
connection.connect();
// build and execute request
- String request = "SELECT * FROM projectdescription WHERE id = ?;";
- VereinfachtesResultSet rs = connection.issueSelectStatement(request, projectDescription);
+ String request = "SELECT * FROM projectdescription WHERE author = ? AND project = ?;";
+ VereinfachtesResultSet rs = connection.issueSelectStatement(request, studentIdentifier.getStudentId(),studentIdentifier.getProjectId());
if (rs.next()) {
@@ -78,14 +80,14 @@ public class ProjectDescriptionDAOImpl implements ProjectDescriptionDAO {
}
@Override
- public void deleteDescription(String projectDescription) {
+ public void deleteDescription(StudentIdentifier studentIdentifier) {
// establish connection
MysqlConnect connection = new MysqlConnect();
connection.connect();
// build and execute request
- String request = "DELETE FROM projectdescription WHERE id = ?;";
- connection.issueInsertOrDeleteStatement(request, projectDescription);
+ String request = "DELETE FROM projectdescription WHERE WHERE author = ? AND project = ?;";
+ connection.issueInsertOrDeleteStatement(request, studentIdentifier.getStudentId(),studentIdentifier.getProjectId());
// close connection
connection.close();
@@ -94,14 +96,14 @@ public class ProjectDescriptionDAOImpl implements ProjectDescriptionDAO {
}
@Override
- public void closeDescription(String projectDescription) {
+ public void closeDescription(String id) {
// establish connection
MysqlConnect connection = new MysqlConnect();
connection.connect();
// build and execute request
String request = "UPDATE projectdescription SET open=? WHERE id = ?";
- connection.issueUpdateStatement(request, false, projectDescription);
+ connection.issueUpdateStatement(request, false, id);
//close connection
connection.close();
@@ -115,7 +117,7 @@ public class ProjectDescriptionDAOImpl implements ProjectDescriptionDAO {
String text = rs.getString("text");
String open = rs.getString("open");
- return null;
+ return new ProjectDescription(id,author,text,project,new ArrayList<>(),new ArrayList<>(),timestamp);
}
}
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/service/JournalServiceImpl.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/service/JournalServiceImpl.java
index aa18b98ec86a9de873996cc7870897db802a1abe..47a89fb45d159b80d9fa548b02895fc355fdf904 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/service/JournalServiceImpl.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/service/JournalServiceImpl.java
@@ -4,6 +4,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import unipotsdam.gf.modules.assessment.controller.model.StudentIdentifier;
import unipotsdam.gf.modules.journal.model.*;
+import unipotsdam.gf.modules.journal.model.dao.JournalDAO;
+import unipotsdam.gf.modules.journal.model.dao.JournalDAOImpl;
import unipotsdam.gf.modules.journal.util.JournalUtils;
import java.util.ArrayList;
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/service/ProjectDescriptionImpl.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/service/ProjectDescriptionImpl.java
index 7ec02b481f00bc0834a011bb0449bb7dfe3c600d..e82c0fdc13c32ca43f6831cc5e061c5fe9d539f5 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/service/ProjectDescriptionImpl.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/service/ProjectDescriptionImpl.java
@@ -1,6 +1,13 @@
package unipotsdam.gf.modules.journal.service;
+import unipotsdam.gf.modules.assessment.controller.model.StudentIdentifier;
import unipotsdam.gf.modules.journal.model.*;
+import unipotsdam.gf.modules.journal.model.dao.LinkDAO;
+import unipotsdam.gf.modules.journal.model.dao.LinkDAOImpl;
+import unipotsdam.gf.modules.journal.model.dao.ProjectDescriptionDAO;
+import unipotsdam.gf.modules.journal.model.dao.ProjectDescriptionDAOImpl;
+
+import java.util.Date;
public class ProjectDescriptionImpl implements ProjectDescriptionService {
@@ -8,15 +15,23 @@ public class ProjectDescriptionImpl implements ProjectDescriptionService {
LinkDAO linkDAO = new LinkDAOImpl();
@Override
- public ProjectDescription getProject(String project) {
+ public ProjectDescription getProject(StudentIdentifier studentIdentifier) {
+
+ //if no description exists, create a new
+ if(descriptionDAO.getDescription(studentIdentifier)==null){
+ //TODO richtige Daten, standartwerte über config?
+ ProjectDescription description = new ProjectDescription("0", studentIdentifier.getStudentId(), "Hier soll ein Turtorialtext stehen", studentIdentifier.getProjectId(), null, null, new Date().getTime());
+ descriptionDAO.createDescription(description);
+ }
+
+ return descriptionDAO.getDescription(studentIdentifier);
- return descriptionDAO.getDescription(project);
}
@Override
- public void saveProjectText(String project, String text) {
+ public void saveProjectText(StudentIdentifier studentIdentifier, String text) {
- ProjectDescription desc = getProject(project);
+ ProjectDescription desc = getProject(studentIdentifier);
desc.setDescription(text);
descriptionDAO.updateDescription(desc);
}
@@ -33,7 +48,7 @@ public class ProjectDescriptionImpl implements ProjectDescriptionService {
}
@Override
- public void closeDescription(String desc) {
- descriptionDAO.closeDescription(desc);
+ public void closeDescription(String projectDescrID) {
+ descriptionDAO.closeDescription(projectDescrID);
}
}
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/service/ProjectDescriptionService.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/service/ProjectDescriptionService.java
index a58f836c192b8d4fe15f07dceaa1a56e0337b45e..27f61533f11190ad25edc721439087ecb9ddf9bb 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/service/ProjectDescriptionService.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/service/ProjectDescriptionService.java
@@ -1,5 +1,6 @@
package unipotsdam.gf.modules.journal.service;
+import unipotsdam.gf.modules.assessment.controller.model.StudentIdentifier;
import unipotsdam.gf.modules.journal.model.ProjectDescription;
/**
@@ -9,13 +10,13 @@ import unipotsdam.gf.modules.journal.model.ProjectDescription;
public interface ProjectDescriptionService {
- ProjectDescription getProject(String project);
+ ProjectDescription getProject(StudentIdentifier studentIdentifier);
- void saveProjectText(String project, String text);
+ void saveProjectText(StudentIdentifier studentIdentifier, String text);
void addLink(String project, String link, String name);
void deleteLink(String link);
- void closeDescription(String project);
+ void closeDescription(String projectDescriptionId);
}
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/util/JournalUtils.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/util/JournalUtils.java
index 6000fb286ab51fc899e8d6463435c4073cd19a28..d38cf359ae62c553574bce825ea6b17abce99118 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/util/JournalUtils.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/util/JournalUtils.java
@@ -4,8 +4,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import unipotsdam.gf.core.database.mysql.MysqlConnect;
import unipotsdam.gf.core.database.mysql.VereinfachtesResultSet;
-import unipotsdam.gf.core.management.utils.Category;
import unipotsdam.gf.modules.journal.model.Visibility;
+import unipotsdam.gf.modules.peer2peerfeedback.Category;
/**
* Utility class for Journal and Project description
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/view/JournalView.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/view/JournalView.java
index e1f597c1d6cd07445fdac13fa4aae73eaf92a9fe..7613b8f3eaee08194c78eb5bd9b2e20ab7e4caea 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/view/JournalView.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/view/JournalView.java
@@ -139,7 +139,7 @@ public class JournalView {
journalService.closeJournal(journal);
//TODO token
try {
- URI location = new URI("../pages/eportfolio.jsp?token=test");
+ URI location = new URI("../pages/eportfolio.jsp?token=0");
log.debug("<<< closeJournal: redirect to " +location.toString());
return Response.temporaryRedirect(location).build();
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/view/ProjectDescriptionView.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/view/ProjectDescriptionView.java
index fd4db2c127d63cad96c921d572d1fb4470c01f39..7d8e53586914172f0aefa0d74307b3bfdfa9db81 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/view/ProjectDescriptionView.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/view/ProjectDescriptionView.java
@@ -2,6 +2,7 @@ package unipotsdam.gf.modules.journal.view;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import unipotsdam.gf.modules.assessment.controller.model.StudentIdentifier;
import unipotsdam.gf.modules.journal.model.ProjectDescription;
import unipotsdam.gf.modules.journal.service.ProjectDescriptionImpl;
import unipotsdam.gf.modules.journal.service.ProjectDescriptionService;
@@ -27,11 +28,11 @@ public class ProjectDescriptionView {
//get Description
@GET
@Produces(MediaType.APPLICATION_JSON)
- @Path("{project}")
- public Response getProjectDescription(@PathParam("project") String project){
- log.debug(">>> getProjectDescription: " + project);
+ @Path("{project}/{student}")
+ public Response getProjectDescription(@PathParam("project") String project, @PathParam("student") String student){
+ log.debug(">>> getProjectDescription: " + project + "/" + student);
- ProjectDescription result = descriptionService.getProject(project);
+ ProjectDescription result = descriptionService.getProject(new StudentIdentifier(project,student));
log.debug(">>> getProjectDescription");
return Response.ok(result).build();
@@ -45,11 +46,11 @@ public class ProjectDescriptionView {
public Response saveProjectText(@FormParam("student")String student,@FormParam("project")String project,@FormParam("text")String text){
log.debug(">>> saveText: " + text);
- descriptionService.saveProjectText("0",text);
+ descriptionService.saveProjectText(new StudentIdentifier(project,student),text);
//TODO token
try {
- URI location = new URI("../pages/eportfolio.jsp?token=test");
+ URI location = new URI("../pages/eportfolio.jsp?token=0");
log.debug("<<< saveText: redirect to " +location.toString());
return Response.temporaryRedirect(location).build();
diff --git a/gemeinsamforschen/src/main/webapp/assets/css/e-portfolio.css b/gemeinsamforschen/src/main/webapp/assets/css/e-portfolio.css
index c987b53b4701008b110f05cfe674ae9fc5d02f15..eaf72ed574d05d1b2f3f77784f42e01966a24803 100644
--- a/gemeinsamforschen/src/main/webapp/assets/css/e-portfolio.css
+++ b/gemeinsamforschen/src/main/webapp/assets/css/e-portfolio.css
@@ -3,7 +3,7 @@
grid-gap: 10px;
grid-template-columns: 2fr 1fr 15%;
grid-template-areas:
- "title edit group"
+ "edit edit group"
"text text links"
"text text ..."
;
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/e-portfolio.js b/gemeinsamforschen/src/main/webapp/assets/js/e-portfolio.js
index 45d3585a26c204af5b3ef7ba57f9d8f7b4bc1ebf..038ecf65b0a3436cb919a0601efb4ca5685ef9bb 100644
--- a/gemeinsamforschen/src/main/webapp/assets/js/e-portfolio.js
+++ b/gemeinsamforschen/src/main/webapp/assets/js/e-portfolio.js
@@ -1,5 +1,6 @@
//TODO Get student and project form context
+
$(document).ready(function() {
$('#editDescriptionLink').on('click', function () {
/*TODO getJournal*/
@@ -11,10 +12,9 @@ $(document).ready(function() {
});
$.ajax({
- url: "../rest/projectdescription/test"
+ url: "../rest/projectdescription/0"
}).then(function(data) {
console.log("desc: " + data);
- $('.journal-description-title').append('<h2>' + data.name + '</h2>');
$('.journal-description-text').append(data.descriptionHTML);
for(var link in data.links){
$('.journal-description-links').append('<button class="btn btn-default btn-xs" onclick=\'linkLoeschen("'+link+'")\'> <i class="fa fa-trash" aria-hidden="true" ></i></button><a href=\' + data.links[link] + \'>' + link + '</a> <br/>');
diff --git a/gemeinsamforschen/src/main/webapp/pages/createJournal.jsp b/gemeinsamforschen/src/main/webapp/pages/createJournal.jsp
index 2f3243e1c6621ab32cfa2735a015139805c80871..096a96145b854de8778c48de717fa53fd088a838 100644
--- a/gemeinsamforschen/src/main/webapp/pages/createJournal.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/createJournal.jsp
@@ -79,8 +79,7 @@
<div class="journal-form-editor">
- <textarea id="editor" name="text" form="journalform">
- </textarea>
+ <textarea id="editor" name="text" form="journalform"></textarea>
</div>
<div class="journal-form-buttons">
diff --git a/gemeinsamforschen/src/main/webapp/pages/editDescription.jsp b/gemeinsamforschen/src/main/webapp/pages/editDescription.jsp
index 1113922a4f20be7a8a92d2d5689be1ded6c64c08..2e40b6946e99e121c3db9d10e262949c8f76331d 100644
--- a/gemeinsamforschen/src/main/webapp/pages/editDescription.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/editDescription.jsp
@@ -51,8 +51,7 @@
<div class="description-form-container">
<div class ="description-form-editor">
- <textarea id = "editor" name="text" form="descriptionform" >
- </textarea>
+ <textarea id = "editor" name="text" form="descriptionform"></textarea>
</div>
<div class="description-form-buttons">