Index: .gitignore
===================================================================
--- .gitignore (revision f1d066c061cda95871358a60f749ea06909f629d)
+++ .gitignore (revision f1d066c061cda95871358a60f749ea06909f629d)
@@ -0,0 +1,4 @@
+/build/
+/target/
+.*
+!/.gitignore
Index: eprms-model/.gitignore
===================================================================
--- eprms-model/.gitignore (revision f1d066c061cda95871358a60f749ea06909f629d)
+++ eprms-model/.gitignore (revision f1d066c061cda95871358a60f749ea06909f629d)
@@ -0,0 +1,4 @@
+/build/
+/target/
+.*
+!/.gitignore
Index: eprms-model/pom.xml
===================================================================
--- eprms-model/pom.xml (revision f1d066c061cda95871358a60f749ea06909f629d)
+++ eprms-model/pom.xml (revision f1d066c061cda95871358a60f749ea06909f629d)
@@ -0,0 +1,46 @@
+
+ 4.0.0
+
+ info.ajanovski.eprms
+ model
+ 0.0.1-SNAPSHOT
+
+ EPRMS - Educational Project and Resource Management System - Model
+
+ jar
+
+
+
+ vangel.ajanovski
+ Vangel V. Ajanovski
+ https://ajanovski.info
+ Europe/Skopje
+
+ Project Lead
+ Main Developer
+
+
+
+
+
+ 15
+ 15
+ 15
+
+ 42.2.19
+ 3.6.2
+
+ UTF-8
+ UTF-8
+
+
+
+
+ javax.persistence
+ javax.persistence-api
+ 2.2
+
+
+
Index: eprms-model/src/main/java/info/ajanovski/eprms/model/entities/Activity.java
===================================================================
--- eprms-model/src/main/java/info/ajanovski/eprms/model/entities/Activity.java (revision f1d066c061cda95871358a60f749ea06909f629d)
+++ eprms-model/src/main/java/info/ajanovski/eprms/model/entities/Activity.java (revision f1d066c061cda95871358a60f749ea06909f629d)
@@ -0,0 +1,100 @@
+/*******************************************************************************
+ * 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.model.entities;
+
+import java.util.*;
+import javax.persistence.*;
+
+/*
+*/
+@Entity
+@Table (schema="epm_main", name="activity")
+public class Activity implements java.io.Serializable {
+ private long activityId;
+ private String title;
+ private String description;
+ private Activity parentActivity;
+ private ActivityType activityType;
+ private Project project;
+
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+
+ @Column(name = "activity_id", unique = true, nullable = false)
+ public long getActivityId() {
+ return this.activityId;
+ }
+
+ public void setActivityId(long activityId) {
+ this.activityId=activityId;
+ }
+
+ @Column(name = "title")
+ public String getTitle() {
+ return this.title;
+ }
+
+ public void setTitle(String title) {
+ this.title=title;
+ }
+
+ @Column(name = "description")
+ public String getDescription() {
+ return this.description;
+ }
+
+ public void setDescription(String description) {
+ this.description=description;
+ }
+
+ @ManyToOne(fetch = FetchType.LAZY)
+ @JoinColumn(name = "parent_activity_id", nullable = false, foreignKey = @ForeignKey(name = "fk_activity_activity"))
+ public Activity getParentActivity() {
+ return this.parentActivity;
+ }
+
+ public void setParentActivity(Activity parentActivity) {
+ this.parentActivity=parentActivity;
+ }
+
+ @ManyToOne(fetch = FetchType.LAZY)
+ @JoinColumn(name = "activity_type_id", nullable = false, foreignKey = @ForeignKey(name = "fk_activity_activity_type"))
+ public ActivityType getActivityType() {
+ return this.activityType;
+ }
+
+ public void setActivityType(ActivityType activityType) {
+ this.activityType=activityType;
+ }
+
+ @ManyToOne(fetch = FetchType.LAZY)
+ @JoinColumn(name = "project_id", nullable = false, foreignKey = @ForeignKey(name = "fk_activity_Project"))
+ public Project getProject() {
+ return this.project;
+ }
+
+ public void setProject(Project project) {
+ this.project=project;
+ }
+
+}
Index: eprms-model/src/main/java/info/ajanovski/eprms/model/entities/ActivityType.java
===================================================================
--- eprms-model/src/main/java/info/ajanovski/eprms/model/entities/ActivityType.java (revision f1d066c061cda95871358a60f749ea06909f629d)
+++ eprms-model/src/main/java/info/ajanovski/eprms/model/entities/ActivityType.java (revision f1d066c061cda95871358a60f749ea06909f629d)
@@ -0,0 +1,67 @@
+/*******************************************************************************
+ * 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.model.entities;
+
+import java.util.*;
+import javax.persistence.*;
+
+/*
+*/
+@Entity
+@Table (schema="epm_main", name="activity_type")
+public class ActivityType implements java.io.Serializable {
+ private long activityTypeId;
+ private String title;
+ private String description;
+
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+
+ @Column(name = "activity_type_id", unique = true, nullable = false)
+ public long getActivityTypeId() {
+ return this.activityTypeId;
+ }
+
+ public void setActivityTypeId(long activityTypeId) {
+ this.activityTypeId=activityTypeId;
+ }
+
+ @Column(name = "title")
+ public String getTitle() {
+ return this.title;
+ }
+
+ public void setTitle(String title) {
+ this.title=title;
+ }
+
+ @Column(name = "description")
+ public String getDescription() {
+ return this.description;
+ }
+
+ public void setDescription(String description) {
+ this.description=description;
+ }
+
+}
Index: eprms-model/src/main/java/info/ajanovski/eprms/model/entities/Course.java
===================================================================
--- eprms-model/src/main/java/info/ajanovski/eprms/model/entities/Course.java (revision f1d066c061cda95871358a60f749ea06909f629d)
+++ eprms-model/src/main/java/info/ajanovski/eprms/model/entities/Course.java (revision f1d066c061cda95871358a60f749ea06909f629d)
@@ -0,0 +1,57 @@
+/*******************************************************************************
+ * 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.model.entities;
+
+import java.util.*;
+import javax.persistence.*;
+
+/*
+*/
+@Entity
+@Table (schema="epm_main", name="course")
+public class Course implements java.io.Serializable {
+ private long courseId;
+ private String title;
+
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+
+ @Column(name = "course_id", unique = true, nullable = false)
+ public long getCourseId() {
+ return this.courseId;
+ }
+
+ public void setCourseId(long courseId) {
+ this.courseId=courseId;
+ }
+
+ @Column(name = "title", unique = true, nullable = false)
+ public String getTitle() {
+ return this.title;
+ }
+
+ public void setTitle(String title) {
+ this.title=title;
+ }
+
+}
Index: eprms-model/src/main/java/info/ajanovski/eprms/model/entities/CourseProject.java
===================================================================
--- eprms-model/src/main/java/info/ajanovski/eprms/model/entities/CourseProject.java (revision f1d066c061cda95871358a60f749ea06909f629d)
+++ eprms-model/src/main/java/info/ajanovski/eprms/model/entities/CourseProject.java (revision f1d066c061cda95871358a60f749ea06909f629d)
@@ -0,0 +1,69 @@
+/*******************************************************************************
+ * 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.model.entities;
+
+import java.util.*;
+import javax.persistence.*;
+
+/*
+*/
+@Entity
+@Table (schema="epm_main", name="course_project")
+public class CourseProject implements java.io.Serializable {
+ private long courseProjectId;
+ private Course course;
+ private Project project;
+
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+
+ @Column(name = "course_project_id", unique = true, nullable = false)
+ public long getCourseProjectId() {
+ return this.courseProjectId;
+ }
+
+ public void setCourseProjectId(long courseProjectId) {
+ this.courseProjectId=courseProjectId;
+ }
+
+ @ManyToOne(fetch = FetchType.LAZY)
+ @JoinColumn(name = "course_id", nullable = false, foreignKey = @ForeignKey(name = "fk_course_project_course"))
+ public Course getCourse() {
+ return this.course;
+ }
+
+ public void setCourse(Course course) {
+ this.course=course;
+ }
+
+ @ManyToOne(fetch = FetchType.LAZY)
+ @JoinColumn(name = "project_id", nullable = false, foreignKey = @ForeignKey(name = "fk_course_project_Project"))
+ public Project getProject() {
+ return this.project;
+ }
+
+ public void setProject(Project project) {
+ this.project=project;
+ }
+
+}
Index: eprms-model/src/main/java/info/ajanovski/eprms/model/entities/Database.java
===================================================================
--- eprms-model/src/main/java/info/ajanovski/eprms/model/entities/Database.java (revision f1d066c061cda95871358a60f749ea06909f629d)
+++ eprms-model/src/main/java/info/ajanovski/eprms/model/entities/Database.java (revision f1d066c061cda95871358a60f749ea06909f629d)
@@ -0,0 +1,157 @@
+/*******************************************************************************
+ * 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.model.entities;
+
+import java.util.*;
+import javax.persistence.*;
+
+/*
+*/
+@Entity
+@Table(schema = "", name = "database")
+public class Database implements java.io.Serializable {
+ private long databaseId;
+ private String type;
+ private String server;
+ private String name;
+ private String owner;
+ private String password;
+ private String tunnelUser;
+ private String tunnelPassword;
+ private String port;
+ private String tunnelServer;
+ private Project project;
+ private Date dateCreated;
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+
+ @Column(name = "database_id", unique = true, nullable = false)
+ public long getDatabaseId() {
+ return this.databaseId;
+ }
+
+ public void setDatabaseId(long databaseId) {
+ this.databaseId = databaseId;
+ }
+
+ @Column(name = "type")
+ public String getType() {
+ return this.type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ @Column(name = "server")
+ public String getServer() {
+ return this.server;
+ }
+
+ public void setServer(String server) {
+ this.server = server;
+ }
+
+ @Column(name = "name")
+ public String getName() {
+ return this.name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ @Column(name = "owner")
+ public String getOwner() {
+ return this.owner;
+ }
+
+ public void setOwner(String owner) {
+ this.owner = owner;
+ }
+
+ @Column(name = "password")
+ public String getPassword() {
+ return this.password;
+ }
+
+ public void setPassword(String password) {
+ this.password = password;
+ }
+
+ @Column(name = "tunnel_user")
+ public String getTunnelUser() {
+ return this.tunnelUser;
+ }
+
+ public void setTunnelUser(String tunnelUser) {
+ this.tunnelUser = tunnelUser;
+ }
+
+ @Column(name = "tunnel_password")
+ public String getTunnelPassword() {
+ return this.tunnelPassword;
+ }
+
+ public void setTunnelPassword(String tunnelPassword) {
+ this.tunnelPassword = tunnelPassword;
+ }
+
+ @Column(name = "port")
+ public String getPort() {
+ return this.port;
+ }
+
+ public void setPort(String port) {
+ this.port = port;
+ }
+
+ @Column(name = "tunnel_server")
+ public String getTunnelServer() {
+ return this.tunnelServer;
+ }
+
+ public void setTunnelServer(String tunnelServer) {
+ this.tunnelServer = tunnelServer;
+ }
+
+ @Column(name = "date_created")
+ public Date getDateCreated() {
+ return this.dateCreated;
+ }
+
+ public void setDateCreated(Date created) {
+ this.dateCreated = created;
+ }
+
+ @ManyToOne(fetch = FetchType.LAZY)
+ @JoinColumn(name = "project_id", nullable = false, foreignKey = @ForeignKey(name = "fk_database_Project"))
+ public Project getProject() {
+ return this.project;
+ }
+
+ public void setProject(Project project) {
+ this.project = project;
+ }
+
+}
Index: eprms-model/src/main/java/info/ajanovski/eprms/model/entities/Person.java
===================================================================
--- eprms-model/src/main/java/info/ajanovski/eprms/model/entities/Person.java (revision f1d066c061cda95871358a60f749ea06909f629d)
+++ eprms-model/src/main/java/info/ajanovski/eprms/model/entities/Person.java (revision f1d066c061cda95871358a60f749ea06909f629d)
@@ -0,0 +1,96 @@
+/*******************************************************************************
+ * 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.model.entities;
+
+import java.util.*;
+import javax.persistence.*;
+
+/*
+*/
+@Entity
+@Table(schema = "epm_main", name = "person")
+public class Person implements java.io.Serializable {
+ private long personId;
+ private String firstName;
+ private String lastName;
+ private String email;
+ private String userName;
+ private String authString;
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+
+ @Column(name = "person_id", unique = true, nullable = false)
+ public long getPersonId() {
+ return this.personId;
+ }
+
+ public void setPersonId(long personId) {
+ this.personId = personId;
+ }
+
+ @Column(name = "first_name")
+ public String getFirstName() {
+ return this.firstName;
+ }
+
+ public void setFirstName(String firstName) {
+ this.firstName = firstName;
+ }
+
+ @Column(name = "last_name")
+ public String getLastName() {
+ return this.lastName;
+ }
+
+ public void setLastName(String lastName) {
+ this.lastName = lastName;
+ }
+
+ @Column(name = "email")
+ public String getEmail() {
+ return this.email;
+ }
+
+ public void setEmail(String email) {
+ this.email = email;
+ }
+
+ @Column(name = "user_name")
+ public String getUserName() {
+ return this.userName;
+ }
+
+ public void setUserName(String userName) {
+ this.userName = userName;
+ }
+
+ @Column(name = "auth_string")
+ public String getAuthString() {
+ return this.authString;
+ }
+
+ public void setAuthString(String authString) {
+ this.authString = authString;
+ }
+
+}
Index: eprms-model/src/main/java/info/ajanovski/eprms/model/entities/PersonRole.java
===================================================================
--- eprms-model/src/main/java/info/ajanovski/eprms/model/entities/PersonRole.java (revision f1d066c061cda95871358a60f749ea06909f629d)
+++ eprms-model/src/main/java/info/ajanovski/eprms/model/entities/PersonRole.java (revision f1d066c061cda95871358a60f749ea06909f629d)
@@ -0,0 +1,69 @@
+/*******************************************************************************
+ * 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.model.entities;
+
+import java.util.*;
+import javax.persistence.*;
+
+/*
+*/
+@Entity
+@Table (schema="epm_util", name="person_role")
+public class PersonRole implements java.io.Serializable {
+ private long personRoleId;
+ private Person person;
+ private Role role;
+
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+
+ @Column(name = "person_role_id", unique = true, nullable = false)
+ public long getPersonRoleId() {
+ return this.personRoleId;
+ }
+
+ public void setPersonRoleId(long personRoleId) {
+ this.personRoleId=personRoleId;
+ }
+
+ @ManyToOne(fetch = FetchType.LAZY)
+ @JoinColumn(name = "person_id", nullable = false, foreignKey = @ForeignKey(name = "fk_person_role_person"))
+ public Person getPerson() {
+ return this.person;
+ }
+
+ public void setPerson(Person person) {
+ this.person=person;
+ }
+
+ @ManyToOne(fetch = FetchType.LAZY)
+ @JoinColumn(name = "role_id", nullable = false, foreignKey = @ForeignKey(name = "fk_person_role_role"))
+ public Role getRole() {
+ return this.role;
+ }
+
+ public void setRole(Role role) {
+ this.role=role;
+ }
+
+}
Index: eprms-model/src/main/java/info/ajanovski/eprms/model/entities/Project.java
===================================================================
--- eprms-model/src/main/java/info/ajanovski/eprms/model/entities/Project.java (revision f1d066c061cda95871358a60f749ea06909f629d)
+++ eprms-model/src/main/java/info/ajanovski/eprms/model/entities/Project.java (revision f1d066c061cda95871358a60f749ea06909f629d)
@@ -0,0 +1,107 @@
+/*******************************************************************************
+ * 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.model.entities;
+
+import java.util.*;
+import javax.persistence.*;
+
+/*
+*/
+@Entity
+@Table (schema="epm_main", name="Project")
+public class Project implements java.io.Serializable {
+ private long projectId;
+ private String title;
+ private String description;
+ private List responsibilities = new ArrayList();
+ private List repositories = new ArrayList();
+ private List databases = new ArrayList();
+ private List activities = new ArrayList();
+
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+
+ @Column(name = "project_id", unique = true, nullable = false)
+ public long getProjectId() {
+ return this.projectId;
+ }
+
+ public void setProjectId(long projectId) {
+ this.projectId=projectId;
+ }
+
+ @Column(name = "title", unique = true, nullable = false)
+ public String getTitle() {
+ return this.title;
+ }
+
+ public void setTitle(String title) {
+ this.title=title;
+ }
+
+ @Column(name = "description")
+ public String getDescription() {
+ return this.description;
+ }
+
+ public void setDescription(String description) {
+ this.description=description;
+ }
+
+ @OneToMany(fetch = FetchType.LAZY, mappedBy = "project")
+ public List getResponsibilities() {
+ return this.responsibilities;
+ }
+
+ public void setResponsibilities(List responsibilities) {
+ this.responsibilities=responsibilities;
+ }
+
+ @OneToMany(fetch = FetchType.LAZY, mappedBy = "project")
+ public List getRepositories() {
+ return this.repositories;
+ }
+
+ public void setRepositories(List repositories) {
+ this.repositories=repositories;
+ }
+
+ @OneToMany(fetch = FetchType.LAZY, mappedBy = "project")
+ public List getDatabases() {
+ return this.databases;
+ }
+
+ public void setDatabases(List databases) {
+ this.databases=databases;
+ }
+
+ @OneToMany(fetch = FetchType.LAZY, mappedBy = "project")
+ public List getActivities() {
+ return this.activities;
+ }
+
+ public void setActivities(List activities) {
+ this.activities=activities;
+ }
+
+}
Index: eprms-model/src/main/java/info/ajanovski/eprms/model/entities/Repository.java
===================================================================
--- eprms-model/src/main/java/info/ajanovski/eprms/model/entities/Repository.java (revision f1d066c061cda95871358a60f749ea06909f629d)
+++ eprms-model/src/main/java/info/ajanovski/eprms/model/entities/Repository.java (revision f1d066c061cda95871358a60f749ea06909f629d)
@@ -0,0 +1,119 @@
+/*******************************************************************************
+ * 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.model.entities;
+
+import java.util.*;
+import javax.persistence.*;
+
+/*
+*/
+@Entity
+@Table(schema = "epm_main", name = "repository")
+public class Repository implements java.io.Serializable {
+ private long repositoryId;
+ private String title;
+ private String url;
+ private Date dateCreated;
+ private String type;
+ private Person person;
+ private Team team;
+ private Project project;
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+
+ @Column(name = "repository_id", unique = true, nullable = false)
+ public long getRepositoryId() {
+ return this.repositoryId;
+ }
+
+ public void setRepositoryId(long repositoryId) {
+ this.repositoryId = repositoryId;
+ }
+
+ @Column(name = "title")
+ public String getTitle() {
+ return this.title;
+ }
+
+ public void setTitle(String title) {
+ this.title = title;
+ }
+
+ @Column(name = "url")
+ public String getUrl() {
+ return this.url;
+ }
+
+ public void setUrl(String url) {
+ this.url = url;
+ }
+
+ @Column(name = "type")
+ public String getType() {
+ return this.type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ @Column(name = "date_created")
+ public Date getDateCreated() {
+ return this.dateCreated;
+ }
+
+ public void setDateCreated(Date created) {
+ this.dateCreated = created;
+ }
+
+ @ManyToOne(fetch = FetchType.LAZY)
+ @JoinColumn(name = "person_id", nullable = true, foreignKey = @ForeignKey(name = "fk_repository_person"))
+ public Person getPerson() {
+ return this.person;
+ }
+
+ public void setPerson(Person person) {
+ this.person = person;
+ }
+
+ @ManyToOne(fetch = FetchType.LAZY)
+ @JoinColumn(name = "team_id", nullable = true, foreignKey = @ForeignKey(name = "fk_repository_team"))
+ public Team getTeam() {
+ return this.team;
+ }
+
+ public void setTeam(Team team) {
+ this.team = team;
+ }
+
+ @ManyToOne(fetch = FetchType.LAZY)
+ @JoinColumn(name = "project_id", nullable = true, foreignKey = @ForeignKey(name = "fk_repository_Project"))
+ public Project getProject() {
+ return this.project;
+ }
+
+ public void setProject(Project project) {
+ this.project = project;
+ }
+
+}
Index: eprms-model/src/main/java/info/ajanovski/eprms/model/entities/Responsibility.java
===================================================================
--- eprms-model/src/main/java/info/ajanovski/eprms/model/entities/Responsibility.java (revision f1d066c061cda95871358a60f749ea06909f629d)
+++ eprms-model/src/main/java/info/ajanovski/eprms/model/entities/Responsibility.java (revision f1d066c061cda95871358a60f749ea06909f629d)
@@ -0,0 +1,69 @@
+/*******************************************************************************
+ * 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.model.entities;
+
+import java.util.*;
+import javax.persistence.*;
+
+/*
+*/
+@Entity
+@Table (schema="epm_main", name="responsibility")
+public class Responsibility implements java.io.Serializable {
+ private long responsibilityId;
+ private Project project;
+ private Team team;
+
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+
+ @Column(name = "responsibility_id", unique = true, nullable = false)
+ public long getResponsibilityId() {
+ return this.responsibilityId;
+ }
+
+ public void setResponsibilityId(long responsibilityId) {
+ this.responsibilityId=responsibilityId;
+ }
+
+ @ManyToOne(fetch = FetchType.LAZY)
+ @JoinColumn(name = "project_id", nullable = false, foreignKey = @ForeignKey(name = "fk_responsibility_Project"))
+ public Project getProject() {
+ return this.project;
+ }
+
+ public void setProject(Project project) {
+ this.project=project;
+ }
+
+ @ManyToOne(fetch = FetchType.LAZY)
+ @JoinColumn(name = "team_id", nullable = false, foreignKey = @ForeignKey(name = "fk_responsibility_team"))
+ public Team getTeam() {
+ return this.team;
+ }
+
+ public void setTeam(Team team) {
+ this.team=team;
+ }
+
+}
Index: eprms-model/src/main/java/info/ajanovski/eprms/model/entities/Role.java
===================================================================
--- eprms-model/src/main/java/info/ajanovski/eprms/model/entities/Role.java (revision f1d066c061cda95871358a60f749ea06909f629d)
+++ eprms-model/src/main/java/info/ajanovski/eprms/model/entities/Role.java (revision f1d066c061cda95871358a60f749ea06909f629d)
@@ -0,0 +1,57 @@
+/*******************************************************************************
+ * 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.model.entities;
+
+import java.util.*;
+import javax.persistence.*;
+
+/*
+*/
+@Entity
+@Table (schema="epm_util", name="role")
+public class Role implements java.io.Serializable {
+ private long roleId;
+ private String name;
+
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+
+ @Column(name = "role_id", unique = true, nullable = false)
+ public long getRoleId() {
+ return this.roleId;
+ }
+
+ public void setRoleId(long roleId) {
+ this.roleId=roleId;
+ }
+
+ @Column(name = "name")
+ public String getName() {
+ return this.name;
+ }
+
+ public void setName(String name) {
+ this.name=name;
+ }
+
+}
Index: eprms-model/src/main/java/info/ajanovski/eprms/model/entities/Team.java
===================================================================
--- eprms-model/src/main/java/info/ajanovski/eprms/model/entities/Team.java (revision f1d066c061cda95871358a60f749ea06909f629d)
+++ eprms-model/src/main/java/info/ajanovski/eprms/model/entities/Team.java (revision f1d066c061cda95871358a60f749ea06909f629d)
@@ -0,0 +1,67 @@
+/*******************************************************************************
+ * 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.model.entities;
+
+import java.util.*;
+import javax.persistence.*;
+
+/*
+*/
+@Entity
+@Table (schema="epm_main", name="team")
+public class Team implements java.io.Serializable {
+ private long teamId;
+ private String name;
+ private List teamMembers = new ArrayList();
+
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+
+ @Column(name = "team_id", unique = true, nullable = false)
+ public long getTeamId() {
+ return this.teamId;
+ }
+
+ public void setTeamId(long teamId) {
+ this.teamId=teamId;
+ }
+
+ @Column(name = "name")
+ public String getName() {
+ return this.name;
+ }
+
+ public void setName(String name) {
+ this.name=name;
+ }
+
+ @OneToMany(fetch = FetchType.LAZY, mappedBy = "team")
+ public List getTeamMembers() {
+ return this.teamMembers;
+ }
+
+ public void setTeamMembers(List teamMembers) {
+ this.teamMembers=teamMembers;
+ }
+
+}
Index: eprms-model/src/main/java/info/ajanovski/eprms/model/entities/TeamMember.java
===================================================================
--- eprms-model/src/main/java/info/ajanovski/eprms/model/entities/TeamMember.java (revision f1d066c061cda95871358a60f749ea06909f629d)
+++ eprms-model/src/main/java/info/ajanovski/eprms/model/entities/TeamMember.java (revision f1d066c061cda95871358a60f749ea06909f629d)
@@ -0,0 +1,89 @@
+/*******************************************************************************
+ * 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.model.entities;
+
+import java.util.*;
+import javax.persistence.*;
+
+/*
+*/
+@Entity
+@Table (schema="epm_main", name="team_member")
+public class TeamMember implements java.io.Serializable {
+ private long teamMemberId;
+ private Long positionNumber;
+ private String role;
+ private Person person;
+ private Team team;
+
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+
+ @Column(name = "team_member_id", unique = true, nullable = false)
+ public long getTeamMemberId() {
+ return this.teamMemberId;
+ }
+
+ public void setTeamMemberId(long teamMemberId) {
+ this.teamMemberId=teamMemberId;
+ }
+
+ @Column(name = "position_number")
+ public Long getPositionNumber() {
+ return this.positionNumber;
+ }
+
+ public void setPositionNumber(Long positionNumber) {
+ this.positionNumber=positionNumber;
+ }
+
+ @Column(name = "role")
+ public String getRole() {
+ return this.role;
+ }
+
+ public void setRole(String role) {
+ this.role=role;
+ }
+
+ @ManyToOne(fetch = FetchType.LAZY)
+ @JoinColumn(name = "person_id", nullable = false, foreignKey = @ForeignKey(name = "fk_team_member_person"))
+ public Person getPerson() {
+ return this.person;
+ }
+
+ public void setPerson(Person person) {
+ this.person=person;
+ }
+
+ @ManyToOne(fetch = FetchType.LAZY)
+ @JoinColumn(name = "team_id", nullable = false, foreignKey = @ForeignKey(name = "fk_team_member_team"))
+ public Team getTeam() {
+ return this.team;
+ }
+
+ public void setTeam(Team team) {
+ this.team=team;
+ }
+
+}
Index: eprms-model/src/main/java/info/ajanovski/eprms/model/entities/WorkEvaluation.java
===================================================================
--- eprms-model/src/main/java/info/ajanovski/eprms/model/entities/WorkEvaluation.java (revision f1d066c061cda95871358a60f749ea06909f629d)
+++ eprms-model/src/main/java/info/ajanovski/eprms/model/entities/WorkEvaluation.java (revision f1d066c061cda95871358a60f749ea06909f629d)
@@ -0,0 +1,98 @@
+/*******************************************************************************
+ * 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.model.entities;
+
+import java.util.*;
+import javax.persistence.*;
+
+/*
+*/
+@Entity
+@Table (schema="epm_main", name="work_evaluation")
+public class WorkEvaluation implements java.io.Serializable {
+ private long workEvaluationId;
+ private String title;
+ private String description;
+ private Float percentEvaluated;
+ private Float points;
+ private WorkReport workReport;
+
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+
+ @Column(name = "work_evaluation_id", unique = true, nullable = false)
+ public long getWorkEvaluationId() {
+ return this.workEvaluationId;
+ }
+
+ public void setWorkEvaluationId(long workEvaluationId) {
+ this.workEvaluationId=workEvaluationId;
+ }
+
+ @Column(name = "title")
+ public String getTitle() {
+ return this.title;
+ }
+
+ public void setTitle(String title) {
+ this.title=title;
+ }
+
+ @Column(name = "description")
+ public String getDescription() {
+ return this.description;
+ }
+
+ public void setDescription(String description) {
+ this.description=description;
+ }
+
+ @Column(name = "percent_evaluated")
+ public Float getPercentEvaluated() {
+ return this.percentEvaluated;
+ }
+
+ public void setPercentEvaluated(Float percentEvaluated) {
+ this.percentEvaluated=percentEvaluated;
+ }
+
+ @Column(name = "points")
+ public Float getPoints() {
+ return this.points;
+ }
+
+ public void setPoints(Float points) {
+ this.points=points;
+ }
+
+ @ManyToOne(fetch = FetchType.LAZY)
+ @JoinColumn(name = "work_report_id", nullable = false, foreignKey = @ForeignKey(name = "fk_work_evaluation_work_report"))
+ public WorkReport getWorkReport() {
+ return this.workReport;
+ }
+
+ public void setWorkReport(WorkReport workReport) {
+ this.workReport=workReport;
+ }
+
+}
Index: eprms-model/src/main/java/info/ajanovski/eprms/model/entities/WorkReport.java
===================================================================
--- eprms-model/src/main/java/info/ajanovski/eprms/model/entities/WorkReport.java (revision f1d066c061cda95871358a60f749ea06909f629d)
+++ eprms-model/src/main/java/info/ajanovski/eprms/model/entities/WorkReport.java (revision f1d066c061cda95871358a60f749ea06909f629d)
@@ -0,0 +1,121 @@
+/*******************************************************************************
+ * 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.model.entities;
+
+import java.util.*;
+import javax.persistence.*;
+
+/*
+*/
+@Entity
+@Table (schema="epm_main", name="work_report")
+public class WorkReport implements java.io.Serializable {
+ private long workReportId;
+ private String title;
+ private String description;
+ private Float percentReported;
+ private Activity activity;
+ private Person person;
+ private WorkReport continuationOfWorkReport;
+ private Team team;
+
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+
+ @Column(name = "work_report_id", unique = true, nullable = false)
+ public long getWorkReportId() {
+ return this.workReportId;
+ }
+
+ public void setWorkReportId(long workReportId) {
+ this.workReportId=workReportId;
+ }
+
+ @Column(name = "title")
+ public String getTitle() {
+ return this.title;
+ }
+
+ public void setTitle(String title) {
+ this.title=title;
+ }
+
+ @Column(name = "description")
+ public String getDescription() {
+ return this.description;
+ }
+
+ public void setDescription(String description) {
+ this.description=description;
+ }
+
+ @Column(name = "percent_reported")
+ public Float getPercentReported() {
+ return this.percentReported;
+ }
+
+ public void setPercentReported(Float percentReported) {
+ this.percentReported=percentReported;
+ }
+
+ @ManyToOne(fetch = FetchType.LAZY)
+ @JoinColumn(name = "activity_id", nullable = false, foreignKey = @ForeignKey(name = "fk_work_report_activity"))
+ public Activity getActivity() {
+ return this.activity;
+ }
+
+ public void setActivity(Activity activity) {
+ this.activity=activity;
+ }
+
+ @ManyToOne(fetch = FetchType.LAZY)
+ @JoinColumn(name = "person_id", nullable = true, foreignKey = @ForeignKey(name = "fk_work_report_person"))
+ public Person getPerson() {
+ return this.person;
+ }
+
+ public void setPerson(Person person) {
+ this.person=person;
+ }
+
+ @ManyToOne(fetch = FetchType.LAZY)
+ @JoinColumn(name = "continuation_of_work_report_id", nullable = true, foreignKey = @ForeignKey(name = "fk_work_report_work_report"))
+ public WorkReport getContinuationOfWorkReport() {
+ return this.continuationOfWorkReport;
+ }
+
+ public void setContinuationOfWorkReport(WorkReport continuationOfWorkReport) {
+ this.continuationOfWorkReport=continuationOfWorkReport;
+ }
+
+ @ManyToOne(fetch = FetchType.LAZY)
+ @JoinColumn(name = "team_id", nullable = true, foreignKey = @ForeignKey(name = "fk_work_report_team"))
+ public Team getTeam() {
+ return this.team;
+ }
+
+ public void setTeam(Team team) {
+ this.team=team;
+ }
+
+}
Index: eprms-model/src/main/java/info/ajanovski/eprms/model/util/ModelConstants.java
===================================================================
--- eprms-model/src/main/java/info/ajanovski/eprms/model/util/ModelConstants.java (revision f1d066c061cda95871358a60f749ea06909f629d)
+++ eprms-model/src/main/java/info/ajanovski/eprms/model/util/ModelConstants.java (revision f1d066c061cda95871358a60f749ea06909f629d)
@@ -0,0 +1,34 @@
+/*******************************************************************************
+ * 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.model.util;
+
+public class ModelConstants {
+
+ public static final String BooleanTRUEasCHAR = "T";
+ public static final String BooleanFALSEasCHAR = "F";
+
+ public static final String EmailUnknown = "EMAIL@UNKNOWN";
+
+ public static final String RoleAdministrator = "ADMINISTRATOR";
+ public static final String RoleInstructor = "INSTRUCTOR";
+ public static final String RoleStudent = "STUDENT";
+
+}
Index: eprms-tap/pom.xml
===================================================================
--- eprms-tap/pom.xml (revision 2090f001e6d9b81b1c77254e67b140aee64480e4)
+++ eprms-tap/pom.xml (revision f1d066c061cda95871358a60f749ea06909f629d)
@@ -33,5 +33,8 @@
+ 15
+ 1515
+
5.7.11.0.4
@@ -49,4 +52,5 @@
42.2.193.6.2
+
UTF-8UTF-8
@@ -61,4 +65,10 @@
+
+ info.ajanovski.eprms
+ model
+ 0.0.1-SNAPSHOT
+
+
Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/AppConfiguration.java
===================================================================
--- eprms-tap/src/main/java/info/ajanovski/eprms/tap/AppConfiguration.java (revision 2090f001e6d9b81b1c77254e67b140aee64480e4)
+++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/AppConfiguration.java (revision f1d066c061cda95871358a60f749ea06909f629d)
@@ -38,8 +38,12 @@
import org.springframework.boot.web.servlet.ServletContextInitializer;
import org.springframework.boot.web.servlet.server.ConfigurableServletWebServerFactory;
+import org.springframework.context.MessageSource;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
+import org.springframework.context.support.ReloadableResourceBundleMessageSource;
import org.springframework.http.HttpStatus;
+import org.springframework.web.servlet.LocaleResolver;
+import org.springframework.web.servlet.i18n.CookieLocaleResolver;
import info.ajanovski.eprms.tap.util.AppConfig;
@@ -114,3 +118,19 @@
return factory;
}
+
+ @Bean(name = "messageSource")
+ public MessageSource getMessageResource() {
+ ReloadableResourceBundleMessageSource messageResource = new ReloadableResourceBundleMessageSource();
+ messageResource.setBasename("classpath:app");
+ messageResource.setDefaultEncoding("UTF-8");
+ return messageResource;
+ }
+
+ @Bean(name = "localeResolver")
+ public LocaleResolver getLocaleResolver() {
+ CookieLocaleResolver resolver = new CookieLocaleResolver();
+ resolver.setCookieDomain("localeCookie");
+ resolver.setCookieMaxAge(60 * 60);
+ return resolver;
+ }
}
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 2090f001e6d9b81b1c77254e67b140aee64480e4)
+++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/components/Layout.java (revision f1d066c061cda95871358a60f749ea06909f629d)
@@ -36,5 +36,5 @@
import org.slf4j.Logger;
-import info.ajanovski.eprms.tap.entities.Person;
+import info.ajanovski.eprms.model.entities.Person;
import info.ajanovski.eprms.tap.services.GenericService;
import info.ajanovski.eprms.tap.services.PersonManager;
Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/components/TeamMembersGrid.java
===================================================================
--- eprms-tap/src/main/java/info/ajanovski/eprms/tap/components/TeamMembersGrid.java (revision 2090f001e6d9b81b1c77254e67b140aee64480e4)
+++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/components/TeamMembersGrid.java (revision f1d066c061cda95871358a60f749ea06909f629d)
@@ -34,6 +34,6 @@
import org.apache.tapestry5.ioc.annotations.Inject;
-import info.ajanovski.eprms.tap.entities.Team;
-import info.ajanovski.eprms.tap.entities.TeamMember;
+import info.ajanovski.eprms.model.entities.Team;
+import info.ajanovski.eprms.model.entities.TeamMember;
import info.ajanovski.eprms.tap.services.GenericService;
import info.ajanovski.eprms.tap.util.UserInfo;
Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/data/GenericDao.java
===================================================================
--- eprms-tap/src/main/java/info/ajanovski/eprms/tap/data/GenericDao.java (revision f1d066c061cda95871358a60f749ea06909f629d)
+++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/data/GenericDao.java (revision f1d066c061cda95871358a60f749ea06909f629d)
@@ -0,0 +1,44 @@
+/*******************************************************************************
+ * 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.data;
+
+import java.util.List;
+
+public interface GenericDao {
+ public Object getByPK(Class classToLoad, long id);
+
+ public void deleteByPK(Class classToLoad, long id);
+
+ public void delete(Object object);
+
+ public List