Index: eprms-model/pom.xml =================================================================== --- eprms-model/pom.xml (revision e60cba5118b277aebd8226e62100cde03c904f94) +++ eprms-model/pom.xml (revision f14a006edd2d177215bbf9e7e05effa2eef2ad96) @@ -6,5 +6,5 @@ info.ajanovski.eprms model - 0.0.5-SNAPSHOT + 0.0.6-SNAPSHOT EPRMS - Educational Project and Resource Management System - Model Index: eprms-model/src/main/java/info/ajanovski/eprms/model/util/CourseComparator.java =================================================================== --- eprms-model/src/main/java/info/ajanovski/eprms/model/util/CourseComparator.java (revision f14a006edd2d177215bbf9e7e05effa2eef2ad96) +++ eprms-model/src/main/java/info/ajanovski/eprms/model/util/CourseComparator.java (revision f14a006edd2d177215bbf9e7e05effa2eef2ad96) @@ -0,0 +1,11 @@ +package info.ajanovski.eprms.model.util; + +import java.util.Comparator; + +import info.ajanovski.eprms.model.entities.Course; + +public class CourseComparator implements Comparator { + public int compare(Course a1, Course a2) { + return a1.getTitle().compareTo(a2.getTitle()); + } +} Index: eprms-model/src/main/java/info/ajanovski/eprms/model/util/ProjectActiveComparator.java =================================================================== --- eprms-model/src/main/java/info/ajanovski/eprms/model/util/ProjectActiveComparator.java (revision f14a006edd2d177215bbf9e7e05effa2eef2ad96) +++ eprms-model/src/main/java/info/ajanovski/eprms/model/util/ProjectActiveComparator.java (revision f14a006edd2d177215bbf9e7e05effa2eef2ad96) @@ -0,0 +1,30 @@ +package info.ajanovski.eprms.model.util; + +import java.util.Comparator; + +import info.ajanovski.eprms.model.entities.Activity; +import info.ajanovski.eprms.model.entities.Project; +import info.ajanovski.eprms.model.entities.WorkEvaluation; +import info.ajanovski.eprms.model.entities.WorkReport; + +public class ProjectActiveComparator implements Comparator { + public Float mostActive(Project p) { + Float sum = 0F; + for (Activity a : p.getActivities()) { + Float max = 0F; + for (WorkReport wr : a.getWorkReports()) { + for (WorkEvaluation we : wr.getWorkEvaluations()) { + if (we.getPoints() > max) { + max = we.getPoints(); + } + } + } + sum += max; + } + return sum; + } + + public int compare(Project p1, Project p2) { + return mostActive(p1).compareTo(mostActive(p2)); + } +} Index: eprms-model/src/main/java/info/ajanovski/eprms/model/util/WorkEvaluationComparator.java =================================================================== --- eprms-model/src/main/java/info/ajanovski/eprms/model/util/WorkEvaluationComparator.java (revision f14a006edd2d177215bbf9e7e05effa2eef2ad96) +++ eprms-model/src/main/java/info/ajanovski/eprms/model/util/WorkEvaluationComparator.java (revision f14a006edd2d177215bbf9e7e05effa2eef2ad96) @@ -0,0 +1,11 @@ +package info.ajanovski.eprms.model.util; + +import java.util.Comparator; + +import info.ajanovski.eprms.model.entities.WorkEvaluation; + +public class WorkEvaluationComparator implements Comparator { + public int compare(WorkEvaluation w1, WorkEvaluation w2) { + return Long.valueOf(w1.getWorkEvaluationId()).compareTo(Long.valueOf(w2.getWorkEvaluationId())); + } +} Index: eprms-model/src/main/java/info/ajanovski/eprms/model/util/WorkReportComparator.java =================================================================== --- eprms-model/src/main/java/info/ajanovski/eprms/model/util/WorkReportComparator.java (revision f14a006edd2d177215bbf9e7e05effa2eef2ad96) +++ eprms-model/src/main/java/info/ajanovski/eprms/model/util/WorkReportComparator.java (revision f14a006edd2d177215bbf9e7e05effa2eef2ad96) @@ -0,0 +1,11 @@ +package info.ajanovski.eprms.model.util; + +import java.util.Comparator; + +import info.ajanovski.eprms.model.entities.WorkReport; + +public class WorkReportComparator implements Comparator { + public int compare(WorkReport w1, WorkReport w2) { + return Long.valueOf(w1.getWorkReportId()).compareTo(Long.valueOf(w2.getWorkReportId())); + } +} Index: eprms-tap/pom.xml =================================================================== --- eprms-tap/pom.xml (revision e60cba5118b277aebd8226e62100cde03c904f94) +++ eprms-tap/pom.xml (revision f14a006edd2d177215bbf9e7e05effa2eef2ad96) @@ -8,5 +8,5 @@ org.springframework.boot spring-boot-starter-parent - 2.5.3 + 2.6.1 @@ -14,5 +14,5 @@ info.ajanovski.eprms eprms-tap - 0.0.6-SNAPSHOT + 0.0.7-SNAPSHOT EPRMS - Educational Project and Resource Management System @@ -38,10 +38,10 @@ 15 - 2.5.3 - 5.7.3 + 2.6.3 + 5.8.0 1.0.4 1.0.1 - 2.12.4 + 2.13.1 2.3.1 2.33.3 @@ -52,6 +52,6 @@ 1.0.9 - 42.2.23 - 3.6.2 + 42.3.3 + 3.6.4 UTF-8 @@ -71,5 +71,5 @@ info.ajanovski.eprms model - 0.0.5-SNAPSHOT + 0.0.6-SNAPSHOT @@ -264,4 +264,9 @@ + org.webjars + webjars-locator + 0.42 + + org.webjars.npm fontsource-fira-sans @@ -269,9 +274,4 @@ - org.webjars - webjars-locator - 0.42 - - org.webjars.npm feather-icons @@ -281,5 +281,5 @@ org.webjars ckeditor - 4.16.1 + 4.17.1 @@ -361,4 +361,52 @@ 2.6 + + + + org.apache.maven.plugins + maven-dependency-plugin + + + unpack + generate-test-sources + + unpack + + + + + org.webjars.npm + fontsource-fira-sans + jar + META-INF/resources/webjars/**/* + ${project.basedir}/target/classes/META-INF/assets/ + + + org.webjars.npm + firacode + jar + META-INF/resources/webjars/**/* + ${project.basedir}/target/classes/META-INF/assets/ + + + org.webjars.npm + feather-icons + jar + META-INF/resources/webjars/**/* + ${project.basedir}/target/classes/META-INF/assets/ + + + org.webjars + ckeditor + jar + META-INF/resources/webjars/**/* + ${project.basedir}/target/classes/META-INF/assets/ + + + + + + + Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/App.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/App.java (revision e60cba5118b277aebd8226e62100cde03c904f94) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/App.java (revision f14a006edd2d177215bbf9e7e05effa2eef2ad96) @@ -25,5 +25,4 @@ import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; -import org.springframework.web.context.support.AnnotationConfigWebApplicationContext; @SpringBootApplication @@ -37,5 +36,5 @@ public static void main(String[] args) throws Exception { SpringApplication application = new SpringApplication(App.class); - application.setApplicationContextClass(AnnotationConfigWebApplicationContext.class); + // application.setApplicationContextClass(AnnotationConfigWebApplicationContext.class); SpringApplication.run(App.class, args); } Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/components/IconActionLink.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/components/IconActionLink.java (revision f14a006edd2d177215bbf9e7e05effa2eef2ad96) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/components/IconActionLink.java (revision f14a006edd2d177215bbf9e7e05effa2eef2ad96) @@ -0,0 +1,38 @@ +/******************************************************************************* + * Copyright (C) 2021 Vangel V. Ajanovski + * + * This file is part of the EPRMS - Educational Project and Resource + * Management System (hereinafter: EPRMS). + * + * EPRMS is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * EPRMS is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with EPRMS. If not, see . + ******************************************************************************/ + +package info.ajanovski.eprms.tap.components; + +import org.apache.tapestry5.BindingConstants; +import org.apache.tapestry5.annotations.Parameter; +import org.apache.tapestry5.annotations.Property; +import org.apache.tapestry5.corelib.components.Any; + +public class IconActionLink extends Any { + + @Property + @Parameter(required = false, defaultPrefix = BindingConstants.PROP) + private Object context; + + @Property + @Parameter(required = false, defaultPrefix = BindingConstants.LITERAL) + private String path; + +} Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/components/SVGIcon.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/components/SVGIcon.java (revision e60cba5118b277aebd8226e62100cde03c904f94) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/components/SVGIcon.java (revision f14a006edd2d177215bbf9e7e05effa2eef2ad96) @@ -22,10 +22,17 @@ import org.apache.tapestry5.BindingConstants; +import org.apache.tapestry5.annotations.Mixin; import org.apache.tapestry5.annotations.Parameter; import org.apache.tapestry5.annotations.Property; +import org.apache.tapestry5.annotations.SupportsInformalParameters; +import org.apache.tapestry5.corelib.mixins.RenderInformals; import org.apache.tapestry5.ioc.annotations.Inject; import org.apache.tapestry5.services.AssetSource; +@SupportsInformalParameters public class SVGIcon { + + @Mixin + private RenderInformals renderInformals; @Property Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/data/ProjectDao.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/data/ProjectDao.java (revision e60cba5118b277aebd8226e62100cde03c904f94) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/data/ProjectDao.java (revision f14a006edd2d177215bbf9e7e05effa2eef2ad96) @@ -36,5 +36,5 @@ public Float sumPoints(Project p); - public List getCourseProjectsOrderByTitle(Course selectedCourse); + public List getAllProjectsInCourseOrderByTitle(Course selectedCourse); public List getProjectByPerson(Long personId); Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/data/ProjectDaoImpl.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/data/ProjectDaoImpl.java (revision e60cba5118b277aebd8226e62100cde03c904f94) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/data/ProjectDaoImpl.java (revision f14a006edd2d177215bbf9e7e05effa2eef2ad96) @@ -44,5 +44,5 @@ @SuppressWarnings("unchecked") public List getAllProjectsOrderByTitle() { - return getEntityManager().createQuery("from Project order by title").getResultList(); + return getEntityManager().createQuery("from Project order by lower(title)").getResultList(); } @@ -85,5 +85,5 @@ @Override @SuppressWarnings("unchecked") - public List getCourseProjectsOrderByTitle(Course selectedCourse) { + public List getAllProjectsInCourseOrderByTitle(Course selectedCourse) { if (selectedCourse != null) { return getEntityManager().createQuery(""" @@ -93,5 +93,5 @@ join cp.course c where c.courseId=:courseId - order by p.title + order by lower(p.title) """).setParameter("courseId", selectedCourse.getCourseId()).getResultList(); } else { Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/model/ActivityTypeSelectModel.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/model/ActivityTypeSelectModel.java (revision f14a006edd2d177215bbf9e7e05effa2eef2ad96) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/model/ActivityTypeSelectModel.java (revision f14a006edd2d177215bbf9e7e05effa2eef2ad96) @@ -0,0 +1,46 @@ +package info.ajanovski.eprms.tap.model; + +import java.util.ArrayList; +import java.util.List; + +import org.apache.tapestry5.OptionGroupModel; +import org.apache.tapestry5.OptionModel; +import org.apache.tapestry5.internal.OptionModelImpl; +import org.apache.tapestry5.util.AbstractSelectModel; + +import info.ajanovski.eprms.model.entities.ActivityType; + +public class ActivityTypeSelectModel extends AbstractSelectModel { + private List activityTypes; + + public ActivityTypeSelectModel(List activityTypes) { + if (activityTypes == null) { + this.activityTypes = new ArrayList(); + } else { + this.activityTypes = activityTypes; + } + } + + @Override + public List getOptionGroups() { + return null; + } + + public int getDepth(ActivityType at) { + if (at.getSuperActivityType() != null) { + return getDepth(at.getSuperActivityType()) + 1; + } else { + return 0; + } + } + + @Override + public List getOptions() { + List options = new ArrayList(); + for (ActivityType at : activityTypes) { + String name = (new String("-")).repeat(3 * getDepth(at)) + at.getTitle(); + options.add(new OptionModelImpl(name, at)); + } + return options; + } +} Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/ManageActivityTypes.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/ManageActivityTypes.java (revision e60cba5118b277aebd8226e62100cde03c904f94) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/ManageActivityTypes.java (revision f14a006edd2d177215bbf9e7e05effa2eef2ad96) @@ -11,5 +11,7 @@ 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.services.SelectModelFactory; +import org.apache.tapestry5.services.ajax.AjaxResponseRenderer; import info.ajanovski.eprms.model.entities.ActivityType; @@ -17,4 +19,5 @@ import info.ajanovski.eprms.tap.annotations.AdministratorPage; import info.ajanovski.eprms.tap.annotations.InstructorPage; +import info.ajanovski.eprms.tap.model.ActivityTypeSelectModel; import info.ajanovski.eprms.tap.services.GenericService; @@ -32,6 +35,17 @@ private SelectModelFactory selectModelFactory; + @Inject + private AjaxResponseRenderer ajaxResponseRenderer; + @Inject + private Request request; + @Property private ActivityType activityType; + + @Property + private ActivityType superActivityType; + + @InjectComponent + private Zone editFormZone; @Persist @@ -39,14 +53,24 @@ private ActivityType newActivityType; - public void onActionFromNewActivityType() { + public void onNewActivityType() { newActivityType = new ActivityType(); + if (request.isXHR()) { + ajaxResponseRenderer.addRender(editFormZone); + } } - public void onActionFromEditActivityType(ActivityType at) { + public void onEditActivityType(ActivityType at) { newActivityType = at; + superActivityType = newActivityType.getSuperActivityType(); + if (request.isXHR()) { + ajaxResponseRenderer.addRender(editFormZone); + } } public SelectModel getListTypes() { - return selectModelFactory.create(genericService.getAll(ActivityType.class), "title"); + List list = (List) genericService.getAll(ActivityType.class); + ActivityTypeHierarchicalComparator athc = new ActivityTypeHierarchicalComparator(); + list.sort(athc); + return new ActivityTypeSelectModel(list); } @@ -73,5 +97,4 @@ if (newActivityType != null) { newActivityType = genericService.getByPK(ActivityType.class, newActivityType.getActivityTypeId()); - } } @@ -83,3 +106,10 @@ } + void onCancelNewActivityTypeForm() { + newActivityType = null; + if (request.isXHR()) { + ajaxResponseRenderer.addRender(editFormZone); + } + } + } Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/ManageCourses.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/ManageCourses.java (revision e60cba5118b277aebd8226e62100cde03c904f94) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/ManageCourses.java (revision f14a006edd2d177215bbf9e7e05effa2eef2ad96) @@ -2,4 +2,5 @@ import java.util.ArrayList; +import java.util.Collections; import java.util.List; import java.util.stream.Collectors; @@ -20,4 +21,5 @@ import info.ajanovski.eprms.model.util.ActivityTypeHierarchicalComparator; import info.ajanovski.eprms.model.util.CourseActivityTypeHierarchicalComparator; +import info.ajanovski.eprms.model.util.CourseComparator; import info.ajanovski.eprms.tap.annotations.AdministratorPage; import info.ajanovski.eprms.tap.services.GenericService; @@ -60,5 +62,8 @@ public List getAllCourses() { - return (List) genericService.getAll(Course.class); + List lista = (List) genericService.getAll(Course.class); + CourseComparator cc = new CourseComparator(); + Collections.sort(lista, cc); + return lista; } Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/ManageProjects.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/ManageProjects.java (revision e60cba5118b277aebd8226e62100cde03c904f94) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/ManageProjects.java (revision f14a006edd2d177215bbf9e7e05effa2eef2ad96) @@ -24,4 +24,5 @@ import java.security.SecureRandom; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import java.util.stream.Collectors; @@ -48,4 +49,5 @@ import info.ajanovski.eprms.model.entities.Team; import info.ajanovski.eprms.model.entities.TeamMember; +import info.ajanovski.eprms.model.util.CourseComparator; import info.ajanovski.eprms.model.util.ModelConstants; import info.ajanovski.eprms.mq.MessagingService; @@ -236,5 +238,8 @@ public List getAllCourses() { - return (List) genericService.getAll(Course.class); + List lista = (List) genericService.getAll(Course.class); + CourseComparator cc = new CourseComparator(); + Collections.sort(lista, cc); + return lista; } Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/OverallCourseReport.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/OverallCourseReport.java (revision e60cba5118b277aebd8226e62100cde03c904f94) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/OverallCourseReport.java (revision f14a006edd2d177215bbf9e7e05effa2eef2ad96) @@ -2,4 +2,5 @@ import java.util.ArrayList; +import java.util.Collections; import java.util.Date; import java.util.List; @@ -28,5 +29,7 @@ import info.ajanovski.eprms.model.entities.WorkReport; import info.ajanovski.eprms.model.util.CourseActivityTypeHierarchicalComparator; +import info.ajanovski.eprms.model.util.CourseComparator; import info.ajanovski.eprms.model.util.ModelConstants; +import info.ajanovski.eprms.model.util.WorkEvaluationComparator; import info.ajanovski.eprms.mq.MessagingService; import info.ajanovski.eprms.tap.annotations.AdministratorPage; @@ -63,6 +66,30 @@ private AjaxResponseRenderer ajaxResponseRenderer; + @Inject + private SelectModelFactory selectModelFactory; + @InjectComponent - private Zone zNewWorkReportModal, zNewWorkEvaluationModal; + private Zone zNewWorkReportModal, zNewWorkEvaluationModal, zTable; + + @Persist + @Property + private Course selectedCourse; + + @Property + private CourseActivityType courseActivityType; + + @Property + private WorkReport workReport; + + @Property + private WorkEvaluation workEvaluation; + + @Persist + @Property + private WorkReport newWorkReport; + + @Persist + @Property + private WorkEvaluation newWorkEvaluation; public List getAllProjects() { @@ -70,9 +97,9 @@ if (selectedCourse == null) { list = ((List) projectManager.getAllProjectsOrderByTitle()).stream() - .filter(c -> (c.getStatus() != null && c.getStatus().equals(ModelConstants.ProjectStatusActive))) + .filter(p -> (p.getStatus() != null && p.getStatus().equals(ModelConstants.ProjectStatusActive))) .collect(Collectors.toList()); } else { - list = ((List) projectManager.getCourseProjectsOrderByTitle(selectedCourse)).stream() - .filter(c -> (c.getStatus() != null && c.getStatus().equals(ModelConstants.ProjectStatusActive))) + list = ((List) projectManager.getAllProjectsInCourseOrderByTitle(selectedCourse)).stream() + .filter(p -> (p.getStatus() != null && p.getStatus().equals(ModelConstants.ProjectStatusActive))) .collect(Collectors.toList()); } @@ -98,18 +125,13 @@ } - @Property - private CourseActivityType courseActivityType; - - @Property - private WorkReport workReport; - - @Property - private WorkEvaluation workEvaluation; - - @Persist - @Property - private WorkReport newWorkReport; - - public void onActionFromAddWorkReport(Activity a) { + public List getWorkReportsForActivity() { + return projectManager.getWorkReportsForActivity(getActivity()); + } + + public List getWorkEvaluationsForWorkReport() { + return projectManager.getWorkEvaluationForWorkReport(workReport); + } + + public void onAddWorkReport(Activity a) { newWorkEvaluation = null; newWorkReport = new WorkReport(); @@ -127,9 +149,6 @@ } - @Persist - @Property - private WorkEvaluation newWorkEvaluation; - - public void onActionFromAddWorkEvaluation(WorkReport wr) { + public void onAddWorkEvaluation(WorkReport wr) { + WorkReport wr1 = genericService.getByPK(WorkReport.class, wr.getWorkReportId()); newWorkReport = null; newWorkEvaluation = new WorkEvaluation(); @@ -137,5 +156,5 @@ newWorkEvaluation.setPerson(genericService.getByPK(Person.class, userInfo.getPersonId())); newWorkEvaluation.setStatus(ModelConstants.EvaluationStatusCreated); - newWorkEvaluation.setWorkReport(wr); + newWorkEvaluation.setWorkReport(wr1); if (request.isXHR()) { ajaxResponseRenderer.addRender(zNewWorkEvaluationModal); @@ -143,5 +162,5 @@ } - public void onActionFromEditWorkEvaluation(WorkEvaluation wa) { + public void onEditWorkEvaluation(WorkEvaluation wa) { newWorkReport = null; newWorkEvaluation = wa; @@ -152,5 +171,5 @@ @CommitAfter - public void onActionFromToggleWorkEvaluationStatus(WorkEvaluation wa) { + public void onToggleWorkEvaluationStatus(WorkEvaluation wa) { if (wa.getStatus().equals(ModelConstants.EvaluationStatusCreated)) { wa.setStatus(ModelConstants.EvaluationStatusPublished); @@ -159,4 +178,7 @@ } genericService.saveOrUpdate(wa); + if (request.isXHR()) { + ajaxResponseRenderer.addRender(zTable); + } } @@ -173,7 +195,4 @@ } - @Inject - private SelectModelFactory selectModelFactory; - public SelectModel getCoursesModel() { return selectModelFactory.create(getAllCourses(), "title"); @@ -181,10 +200,9 @@ public List getAllCourses() { - return (List) genericService.getAll(Course.class); - } - - @Persist - @Property - private Course selectedCourse; + List lista = (List) genericService.getAll(Course.class); + CourseComparator cc = new CourseComparator(); + Collections.sort(lista, cc); + return lista; + } public void onActivate() { @@ -192,4 +210,8 @@ selectedCourse = genericService.getByPK(Course.class, selectedCourse.getCourseId()); } + if (newWorkEvaluation != null && newWorkEvaluation.getWorkReport() != null) { + newWorkEvaluation.setWorkReport( + genericService.getByPK(WorkReport.class, newWorkEvaluation.getWorkReport().getWorkReportId())); + } messagingService.setupMQHost(AppConfig.getString("MQHost")); } Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/user/MyProjectReports.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/user/MyProjectReports.java (revision e60cba5118b277aebd8226e62100cde03c904f94) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/user/MyProjectReports.java (revision f14a006edd2d177215bbf9e7e05effa2eef2ad96) @@ -78,9 +78,13 @@ private WorkReport newWorkReport; - public void onActionFromAddReport(Activity a) { + public void onAddReport(Activity a) { newWorkReport = new WorkReport(); newWorkReport.setPerson(genericService.getByPK(Person.class, userInfo.getPersonId())); newWorkReport.setActivity(a); newWorkReport.setSubmissionDate(new Date()); + } + + public void onEditWorkReport(WorkReport wr) { + newWorkReport = wr; } @@ -109,10 +113,6 @@ } - public void onActionFromEditWorkReport(WorkReport wr) { - newWorkReport = wr; - } - @CommitAfter - public void onActionFromDeleteWorkReport(WorkReport wr) { + public void onDeleteWorkReport(WorkReport wr) { genericService.delete(wr); newWorkReport = null; @@ -130,3 +130,11 @@ } + public List getWorkReportsForActivity() { + return projectManager.getWorkReportsForActivity(activity); + } + + public List getWorkEvaluationsForWorkReport() { + return projectManager.getWorkEvaluationForWorkReport(workReport); + } + } Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/services/ProjectManager.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/services/ProjectManager.java (revision e60cba5118b277aebd8226e62100cde03c904f94) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/services/ProjectManager.java (revision f14a006edd2d177215bbf9e7e05effa2eef2ad96) @@ -23,7 +23,10 @@ import java.util.List; +import info.ajanovski.eprms.model.entities.Activity; import info.ajanovski.eprms.model.entities.Course; import info.ajanovski.eprms.model.entities.CourseProject; import info.ajanovski.eprms.model.entities.Project; +import info.ajanovski.eprms.model.entities.WorkEvaluation; +import info.ajanovski.eprms.model.entities.WorkReport; public interface ProjectManager { @@ -37,5 +40,5 @@ public Float sumPoints(Project p); - public List getCourseProjectsOrderByTitle(Course selectedCourse); + public List getAllProjectsInCourseOrderByTitle(Course selectedCourse); public List getProjectByPerson(Long personId); @@ -43,3 +46,7 @@ public void cycleStatus(Project p); + public List getWorkEvaluationForWorkReport(WorkReport workReport); + + public List getWorkReportsForActivity(Activity activity); + } Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/services/ProjectManagerImpl.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/services/ProjectManagerImpl.java (revision e60cba5118b277aebd8226e62100cde03c904f94) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/services/ProjectManagerImpl.java (revision f14a006edd2d177215bbf9e7e05effa2eef2ad96) @@ -21,5 +21,7 @@ package info.ajanovski.eprms.tap.services; +import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.List; import java.util.stream.Collectors; @@ -27,8 +29,13 @@ import javax.inject.Inject; +import info.ajanovski.eprms.model.entities.Activity; import info.ajanovski.eprms.model.entities.Course; import info.ajanovski.eprms.model.entities.CourseProject; import info.ajanovski.eprms.model.entities.Project; +import info.ajanovski.eprms.model.entities.WorkEvaluation; +import info.ajanovski.eprms.model.entities.WorkReport; import info.ajanovski.eprms.model.util.ModelConstants; +import info.ajanovski.eprms.model.util.WorkEvaluationComparator; +import info.ajanovski.eprms.model.util.WorkReportComparator; import info.ajanovski.eprms.tap.data.ProjectDao; @@ -77,6 +84,6 @@ @Override - public List getCourseProjectsOrderByTitle(Course selectedCourse) { - return projectDao.getCourseProjectsOrderByTitle(selectedCourse); + public List getAllProjectsInCourseOrderByTitle(Course selectedCourse) { + return projectDao.getAllProjectsInCourseOrderByTitle(selectedCourse); } @@ -104,3 +111,24 @@ } + @Override + public List getWorkEvaluationForWorkReport(WorkReport workReport) { + List list = workReport.getWorkEvaluations(); + WorkEvaluationComparator comparator = new WorkEvaluationComparator(); + Collections.sort(list, comparator); + return list; + } + + @Override + public List getWorkReportsForActivity(Activity activity) { + List list; + if (activity != null) { + list = activity.getWorkReports(); + } else { + list = new ArrayList(); + } + WorkReportComparator comparator = new WorkReportComparator(); + Collections.sort(list, comparator); + return list; + } + } Index: eprms-tap/src/main/resources/META-INF/modules/webeditor-config-admin.js =================================================================== --- eprms-tap/src/main/resources/META-INF/modules/webeditor-config-admin.js (revision e60cba5118b277aebd8226e62100cde03c904f94) +++ eprms-tap/src/main/resources/META-INF/modules/webeditor-config-admin.js (revision f14a006edd2d177215bbf9e7e05effa2eef2ad96) @@ -24,6 +24,6 @@ }, paths: { - 'ckeditor-core': '../webjars/ckeditor/4.16.1/standard/ckeditor', - 'ckeditor-jquery': '../webjars/ckeditor/4.16.1/standard/adapters/jquery' + 'ckeditor-core': '../webjars/ckeditor/4.17.1/standard/ckeditor', + 'ckeditor-jquery': '../webjars/ckeditor/4.17.1/standard/adapters/jquery' } }); Index: eprms-tap/src/main/resources/META-INF/modules/webeditor-config.js =================================================================== --- eprms-tap/src/main/resources/META-INF/modules/webeditor-config.js (revision e60cba5118b277aebd8226e62100cde03c904f94) +++ eprms-tap/src/main/resources/META-INF/modules/webeditor-config.js (revision f14a006edd2d177215bbf9e7e05effa2eef2ad96) @@ -24,6 +24,6 @@ }, paths: { - 'ckeditor-core': '../webjars/ckeditor/4.16.1/standard/ckeditor', - 'ckeditor-jquery': '../webjars/ckeditor/4.16.1/standard/adapters/jquery' + 'ckeditor-core': '../webjars/ckeditor/4.17.1/standard/ckeditor', + 'ckeditor-jquery': '../webjars/ckeditor/4.17.1/standard/adapters/jquery' } }); Index: eprms-tap/src/main/resources/info/ajanovski/eprms/tap/components/IconActionLink.tml =================================================================== --- eprms-tap/src/main/resources/info/ajanovski/eprms/tap/components/IconActionLink.tml (revision f14a006edd2d177215bbf9e7e05effa2eef2ad96) +++ eprms-tap/src/main/resources/info/ajanovski/eprms/tap/components/IconActionLink.tml (revision f14a006edd2d177215bbf9e7e05effa2eef2ad96) @@ -0,0 +1,6 @@ + + + + Index: eprms-tap/src/main/resources/info/ajanovski/eprms/tap/pages/admin/ManageActivityTypes.tml =================================================================== --- eprms-tap/src/main/resources/info/ajanovski/eprms/tap/pages/admin/ManageActivityTypes.tml (revision e60cba5118b277aebd8226e62100cde03c904f94) +++ eprms-tap/src/main/resources/info/ajanovski/eprms/tap/pages/admin/ManageActivityTypes.tml (revision f14a006edd2d177215bbf9e7e05effa2eef2ad96) @@ -7,34 +7,44 @@

${message:New-label} - ${message:ActivityType-label} + class="btn btn-primary" t:type="eventlink" t:id="newActivityType" + t:zone="editFormZone"> + ${message:New-label} ${message:ActivityType-label}

-
-
-
- -
- -
- -
+
+
+ +
+
+ + +
+ +
+ + +
+ + Cancel +
+
+
+
-

- ${activityType.title} + ${activityType.title} + t:context="activityType" t:zone="editFormZone">

- Index: eprms-tap/src/main/resources/info/ajanovski/eprms/tap/pages/admin/ManageCourses.tml =================================================================== --- eprms-tap/src/main/resources/info/ajanovski/eprms/tap/pages/admin/ManageCourses.tml (revision e60cba5118b277aebd8226e62100cde03c904f94) +++ eprms-tap/src/main/resources/info/ajanovski/eprms/tap/pages/admin/ManageCourses.tml (revision f14a006edd2d177215bbf9e7e05effa2eef2ad96) @@ -43,8 +43,8 @@ t:path="minus" />

- ${message:add-label} - ${message:activityType-label} +

+ ${message:add-label} +

Index: eprms-tap/src/main/resources/info/ajanovski/eprms/tap/pages/admin/OverallCourseReport.tml =================================================================== --- eprms-tap/src/main/resources/info/ajanovski/eprms/tap/pages/admin/OverallCourseReport.tml (revision e60cba5118b277aebd8226e62100cde03c904f94) +++ eprms-tap/src/main/resources/info/ajanovski/eprms/tap/pages/admin/OverallCourseReport.tml (revision f14a006edd2d177215bbf9e7e05effa2eef2ad96) @@ -5,4 +5,59 @@ .CREATED { background-color: #ffc0c0ff !important; + color: #000000ff !important; +} + +.report { + min-height: 5rem; + max-height: 10rem; + overflow: auto; + font-size: 75%; +} + +.evaluation { + font-size: 85%; + max-height: 12.5rem; + overflow: auto; +} + +table { + margin: 0; + table-layout: fixed; +} + +table thead th { + position: sticky; + top: 3.5em; + z-index: 1; + width: 18vw; + background: white; +} + +table thead th:first-child { + position: sticky; + left: 0; + z-index: 2; + width: 8vw; +} + +table td { + background: #fff; +} + +table tbody th { + position: relative; +} + +table tbody th { + position: sticky; + left: 0; + background: #eee; + z-index: 1; +} + +[role="region"][aria-labelledby][tabindex] { + width: 100%; + max-height: 98vh; + overflow: auto; } @@ -11,5 +66,6 @@

${message:admin/OverallCourseReport-pagelink}

-
+