Index: dbLearnStar-model/pom.xml =================================================================== --- dbLearnStar-model/pom.xml (revision fbb7458669ddeea54a41f0e763501c91320ebbe1) +++ dbLearnStar-model/pom.xml (revision 1f584912ead0a8e2a6a25f72946242dce1c6e8f4) @@ -6,5 +6,5 @@ dblearnstar dblearnstar-model - 0.0.3-SNAPSHOT + 0.0.4-SNAPSHOT dbLearnStar - Model Index: dbLearnStar-model/src/main/java/dblearnstar/model/model/ModelConstants.java =================================================================== --- dbLearnStar-model/src/main/java/dblearnstar/model/model/ModelConstants.java (revision fbb7458669ddeea54a41f0e763501c91320ebbe1) +++ dbLearnStar-model/src/main/java/dblearnstar/model/model/ModelConstants.java (revision 1f584912ead0a8e2a6a25f72946242dce1c6e8f4) @@ -23,8 +23,8 @@ public class ModelConstants { - public final static String TaskCodeSQL = "SQL"; - public final static String TaskCodeDDL = "DDL"; - public final static String TaskCodeTEXT = "TEXT"; - public final static String TaskCodeUPLOAD = "UPLOAD"; + public static final String TaskCodeSQL = "SQL"; + public static final String TaskCodeDDL = "DDL"; + public static final String TaskCodeTEXT = "TEXT"; + public static final String TaskCodeUPLOAD = "UPLOAD"; public static final String ActivityEval = "TASK_EVAL"; @@ -42,5 +42,8 @@ * Pages */ - public final static String PageIndex = "Index"; + public static final String PageIndex = "Index"; + + public static final Object InstructorRole = "INSTRUCTOR"; + public static final Object AdministratorRole = "ADMINISTRATOR"; } Index: dbLearnStar-webApp/pom.xml =================================================================== --- dbLearnStar-webApp/pom.xml (revision fbb7458669ddeea54a41f0e763501c91320ebbe1) +++ dbLearnStar-webApp/pom.xml (revision 1f584912ead0a8e2a6a25f72946242dce1c6e8f4) @@ -68,5 +68,5 @@ dblearnstar dblearnstar-model - 0.0.3-SNAPSHOT + 0.0.4-SNAPSHOT Index: dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/ComplaintsAndDiscussions.java =================================================================== --- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/ComplaintsAndDiscussions.java (revision fbb7458669ddeea54a41f0e763501c91320ebbe1) +++ dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/ComplaintsAndDiscussions.java (revision 1f584912ead0a8e2a6a25f72946242dce1c6e8f4) @@ -31,4 +31,5 @@ import org.apache.tapestry5.hibernate.annotations.CommitAfter; import org.apache.tapestry5.ioc.annotations.Inject; +import org.slf4j.Logger; import dblearnstar.model.entities.AssessmentDiscussion; @@ -36,8 +37,11 @@ import dblearnstar.model.entities.SolutionAssessment; import dblearnstar.model.model.ComparatorAssessmentDiscussionByReplyTo; +import dblearnstar.model.model.TaskTypeChecker; import dblearnstar.model.model.UserInfo; import dblearnstar.webapp.annotations.AdministratorPage; import dblearnstar.webapp.annotations.StudentPage; import dblearnstar.webapp.services.GenericService; +import dblearnstar.webapp.services.PersonManager; +import dblearnstar.webapp.services.TestManager; @StudentPage @@ -51,4 +55,10 @@ @Inject private GenericService genericService; + @Inject + private Logger logger; + @Inject + private PersonManager personManager; + @Inject + private TestManager testManager; @Persist @@ -68,5 +78,4 @@ solutionAssessmentToDiscuss.getSolutionAssessmentId()); } - } @@ -102,4 +111,7 @@ newAssessmentDiscussion.setPostedOn(new Date()); newAssessmentDiscussion.setReplyTo(replyTo); + if (userInfo.isAdministrator() || userInfo.isInstructor()) { + newAssessmentDiscussion.setMessage("
" + replyTo.getMessage() + "
\n

"); + } newAssessmentDiscussion.setSolutionEvaluation(solutionAssessmentToDiscuss); } @@ -111,5 +123,5 @@ } - void onActionFromCancelNewAssessmentDiscussionForm() { + void onCancelNewAssessmentDiscussionForm() { newAssessmentDiscussion = null; } @@ -139,4 +151,8 @@ } + public boolean isPostedByInstructor() { + return personManager.isInstructor(runningAssessmentDiscussion.getPerson()); + } + @CommitAfter public void onActionFromDeleteDiscussion(long assessmentDiscussionId) { @@ -144,3 +160,6 @@ } + public boolean isSQL() { + return TaskTypeChecker.isSQL(testManager.getCodeType(solutionAssessmentToDiscuss.getStudentSubmitSolution())); + } } Index: dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/OpenDiscussions.java =================================================================== --- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/OpenDiscussions.java (revision fbb7458669ddeea54a41f0e763501c91320ebbe1) +++ dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/OpenDiscussions.java (revision 1f584912ead0a8e2a6a25f72946242dce1c6e8f4) @@ -133,3 +133,16 @@ } + @Inject + private PersonManager personManager; + + public boolean isAnsweredByInstructor() { + boolean answer = false; + for (AssessmentDiscussion ad : runningSolutionAssessment.getAssessmentDiscussions()) { + if (personManager.isInstructor(ad.getPerson())) { + answer = true; + } + } + return answer; + } + } Index: dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/admin/SubmissionEvaluations.java =================================================================== --- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/admin/SubmissionEvaluations.java (revision fbb7458669ddeea54a41f0e763501c91320ebbe1) +++ dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/admin/SubmissionEvaluations.java (revision 1f584912ead0a8e2a6a25f72946242dce1c6e8f4) @@ -361,18 +361,9 @@ } - public String getCodeType(StudentSubmitSolution submittedSolution) { - List listTypes = submittedSolution.getTaskInTestInstance().getTask().getTaskIsOfTypes(); - if (listTypes != null && listTypes.size() > 0) { - return listTypes.get(0).getTaskType().getCodetype(); - } else { - return "/"; - } - } - public boolean isEditedAssessmentTaskSQL() { if (editedAssessment != null) { StudentSubmitSolution sss = genericService.getByPK(StudentSubmitSolution.class, editedAssessment.getStudentSubmitSolution().getStudentSubmitSolutionId()); - return TaskTypeChecker.isSQL(getCodeType(sss)); + return TaskTypeChecker.isSQL(testManager.getCodeType(sss)); } else { return false; @@ -381,17 +372,17 @@ public boolean isSQL() { - return TaskTypeChecker.isSQL(getCodeType(submission)); + return TaskTypeChecker.isSQL(testManager.getCodeType(submission)); } public boolean isTEXT() { - return TaskTypeChecker.isTEXT(getCodeType(submission)); + return TaskTypeChecker.isTEXT(testManager.getCodeType(submission)); } public boolean isDDL() { - return TaskTypeChecker.isDDL(getCodeType(submission)); + return TaskTypeChecker.isDDL(testManager.getCodeType(submission)); } public boolean isUPLOAD() { - return TaskTypeChecker.isUPLOAD(getCodeType(submission)); + return TaskTypeChecker.isUPLOAD(testManager.getCodeType(submission)); } Index: dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/PersonDao.java =================================================================== --- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/PersonDao.java (revision fbb7458669ddeea54a41f0e763501c91320ebbe1) +++ dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/PersonDao.java (revision 1f584912ead0a8e2a6a25f72946242dce1c6e8f4) @@ -46,3 +46,5 @@ public List getAllStudents(); + public boolean isInstructor(Person person); + } Index: dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/PersonDaoImpl.java =================================================================== --- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/PersonDaoImpl.java (revision fbb7458669ddeea54a41f0e763501c91320ebbe1) +++ dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/PersonDaoImpl.java (revision 1f584912ead0a8e2a6a25f72946242dce1c6e8f4) @@ -30,4 +30,5 @@ import dblearnstar.model.entities.PersonRole; import dblearnstar.model.entities.Student; +import dblearnstar.model.model.ModelConstants; public class PersonDaoImpl implements PersonDao { @@ -136,8 +137,27 @@ getEntityManager().createQuery("from Student s order by s.person.lastName").getResultList()); } catch (Exception e) { - logger.error("getAllStudents{}", e); + logger.error("getAllStudents {}", e); return null; } } + @Override + public boolean isInstructor(Person person) { + try { + List list = getEntityManager() + .createQuery( + "from PersonRole pr where pr.person.personId=:personId and pr.role.name=:instructorRole") + .setParameter("personId", person.getPersonId()) + .setParameter("instructorRole", ModelConstants.InstructorRole).getResultList(); + if (list != null && list.size() > 0) { + return true; + } else { + return false; + } + } catch (Exception e) { + logger.error("isInstructor {}", e); + return false; + } + } + } Index: dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/PersonManager.java =================================================================== --- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/PersonManager.java (revision fbb7458669ddeea54a41f0e763501c91320ebbe1) +++ dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/PersonManager.java (revision 1f584912ead0a8e2a6a25f72946242dce1c6e8f4) @@ -45,3 +45,5 @@ public List getAllStudents(); + public boolean isInstructor(Person person); + } Index: dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/PersonManagerImpl.java =================================================================== --- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/PersonManagerImpl.java (revision fbb7458669ddeea54a41f0e763501c91320ebbe1) +++ dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/PersonManagerImpl.java (revision 1f584912ead0a8e2a6a25f72946242dce1c6e8f4) @@ -84,3 +84,8 @@ return personDao.getAllStudents(); } + + @Override + public boolean isInstructor(Person person) { + return personDao.isInstructor(person); + } } Index: dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/TestManager.java =================================================================== --- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/TestManager.java (revision fbb7458669ddeea54a41f0e763501c91320ebbe1) +++ dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/TestManager.java (revision 1f584912ead0a8e2a6a25f72946242dce1c6e8f4) @@ -90,3 +90,4 @@ public boolean accessToTaskInTestInstanceAllowed(Student student, TaskInTestInstance tti); + public String getCodeType(StudentSubmitSolution submittedSolution); } Index: dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/TestManagerImpl.java =================================================================== --- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/TestManagerImpl.java (revision fbb7458669ddeea54a41f0e763501c91320ebbe1) +++ dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/TestManagerImpl.java (revision 1f584912ead0a8e2a6a25f72946242dce1c6e8f4) @@ -41,4 +41,5 @@ import dblearnstar.model.entities.Task; import dblearnstar.model.entities.TaskInTestInstance; +import dblearnstar.model.entities.TaskIsOfType; import dblearnstar.model.entities.TestInstance; @@ -453,3 +454,13 @@ } + @Override + public String getCodeType(StudentSubmitSolution submittedSolution) { + List listTypes = submittedSolution.getTaskInTestInstance().getTask().getTaskIsOfTypes(); + if (listTypes != null && listTypes.size() > 0) { + return listTypes.get(0).getTaskType().getCodetype(); + } else { + return "/"; + } + } + } Index: dbLearnStar-webApp/src/main/resources/META-INF/assets/ComplaintsAndDiscussions.css =================================================================== --- dbLearnStar-webApp/src/main/resources/META-INF/assets/ComplaintsAndDiscussions.css (revision fbb7458669ddeea54a41f0e763501c91320ebbe1) +++ dbLearnStar-webApp/src/main/resources/META-INF/assets/ComplaintsAndDiscussions.css (revision 1f584912ead0a8e2a6a25f72946242dce1c6e8f4) @@ -1,35 +1,27 @@ +.indentation0 { + margin: 0rem; +} + .indentation1 { - margin: 0.5rem; - padding: 1rem; + margin-left: 0rem; } .indentation2 { - margin: 0.5rem; - padding: 1rem; margin-left: 2rem; } .indentation3 { - margin: 0.5rem; - padding: 1rem; margin-left: 4rem; } .indentation4 { - margin: 0.5rem; - padding: 1rem; margin-left: 6rem; } .indentation5 { - margin: 0.5rem; - padding: 1rem; margin-left: 8rem; } .indentation6 { - margin: 0.5rem; - margin-left: 10rem; - padding: 1rem; margin-left: 10rem; } Index: dbLearnStar-webApp/src/main/resources/dblearnstar/webapp/pages/ComplaintsAndDiscussions.tml =================================================================== --- dbLearnStar-webApp/src/main/resources/dblearnstar/webapp/pages/ComplaintsAndDiscussions.tml (revision fbb7458669ddeea54a41f0e763501c91320ebbe1) +++ dbLearnStar-webApp/src/main/resources/dblearnstar/webapp/pages/ComplaintsAndDiscussions.tml (revision 1f584912ead0a8e2a6a25f72946242dce1c6e8f4) @@ -8,8 +8,6 @@

${solutionAssessmentToDiscuss.studentSubmitSolution.taskInTestInstance.testInstance.title}

-

${solutionAssessmentToDiscuss.studentSubmitSolution.taskInTestInstance.task.title} +

${solutionAssessmentToDiscuss.studentSubmitSolution.taskInTestInstance.task.title}

- -

- +
@@ -32,10 +30,16 @@

${message:Discussed-Solution-by-label} - ${solutionAssessmentToDiscuss.studentSubmitSolution.studentStartedTest.student.person.lastName} - ${solutionAssessmentToDiscuss.studentSubmitSolution.studentStartedTest.student.person.firstName} + ${solutionAssessmentToDiscuss.studentSubmitSolution.studentStartedTest.student.person.userName}

-
+ + 

+
+ + + +
@@ -46,5 +50,6 @@
${message:grade-label}: - ${solutionAssessmentToDiscuss.grade}
+ ${solutionAssessmentToDiscuss.grade} +
${solutionAssessmentToDiscuss.evaluatedOn}
@@ -64,17 +69,24 @@ ${message:discussionForm-description} -
- - - - + + + + + + + + +
+ + Cancel +
- Cancel + @@ -84,24 +96,32 @@ t:test="solutionAssessmentToDiscuss.assessmentDiscussions"> +

${message:discussions-label}

-
-

${runningAssessmentDiscussion.postedOn} - - ${runningAssessmentDiscussion.person.lastName} - ${runningAssessmentDiscussion.person.firstName}

-

+

+
${runningAssessmentDiscussion.postedOn} + - + ${runningAssessmentDiscussion.person.userName}${runningAssessmentDiscussion.person.userName} + +
+
-

-
- - - - +

+ + + + +

Index: dbLearnStar-webApp/src/main/resources/dblearnstar/webapp/pages/OpenDiscussions.tml =================================================================== --- dbLearnStar-webApp/src/main/resources/dblearnstar/webapp/pages/OpenDiscussions.tml (revision fbb7458669ddeea54a41f0e763501c91320ebbe1) +++ dbLearnStar-webApp/src/main/resources/dblearnstar/webapp/pages/OpenDiscussions.tml (revision 1f584912ead0a8e2a6a25f72946242dce1c6e8f4) @@ -2,6 +2,8 @@ xmlns:t="http://tapestry.apache.org/schema/tapestry_5_4.xsd" xmlns:p="tapestry:parameter"> +

${message:OpenDiscussions-pagelink}

-
+ +
@@ -20,10 +22,14 @@ -

Discussions

- ${runningSolutionAssessment.studentSubmitSolution.taskInTestInstance.task.title} + ${runningSolutionAssessment.studentSubmitSolution.taskInTestInstance.task.title} + - ${message:solutionBy-label} - + ${runningSolutionAssessment.studentSubmitSolution.studentStartedTest.student.person.userName} + + ${message:answeredByInstructor-label}

Index: dbLearnStar-webApp/src/main/webapp/WEB-INF/app.properties =================================================================== --- dbLearnStar-webApp/src/main/webapp/WEB-INF/app.properties (revision fbb7458669ddeea54a41f0e763501c91320ebbe1) +++ dbLearnStar-webApp/src/main/webapp/WEB-INF/app.properties (revision 1f584912ead0a8e2a6a25f72946242dce1c6e8f4) @@ -17,4 +17,5 @@ admin/TestAdmin-pagelink=Tests admin/TestCollectionManagement-pagelink=Test Collections +answeredByInstructor-label=Includes comments by an instructor serverTime-label=Server time testOpenUntil-label=Test open until @@ -34,4 +35,5 @@ close-label=Close comparisonOfSolutions-page=Comparison of Solutions +complaint-label=Complaint ComplaintsAndDiscussionForSolution-label=Complaints and Discussions for a Solution Assessment ComplaintsAndDiscussions-page=Complaints and Discussions @@ -95,4 +97,5 @@ main-developer-label=Lead Researcher and Developer main-developer-name=Vangel V. Ajanovski - Associate Professor at FCSE +message-label=Message new-label=New no-available-options-label=No available options @@ -145,4 +148,5 @@ sql-resultIncorrect=Your query resulted with data in the correct form, but not corresponding to what is expected from a correct query. Therefore it is certainly not correct\! sqlEvaluation-label=Evaluation of SQL submission +solutionBy-label=Solution by studenthomepage-page=Exams and Tasks student-label=student Index: dbLearnStar-webApp/src/main/webapp/WEB-INF/app_mk.properties =================================================================== --- dbLearnStar-webApp/src/main/webapp/WEB-INF/app_mk.properties (revision fbb7458669ddeea54a41f0e763501c91320ebbe1) +++ dbLearnStar-webApp/src/main/webapp/WEB-INF/app_mk.properties (revision 1f584912ead0a8e2a6a25f72946242dce1c6e8f4) @@ -17,4 +17,5 @@ admin/TestAdmin-pagelink=Администрација на тестови admin/TestCollectionManagement-pagelink=Колекции тестови +answeredByInstructor-label=Содржи коментари од наставник serverTime-label=Време на серверот testOpenUntil-label=Тестот е отворен до @@ -34,4 +35,5 @@ close-label=Затвори comparisonOfSolutions-page=Споредба на решенија +complaint-label=Приговор ComplaintsAndDiscussionForSolution-label=Приговори и дискусии по оценување на задача ComplaintsAndDiscussions-page=Приговори и дискусии @@ -96,4 +98,5 @@ main-developer-label=Главен истражувач и развивач main-developer-name=Вангел В. Ајановски +message-label=Порака new-label=Ново no-available-options-label=Нема достапни опции за избор @@ -147,4 +150,5 @@ sql-resultIncorrect=Прашалникот резултираше со поинакви податоци од очекуваните. Сигурно не е коректен. sqlEvaluation-label=Евалуација на SQL поднесок +solutionBy-label=Решение од studenthomepage-page=Тестови и задачи student-label=студент