Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/components/Backlink.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/components/Backlink.java (revision 052c989a9e32c3fea046815ef2b6d09012b88e29) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/components/Backlink.java (revision 052c989a9e32c3fea046815ef2b6d09012b88e29) @@ -0,0 +1,37 @@ +/******************************************************************************* + * 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; + +public class Backlink { + + @Property + @Parameter(required = true, defaultPrefix = BindingConstants.LITERAL) + private String page; + + @Property + @Parameter(required = false, defaultPrefix = BindingConstants.PROP) + private Object context; + +} 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 e2bfb4ca8ffd252ba7c96c70a530a3de875750fd) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/components/Layout.java (revision 052c989a9e32c3fea046815ef2b6d09012b88e29) @@ -41,6 +41,5 @@ import info.ajanovski.eprms.tap.util.UserInfo; -@Import(stylesheet = { - "site-overrides.css" }, module = { "bootstrap/dropdown", "bootstrap/collapse" }) +@Import(stylesheet = { "site-overrides.css" }, module = { "bootstrap/dropdown", "bootstrap/collapse" }) public class Layout { @@ -82,10 +81,11 @@ public String[] getStudentPageNames() { - return new String[] { "Index", "MyDatabases", "MyRepositories", "MyRepositoryAuth" }; + return new String[] { "Index", "MyProjectReports", "MyDatabases", "MyRepositories", "MyRepositoryAuth" }; } public String[] getAdminPageNames() { if (userInfo.isAdministrator()) { - return new String[] { "admin/Projects", "admin/Teams", "admin/ManageDatabases", "admin/ManageRepositories" }; + return new String[] { "admin/OverallCourseReport", "admin/ManageProjects", "admin/ManageTeams", + "admin/ManageDatabases", "admin/ManageRepositories" }; } else { return null; 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 e2bfb4ca8ffd252ba7c96c70a530a3de875750fd) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/components/SVGIcon.java (revision 052c989a9e32c3fea046815ef2b6d09012b88e29) @@ -63,6 +63,6 @@ } if (width == null && height == null) { - height = "1.5em"; - width = "1.5em"; + height = "1.2em"; + width = "1.2em"; } } 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 e2bfb4ca8ffd252ba7c96c70a530a3de875750fd) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/data/ProjectDao.java (revision 052c989a9e32c3fea046815ef2b6d09012b88e29) @@ -22,5 +22,21 @@ package info.ajanovski.eprms.tap.data; +import java.util.List; + +import info.ajanovski.eprms.model.entities.Course; +import info.ajanovski.eprms.model.entities.CourseProject; +import info.ajanovski.eprms.model.entities.Project; + public interface ProjectDao { + public List getAllProjectsOrderByTitle(); + + public List getProjectCourses(Project p); + + public Float sumPoints(Project p); + + public List getCourseProjectsOrderByTitle(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 e2bfb4ca8ffd252ba7c96c70a530a3de875750fd) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/data/ProjectDaoImpl.java (revision 052c989a9e32c3fea046815ef2b6d09012b88e29) @@ -22,5 +22,96 @@ package info.ajanovski.eprms.tap.data; +import java.util.List; + +import javax.inject.Inject; + +import org.hibernate.Session; + +import info.ajanovski.eprms.model.entities.Course; +import info.ajanovski.eprms.model.entities.CourseProject; +import info.ajanovski.eprms.model.entities.Project; + public class ProjectDaoImpl implements ProjectDao { + @Inject + private Session session; + + @Override + @SuppressWarnings("unchecked") + public List getAllProjectsOrderByTitle() { + return session.createQuery("from Project order by title").list(); + } + + @Override + @SuppressWarnings("unchecked") + public List getProjectCourses(Project p) { + if (p != null) { + return session.createQuery("from CourseProject cp where cp.project.projectId=:projectId") + .setParameter("projectId", p.getProjectId()).list(); + } else { + return null; + } + } + + @Override + @SuppressWarnings("unchecked") + public Float sumPoints(Project p) { + if (p != null) { + List lista = session.createQuery(""" + select max(we.points) as maxpoints + from WorkEvaluation as we + join we.workReport as wr + join wr.activity as a + join a.project as p + where p.projectId=:projectId + group by a + """).setParameter("projectId", p.getProjectId()).list(); + Float output = 0.0f; + for (Float o : lista) { + if (o != null) { + output += o; + } + } + return output; + } else { + return null; + } + } + + @Override + @SuppressWarnings("unchecked") + public List getCourseProjectsOrderByTitle(Course selectedCourse) { + if (selectedCourse != null) { + return session.createQuery(""" + select p + from Project p + join p.courseProjects cp + join cp.course c + where c.courseId=:courseId + order by p.title + """).setParameter("courseId", selectedCourse.getCourseId()).list(); + } else { + return null; + } + } + + @Override + @SuppressWarnings("unchecked") + public List getProjectByPerson(Long personId) { + if (personId != null) { + return session.createQuery(""" + select p + from Project p + join p.responsibilities r + join r.team t + join t.teamMembers tm + join tm.person person + where person.personId=:personId + order by p.title + """).setParameter("personId", personId).list(); + } else { + return null; + } + } + } Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/MyProjectReports.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/MyProjectReports.java (revision 052c989a9e32c3fea046815ef2b6d09012b88e29) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/MyProjectReports.java (revision 052c989a9e32c3fea046815ef2b6d09012b88e29) @@ -0,0 +1,47 @@ +package info.ajanovski.eprms.tap.pages; + +import java.util.List; + +import javax.inject.Inject; + +import org.apache.tapestry5.annotations.Property; +import org.apache.tapestry5.annotations.SessionState; + +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; +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.ProjectManager; +import info.ajanovski.eprms.tap.util.UserInfo; + +@StudentPage +@InstructorPage +@AdministratorPage +public class MyProjectReports { + @SessionState + @Property + private UserInfo userInfo; + + @Inject + private ProjectManager projectManager; + + public List getMyProjects() { + return projectManager.getProjectByPerson(userInfo.getPersonId()); + } + + @Property + private Project project; + + @Property + private Activity activity; + + @Property + private WorkReport workReport; + + @Property + private WorkEvaluation workEvaluation; + +} Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/ManageActivities.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/ManageActivities.java (revision 052c989a9e32c3fea046815ef2b6d09012b88e29) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/ManageActivities.java (revision 052c989a9e32c3fea046815ef2b6d09012b88e29) @@ -0,0 +1,70 @@ +package info.ajanovski.eprms.tap.pages.admin; + +import java.util.List; + +import javax.inject.Inject; + +import org.apache.tapestry5.SelectModel; +import org.apache.tapestry5.annotations.InjectComponent; +import org.apache.tapestry5.annotations.Persist; +import org.apache.tapestry5.annotations.Property; +import org.apache.tapestry5.corelib.components.Zone; +import org.apache.tapestry5.hibernate.annotations.CommitAfter; +import org.apache.tapestry5.services.SelectModelFactory; + +import info.ajanovski.eprms.model.entities.Activity; +import info.ajanovski.eprms.model.entities.ActivityType; +import info.ajanovski.eprms.model.entities.Project; +import info.ajanovski.eprms.tap.annotations.AdministratorPage; +import info.ajanovski.eprms.tap.services.GenericService; + +@AdministratorPage +public class ManageActivities { + + @Persist + @Property + private Project selectedProject; + + @Persist + @Property + private Activity newActivity; + + @Inject + private GenericService genericService; + + public void onActivate() { + if (selectedProject != null) { + selectedProject = genericService.getByPK(Project.class, selectedProject.getProjectId()); + } + } + + public void onActivate(Project p) { + selectedProject = genericService.getByPK(Project.class, p.getProjectId()); + } + + public void onActionFromNewActivity() { + newActivity = new Activity(); + newActivity.setProject(selectedProject); + } + + @InjectComponent + private Zone zoneActivities; + + @CommitAfter + public void onSuccessFromNewActivityForm() { + genericService.save(newActivity); + newActivity = null; + } + + @Inject + private SelectModelFactory selectModelFactory; + + public SelectModel getListTypes() { + return selectModelFactory.create(genericService.getAll(ActivityType.class), "title"); + } + + public List getAllActivities() { + return selectedProject.getActivities(); + } + +} 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 052c989a9e32c3fea046815ef2b6d09012b88e29) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/ManageProjects.java (revision 052c989a9e32c3fea046815ef2b6d09012b88e29) @@ -0,0 +1,274 @@ +/******************************************************************************* + * 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.pages.admin; + +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; + +import org.apache.tapestry5.SelectModel; +import org.apache.tapestry5.ValueEncoder; +import org.apache.tapestry5.annotations.Persist; +import org.apache.tapestry5.annotations.Property; +import org.apache.tapestry5.annotations.SessionState; +import org.apache.tapestry5.commons.Messages; +import org.apache.tapestry5.hibernate.annotations.CommitAfter; +import org.apache.tapestry5.ioc.annotations.Inject; +import org.apache.tapestry5.services.SelectModelFactory; + +import info.ajanovski.eprms.model.entities.Activity; +import info.ajanovski.eprms.model.entities.Course; +import info.ajanovski.eprms.model.entities.Database; +import info.ajanovski.eprms.model.entities.Person; +import info.ajanovski.eprms.model.entities.Project; +import info.ajanovski.eprms.model.entities.Repository; +import info.ajanovski.eprms.model.entities.Responsibility; +import info.ajanovski.eprms.model.entities.Team; +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.services.GenericService; +import info.ajanovski.eprms.tap.services.ProjectManager; +import info.ajanovski.eprms.tap.util.UserInfo; + +@InstructorPage +@AdministratorPage +public class ManageProjects { + @SessionState + @Property + private UserInfo userInfo; + + @Inject + private ProjectManager projectManager; + + @Inject + private GenericService genericService; + + public List getAllProjects() { + return (List) projectManager.getAllProjectsOrderByTitle(); + } + + public List getProjects() { + if (selectedProject != null) { + List ls = new ArrayList(); + ls.add(genericService.getByPK(Project.class, selectedProject.getProjectId())); + return ls; + } else { + return getAllProjects(); + } + } + + @Property + private Project project; + + @Persist + @Property + private Project selectedProject; + + @Property + private Responsibility responsibility; + + @Property + private TeamMember teamMember; + + @Property + private Database database; + + @Property + private Repository repository; + + @Persist + @Property + private TeamMember newTm; + + @Persist + @Property + private Project newProject; + + @Persist + @Property + private Team newTeam; + + @Persist + @Property + private Responsibility newResponsibility; + + @Persist + @Property + private Database newDb; + + @Persist + @Property + private Repository newRp; + + public void onActionFromAddTeamMember(Team t) { + newTm = new TeamMember(); + newTm.setTeam(t); + } + + public void onActionFromNewProject() { + newProject = new Project(); + } + + public void onActionFromEditProject(Project p) { + newProject = p; + inCourses = projectManager.getProjectCourses(newProject).stream().map(cp -> cp.getCourse()) + .collect(Collectors.toList()); + } + + public void onActionFromNewTeam(Project p) { + newTeam = new Team(); + newResponsibility = new Responsibility(); + newResponsibility.setProject(p); + newResponsibility.setTeam(newTeam); + } + + public void onActionFromNewDatabase(Project p) { + newDb = new Database(); + newDb.setProject(p); + } + + public void onActionFromNewRepository(Project p) { + newRp = new Repository(); + newRp.setProject(p); + } + + public List getAllCourses() { + return (List) genericService.getAll(Course.class); + } + + @Persist + @Property + private List inCourses; + + @Inject + private Messages messages; + + public SelectModel getCoursesModel() { + return selectModelFactory.create(getAllCourses(), "title"); + } + + public SelectModel getSelectedCoursesModel() { + return selectModelFactory.create(inCourses, "title"); + } + + public ValueEncoder getCourseEncoder() { + return new ValueEncoder() { + @Override + public String toClient(Course value) { + return String.valueOf(value.getCourseId()); + } + + @Override + public Course toValue(String id) { + return genericService.getByPK(Course.class, Long.parseLong(id)); + } + }; + } + + @CommitAfter + public void onSuccessFromTeamMemberForm() { + genericService.save(newTm); + newTm = null; + } + + @CommitAfter + public void onSuccessFromNewProjectForm() { + genericService.saveOrUpdate(newProject); + projectManager.addCoursesToProject(inCourses, newProject); + selectedProject = newProject; + newProject = null; + } + + @CommitAfter + public void onSuccessFromNewTeamForm() { + genericService.save(newTeam); + genericService.save(newResponsibility); + newTeam = null; + newResponsibility = null; + } + + @CommitAfter + public void onSuccessFromNewDatabaseForm() { + genericService.save(newDb); + newDb = null; + } + + @CommitAfter + public void onSuccessFromNewRepositoryForm() { + genericService.save(newRp); + newRp = null; + } + + @Property + private Person person; + + public List getPersons() { + return (List) genericService.getAll(Person.class); + } + + @Inject + private SelectModelFactory selectModelFactory; + + public SelectModel getPersonModel() { + return (SelectModel) selectModelFactory.create(getPersons(), "userName"); + } + + public SelectModel getProjectModel() { + return (SelectModel) selectModelFactory.create(getAllProjects(), "title"); + } + + @Property + private Course course; + + public List getProjectCourses() { + return projectManager.getProjectCourses(project).stream().map(cp -> cp.getCourse()) + .collect(Collectors.toList()); + } + + @Persist + @Property + private Project copyActivitiesFromProject; + + public void onActionFromCopyActivities(Project p) { + copyActivitiesFromProject = p; + } + + public void onActionFromResetClipboard() { + copyActivitiesFromProject = null; + } + + @CommitAfter + public void onActionFromPasteActivities(Project pasteActivitiesToProject) { + for (Activity original : genericService.getByPK(Project.class, copyActivitiesFromProject.getProjectId()) + .getActivities()) { + Activity copy = new Activity(); + copy.setDescription(original.getDescription()); + copy.setTitle(original.getTitle()); + copy.setProject(pasteActivitiesToProject); + copy.setActivityType(original.getActivityType()); + genericService.save(copy); + } + genericService.save(pasteActivitiesToProject); + copyActivitiesFromProject = null; + } + +} Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/ManageTeams.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/ManageTeams.java (revision 052c989a9e32c3fea046815ef2b6d09012b88e29) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/ManageTeams.java (revision 052c989a9e32c3fea046815ef2b6d09012b88e29) @@ -0,0 +1,48 @@ +/******************************************************************************* + * 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.pages.admin; + +import java.util.List; + +import org.apache.tapestry5.annotations.Property; +import org.apache.tapestry5.annotations.SessionState; +import org.apache.tapestry5.ioc.annotations.Inject; + +import info.ajanovski.eprms.model.entities.Team; +import info.ajanovski.eprms.tap.annotations.AdministratorPage; +import info.ajanovski.eprms.tap.annotations.InstructorPage; +import info.ajanovski.eprms.tap.services.GenericService; +import info.ajanovski.eprms.tap.util.UserInfo; + +@InstructorPage +@AdministratorPage +public class ManageTeams { + @SessionState + @Property + private UserInfo userInfo; + + @Inject + private GenericService genericService; + + public List getTeams() { + return (List) genericService.getAll(Team.class); + } +} 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 052c989a9e32c3fea046815ef2b6d09012b88e29) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/OverallCourseReport.java (revision 052c989a9e32c3fea046815ef2b6d09012b88e29) @@ -0,0 +1,113 @@ +package info.ajanovski.eprms.tap.pages.admin; + +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.hibernate.annotations.CommitAfter; +import org.apache.tapestry5.ioc.annotations.Inject; +import org.apache.tapestry5.services.SelectModelFactory; + +import info.ajanovski.eprms.model.entities.Activity; +import info.ajanovski.eprms.model.entities.Course; +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.tap.annotations.AdministratorPage; +import info.ajanovski.eprms.tap.annotations.InstructorPage; +import info.ajanovski.eprms.tap.services.GenericService; +import info.ajanovski.eprms.tap.services.ProjectManager; +import info.ajanovski.eprms.tap.util.UserInfo; + +@InstructorPage +@AdministratorPage +public class OverallCourseReport { + @SessionState + @Property + private UserInfo userInfo; + + @Inject + private ProjectManager projectManager; + + @Inject + private GenericService genericService; + + public List getAllProjects() { + if (selectedCourse == null) { + return (List) projectManager.getAllProjectsOrderByTitle(); + } else { + return (List) projectManager.getCourseProjectsOrderByTitle(selectedCourse); + } + } + + @Property + private Project project; + + @Property + private Activity activity; + @Property + private WorkReport workReport; + @Property + private WorkEvaluation workEvaluation; + + @Persist + @Property + private WorkReport newWorkReport; + + public void onActionFromAddWorkReport(Activity a) { + newWorkEvaluation = null; + newWorkReport = new WorkReport(); + newWorkReport.setActivity(a); + } + + @CommitAfter + public void onSuccessFromFrmAddWorkReport() { + genericService.saveOrUpdate(newWorkReport); + newWorkReport = null; + newWorkEvaluation = null; + } + + @Persist + @Property + private WorkEvaluation newWorkEvaluation; + + public void onActionFromAddWorkEvaluation(WorkReport wr) { + newWorkReport = null; + newWorkEvaluation = new WorkEvaluation(); + newWorkEvaluation.setWorkReport(wr); + } + + public void onActionFromEditWorkEvaluation(WorkEvaluation wa) { + newWorkReport = null; + newWorkEvaluation = wa; + } + + @CommitAfter + public void onSuccessFromFrmAddWorkEvaluation() { + genericService.saveOrUpdate(newWorkEvaluation); + newWorkReport = null; + newWorkEvaluation = null; + } + + public Float getProjectTotal() { + return projectManager.sumPoints(project); + } + + @Inject + private SelectModelFactory selectModelFactory; + + public SelectModel getCoursesModel() { + return selectModelFactory.create(getAllCourses(), "title"); + } + + public List getAllCourses() { + return (List) genericService.getAll(Course.class); + } + + @Persist + @Property + private Course selectedCourse; + +} Index: rms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/Projects.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/Projects.java (revision e2bfb4ca8ffd252ba7c96c70a530a3de875750fd) +++ (revision ) @@ -1,190 +1,0 @@ -/******************************************************************************* - * 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.pages.admin; - -import java.util.ArrayList; -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.hibernate.annotations.CommitAfter; -import org.apache.tapestry5.ioc.annotations.Inject; -import org.apache.tapestry5.services.SelectModelFactory; - -import info.ajanovski.eprms.model.entities.Database; -import info.ajanovski.eprms.model.entities.Person; -import info.ajanovski.eprms.model.entities.Project; -import info.ajanovski.eprms.model.entities.Repository; -import info.ajanovski.eprms.model.entities.Responsibility; -import info.ajanovski.eprms.model.entities.Team; -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.services.GenericService; -import info.ajanovski.eprms.tap.util.UserInfo; - -@InstructorPage -@AdministratorPage -public class Projects { - @SessionState - @Property - private UserInfo userInfo; - - @Inject - private GenericService genericService; - - public List getAllProjects() { - return (List) genericService.getAll(Project.class); - } - - public List getProjects() { - if (selectedProject != null) { - List ls = new ArrayList(); - ls.add(genericService.getByPK(Project.class, selectedProject.getProjectId())); - return ls; - } else { - return getAllProjects(); - } - } - - @Property - private Project project; - - @Persist - @Property - private Project selectedProject; - - @Property - private Responsibility responsibility; - - @Property - private TeamMember teamMember; - - @Property - private Database database; - - @Property - private Repository repository; - - @Persist - @Property - private TeamMember newTm; - - @Persist - @Property - private Project newProject; - - @Persist - @Property - private Team newTeam; - - @Persist - @Property - private Responsibility newResponsibility; - - @Persist - @Property - private Database newDb; - - @Persist - @Property - private Repository newRp; - - public void onActionFromAddTeamMember(Team t) { - newTm = new TeamMember(); - newTm.setTeam(t); - } - - public void onActionFromNewProject() { - newProject = new Project(); - } - - public void onActionFromNewTeam(Project p) { - newTeam = new Team(); - newResponsibility = new Responsibility(); - newResponsibility.setProject(p); - newResponsibility.setTeam(newTeam); - } - - public void onActionFromNewDatabase(Project p) { - newDb = new Database(); - newDb.setProject(p); - } - - public void onActionFromNewRepository(Project p) { - newRp = new Repository(); - newRp.setProject(p); - } - - @CommitAfter - public void onSuccessFromTeamMemberForm() { - genericService.save(newTm); - newTm = null; - } - - @CommitAfter - public void onSuccessFromNewProjectForm() { - genericService.save(newProject); - selectedProject = newProject; - newProject = null; - } - - @CommitAfter - public void onSuccessFromNewTeamForm() { - genericService.save(newTeam); - genericService.save(newResponsibility); - newTeam = null; - newResponsibility = null; - } - - @CommitAfter - public void onSuccessFromNewDatabaseForm() { - genericService.save(newDb); - newDb = null; - } - - @CommitAfter - public void onSuccessFromNewRepositoryForm() { - genericService.save(newRp); - newRp = null; - } - - @Property - private Person person; - - public List getPersons() { - return (List) genericService.getAll(Person.class); - } - - @Inject - private SelectModelFactory selectModelFactory; - - public SelectModel getPersonModel() { - return (SelectModel) selectModelFactory.create(getPersons(), "userName"); - } - - public SelectModel getProjectModel() { - return (SelectModel) selectModelFactory.create(getAllProjects(), "title"); - } - -} Index: rms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/Teams.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/Teams.java (revision e2bfb4ca8ffd252ba7c96c70a530a3de875750fd) +++ (revision ) @@ -1,48 +1,0 @@ -/******************************************************************************* - * 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.pages.admin; - -import java.util.List; - -import org.apache.tapestry5.annotations.Property; -import org.apache.tapestry5.annotations.SessionState; -import org.apache.tapestry5.ioc.annotations.Inject; - -import info.ajanovski.eprms.model.entities.Team; -import info.ajanovski.eprms.tap.annotations.AdministratorPage; -import info.ajanovski.eprms.tap.annotations.InstructorPage; -import info.ajanovski.eprms.tap.services.GenericService; -import info.ajanovski.eprms.tap.util.UserInfo; - -@InstructorPage -@AdministratorPage -public class Teams { - @SessionState - @Property - private UserInfo userInfo; - - @Inject - private GenericService genericService; - - public List getTeams() { - return (List) genericService.getAll(Team.class); - } -} Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/services/AppModule.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/services/AppModule.java (revision e2bfb4ca8ffd252ba7c96c70a530a3de875750fd) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/services/AppModule.java (revision 052c989a9e32c3fea046815ef2b6d09012b88e29) @@ -47,4 +47,5 @@ import info.ajanovski.eprms.tap.data.GenericDao; import info.ajanovski.eprms.tap.data.PersonDao; +import info.ajanovski.eprms.tap.data.ProjectDao; import info.ajanovski.eprms.tap.data.ResourceDao; import info.ajanovski.eprms.tap.util.AppConfig; @@ -58,4 +59,6 @@ binder.bind(PersonDao.class); binder.bind(PersonManager.class); + binder.bind(ProjectDao.class); + binder.bind(ProjectManager.class); binder.bind(ResourceManager.class); binder.bind(ResourceDao.class); 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 e2bfb4ca8ffd252ba7c96c70a530a3de875750fd) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/services/ProjectManager.java (revision 052c989a9e32c3fea046815ef2b6d09012b88e29) @@ -21,5 +21,23 @@ package info.ajanovski.eprms.tap.services; +import java.util.List; + +import info.ajanovski.eprms.model.entities.Course; +import info.ajanovski.eprms.model.entities.CourseProject; +import info.ajanovski.eprms.model.entities.Project; + public interface ProjectManager { - + + public List getAllProjectsOrderByTitle(); + + public List getProjectCourses(Project p); + + public void addCoursesToProject(List inCourses, Project p); + + public Float sumPoints(Project p); + + public List getCourseProjectsOrderByTitle(Course selectedCourse); + + public List getProjectByPerson(Long personId); + } 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 e2bfb4ca8ffd252ba7c96c70a530a3de875750fd) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/services/ProjectManagerImpl.java (revision 052c989a9e32c3fea046815ef2b6d09012b88e29) @@ -21,5 +21,66 @@ package info.ajanovski.eprms.tap.services; +import java.util.List; +import java.util.stream.Collectors; + +import javax.inject.Inject; + +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.tap.data.ProjectDao; + public class ProjectManagerImpl implements ProjectManager { + @Inject + private ProjectDao projectDao; + + @Inject + private GenericService genericService; + + @Override + public List getAllProjectsOrderByTitle() { + return projectDao.getAllProjectsOrderByTitle(); + } + + @Override + public List getProjectCourses(Project p) { + return projectDao.getProjectCourses(p); + } + + @Override + public void addCoursesToProject(List inCourses, Project p) { + List projectCourses = projectDao.getProjectCourses(p); + List coursesFromProjectCourses = projectCourses.stream().map(cp -> cp.getCourse()) + .collect(Collectors.toList()); + for (Course c : inCourses) { + if (!coursesFromProjectCourses.contains(c)) { + CourseProject cp = new CourseProject(); + cp.setCourse(c); + cp.setProject(p); + genericService.save(cp); + } + } + for (CourseProject cp : projectCourses) { + if (!inCourses.contains(cp.getCourse())) { + genericService.delete(cp); + } + } + } + + @Override + public Float sumPoints(Project p) { + return projectDao.sumPoints(p); + } + + @Override + public List getCourseProjectsOrderByTitle(Course selectedCourse) { + return projectDao.getCourseProjectsOrderByTitle(selectedCourse); + } + + @Override + public List getProjectByPerson(Long personId) { + return projectDao.getProjectByPerson(personId); + } + } Index: eprms-tap/src/main/resources/META-INF/assets/site-overrides.css =================================================================== --- eprms-tap/src/main/resources/META-INF/assets/site-overrides.css (revision e2bfb4ca8ffd252ba7c96c70a530a3de875750fd) +++ eprms-tap/src/main/resources/META-INF/assets/site-overrides.css (revision 052c989a9e32c3fea046815ef2b6d09012b88e29) @@ -71,2 +71,10 @@ margin-left:0.5em; } + +svg { + fill: transparent; + stroke: currentColor; + stroke-width: 0.1em; + stroke-linecap: round; + stroke-linejoin: round; +} Index: eprms-tap/src/main/resources/info/ajanovski/eprms/tap/components/Backlink.tml =================================================================== --- eprms-tap/src/main/resources/info/ajanovski/eprms/tap/components/Backlink.tml (revision 052c989a9e32c3fea046815ef2b6d09012b88e29) +++ eprms-tap/src/main/resources/info/ajanovski/eprms/tap/components/Backlink.tml (revision 052c989a9e32c3fea046815ef2b6d09012b88e29) @@ -0,0 +1,9 @@ + + +
+ ${message:back-label} +
+ + 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 e2bfb4ca8ffd252ba7c96c70a530a3de875750fd) +++ eprms-tap/src/main/resources/info/ajanovski/eprms/tap/components/Layout.tml (revision 052c989a9e32c3fea046815ef2b6d09012b88e29) @@ -45,5 +45,5 @@ - +
  • + aria-expanded="false"> + ${userInfo.userName}
    + class="dropdown-item"> ${message:Logout-label} Index: eprms-tap/src/main/resources/info/ajanovski/eprms/tap/components/SVGIcon.tml =================================================================== --- eprms-tap/src/main/resources/info/ajanovski/eprms/tap/components/SVGIcon.tml (revision e2bfb4ca8ffd252ba7c96c70a530a3de875750fd) +++ eprms-tap/src/main/resources/info/ajanovski/eprms/tap/components/SVGIcon.tml (revision 052c989a9e32c3fea046815ef2b6d09012b88e29) @@ -2,6 +2,9 @@ xmlns:p="tapestry:parameter"> -${title} - + + + + Index: eprms-tap/src/main/resources/info/ajanovski/eprms/tap/components/TeamMembersGrid.tml =================================================================== --- eprms-tap/src/main/resources/info/ajanovski/eprms/tap/components/TeamMembersGrid.tml (revision e2bfb4ca8ffd252ba7c96c70a530a3de875750fd) +++ eprms-tap/src/main/resources/info/ajanovski/eprms/tap/components/TeamMembersGrid.tml (revision 052c989a9e32c3fea046815ef2b6d09012b88e29) @@ -2,15 +2,14 @@ xmlns:p="tapestry:parameter"> -
    ${message:Team-label} - ${team.name}
    +
    ${message:Team-label}: ${team.name}
    - + ${message:remove-label} + role="button" class="btn btn-danger btn-sm "> ${message:remove-label} - - +
    Index: eprms-tap/src/main/resources/info/ajanovski/eprms/tap/pages/MyProjectReports.tml =================================================================== --- eprms-tap/src/main/resources/info/ajanovski/eprms/tap/pages/MyProjectReports.tml (revision 052c989a9e32c3fea046815ef2b6d09012b88e29) +++ eprms-tap/src/main/resources/info/ajanovski/eprms/tap/pages/MyProjectReports.tml (revision 052c989a9e32c3fea046815ef2b6d09012b88e29) @@ -0,0 +1,44 @@ + + + + +

    ${message:myprojectreports-pagelink}

    + +
    +
    +

    Project: ${project.title}

    +
    +
    +
    +

    ${message:activity-label}:${activity.title}

    +
    +

    ${message:report-label}:${workReport.title}

    +

    ${message:description-label}:${workReport.description}

    +

    ${message:percentReported-label}: + ${workReport.percentReported}

    +
    +

    ${message:evaluation-label}:${workEvaluation.title}

    +

    ${message:description-label}:${workEvaluation.description}

    +

    ${message:percentEvaluated-label}: + ${workEvaluation.percentEvaluated}

    +

    ${message:points-label}:${workEvaluation.points}

    +
    +
    +
    +
    +
    + + Index: eprms-tap/src/main/resources/info/ajanovski/eprms/tap/pages/admin/ManageActivities.tml =================================================================== --- eprms-tap/src/main/resources/info/ajanovski/eprms/tap/pages/admin/ManageActivities.tml (revision 052c989a9e32c3fea046815ef2b6d09012b88e29) +++ eprms-tap/src/main/resources/info/ajanovski/eprms/tap/pages/admin/ManageActivities.tml (revision 052c989a9e32c3fea046815ef2b6d09012b88e29) @@ -0,0 +1,33 @@ + + + + +

    ${message:admin/ProjectActivities-pagelink}

    + +

    Project: ${selectedProject.title}

    + +
    +
    + +
    + +
    +     +
    +
    + +
    + +
    +
    +

    + ${message:newActivity-label} +

    + Index: eprms-tap/src/main/resources/info/ajanovski/eprms/tap/pages/admin/ManageDatabases.tml =================================================================== --- eprms-tap/src/main/resources/info/ajanovski/eprms/tap/pages/admin/ManageDatabases.tml (revision e2bfb4ca8ffd252ba7c96c70a530a3de875750fd) +++ eprms-tap/src/main/resources/info/ajanovski/eprms/tap/pages/admin/ManageDatabases.tml (revision 052c989a9e32c3fea046815ef2b6d09012b88e29) @@ -32,7 +32,9 @@ ${message:edit-label} + class="btn btn-sm btn-secondary" t:mixins="confirm"> ${message:edit-label} ${message:remove-label} + class="btn btn-sm btn-danger" t:mixins="confirm"> ${message:remove-label} Index: eprms-tap/src/main/resources/info/ajanovski/eprms/tap/pages/admin/ManageProjects.tml =================================================================== --- eprms-tap/src/main/resources/info/ajanovski/eprms/tap/pages/admin/ManageProjects.tml (revision 052c989a9e32c3fea046815ef2b6d09012b88e29) +++ eprms-tap/src/main/resources/info/ajanovski/eprms/tap/pages/admin/ManageProjects.tml (revision 052c989a9e32c3fea046815ef2b6d09012b88e29) @@ -0,0 +1,184 @@ + + +

    ${message:admin/ManageProjects-pagelink}

    + +
    +
    +
    +
    +
    +
    + +
    + + +
    +
    +
    + +
    +
    + ${message:copy-label} ${message:activities-label}: + ${copyActivitiesFromProject.title} ${message:reset-label} +
    + +
    +
    +

    ${message:Project-label}

    +
    + +
    + +
    +
    +     +
    +
    +
    + +
    +
    +

    ${message:Team-label}

    +
    +
    +
    + +
    +
    +

    ${message:TeamMember-label}

    +
    + + + + +
    +
    +
    + +
    +
    +

    ${message:Database-label}

    +
    +
    +
    + +
    +
    +

    ${message:Repository-label}

    +
    +
    +
    + + +
    +
    + +
    +
    +
    +

    + ${message:Edit-label} ${message:Project-label} + ${message:Edit-label} ${message:Activities-label} + ${message:Copy-label} ${message:Activities-label} + ${message:Paste-label} + ${message:Activities-label} + + +

    +

    ${project.title}

    +

    + +

    +
    +
    +
    +
    +

    + ${message:repository-label}
    ${repository.url} +

    +

    + ${message:repository-label} + +

    + +

    + ${message:database-label}
    ${database.name} +

    +

    + ${message:database-label} + +

    + +
    +
    +
    + +

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

    +
    + ${message:Team-label} +
    +

    ${message:Activities-label}

    +
    +
    +
    + +
    +
    +
    +
    + + Index: eprms-tap/src/main/resources/info/ajanovski/eprms/tap/pages/admin/ManageRepositories.tml =================================================================== --- eprms-tap/src/main/resources/info/ajanovski/eprms/tap/pages/admin/ManageRepositories.tml (revision e2bfb4ca8ffd252ba7c96c70a530a3de875750fd) +++ eprms-tap/src/main/resources/info/ajanovski/eprms/tap/pages/admin/ManageRepositories.tml (revision 052c989a9e32c3fea046815ef2b6d09012b88e29) @@ -5,10 +5,12 @@

    ${message:admin/ManageRepositories-pagelink}

    -Show repositories for creation: ${isOnlyShowNotCreated} +Show + repositories for creation: ${isOnlyShowNotCreated}
    - ./create_repository.sh "${repository.title}" - "${repository.url}"
     + ./create_repository.sh "${repository.type}" "${repository.title}" + "${repository.url}"
    +     Index: eprms-tap/src/main/resources/info/ajanovski/eprms/tap/pages/admin/ManageTeams.tml =================================================================== --- eprms-tap/src/main/resources/info/ajanovski/eprms/tap/pages/admin/ManageTeams.tml (revision 052c989a9e32c3fea046815ef2b6d09012b88e29) +++ eprms-tap/src/main/resources/info/ajanovski/eprms/tap/pages/admin/ManageTeams.tml (revision 052c989a9e32c3fea046815ef2b6d09012b88e29) @@ -0,0 +1,10 @@ + + +

    ${message:admin/ManageTeams-pagelink}

    + +
    + + 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 052c989a9e32c3fea046815ef2b6d09012b88e29) +++ eprms-tap/src/main/resources/info/ajanovski/eprms/tap/pages/admin/OverallCourseReport.tml (revision 052c989a9e32c3fea046815ef2b6d09012b88e29) @@ -0,0 +1,61 @@ + + +

    ${message:admin/OverallCourseReport-pagelink}

    + +
    +
    +
    +
    + +
    + + +
    +
    + + + +
    +
    +
    + +
    +
    +
    + +
    +
    ${project.title}
    + ${projectTotal} +
    +
    ${activity.title} +
    + ${workReport.title} ${workReport.description} +
    + ${workEvaluation.title} ${workEvaluation.description} + ${workEvaluation.points} + +
    + +
    +

    + +

    +
    +
    + + Index: rms-tap/src/main/resources/info/ajanovski/eprms/tap/pages/admin/Projects.tml =================================================================== --- eprms-tap/src/main/resources/info/ajanovski/eprms/tap/pages/admin/Projects.tml (revision e2bfb4ca8ffd252ba7c96c70a530a3de875750fd) +++ (revision ) @@ -1,137 +1,0 @@ - - -

    ${message:admin/Projects-pagelink}

    - -
    -
    -
    -
    -
    -
    -
    - -
    -
    -

    ${message:Database-label}

    -
    -
    -
    - -
    -
    -

    ${message:Repository-label}

    -
    -
    -
    - - -
    -
    - - -
    -
    -
    -

    ${project.title}

    -
    -
    -
    -
    -

    - ${message:repository-label}
    ${repository.url} -

    -

    - - ${message:repository-label} - -

    - -

    - ${message:database-label}
    ${database.name} -

    -

    - - ${message:database-label} - -

    - -
    -
    -
    - -

    - - ${message:add-label} ${message:TeamMember-label} -

    -
    - - ${message:Team-label} -
    -
    -
    -
    -
    - - Index: rms-tap/src/main/resources/info/ajanovski/eprms/tap/pages/admin/Teams.tml =================================================================== --- eprms-tap/src/main/resources/info/ajanovski/eprms/tap/pages/admin/Teams.tml (revision e2bfb4ca8ffd252ba7c96c70a530a3de875750fd) +++ (revision ) @@ -1,10 +1,0 @@ - - -

    ${message:admin/Teams-pagelink}

    - -
    - - Index: eprms-tap/src/main/webapp/WEB-INF/app.properties =================================================================== --- eprms-tap/src/main/webapp/WEB-INF/app.properties (revision e2bfb4ca8ffd252ba7c96c70a530a3de875750fd) +++ eprms-tap/src/main/webapp/WEB-INF/app.properties (revision 052c989a9e32c3fea046815ef2b6d09012b88e29) @@ -5,14 +5,18 @@ index-pagelink=Home +myprojectreports-pagelink=My Project Reports myrepositories-pagelink=My Repositories myrepositoryauth-pagelink=Repository Auth mydatabases-pagelink=My Databases -admin/teams-pagelink=Teams -admin/projects-pagelink=Projects +admin/ManageTeams-pagelink=Teams +admin/ManageProjects-pagelink=Projects admin/ManageRepositories-pagelink=Manage Repositories admin/ManageDatabases-pagelink=Manage Databases +admin/ProjectActivities-pagelink=Manage Project Activities +admin/OverallCourseReport-pagelink=Overall Course Report admin-label=Admin app-title-short=EPRMS +activity-label=Activity lang-label=Language team-label=Team @@ -27,4 +31,15 @@ repositories-label=Repositories edit-label=Edit +newActivity-label=New Activity +activities-label=Activities +copy-label=Copy +paste-label=Paste +reset-label=Reset +report-label=Report +description-label=Description +percentReported-label=Reported % of total work in this activity +evaluation-label=Evaluation +percentEvaluated-label=Evaluated % of total work in this activity +points-label=Points Logout-label=Logout @@ -33,2 +48,3 @@ copyrightYear=2021 copyrightHolder=Vangel V. Ajanovski +back-label=Back Index: eprms-tap/src/main/webapp/WEB-INF/app_mk.properties =================================================================== --- eprms-tap/src/main/webapp/WEB-INF/app_mk.properties (revision e2bfb4ca8ffd252ba7c96c70a530a3de875750fd) +++ eprms-tap/src/main/webapp/WEB-INF/app_mk.properties (revision 052c989a9e32c3fea046815ef2b6d09012b88e29) @@ -5,16 +5,21 @@ index-pagelink=\u041F\u043E\u0447\u0435\u0442\u043D\u0430 +myprojectreports-pagelink=\u041C\u043E\u0438 \u0418\u0437\u0432\u0435\u0448\u0442\u0430\u0438 + myrepositories-pagelink=\u041C\u043E\u0438 \u0440\u0435\u043F\u043E\u0437\u0438\u0442\u043E\u0440\u0438\u0443\u043C\u0438 myrepositoryauth-pagelink=\u0410\u0432\u0442\u0435\u043D\u0442\u0438\u043A\u0430\u0446\u0438\u0458\u0430 \u0437\u0430 \u0440\u0435\u043F\u043E mydatabases-pagelink=\u041C\u043E\u0438 \u0431\u0430\u0437\u0438 \u043D\u0430 \u043F\u043E\u0434\u0430\u0442\u043E\u0446\u0438 -admin/teams-pagelink=\u0422\u0438\u043C\u043E\u0432\u0438 -admin/projects-pagelink=\u041F\u0440\u043E\u0435\u043A\u0442\u0438 +admin/ManageTeams-pagelink=\u0423\u043F\u0440\u0430\u0432\u0443\u0432\u0430\u045A\u0435 \u0441\u043E \u0422\u0438\u043C\u043E\u0432\u0438 +admin/ManageProjects-pagelink=\u0423\u043F\u0440\u0430\u0432\u0443\u0432\u0430\u045A\u0435 \u0441\u043E \u041F\u0440\u043E\u0435\u043A\u0442\u0438 admin/ManageRepositories-pagelink=\u0423\u043F\u0440\u0430\u0432\u0443\u0432\u0430\u045A\u0435 \u0441\u043E \u0440\u0435\u043F\u043E\u0437\u0438\u0442\u043E\u0440\u0438\u0443\u043C\u0438 admin/ManageDatabases-pagelink=\u0423\u043F\u0440\u0430\u0432\u0443\u0432\u0430\u045A\u0435 \u0441\u043E \u0431\u0430\u0437\u0438 \u043D\u0430 \u043F\u043E\u0434\u0430\u0442\u043E\u0446\u0438 - +admin/ProjectActivities-pagelink=\u0423\u043F\u0440\u0430\u0432\u0443\u0432\u0430\u045A\u0435 \u0441\u043E \u043F\u0440\u043E\u0435\u043A\u0442\u043D\u0438 \u0430\u043A\u0442\u0438\u0432\u043D\u043E\u0441\u0442\u0438 +admin/OverallCourseReport-pagelink=\u0418\u0437\u0432\u0435\u0448\u0442\u0430\u0458 admin-label=\u0410\u0434\u043C\u0438\u043D app-title=\u0415\u041F\u041C lang-label=Language team-label=\u0422\u0438\u043C +activity-label=\u0410\u043A\u0442\u0438\u0432\u043D\u043E\u0441\u0442 + teammember-label=\u0427\u043B\u0435\u043D \u043D\u0430 \u0442\u0438\u043C\u043E\u0442 project-label=\u041F\u0440\u043E\u0435\u043A\u0442 @@ -27,4 +32,18 @@ repositories-label=\u0420\u0435\u043F\u043E\u0437\u0438\u0442\u043E\u0440\u0438\u0443\u043C\u0438 edit-label=\u0418\u0437\u043C\u0435\u043D\u0438 +newActivity-label=\u041D\u043E\u0432\u0430 \u0430\u043A\u0442\u0438\u0432\u043D\u043E\u0441\u0442 +activityId-label=\u0411\u0440. \u0430\u043A\u0442\u0438\u0432\u043D\u043E\u0441\u0442 +title-label=\u041D\u0430\u0437\u0438\u0432 +description-label=\u041E\u043F\u0438\u0441 +selectActivityType-label=\u0418\u0437\u0431\u0435\u0440\u0438 \u0442\u0438\u043F \u0430\u043A\u0442\u0438\u0432\u043D\u043E\u0441\u0442 +activities-label=\u0410\u043A\u0442\u0438\u0432\u043D\u043E\u0441\u0442\u0438 +copy-label=\u041A\u043E\u043F\u0438\u0440\u0430\u0458 +reset-label=\u0420\u0435\u0441\u0435\u0442 +report-label=\u0418\u0437\u0432\u0435\u0448\u0442\u0430\u0458 +description-label=\u041E\u043F\u0438\u0441 +percentReported-label=\u0418\u0437\u0432\u0435\u0441\u0442\u0443\u0432\u0430\u043C\u0435 \u0434\u0435\u043A\u0430 \u0441\u0435 \u0438\u0437\u0440\u0430\u0431\u043E\u0442\u0435\u043D\u0438 % \u043E\u0434 \u0432\u043A\u0443\u043F\u043D\u0430\u0442\u0430 \u0440\u0430\u0431\u043E\u0442\u0430 \u043D\u0430 \u043E\u0432\u0430\u0430 \u0430\u043A\u0442\u0438\u0432\u043D\u043E\u0441\u0442 +evaluation-label=\u0415\u0432\u0430\u043B\u0443\u0430\u0446\u0438\u0458\u0430 +percentEvaluated-label=\u0415\u0432\u0430\u043B\u0443\u0438\u0440\u0430\u043D\u043E \u0435 \u0434\u0435\u043A\u0430 \u0441\u0435 \u0438\u0437\u0440\u0430\u0431\u043E\u0442\u0435\u043D\u0438 % \u043E\u0434 \u0432\u043A\u0443\u043F\u043D\u0430\u0442\u0430 \u0440\u0430\u0431\u043E\u0442\u0430 \u043D\u0430 \u043E\u0432\u0430\u0430 \u0430\u043A\u0442\u0438\u0432\u043D\u043E\u0441\u0442 +points-label=Points Logout-label=\u041E\u0434\u0458\u0430\u0432\u0430 @@ -39,2 +58,3 @@ userName-label=\u041A\u043E\u0440\u0438\u0441\u043D\u0438\u0447\u043A\u043E \u0438\u043C\u0435 role-label=\u0423\u043B\u043E\u0433\u0430 +back-label=\u043D\u0430\u0437\u0430\u0434 Index: eprms-tap/src/main/webapp/images/feather-sprite.svg =================================================================== --- eprms-tap/src/main/webapp/images/feather-sprite.svg (revision 052c989a9e32c3fea046815ef2b6d09012b88e29) +++ eprms-tap/src/main/webapp/images/feather-sprite.svg (revision 052c989a9e32c3fea046815ef2b6d09012b88e29) @@ -0,0 +1,1 @@ +