piair/MyINPulse
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

backend-api #6

Merged
piair merged 107 commits from backend-api into main 2025-03-26 19:04:09 +01:00
Conversation 5 Commits 107 Files Changed 80 +9 -9
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 467babab79 - Show all commits

4
MyINPulse-back/src/main/java/enseirb/myinpulse/model/Administrator.java
View File

@@ -34,9 +34,9 @@ public class Administrator extends User {
public Administrator( public Administrator(
String userSurname, String userSurname,
String username, String username,
String mainMail, String primaryMail,
String secondaryMail, String secondaryMail,
String phoneNumber) { String phoneNumber) {
super(null, userSurname, username, mainMail, secondaryMail, phoneNumber); super(null, userSurname, username, primaryMail, secondaryMail, phoneNumber);
} }
} }

4
MyINPulse-back/src/main/java/enseirb/myinpulse/model/Entrepreneur.java
View File

@@ -40,13 +40,13 @@ public class Entrepreneur extends User {
Long idUser, Long idUser,
String userSurname, String userSurname,
String username, String username,
String mainMail, String primaryMail,
String secondaryMail, String secondaryMail,
String phoneNumber, String phoneNumber,
String school, String school,
String course, String course,
boolean sneeStatus) { boolean sneeStatus) {
super(idUser, userSurname, username, mainMail, secondaryMail, phoneNumber); super(idUser, userSurname, username, primaryMail, secondaryMail, phoneNumber);
this.school = school; this.school = school;
this.course = course; this.course = course;
this.sneeStatus = sneeStatus; this.sneeStatus = sneeStatus;

6
MyINPulse-back/src/main/java/enseirb/myinpulse/model/Project.java
View File

@@ -39,16 +39,16 @@ public class Project {
public Project() {} public Project() {}
public Project( public Project(
Long idProject,
String projectName, String projectName,
byte[] logo, byte[] logo,
LocalDate creationDate, LocalDate creationDate,
String projectStatus) { String projectStatus,
this.idProject = idProject; Administrator projectAdministrator) {
this.projectName = projectName; this.projectName = projectName;
this.logo = logo; this.logo = logo;
this.creationDate = creationDate; this.creationDate = creationDate;
this.projectStatus = projectStatus; this.projectStatus = projectStatus;
this.projectAdministrator = projectAdministrator;
} }
public Long getIdProject() { public Long getIdProject() {

4
MyINPulse-back/src/main/java/enseirb/myinpulse/model/User.java
View File

@@ -71,8 +71,8 @@ public class User {
return primaryMail; return primaryMail;
} }
public void setPrimaryMail(String mainMail) { public void setPrimaryMail(String primaryMail) {
this.primaryMail = mainMail; this.primaryMail = primaryMail;
} }
public String getSecondaryMail() { public String getSecondaryMail() {