Merge pull request #56 from consiglionazionaledellericerche/29-nella-…

…anagrafica-manca-la-residenza-e-la-data-di-nascita Aggiunta campo residenza alle persone.
consiglionazionaledellericerche · Sep 4, 2023 · b10da44 · b10da44
2 parents 473c470 + 9be7833
commit b10da44
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,12 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [2.8.0] - UNRELEASED
 ### Added
  - Gestito invio segnalazioni anonime ad epas-helpdesk-service.
+ - Aggiunto campo residenza all'anagrafica delle persone
 
 ### Changed
  - Mostrato un messaggio di avvertimento in caso di segnalazione non inviata correttamente
  - Corretta gestione caso JWT necessario ma non presente.
  - Inviata la sessione play al epas-helpdesk-service (se configurato)
  - Risolto bug nello scaricamento dell'allegato per richieste congedo parentale per il padre
+ - Gestiti campi data di nascita e residenza nell'interfacce REST di gestione delle persone
 
 
 ## [2.7.0] - 2023-08-10

diff --git a/app/cnr/sync/dto/v2/PersonCreateDto.java b/app/cnr/sync/dto/v2/PersonCreateDto.java
@@ -48,6 +48,8 @@ public class PersonCreateDto {
   private String telephone;
   private String fax;
   private String mobile;
+  private LocalDate birthday;
+  private String residence;
   @Required
   private Integer qualification;
   @Required

diff --git a/app/cnr/sync/dto/v2/PersonShowDto.java b/app/cnr/sync/dto/v2/PersonShowDto.java
@@ -25,6 +25,7 @@
 import lombok.EqualsAndHashCode;
 import lombok.val;
 import models.Person;
+import org.joda.time.LocalDate;
 import org.modelmapper.ModelMapper;
 
 /**
@@ -43,6 +44,8 @@ public class PersonShowDto extends PersonShowTerseDto {
   private String telephone;
   private String fax;
   private String mobile;
+  private LocalDate birthday;
+  private String residence;
   private Integer qualification;
   private Set<String> badges = Sets.newHashSet();
   private OfficeDto office;

diff --git a/app/cnr/sync/dto/v2/PersonUpdateDto.java b/app/cnr/sync/dto/v2/PersonUpdateDto.java
@@ -45,7 +45,9 @@ public void update(Person person) {
     person.setEppn(getEppn());
     person.setTelephone(getTelephone());
     person.setFax(getFax());
-    person.setMobile(getMobile()); 
+    person.setMobile(getMobile());
+    person.setBirthday(getBirthday());
+    person.setResidence(getResidence());
     if (getQualification() != null) {
       person.setQualification(
           ((Qualification) Qualification.findAll().stream()

diff --git a/app/models/Person.java b/app/models/Person.java
@@ -96,6 +96,8 @@ public class Person extends PeriodModel implements IPropertiesInPeriodOwner {
 
   private LocalDate birthday;
 
+  private String residence;
+
   @Email
   @Unique
   @Required
@@ -358,7 +360,8 @@ private void onUpdate() {
   @PrePersist
   private void onCreation() {
     // TODO meglio rendere non necessario questo barbatrucco...
-    this.setBeginDate(LocalDate.now().minusYears(1).withMonthOfYear(12).withDayOfMonth(31));
+    this.setBeginDate(
+        org.joda.time.LocalDate.now().minusYears(1).withMonthOfYear(12).withDayOfMonth(31));
     this.updatedAt = LocalDateTime.now();
     if (user != null) {
       user.setSubjectId(eppn);

diff --git a/app/views/Persons/edit.html b/app/views/Persons/edit.html
@@ -48,6 +48,7 @@
 	#{panel title:'Altre informazioni', color:'primary'}
 		#{f.input 'person.telephone'/}
 		#{f.date 'person.birthday', view:'year'/}
+		#{f.input 'person.residence' /}
 		#{secure.check 'Persons.updatePerseoId'}
        		#{f.input 'person.perseoId', custom_popover: true /}
        	#{/secure.check}

diff --git a/conf/messages.it b/conf/messages.it
@@ -707,6 +707,7 @@ person.office= Sede
 person=Persona
 person.qualification= Livello
 personQualification= Livello
+person.residence=Residenza
 person.surname=Cognome
 person.telephone=Telefono
 person.user.username= Username in ePAS

diff --git a/db/evolutions/207.sql b/db/evolutions/207.sql
@@ -0,0 +1,10 @@
+# --- !Ups
+
+ALTER TABLE persons ADD COLUMN residence TEXT;
+ALTER TABLE persons_history ADD COLUMN residence TEXT;
+
+
+# --- !Downs
+
+ALTER TABLE persons DROP COLUMN residence;
+ALTER TABLE persons_history DROP COLUMN residence;
diff --git a/docs/rest/personsServices.rst b/docs/rest/personsServices.rst
@@ -49,6 +49,7 @@ Il campo *number* corrisponde alla matricola.
      "badges": [
          "15409"
      ],
+     "birthday": "1564-02-15",
      "email": "[email protected]",
      "eppn": "[email protected]",
      "fax": null,
@@ -65,6 +66,7 @@ Il campo *number* corrisponde alla matricola.
      },
      "othersSurnames": null,
      "qualification": 1,
+     "residence": "Via Giuseppe Giusti, 24, 56127 Pisa",
      "surname": "Galilei",
      "telephone": null
   }