Index: eprms-tap/pom.xml =================================================================== --- eprms-tap/pom.xml (revision 08cb96a91c722fe1e857a8ccbd63d1926bfbbeb6) +++ eprms-tap/pom.xml (revision b8d314934b8eb0b105ad32cec5c4179356952627) @@ -71,5 +71,5 @@ info.ajanovski.eprms model - 0.0.7-SNAPSHOT + 0.0.8-SNAPSHOT Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/components/Layout.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/components/Layout.java (revision 08cb96a91c722fe1e857a8ccbd63d1926bfbbeb6) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/components/Layout.java (revision b8d314934b8eb0b105ad32cec5c4179356952627) @@ -81,5 +81,5 @@ public String[] getStudentPageNames() { - return new String[] { "user/MyProjects", "user/MyProjectReports", "user/MyDatabases", "user/MyRepositories", + return new String[] { "user/MyProjects", "user/MyProjectReports", "user/Discussions", "user/MyDatabases", "user/MyRepositories", "user/MyRepositoryAuth" }; } Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/user/DiscussProject.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/user/DiscussProject.java (revision b8d314934b8eb0b105ad32cec5c4179356952627) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/user/DiscussProject.java (revision b8d314934b8eb0b105ad32cec5c4179356952627) @@ -0,0 +1,163 @@ +package info.ajanovski.eprms.tap.pages.user; + +import java.util.Collections; +import java.util.Date; +import java.util.List; + +import org.apache.tapestry5.annotations.Import; +import org.apache.tapestry5.annotations.InjectComponent; +import org.apache.tapestry5.annotations.Persist; +import org.apache.tapestry5.annotations.Property; +import org.apache.tapestry5.annotations.SessionState; +import org.apache.tapestry5.corelib.components.Zone; +import org.apache.tapestry5.hibernate.annotations.CommitAfter; +import org.apache.tapestry5.http.services.Request; +import org.apache.tapestry5.ioc.annotations.Inject; +import org.apache.tapestry5.services.SelectModelFactory; +import org.apache.tapestry5.services.ajax.AjaxResponseRenderer; + +import info.ajanovski.eprms.model.entities.DiscussionOnCourseProject; +import info.ajanovski.eprms.model.entities.DiscussionPost; +import info.ajanovski.eprms.model.entities.Person; +import info.ajanovski.eprms.model.util.ComparatorDiscussionPostByReplyTo; +import info.ajanovski.eprms.model.util.ModelConstants; +import info.ajanovski.eprms.tap.annotations.InstructorPage; +import info.ajanovski.eprms.tap.annotations.StudentPage; +import info.ajanovski.eprms.tap.services.GenericService; +import info.ajanovski.eprms.tap.services.PersonManager; +import info.ajanovski.eprms.tap.util.UserInfo; + +@StudentPage +@InstructorPage +@Import(stylesheet = { "DiscussProject.css" }) +public class DiscussProject { + @SessionState + @Property + private UserInfo userInfo; + + @Inject + private GenericService genericService; + + @Inject + private PersonManager personManager; + + @Inject + private AjaxResponseRenderer ajaxResponseRenderer; + + @Inject + private Request request; + + @Inject + private SelectModelFactory selectModelFactory; + + @Property + DiscussionOnCourseProject discussionOnCourseProject; + + @Property + DiscussionPost discussionPost; + + @Persist + @Property + DiscussionPost editDiscussionPost; + + @InjectComponent + private Zone zAllPosts; + + void onActivate(DiscussionOnCourseProject docp) { + discussionOnCourseProject = genericService.getByPK(DiscussionOnCourseProject.class, + docp.getDiscussionOnCourseProjectId()); + } + + public DiscussionOnCourseProject onPassivate() { + return discussionOnCourseProject; + } + + public String[] getPostTypes() { + return ModelConstants.AllDiscussionPostTypes; + } + + public List getAllDiscussionPosts() { + List lista = discussionOnCourseProject.getDiscussionPosts(); + ComparatorDiscussionPostByReplyTo c = new ComparatorDiscussionPostByReplyTo(); + Collections.sort(lista, c); + return lista; + } + + void onActionFromAddPost() { + editDiscussionPost = new DiscussionPost(); + editDiscussionPost.setDiscussionOnCourseProject(discussionOnCourseProject); + editDiscussionPost.setPerson(genericService.getByPK(Person.class, userInfo.getPersonId())); + if (request.isXHR()) { + ajaxResponseRenderer.addRender(zAllPosts); + } + } + + void onActionFromReplyToPost(DiscussionPost originalPost) { + editDiscussionPost = new DiscussionPost(); + editDiscussionPost.setReplyTo(originalPost); + editDiscussionPost.setType(originalPost.getType()); + editDiscussionPost.setDiscussionOnCourseProject(discussionOnCourseProject); + editDiscussionPost.setPerson(genericService.getByPK(Person.class, userInfo.getPersonId())); + if (request.isXHR()) { + ajaxResponseRenderer.addRender(zAllPosts); + } + } + + @CommitAfter + public void onSuccessFromFrmEditPost() { + editDiscussionPost.setPostedOn(new Date()); + genericService.saveOrUpdate(editDiscussionPost); + editDiscussionPost = null; + if (request.isXHR()) { + ajaxResponseRenderer.addRender(zAllPosts); + } + } + + public String getCoding(DiscussionPost i) { + if (i.getReplyTo() == null) { + return Long.toString(i.getPostedOn().getTime()) + "-"; + } else { + return getCoding(i.getReplyTo()) + Long.toString(i.getPostedOn().getTime()) + "-"; + } + } + + public String getIndentation() { + int a = getCoding(discussionPost).split("-").length; + return "indentation" + a; + } + + public boolean isPostAuthorProjectTeamMember() { + return discussionPost.getDiscussionOnCourseProject().getCourseProject().getProject().getResponsibilities() + .stream().anyMatch(r -> r.getTeam().getTeamMembers().stream() + .anyMatch(tm -> tm.getPerson().getPersonId() == discussionPost.getPerson().getPersonId())); + } + + public String getPostAuthor() { + String fullName = discussionPost.getPerson().getLastName() + " " + discussionPost.getPerson().getFirstName() + + " [" + discussionPost.getPerson().getUserName() + "]"; + if (personManager.isAdministrator(discussionPost.getPerson().getPersonId())) { + return fullName; + } else if (isPostAuthorProjectTeamMember()) { + return fullName; + } else if (discussionPost.getPublicPosting()) { + return discussionPost.getPerson().getLastName() + " " + discussionPost.getPerson().getFirstName() + " [" + + discussionPost.getPerson().getUserName() + "]"; + } else { + return "Anon"; + } + } + + public String getClassOfPostAuthor() { + if (personManager.isAdministrator(discussionPost.getPerson().getPersonId())) { + return "border-dark personAdmin"; + } else if (isPostAuthorProjectTeamMember()) { + return "border-primary personProjectTeamMember"; + } else { + return "border-light"; + } + } + + void onActionFromCancelFrmEditPost() { + editDiscussionPost = null; + } +} Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/user/Discussions.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/user/Discussions.java (revision b8d314934b8eb0b105ad32cec5c4179356952627) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/user/Discussions.java (revision b8d314934b8eb0b105ad32cec5c4179356952627) @@ -0,0 +1,87 @@ +package info.ajanovski.eprms.tap.pages.user; + +import java.util.List; + +import org.apache.tapestry5.SelectModel; +import org.apache.tapestry5.annotations.Persist; +import org.apache.tapestry5.annotations.Property; +import org.apache.tapestry5.annotations.SessionState; +import org.apache.tapestry5.ioc.annotations.Inject; +import org.apache.tapestry5.services.SelectModelFactory; + +import info.ajanovski.eprms.model.entities.Course; +import info.ajanovski.eprms.model.entities.DiscussionOnCourseProject; +import info.ajanovski.eprms.model.entities.DiscussionPost; +import info.ajanovski.eprms.model.entities.DiscussionSession; +import info.ajanovski.eprms.model.entities.Responsibility; +import info.ajanovski.eprms.model.entities.TeamMember; +import info.ajanovski.eprms.tap.annotations.AdministratorPage; +import info.ajanovski.eprms.tap.annotations.InstructorPage; +import info.ajanovski.eprms.tap.annotations.StudentPage; +import info.ajanovski.eprms.tap.services.CourseManager; +import info.ajanovski.eprms.tap.services.GenericService; +import info.ajanovski.eprms.tap.util.UserInfo; + +@StudentPage +@InstructorPage +@AdministratorPage +public class Discussions { + @SessionState + @Property + private UserInfo userInfo; + + @Inject + private GenericService genericService; + + @Inject + private CourseManager courseManager; + + @Inject + private SelectModelFactory selectModelFactory; + + @Persist + @Property + private Course selectedCourse; + + @Persist + @Property + private DiscussionSession selectedDiscussionSession; + + @Property + private DiscussionOnCourseProject discussionOnCourseProject; + + @Property + private DiscussionPost discussionPost; + + @Property + private Responsibility responsibility; + + @Property + private TeamMember teamMember; + + void onActivate() { + if (selectedDiscussionSession != null) { + selectedDiscussionSession = genericService.getByPK(DiscussionSession.class, + selectedDiscussionSession.getDiscussionSessionId()); + } + } + + public SelectModel getCourseModel() { + return selectModelFactory.create(courseManager.getAllCoursesByPerson(userInfo.getPersonId()), "title"); + } + + public SelectModel getDiscussionSessionModel() { + return selectModelFactory.create(((List) genericService.getAll(DiscussionSession.class)) + .stream().filter(p -> p.getCourse().getCourseId() == selectedCourse.getCourseId()).toList(), "title"); + } + + public SelectModel getCourseProjectModel() { + return selectModelFactory.create(selectedDiscussionSession.getDiscussionsOnCourseProjects(), + "discussionOnCourseProjectId"); + } + + void onSuccessFromSelectCourseForm() { + selectedDiscussionSession = null; + } + +} Index: eprms-tap/src/main/resources/META-INF/assets/DiscussProject.css =================================================================== --- eprms-tap/src/main/resources/META-INF/assets/DiscussProject.css (revision b8d314934b8eb0b105ad32cec5c4179356952627) +++ eprms-tap/src/main/resources/META-INF/assets/DiscussProject.css (revision b8d314934b8eb0b105ad32cec5c4179356952627) @@ -0,0 +1,57 @@ +.indentation0 { + margin: 0rem; +} + +.indentation1 { + margin-left: 0rem; +} + +.indentation2 { + margin-left: 2rem; +} + +.indentation3 { + margin-left: 4rem; +} + +.indentation4 { + margin-left: 6rem; +} + +.indentation5 { + margin-left: 8rem; +} + +.indentation6 { + margin-left: 10rem; +} + +.reshenieto img { + width: 100%; +} + +.discussion { + font-size: 90%; +} + +.discussion img { + width: 100%; +} + +.feedback img { + width: 100%; +} + +.personAdmin #postAuthor::after { + content: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' width='16' height='16' stroke='currentColor' stroke-width='2' fill='none' stroke-linecap='round' stroke-linejoin='round' class='css-i6dzq1'%3E%3Crect x='4' y='4' width='16' height='16' rx='2' ry='2'%3E%3C/rect%3E%3Crect x='9' y='9' width='6' height='6'%3E%3C/rect%3E%3Cline x1='9' y1='1' x2='9' y2='4'%3E%3C/line%3E%3Cline x1='15' y1='1' x2='15' y2='4'%3E%3C/line%3E%3Cline x1='9' y1='20' x2='9' y2='23'%3E%3C/line%3E%3Cline x1='15' y1='20' x2='15' y2='23'%3E%3C/line%3E%3Cline x1='20' y1='9' x2='23' y2='9'%3E%3C/line%3E%3Cline x1='20' y1='14' x2='23' y2='14'%3E%3C/line%3E%3Cline x1='1' y1='9' x2='4' y2='9'%3E%3C/line%3E%3Cline x1='1' y1='14' x2='4' y2='14'%3E%3C/line%3E%3C/svg%3E"); + display: inline-block; + margin-left:0.5em; + vertical-align: -3px; +} + +.personProjectTeamMember #postAuthor::after { + content: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' width='16' height='16' stroke='currentColor' stroke-width='2' fill='none' stroke-linecap='round' stroke-linejoin='round' class='css-i6dzq1'%3E%3Cpath d='M17 21v-2a4 4 0 0 0-4-4H5a4 4 0 0 0-4 4v2'%3E%3C/path%3E%3Ccircle cx='9' cy='7' r='4'%3E%3C/circle%3E%3Cpath d='M23 21v-2a4 4 0 0 0-3-3.87'%3E%3C/path%3E%3Cpath d='M16 3.13a4 4 0 0 1 0 7.75'%3E%3C/path%3E%3C/svg%3E"); + display: inline-block; + margin-left:0.5em; + vertical-align: -3px; +} Index: eprms-tap/src/main/resources/info/ajanovski/eprms/tap/components/Layout.tml =================================================================== --- eprms-tap/src/main/resources/info/ajanovski/eprms/tap/components/Layout.tml (revision 08cb96a91c722fe1e857a8ccbd63d1926bfbbeb6) +++ eprms-tap/src/main/resources/info/ajanovski/eprms/tap/components/Layout.tml (revision b8d314934b8eb0b105ad32cec5c4179356952627) @@ -17,7 +17,8 @@ - -