Skip to content
Snippets Groups Projects
Commit ed5b3c1e authored by Julian Dehne's avatar Julian Dehne
Browse files

references #250

it looks like the task answer questions is not finished for all students
however, you seem to be able to go past the execution phase
parent b272cf9d
No related branches found
No related tags found
No related merge requests found
...@@ -128,6 +128,7 @@ public class ReflectionPhaseSimulation implements IReflectionPhaseSimulation { ...@@ -128,6 +128,7 @@ public class ReflectionPhaseSimulation implements IReflectionPhaseSimulation {
@Override @Override
public void simulateCreatingPortfolioEntries(Project project) throws Exception { public void simulateCreatingPortfolioEntries(Project project) throws Exception {
//if (submissionController.getProjectSubmissions(project, FileRole.PORTFOLIO_ENTRY, ))
simulateSubmissions(project, FileRole.PORTFOLIO_ENTRY, Visibility.GROUP); simulateSubmissions(project, FileRole.PORTFOLIO_ENTRY, Visibility.GROUP);
} }
...@@ -163,20 +164,24 @@ public class ReflectionPhaseSimulation implements IReflectionPhaseSimulation { ...@@ -163,20 +164,24 @@ public class ReflectionPhaseSimulation implements IReflectionPhaseSimulation {
} }
private void simulateSubmissions(Project project, FileRole fileRole, Visibility visibility) throws Exception { private void simulateSubmissions(Project project, FileRole fileRole, Visibility visibility) throws Exception {
List<User> usersByProjectName = userDAO.getUsersByProjectName(project.getName()); if (submissionController.getProjectSubmissions(project, fileRole, visibility).size() < 2) {
for (User user : usersByProjectName) { List<User> usersByProjectName = userDAO.getUsersByProjectName(project.getName());
switch (fileRole) { for (User user : usersByProjectName) {
case PORTFOLIO_ENTRY: switch (fileRole) {
List<FullSubmission> assessableSubmissions = submissionController.getAssessableSubmissions(user, project, fileRole); case PORTFOLIO_ENTRY:
if (CollectionUtils.isEmpty(assessableSubmissions)) { List<FullSubmission> assessableSubmissions =
List<SelectedReflectionQuestion> reflectionQuestions = selectedReflectionQuestionsDAO.findBy(project); submissionController.getAssessableSubmissions(user, project, fileRole);
createEntries(project, user, reflectionQuestions, fileRole, visibility); if (CollectionUtils.isEmpty(assessableSubmissions)) {
} List<SelectedReflectionQuestion> reflectionQuestions = selectedReflectionQuestionsDAO.findBy(project);
break; createEntries(project, user, reflectionQuestions, fileRole, visibility);
case REFLECTION_QUESTION: }
List<SelectedReflectionQuestion> unansweredQuestions = selectedReflectionQuestionsDAO.getUnansweredQuestions(project, user, false); break;
createEntries(project, user, unansweredQuestions, fileRole, visibility); case REFLECTION_QUESTION:
break; List<SelectedReflectionQuestion> unansweredQuestions =
selectedReflectionQuestionsDAO.getUnansweredQuestions(project, user, false);
createEntries(project, user, unansweredQuestions, fileRole, visibility);
break;
}
} }
} }
} }
...@@ -195,6 +200,11 @@ public class ReflectionPhaseSimulation implements IReflectionPhaseSimulation { ...@@ -195,6 +200,11 @@ public class ReflectionPhaseSimulation implements IReflectionPhaseSimulation {
FullSubmissionPostRequest submission = FullSubmissionPostRequest submission =
new FullSubmissionPostRequest(myGroup, text, fileRole, project, visibility, title); new FullSubmissionPostRequest(myGroup, text, fileRole, project, visibility, title);
submission.setHtml(text); submission.setHtml(text);
if (fileRole == FileRole.REFLECTION_QUESTION) {
submission.setSaveUsername(true);
submission.setUserEMail(user.getEmail());
submission.setReflectionQuestionId(reflectionQuestion.getId());
}
FullSubmission fullSubmission = dossierCreationProcess.addDossier(submission, user, project); FullSubmission fullSubmission = dossierCreationProcess.addDossier(submission, user, project);
if (fileRole == FileRole.REFLECTION_QUESTION) { if (fileRole == FileRole.REFLECTION_QUESTION) {
iExecutionProcess.answerReflectionQuestion(fullSubmission, reflectionQuestion); iExecutionProcess.answerReflectionQuestion(fullSubmission, reflectionQuestion);
......
...@@ -102,6 +102,23 @@ public class WizardDao { ...@@ -102,6 +102,23 @@ public class WizardDao {
correctCreatePortfolioStatus(project, result); correctCreatePortfolioStatus(project, result);
//correctPortfolioFeedback(project, result); //correctPortfolioFeedback(project, result);
if (reflectiveQuestionsAreAnswered(project)) {
result.add(TaskName.ANSWER_REFLECTION_QUESTIONS);
}
return result;
}
public Boolean reflectiveQuestionsAreAnswered(Project project) {
Boolean result = false;
connect.connect();
VereinfachtesResultSet vereinfachtesResultSet = connect.issueSelectStatement(
"SELECT * from tasks where taskName = ? and projectName = ? and progress = ?",
TaskName.ANSWER_REFLECTION_QUESTIONS, project.getName(), Progress.FINISHED.name());
if (vereinfachtesResultSet != null) {
result = vereinfachtesResultSet.next();
}
connect.close();
return result; return result;
} }
......
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