diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/IJournal.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/IJournal.java index 6630d9f81ed28bcd5ecb4e3a9aeee9ecf795d37f..1750b873a33a184cee3e9a1b911ab48ea53c4762 100644 --- a/gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/IJournal.java +++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/IJournal.java @@ -5,6 +5,7 @@ import unipotsdam.gf.core.management.project.Project; import unipotsdam.gf.core.management.user.User; import unipotsdam.gf.assignments.NotImplementedLogger; import unipotsdam.gf.modules.assessment.controller.model.StudentIdentifier; +import unipotsdam.gf.modules.journal.model.EPorfolio; import unipotsdam.gf.modules.journal.model.Journal; import unipotsdam.gf.modules.researchreport.ResearchReport; @@ -53,13 +54,15 @@ public interface IJournal { * @param finalResearchReport * @param presentation */ + void uploadFinalPortfolio(Project project, List<Journal> journalEntries, ResearchReport finalResearchReport, File presentation, User user) ; /** - * + * Gets EPortfolio for assesment * @param project - * @return + * @return EPortfolio (containing Report, ProjectDescription and Journal) */ - HTML getFinalPortfolioForAssessment(Project project, User user) ; + + EPorfolio getFinalPortfolioForAssessment(Project project, User user) ; } diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/DummyJournalImpl.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/DummyJournalImpl.java index 6ea1ea3526226d625dc486eb4d9ca57841c2a519..50da0c81b96dd2a5501eab940ce84682ac2d72c8 100644 --- a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/DummyJournalImpl.java +++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/DummyJournalImpl.java @@ -8,6 +8,7 @@ import unipotsdam.gf.assignments.Assignee; import unipotsdam.gf.assignments.NotImplementedLogger; import unipotsdam.gf.interfaces.IJournal; import unipotsdam.gf.modules.assessment.controller.model.StudentIdentifier; +import unipotsdam.gf.modules.journal.model.EPorfolio; import unipotsdam.gf.modules.journal.model.Journal; import unipotsdam.gf.modules.researchreport.ResearchReport; @@ -50,7 +51,7 @@ public class DummyJournalImpl implements IJournal { } @Override - public HTML getFinalPortfolioForAssessment( + public EPorfolio getFinalPortfolioForAssessment( Project project, User user) { NotImplementedLogger.logAssignment(Assignee.THOMAS, IJournal.class); return null; diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/model/EPorfolio.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/model/EPorfolio.java new file mode 100644 index 0000000000000000000000000000000000000000..1377afb417a9b58a14ef68d4c0524daf2aa63f9a --- /dev/null +++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/model/EPorfolio.java @@ -0,0 +1,63 @@ +package unipotsdam.gf.modules.journal.model; + +import unipotsdam.gf.modules.assessment.controller.model.StudentIdentifier; +import unipotsdam.gf.modules.researchreport.ResearchReport; + +import java.util.ArrayList; + +/** + * Class for passing e-portfolio to assessment + */ + +public class EPorfolio { + + StudentIdentifier student; + ProjectDescription descrition; + ArrayList<Journal> journals; + ResearchReport report; + //TODO mehr? + + + public EPorfolio() { + } + + public EPorfolio(StudentIdentifier student, ProjectDescription descrition, ArrayList<Journal> journals, ResearchReport report) { + this.student = student; + this.descrition = descrition; + this.journals = journals; + this.report = report; + } + + public StudentIdentifier getStudent() { + return student; + } + + public void setStudent(StudentIdentifier student) { + this.student = student; + } + + public ProjectDescription getDescrition() { + return descrition; + } + + public void setDescrition(ProjectDescription descrition) { + this.descrition = descrition; + } + + public ArrayList<Journal> getJournals() { + return journals; + } + + public void setJournals(ArrayList<Journal> journals) { + this.journals = journals; + } + + public ResearchReport getReport() { + return report; + } + + public void setReport(ResearchReport report) { + this.report = report; + } + +} diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/service/IJournalImpl.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/service/IJournalImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..15ca144ac8807f6b12522242395d571b0118e99e --- /dev/null +++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/service/IJournalImpl.java @@ -0,0 +1,69 @@ +package unipotsdam.gf.modules.journal.service; + +import unipotsdam.gf.core.management.project.Project; +import unipotsdam.gf.core.management.user.User; +import unipotsdam.gf.interfaces.IJournal; +import unipotsdam.gf.modules.assessment.controller.model.StudentIdentifier; +import unipotsdam.gf.modules.journal.model.EPorfolio; +import unipotsdam.gf.modules.journal.model.Journal; +import unipotsdam.gf.modules.researchreport.ResearchReport; + +import javax.swing.text.html.HTML; +import java.io.File; +import java.util.ArrayList; +import java.util.List; + +public class IJournalImpl implements IJournal { + + JournalService journalService = new JournalServiceImpl(); + ProjectDescriptionService descriptionService = new ProjectDescriptionImpl(); + + @Override + public String exportJournal(StudentIdentifier student) { + return null; + } + + @Override + public Boolean getPortfoliosForEvaluationPrepared(Project project) { + //Teilnehmer suchen + + //Hat jeder Teilnehmer ein geschlossenenes Portfolio + + //Hat jeder die nötigen Journal + + return null; + } + + @Override + public void assignMissingPortfolioTasks(Project project) { + //Teilnehmer suchen + + //Hat jeder Teilnehmer ein geschlossenenes Portfolio + + //Hat jeder die nötigen Journal + + } + + @Override + public void uploadJournalEntry(Journal journalEntry, User student) { + + } + + @Override + public void uploadFinalPortfolio(Project project, List<Journal> journalEntries, ResearchReport finalResearchReport, File presentation, User user) { + + } + + @Override + public EPorfolio getFinalPortfolioForAssessment(Project project, User user) { + + EPorfolio result = new EPorfolio(); + StudentIdentifier studentIdentifier = new StudentIdentifier(project.getId(),user.getId()); + + result.setDescrition(descriptionService.getProjectbyStudent(studentIdentifier)); + result.setJournals(journalService.getAllJournals(user.getId(),project.getId())); + //TODO result.setReport(...); + + return result; + } +}