Changeset da44aef for Prototype Application/Paw5/src/main/java/finki/paw5/model

Timestamp:

02/15/23 17:58:59 (17 months ago)

Author:

trajchevaM <118018439+trajchevaM@…>

Branches:

main

Children:

59a8941, dad5bcd

Parents:

f0232fb

Message:

register functionality

1. Changed css of login.html
2. Changed css and html of register
3. Foreign keys in Adopter and Employee changed from int to Integer
4. AuthorisationService updated with methods for employee and adopter registration
5. RegisterController works only for employee and adopter
6. Added services for Organisation and Shelter for dropdown list on registration form

Location:

Prototype Application/Paw5/src/main/java/finki/paw5/model/entities

Files:

• Adopter.java (modified) (2 diffs)
• Employee.java (modified) (2 diffs)
• Shelter.java (modified) (2 diffs)

Prototype Application/Paw5/src/main/java/finki/paw5/model/entities/Adopter.java

@@ -41 +41 @@
 
     @Column(name = "verified_by_employee")
-    private int verifiedByEmployeeId;
+    private Integer verifiedByEmployeeId;
 
     public Adopter(LocalDate dateCreated, String name, String email, String password, String telephone,
                    FreeTime freeTime, Funds funds, boolean hasOtherPets, boolean hasKids, Housing housing,
-                   PhysicalActivity physicalActivity, boolean willFoster, boolean verified, int verifiedByEmployeeId) {
+                   PhysicalActivity physicalActivity, boolean willFoster, boolean verified) {
         super(dateCreated, name, email, password, telephone);
         this.freeTime = freeTime;
@@ -55 +55 @@
         this.willFoster = willFoster;
         this.verified = verified;
-        this.verifiedByEmployeeId = verifiedByEmployeeId;
     }
 

Prototype Application/Paw5/src/main/java/finki/paw5/model/entities/Employee.java

@@ -16 +16 @@
 
     @Column(name = "id_shelter", nullable = false)
-    private int shelterId;
+    private Integer shelterId;
 
     @Column(name = "is_verified", nullable = false)
@@ -22 +22 @@
 
     @Column(name = "verified_by_admin")
-    private int verifiedByAdminId;
+    private Integer verifiedByAdminId;
 
     public Employee(LocalDate dateCreated, String name, String email, String password, String telephone,
-                    String position, int shelterId, boolean verified, int verifiedByAdminId) {
+                    String position, int shelterId, boolean verified) {
         super(dateCreated, name, email, password, telephone);
         this.position = position;
         this.shelterId = shelterId;
         this.verified = verified;
-        this.verifiedByAdminId = verifiedByAdminId;
     }
 

Prototype Application/Paw5/src/main/java/finki/paw5/model/entities/Shelter.java

@@ -21 +21 @@
 
     @Column(name = "id_organisation")
-    private int organisationId;
+    private Integer organisationId;
 
     @Column(name = "name_shelter", nullable = false, length = 100)
@@ -29 +29 @@
     private String email;
 
-    public Shelter(String address, String telephone, int organisationId, String name, String email) {
+    public Shelter(String address, String telephone, Integer organisationId, String name, String email) {
         this.address = address;
         this.telephone = telephone;