- Timestamp:
- 02/16/23 13:45:55 (17 months ago)
- Branches:
- main
- Children:
- 50f2c2a
- Parents:
- a762b3a (diff), da44aef (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the(diff)
links above to see all the changes relative to each parent. - Location:
- Prototype Application/Paw5/src/main/java/finki/paw5/model/entities
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
Prototype Application/Paw5/src/main/java/finki/paw5/model/entities/Adopter.java
ra762b3a r59a8941 41 41 42 42 @Column(name = "verified_by_employee") 43 private intverifiedByEmployeeId;43 private Integer verifiedByEmployeeId; 44 44 45 45 public Adopter(LocalDate dateCreated, String name, String email, String password, String telephone, 46 46 FreeTime freeTime, Funds funds, boolean hasOtherPets, boolean hasKids, Housing housing, 47 PhysicalActivity physicalActivity, boolean willFoster, boolean verified , int verifiedByEmployeeId) {47 PhysicalActivity physicalActivity, boolean willFoster, boolean verified) { 48 48 super(dateCreated, name, email, password, telephone); 49 49 this.freeTime = freeTime; … … 55 55 this.willFoster = willFoster; 56 56 this.verified = verified; 57 this.verifiedByEmployeeId = verifiedByEmployeeId;58 57 } 59 58 -
Prototype Application/Paw5/src/main/java/finki/paw5/model/entities/Employee.java
ra762b3a r59a8941 16 16 17 17 @Column(name = "id_shelter", nullable = false) 18 private intshelterId;18 private Integer shelterId; 19 19 20 20 @Column(name = "is_verified", nullable = false) … … 22 22 23 23 @Column(name = "verified_by_admin") 24 private intverifiedByAdminId;24 private Integer verifiedByAdminId; 25 25 26 26 public Employee(LocalDate dateCreated, String name, String email, String password, String telephone, 27 String position, int shelterId, boolean verified , int verifiedByAdminId) {27 String position, int shelterId, boolean verified) { 28 28 super(dateCreated, name, email, password, telephone); 29 29 this.position = position; 30 30 this.shelterId = shelterId; 31 31 this.verified = verified; 32 this.verifiedByAdminId = verifiedByAdminId;33 32 } 34 33 -
Prototype Application/Paw5/src/main/java/finki/paw5/model/entities/Shelter.java
ra762b3a r59a8941 21 21 22 22 @Column(name = "id_organisation") 23 private intorganisationId;23 private Integer organisationId; 24 24 25 25 @Column(name = "name_shelter", nullable = false, length = 100) … … 29 29 private String email; 30 30 31 public Shelter(String address, String telephone, intorganisationId, String name, String email) {31 public Shelter(String address, String telephone, Integer organisationId, String name, String email) { 32 32 this.address = address; 33 33 this.telephone = telephone;
Note:
See TracChangeset
for help on using the changeset viewer.