From ce44e0ea8d71f17543457235d227b46a80a1c17d Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Tue, 18 Oct 2022 18:47:42 +0200 Subject: [PATCH] Updated Leaves sync --- .../it/cnr/isti/epasmed/domain/Leaves.java | 176 ++++++++++++++++++ .../epasmed/repository/LeavesRepository.java | 18 ++ .../isti/epasmed/service/LeavesService.java | 144 ++++++++++++++ .../epasmed/service/mapper/LeavesMapper.java | 43 +++++ .../it/cnr/isti/epasmed/sync/SyncService.java | 59 ++++-- .../isti/epasmed/web/rest/LeavesResource.java | 166 +++++++++++++++++ .../00000000000000_initial_schema.xml | 20 +- src/main/webapp/app/entities/entity.module.ts | 7 + .../leaves-delete-dialog.component.html | 23 +++ .../leaves/leaves-delete-dialog.component.ts | 27 +++ .../leaves/leaves-detail.component.html | 45 +++++ .../leaves/leaves-detail.component.ts | 18 ++ .../leaves/leaves-update.component.html | 149 +++++++++++++++ .../leaves/leaves-update.component.ts | 95 ++++++++++ .../app/entities/leaves/leaves.component.html | 79 ++++++++ .../app/entities/leaves/leaves.component.ts | 102 ++++++++++ .../app/entities/leaves/leaves.model.ts | 27 +++ .../app/entities/leaves/leaves.module.ts | 16 ++ .../app/entities/leaves/leaves.route.ts | 53 ++++++ .../app/entities/leaves/leaves.service.ts | 35 ++++ .../app/layouts/navbar/navbar.component.html | 10 +- 21 files changed, 1297 insertions(+), 15 deletions(-) create mode 100644 src/main/java/it/cnr/isti/epasmed/domain/Leaves.java create mode 100644 src/main/java/it/cnr/isti/epasmed/repository/LeavesRepository.java create mode 100644 src/main/java/it/cnr/isti/epasmed/service/LeavesService.java create mode 100644 src/main/java/it/cnr/isti/epasmed/service/mapper/LeavesMapper.java create mode 100644 src/main/java/it/cnr/isti/epasmed/web/rest/LeavesResource.java create mode 100755 src/main/webapp/app/entities/leaves/leaves-delete-dialog.component.html create mode 100755 src/main/webapp/app/entities/leaves/leaves-delete-dialog.component.ts create mode 100755 src/main/webapp/app/entities/leaves/leaves-detail.component.html create mode 100755 src/main/webapp/app/entities/leaves/leaves-detail.component.ts create mode 100755 src/main/webapp/app/entities/leaves/leaves-update.component.html create mode 100755 src/main/webapp/app/entities/leaves/leaves-update.component.ts create mode 100755 src/main/webapp/app/entities/leaves/leaves.component.html create mode 100755 src/main/webapp/app/entities/leaves/leaves.component.ts create mode 100755 src/main/webapp/app/entities/leaves/leaves.model.ts create mode 100755 src/main/webapp/app/entities/leaves/leaves.module.ts create mode 100755 src/main/webapp/app/entities/leaves/leaves.route.ts create mode 100755 src/main/webapp/app/entities/leaves/leaves.service.ts diff --git a/src/main/java/it/cnr/isti/epasmed/domain/Leaves.java b/src/main/java/it/cnr/isti/epasmed/domain/Leaves.java new file mode 100644 index 0000000..c2bb99e --- /dev/null +++ b/src/main/java/it/cnr/isti/epasmed/domain/Leaves.java @@ -0,0 +1,176 @@ +package it.cnr.isti.epasmed.domain; + +import java.io.Serializable; +import java.time.LocalDate; +import java.time.LocalDateTime; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; +import javax.validation.constraints.NotNull; + +/** + * Leaves + */ +@Entity +@Table(name = "leaves") +public class Leaves implements Serializable { + + private static final long serialVersionUID = 1L; + + @Id + private Integer id; + + private Integer idPersona; + + @NotNull + @Column(nullable = false) + private String cf; + + private String codiceAssenzaDescrizione; + + @NotNull + @Column(nullable = false) + private LocalDate dataInizio; + + private LocalDate dataFine; + + @NotNull + @Column(nullable = false) + private LocalDateTime dataMod; + + private Integer codiceAssenzaCodice; + + private String codiceAssenzaCnr; + + private Integer durata; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public Integer getIdPersona() { + return idPersona; + } + + public void setIdPersona(Integer idPersona) { + this.idPersona = idPersona; + } + + public String getCf() { + return cf; + } + + public void setCf(String cf) { + this.cf = cf; + } + + public String getCodiceAssenzaDescrizione() { + return codiceAssenzaDescrizione; + } + + public void setCodiceAssenzaDescrizione(String codiceAssenzaDescrizione) { + this.codiceAssenzaDescrizione = codiceAssenzaDescrizione; + } + + public LocalDate getDataInizio() { + return dataInizio; + } + + public void setDataInizio(LocalDate dataInizio) { + this.dataInizio = dataInizio; + } + + public LocalDate getDataFine() { + return dataFine; + } + + public void setDataFine(LocalDate dataFine) { + this.dataFine = dataFine; + } + + public LocalDateTime getDataMod() { + return dataMod; + } + + public void setDataMod(LocalDateTime dataMod) { + this.dataMod = dataMod; + } + + public Integer getCodiceAssenzaCodice() { + return codiceAssenzaCodice; + } + + public void setCodiceAssenzaCodice(Integer codiceAssenzaCodice) { + this.codiceAssenzaCodice = codiceAssenzaCodice; + } + + public String getCodiceAssenzaCnr() { + return codiceAssenzaCnr; + } + + public void setCodiceAssenzaCnr(String codiceAssenzaCnr) { + this.codiceAssenzaCnr = codiceAssenzaCnr; + } + + public Integer getDurata() { + return durata; + } + + public void setDurata(Integer durata) { + this.durata = durata; + } + + @Override + public String toString() { + return "Leaves [id=" + id + ", idPersona=" + idPersona + ", cf=" + cf + ", codiceAssenzaDescrizione=" + + codiceAssenzaDescrizione + ", dataInizio=" + dataInizio + ", dataFine=" + dataFine + ", dataMod=" + + dataMod + ", codiceAssenzaCodice=" + codiceAssenzaCodice + ", codiceAssenzaCnr=" + codiceAssenzaCnr + + ", durata=" + durata + "]"; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (!(o instanceof Leaves)) { + return false; + } + return id != null && id.equals(((Leaves) o).id); + } + + public boolean same(Leaves l) { + boolean same = false; + + if (id != null && id.compareTo(l.getId()) == 0) { + if (cf != null && cf.compareTo(l.getCf()) == 0) { + if (idPersona != null && idPersona.compareTo(l.getIdPersona()) == 0) { + if (dataInizio != null && dataInizio.compareTo(l.getDataInizio()) == 0) { + if (dataFine == null && l.getDataFine() == null) { + if (codiceAssenzaCodice != null + && codiceAssenzaCodice.compareTo(l.getCodiceAssenzaCodice()) == 0) { + return true; + } + } else { + if (dataFine != null && dataFine.compareTo(l.getDataFine()) == 0) { + if (codiceAssenzaCodice != null + && codiceAssenzaCodice.compareTo(l.getCodiceAssenzaCodice()) == 0) { + return true; + } + } + } + } + } + } + } + + return same; + } + +} diff --git a/src/main/java/it/cnr/isti/epasmed/repository/LeavesRepository.java b/src/main/java/it/cnr/isti/epasmed/repository/LeavesRepository.java new file mode 100644 index 0000000..43520ef --- /dev/null +++ b/src/main/java/it/cnr/isti/epasmed/repository/LeavesRepository.java @@ -0,0 +1,18 @@ +package it.cnr.isti.epasmed.repository; + +import java.util.Optional; + +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +import it.cnr.isti.epasmed.domain.Leaves; + +/** + * Spring Data JPA repository for the {@link Leaves} entity. + */ +@Repository +public interface LeavesRepository extends JpaRepository { + + Optional findOneByCf(String cf); + + } diff --git a/src/main/java/it/cnr/isti/epasmed/service/LeavesService.java b/src/main/java/it/cnr/isti/epasmed/service/LeavesService.java new file mode 100644 index 0000000..c6bed29 --- /dev/null +++ b/src/main/java/it/cnr/isti/epasmed/service/LeavesService.java @@ -0,0 +1,144 @@ +package it.cnr.isti.epasmed.service; + +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.util.List; +import java.util.Optional; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import it.cnr.isti.epasmed.domain.Leaves; +import it.cnr.isti.epasmed.repository.LeavesRepository; + +/** + * Service class for managing Leaves. + */ +@Service +@Transactional("epasMedTransactionManager") +public class LeavesService { + + private final Logger log = LoggerFactory.getLogger(LeavesService.class); + + private final LeavesRepository leavesRepository; + + // @Autowired + // FormattingConversionService conversionDateTimeService; + + public LeavesService(LeavesRepository leavesRepository) { + this.leavesRepository = leavesRepository; + } + + @Transactional(value = "epasMedTransactionManager", readOnly = true) + public Page getAllLeaves(Pageable pageable) { + log.debug("LeavesService getAllLeaves(): {}", pageable); + leavesRepository.findAll(); + return leavesRepository.findAll(pageable); + } + + @Transactional(value = "epasMedTransactionManager", readOnly = true) + public List getAllLeaves() { + log.debug("LeavesService getAllLeaves()"); + return leavesRepository.findAll(); + } + + @Transactional(value = "epasMedTransactionManager", readOnly = true) + public Optional getLeavesById(Integer id) { + return leavesRepository.findById(id); + } + + public Leaves createLeaves(Leaves leavesDTO) { + log.debug("Creating new Leaves: {}", leavesDTO); + Leaves leaves = new Leaves(); + leaves.setId(leavesDTO.getId()); + leaves.setIdPersona(leavesDTO.getIdPersona()); + leaves.setCf(leavesDTO.getCf()); + leaves.setDataInizio(leavesDTO.getDataInizio()); + leaves.setDataFine(leavesDTO.getDataFine()); + leaves.setCodiceAssenzaCodice(leavesDTO.getCodiceAssenzaCodice()); + leaves.setCodiceAssenzaCnr(leavesDTO.getCodiceAssenzaCnr()); + leaves.setCodiceAssenzaDescrizione(leavesDTO.getCodiceAssenzaDescrizione()); + leaves.setDurata(leavesDTO.getDurata()); + leaves.setDataMod(leavesDTO.getDataMod()); + leavesRepository.save(leaves); + + log.debug("Created Leaves: {}", leaves); + return leaves; + } + + /** + * Update all information for a specific leaves, and return the modified leaves. + * + * @param leavesDTO leave to update. + * @return updated table. + */ + public Optional updateLeaves(Leaves leavesDTO) { + Optional l = leavesRepository.findById(leavesDTO.getId()); + if (l.isPresent()) { + Leaves leaves = l.get(); + leaves.setId(leavesDTO.getId()); + leaves.setIdPersona(leavesDTO.getIdPersona()); + leaves.setCf(leavesDTO.getCf()); + leaves.setDataInizio(leavesDTO.getDataInizio()); + leaves.setDataFine(leavesDTO.getDataInizio()); + leaves.setCodiceAssenzaCodice(leavesDTO.getCodiceAssenzaCodice()); + leaves.setCodiceAssenzaCnr(leavesDTO.getCodiceAssenzaCnr()); + leaves.setCodiceAssenzaDescrizione(leavesDTO.getCodiceAssenzaDescrizione()); + leaves.setDurata(leavesDTO.getDurata()); + leaves.setDataMod(leavesDTO.getDataMod()); + leaves = leavesRepository.save(leaves); + log.debug("Changed Information for Leaves: {}", leaves); + return Optional.of(leaves); + } else { + return l; + } + } + + public void deleteLeaves(Integer id) { + leavesRepository.findById(id).ifPresent(leaves -> { + leavesRepository.delete(leaves); + log.debug("Deleted Leaves: {}", leaves); + }); + } + + + public void updateLeaves(String id, String idPersona, String cf, String dataInizio, String dataFine, + String codiceAssenzaCodice, String codiceAssenzaCnr, String codiceAssenzaDescrizione, String durata, + String dataMod) { + + Optional.of(leavesRepository.findById(Integer.valueOf(id))).filter(Optional::isPresent).map(Optional::get) + .map(leaves -> { + LocalDate dataI = null; + LocalDate dataF = null; + LocalDateTime dataM = null; + + if (dataInizio != null && !dataInizio.isEmpty()) { + dataI = LocalDate.parse(dataInizio); + } + if (dataFine != null && !dataFine.isEmpty()) { + dataF = LocalDate.parse(dataFine); + } + + if (dataMod != null && !dataMod.isEmpty()) { + dataM = LocalDateTime.parse(dataMod); + } + + leaves.setIdPersona(Integer.valueOf(idPersona)); + leaves.setCf(cf); + leaves.setDataInizio(dataI); + leaves.setDataFine(dataF); + leaves.setCodiceAssenzaCodice(Integer.parseInt(codiceAssenzaCodice)); + leaves.setCodiceAssenzaCnr(codiceAssenzaCnr); + leaves.setCodiceAssenzaDescrizione(codiceAssenzaDescrizione); + leaves.setDurata(Integer.parseInt(durata)); + leaves.setDataMod(dataM); + log.debug("Changed Information for Leaves: {}", leaves); + return leaves; + }); + } + +} diff --git a/src/main/java/it/cnr/isti/epasmed/service/mapper/LeavesMapper.java b/src/main/java/it/cnr/isti/epasmed/service/mapper/LeavesMapper.java new file mode 100644 index 0000000..5a5eb2d --- /dev/null +++ b/src/main/java/it/cnr/isti/epasmed/service/mapper/LeavesMapper.java @@ -0,0 +1,43 @@ +package it.cnr.isti.epasmed.service.mapper; + +import java.text.SimpleDateFormat; +import java.time.LocalDate; + +import org.springframework.stereotype.Service; + +import it.cnr.isti.epasmed.domain.Leaves; +import it.cnr.isti.epasmed.sistemainformativo.model.SIAspettative; + +@Service +public class LeavesMapper { + + private final SimpleDateFormat sdfDate = new SimpleDateFormat("yyyy-MM-dd"); + + public Leaves siAspettativeToLeaves(SIAspettative siAspettative) { + if (siAspettative == null) { + return null; + } else { + Leaves leave = new Leaves(); + leave.setId(siAspettative.getId()); + leave.setIdPersona(siAspettative.getIdpersona()); + leave.setCf(siAspettative.getCf()); + leave.setCodiceAssenzaDescrizione(siAspettative.getCodice_assenza_descrizione()); + LocalDate dataInizio = null; + if (siAspettative.getData_inizio() != null) { + dataInizio = LocalDate.parse(sdfDate.format(siAspettative.getData_inizio())); + } + LocalDate dataFine = null; + if (siAspettative.getData_fine() != null) { + dataFine = LocalDate.parse(sdfDate.format(siAspettative.getData_fine())); + } + + leave.setDataInizio(dataInizio); + leave.setDataFine(dataFine); + leave.setCodiceAssenzaCodice(siAspettative.getCodice_assenza_codice()); + leave.setCodiceAssenzaCnr(siAspettative.getCodice_assenza_cnr()); + leave.setDurata(siAspettative.getDurata()); + leave.setDataMod(siAspettative.getData_mod().toLocalDateTime()); + return leave; + } + } +} diff --git a/src/main/java/it/cnr/isti/epasmed/sync/SyncService.java b/src/main/java/it/cnr/isti/epasmed/sync/SyncService.java index affe295..e2a4810 100755 --- a/src/main/java/it/cnr/isti/epasmed/sync/SyncService.java +++ b/src/main/java/it/cnr/isti/epasmed/sync/SyncService.java @@ -25,6 +25,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import it.cnr.isti.epasmed.domain.Leaves; import it.cnr.isti.epasmed.domain.TabsSI; import it.cnr.isti.epasmed.domain.TimeCardsReporting; import it.cnr.isti.epasmed.epas.dto.EPASAffiliationsDTO; @@ -56,8 +57,10 @@ import it.cnr.isti.epasmed.epas.service.EPASPersonsService; import it.cnr.isti.epasmed.epas.service.EPASTimeCardsService; import it.cnr.isti.epasmed.epas.service.EPASValidatesService; import it.cnr.isti.epasmed.epas.service.EPASWorkingTimeTypesService; +import it.cnr.isti.epasmed.service.LeavesService; import it.cnr.isti.epasmed.service.TabsSIService; import it.cnr.isti.epasmed.service.TimeCardsReportingService; +import it.cnr.isti.epasmed.service.mapper.LeavesMapper; import it.cnr.isti.epasmed.sistemainformativo.model.SIAnagrafico; import it.cnr.isti.epasmed.sistemainformativo.model.SIAspettative; import it.cnr.isti.epasmed.sistemainformativo.model.SICartellini; @@ -105,6 +108,10 @@ public class SyncService { TabsSIService tabsSIService; @Autowired TimeCardsReportingService timeCardsReportingService; + @Autowired + LeavesService leavesService; + @Autowired + LeavesMapper leavesMapper; @Autowired SIMasterLogService siMasterLogService; @@ -1036,7 +1043,7 @@ public class SyncService { throws Exception { logger.info("Report {}-{}", year, month); LocalDateTime now = LocalDateTime.now(); - + for (TabsSI tab : tabsSI) { logger.info("TabSI: {}", tab); if (tab.getOperazioni() != null && !tab.getOperazioni().isEmpty() @@ -1074,7 +1081,7 @@ public class SyncService { if (eWTT.getUpdatedAt() != null && !eWTT.getUpdatedAt().isEmpty()) { LocalDateTime updatedAt = LocalDateTime.parse(eWTT.getUpdatedAt(), formatter); if (lastUpdate.compareTo(updatedAt) < 0) { - LocalDateTime dMod=updatedAt.truncatedTo(ChronoUnit.SECONDS); + LocalDateTime dMod = updatedAt.truncatedTo(ChronoUnit.SECONDS); Timestamp dataMod = Timestamp.valueOf(dMod); SIOrario siOrario = new SIOrario(Long.valueOf(eWTT.getId()), eWTT.getDescription(), Boolean.valueOf(eWTT.getHorizontal()), Boolean.valueOf(eWTT.getDisabled()), dataMod, @@ -1179,7 +1186,7 @@ public class SyncService { Timestamp dataMod; try { LocalDateTime dMod = LocalDateTime.parse(epasStamping.getDate(), formatter); - dMod=dMod.truncatedTo(ChronoUnit.SECONDS); + dMod = dMod.truncatedTo(ChronoUnit.SECONDS); dataMod = Timestamp.valueOf(dMod); } catch (IllegalArgumentException | DateTimeParseException e) { logger.error("Invalid stamping data format: {}", e.getLocalizedMessage(), e); @@ -1270,6 +1277,8 @@ public class SyncService { private void writeAspettativeOnSI(Long fluxId, LocalDateTime now, List epasLeavesList, LinkedHashMap epasAbsenceTypeMap) { + int count=0; + // SI for (EPASLeaves leave : epasLeavesList) { logger.debug("Writing Leave: {}", leave); @@ -1336,9 +1345,9 @@ public class SyncService { } } - LocalDateTime dMod=now.truncatedTo(ChronoUnit.SECONDS); + LocalDateTime dMod = now.truncatedTo(ChronoUnit.SECONDS); Timestamp dataMod = Timestamp.valueOf(dMod); - + Integer durata = 0; if (startDate != null && endDate != null) { LocalDate startD = LocalDate.parse(leave.getStart()); @@ -1359,10 +1368,38 @@ public class SyncService { SIAspettative siAspettative = new SIAspettative(leave.getPerson().getFiscalCode(), epasAbsenceType.getDescription(), startDate, endDate, dataMod, SI_FLAG_DEL_FALSE, fluxId, id, idPersona, absenceId, epasAbsenceType.getCode(), durata); - logger.info("Write SIAspettativa: {}", siAspettative); - siAspettativeService.writeNewFlux(fluxId, siAspettative); + if (checkSIAspettativeIsUpgradeable(siAspettative)) { + logger.info("Write SIAspettativa: {}", siAspettative); + count=count+1; + siAspettativeService.writeNewFlux(fluxId, siAspettative); + } } + logger.info("Aspettative scritte su SI: {}",count); + } + + private boolean checkSIAspettativeIsUpgradeable(SIAspettative siAspettative) { + boolean upgradeable = false; + try { + Optional leaves = leavesService.getLeavesById(siAspettative.getId()); + if (leaves.isPresent()) { + Leaves found = leaves.get(); + Leaves leavesDTO = leavesMapper.siAspettativeToLeaves(siAspettative); + if (!found.same(leavesDTO)) { + upgradeable = true; + leavesService.updateLeaves(leavesDTO); + } + } else { + upgradeable = true; + Leaves leavesDTO = leavesMapper.siAspettativeToLeaves(siAspettative); + leavesService.createLeaves(leavesDTO); + } + } catch (Exception e) { + logger.error("Error in check SI Aspettative: {}", e.getLocalizedMessage(), e); + } + + return upgradeable; + } private void syncPersOrario(Long fluxId, TabsSI tab, String year, String month, LocalDateTime now) @@ -1382,7 +1419,7 @@ public class SyncService { logger.error("PersonWorkingTimeDTOList not found"); return; } else { - logger.info("PersonWorkingTimeDTOList size: {}",epasPersonWorkingTimeDTOList.size()); + logger.info("PersonWorkingTimeDTOList size: {}", epasPersonWorkingTimeDTOList.size()); } // SI @@ -1451,7 +1488,7 @@ public class SyncService { } } - LocalDateTime dMod=now.truncatedTo(ChronoUnit.SECONDS); + LocalDateTime dMod = now.truncatedTo(ChronoUnit.SECONDS); Timestamp dataMod = Timestamp.valueOf(dMod); SIPersOrario siPersOrario = new SIPersOrario(id, idPersona, pwtDTO.getCf(), startDate, endDate, @@ -1487,7 +1524,7 @@ public class SyncService { // } // Set Update DateTime - LocalDateTime dMod=now.truncatedTo(ChronoUnit.SECONDS); + LocalDateTime dMod = now.truncatedTo(ChronoUnit.SECONDS); Timestamp dataMod = Timestamp.valueOf(dMod); logger.info("Persons Validated: {}", epasValidates.getValidatedPersons().length); @@ -1560,7 +1597,7 @@ public class SyncService { logger.info("Reference: {}-{}", year, month); // Set Update DateTime - LocalDateTime dMod=now.truncatedTo(ChronoUnit.SECONDS); + LocalDateTime dMod = now.truncatedTo(ChronoUnit.SECONDS); Timestamp dataMod = Timestamp.valueOf(dMod); // logger.info("Persons Validated: {}", diff --git a/src/main/java/it/cnr/isti/epasmed/web/rest/LeavesResource.java b/src/main/java/it/cnr/isti/epasmed/web/rest/LeavesResource.java new file mode 100644 index 0000000..5f067ff --- /dev/null +++ b/src/main/java/it/cnr/isti/epasmed/web/rest/LeavesResource.java @@ -0,0 +1,166 @@ +package it.cnr.isti.epasmed.web.rest; + +import java.net.URI; +import java.net.URISyntaxException; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.Optional; + +import javax.validation.Valid; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.data.domain.Sort; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.servlet.support.ServletUriComponentsBuilder; + +import io.github.jhipster.web.util.HeaderUtil; +import io.github.jhipster.web.util.PaginationUtil; +import io.github.jhipster.web.util.ResponseUtil; +import it.cnr.isti.epasmed.config.Constants; +import it.cnr.isti.epasmed.domain.Leaves; +import it.cnr.isti.epasmed.security.AuthoritiesConstants; +import it.cnr.isti.epasmed.service.LeavesService; +import it.cnr.isti.epasmed.web.rest.errors.BadRequestAlertException; + +/** + * REST controller for managing Leaves. + *

+ * This class accesses the {@link Leaves} entity. + * + * + */ +@RestController +@RequestMapping("/api") +public class LeavesResource { + private static final List ALLOWED_ORDERED_PROPERTIES = Collections + .unmodifiableList(Arrays.asList("id", "idPersona", "cf", "codiceAssenzaDescrizione", "dataInizio", + "dataFine","dataMod")); + + + private final Logger log = LoggerFactory.getLogger(LeavesResource.class); + + @Value("${jhipster.clientApp.name}") + private String applicationName; + + private final LeavesService leavesService; + + public LeavesResource(LeavesService leavesService) { + this.leavesService = leavesService; + + } + + /** + * {@code GET /leaves} : get all leaves. + * + * @param pageable the pagination information. + * @return the {@link ResponseEntity} with status {@code 200 (OK)} and with body + * all leaves. + */ + @GetMapping("/leaves") + public ResponseEntity> getAllLeaves(Pageable pageable) { + log.info("REST request to read Leaves : {}", pageable); + + if (!onlyContainsAllowedProperties(pageable)) { + return ResponseEntity.badRequest().build(); + } + + final Page page = leavesService.getAllLeaves(pageable); + HttpHeaders headers = PaginationUtil + .generatePaginationHttpHeaders(ServletUriComponentsBuilder.fromCurrentRequest(), page); + return new ResponseEntity<>(page.getContent(), headers, HttpStatus.OK); + } + + private boolean onlyContainsAllowedProperties(Pageable pageable) { + return pageable.getSort().stream().map(Sort.Order::getProperty).allMatch(ALLOWED_ORDERED_PROPERTIES::contains); + } + + /** + * {@code POST /leaves} : Creates a new Leaves. + *

+ * + * @param leavesDTO Leave to create. + * @return the {@link ResponseEntity} with status {@code 201 (Created)} and with + * body the new table SI, or with status {@code 400 (Bad Request)} if + * the id is already in use. + * @throws URISyntaxException if the Location URI syntax is incorrect. + */ + @PostMapping("/leaves") + @PreAuthorize("hasAuthority(\"" + AuthoritiesConstants.ADMIN + "\")") + public ResponseEntity createLeaves(@Valid @RequestBody Leaves leavesDTO) throws URISyntaxException { + log.info("REST request to save Leaves : {}", leavesDTO); + + if (leavesDTO.getId() != null) { + throw new BadRequestAlertException("A new leave cannot already have an ID", "Leaves", "idexists"); + } else { + Leaves leave = leavesService.createLeaves(leavesDTO); + return ResponseEntity.created(new URI("/api/leaves/" + leave.getId())).headers(HeaderUtil + .createAlert(applicationName, "A leave is created with identifier " + leave.getId(), leave.getCf())) + .body(leave); + } + } + + /** + * {@code PUT /leaves} : Updates leaves. + * + * @param leavesDTO the leave to update. + * @return the {@link ResponseEntity} with status {@code 200 (OK)} and with body + * the updated leave. + * + */ + @PutMapping("/leaves") + @PreAuthorize("hasAuthority(\"" + AuthoritiesConstants.ADMIN + "\")") + public ResponseEntity updateLeaves(@Valid @RequestBody Leaves leavesDTO) { + log.debug("REST request to update Leaves : {}", leavesDTO); + Optional updatedLeaves = leavesService.updateLeaves(leavesDTO); + + return ResponseUtil.wrapOrNotFound(updatedLeaves, HeaderUtil.createAlert(applicationName, + "A leave is updated with identifier " + leavesDTO.getId(), leavesDTO.getCf())); + } + + /** + * {@code GET /leaves/:id} : get the "id" of leave. + * + * @param id the id of the leave to find. + * @return the {@link ResponseEntity} with status {@code 200 (OK)} and with body + * the leave, or with status {@code 404 (Not Found)}. + */ + @GetMapping("/leaves/{id:" + Constants.VALID_NUMBER_REGEX + "}") + public ResponseEntity getLeaves(@PathVariable String id) { + log.debug("REST request to get Leave : {}", id); + return ResponseUtil.wrapOrNotFound(leavesService.getLeavesById(Integer.valueOf(id))); + + } + + /** + * {@code DELETE /leaves/:id} : delete the "id" Leave. + * + * @param id the id of the leave to delete. + * @return the {@link ResponseEntity} with status {@code 204 (NO_CONTENT)}. + */ + @DeleteMapping("/leaves/{id:" + Constants.VALID_NUMBER_REGEX + "}") + @PreAuthorize("hasAuthority(\"" + AuthoritiesConstants.ADMIN + "\")") + public ResponseEntity deleteLeaves(@PathVariable String id) { + log.debug("REST request to delete Leaves id: {}", id); + leavesService.deleteLeaves(Integer.valueOf(id)); + return ResponseEntity.noContent() + .headers(HeaderUtil.createAlert(applicationName, "A Leave is deleted with identifier " + id, id)) + .build(); + } + +} diff --git a/src/main/resources/config/liquibase/epasmed/changelog/00000000000000_initial_schema.xml b/src/main/resources/config/liquibase/epasmed/changelog/00000000000000_initial_schema.xml index 013169c..efb4fca 100755 --- a/src/main/resources/config/liquibase/epasmed/changelog/00000000000000_initial_schema.xml +++ b/src/main/resources/config/liquibase/epasmed/changelog/00000000000000_initial_schema.xml @@ -221,5 +221,23 @@ - + + + + + + + + + + + + + + + + + + diff --git a/src/main/webapp/app/entities/entity.module.ts b/src/main/webapp/app/entities/entity.module.ts index b583b5c..831cb2c 100755 --- a/src/main/webapp/app/entities/entity.module.ts +++ b/src/main/webapp/app/entities/entity.module.ts @@ -19,6 +19,13 @@ import { RouterModule } from '@angular/router'; pageTitle: 'TimeCards Reporting', }, }, + { + path: 'leaves', + loadChildren: () => import('./leaves/leaves.module').then(m => m.LeavesModule), + data: { + pageTitle: 'Leaves', + }, + }, ]), ], }) diff --git a/src/main/webapp/app/entities/leaves/leaves-delete-dialog.component.html b/src/main/webapp/app/entities/leaves/leaves-delete-dialog.component.html new file mode 100755 index 0000000..647cfb9 --- /dev/null +++ b/src/main/webapp/app/entities/leaves/leaves-delete-dialog.component.html @@ -0,0 +1,23 @@ +

+
+

Confirm delete operation

+ + +
+ +
+ + +

Are you sure you want to delete this Leave?

+
+ +
+ + + +
+
diff --git a/src/main/webapp/app/entities/leaves/leaves-delete-dialog.component.ts b/src/main/webapp/app/entities/leaves/leaves-delete-dialog.component.ts new file mode 100755 index 0000000..3ab4c8b --- /dev/null +++ b/src/main/webapp/app/entities/leaves/leaves-delete-dialog.component.ts @@ -0,0 +1,27 @@ +import { Component } from '@angular/core'; +import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; +import { JhiEventManager } from 'ng-jhipster'; + +import { Leaves } from './leaves.model'; +import { LeavesService } from './leaves.service'; + +@Component({ + selector: 'jhi-leaves-delete-dialog', + templateUrl: './leaves-delete-dialog.component.html', +}) +export class LeavesDeleteDialogComponent { + leaves?: Leaves; + + constructor(private leavesService: LeavesService, public activeModal: NgbActiveModal, private eventManager: JhiEventManager) {} + + cancel(): void { + this.activeModal.dismiss(); + } + + confirmDelete(id: string): void { + this.leavesService.delete(id).subscribe(() => { + this.eventManager.broadcast('leavesListModification'); + this.activeModal.close(); + }); + } +} diff --git a/src/main/webapp/app/entities/leaves/leaves-detail.component.html b/src/main/webapp/app/entities/leaves/leaves-detail.component.html new file mode 100755 index 0000000..4a487cb --- /dev/null +++ b/src/main/webapp/app/entities/leaves/leaves-detail.component.html @@ -0,0 +1,45 @@ +
+
+
+

+ Leaves [{{ leaves.id }}] +

+
+
Id
+
{{ leaves.id }}
+ +
Id Persona
+
{{ leaves.idPersona }}
+ +
Codice Fiscale
+
{{ leaves.cf }}
+ +
Codice Assenza Descrizione
+
{{ leaves.codiceAssenzaDescrizione }}
+ +
Data Inizio
+
{{ leaves.dataInizio }}
+ +
Data Fine
+
{{ leaves.dataFine }}
+ +
Codice Assenza Codice
+
{{ leaves.codiceAssenzaCodice }}
+ +
Codice Assenza Cnr
+
{{ leaves.codiceAssenzaCnr }}
+ +
Durata
+
{{ leaves.durata }}
+ +
Data Mod
+
{{ leaves.dataMod }}
+ +
+ + +
+
+
diff --git a/src/main/webapp/app/entities/leaves/leaves-detail.component.ts b/src/main/webapp/app/entities/leaves/leaves-detail.component.ts new file mode 100755 index 0000000..d7b5dc8 --- /dev/null +++ b/src/main/webapp/app/entities/leaves/leaves-detail.component.ts @@ -0,0 +1,18 @@ +import { Component, OnInit } from '@angular/core'; +import { ActivatedRoute } from '@angular/router'; + +import { Leaves } from './leaves.model'; + +@Component({ + selector: 'jhi-leaves-detail', + templateUrl: './leaves-detail.component.html', +}) +export class LeavesDetailComponent implements OnInit { + leaves: Leaves | null = null; + + constructor(private route: ActivatedRoute) {} + + ngOnInit(): void { + this.route.data.subscribe(({ leaves }) => (this.leaves = leaves)); + } +} diff --git a/src/main/webapp/app/entities/leaves/leaves-update.component.html b/src/main/webapp/app/entities/leaves/leaves-update.component.html new file mode 100755 index 0000000..d085a29 --- /dev/null +++ b/src/main/webapp/app/entities/leaves/leaves-update.component.html @@ -0,0 +1,149 @@ +
+
+
+

Create or edit Leaves

+ +
+ + +
+ +
+ + +
+ + +
+ This + field is required. +
+
+ +
+ + +
+ This field + is required. +
+
+ +
+ + +
+ + This field is required. +
+
+ +
+ + +
+ + This field is required. +
+
+ +
+ + +
+ This + field is required. +
+
+ + +
+ + +
+ + This field is required. +
+
+ +
+ + +
+ + This field is required. +
+
+ +
+ + +
+ This + field is required. +
+
+ +
+ + +
+ This + field is required. +
+
+
+ +
+ + + +
+
+
+
diff --git a/src/main/webapp/app/entities/leaves/leaves-update.component.ts b/src/main/webapp/app/entities/leaves/leaves-update.component.ts new file mode 100755 index 0000000..1d37cf3 --- /dev/null +++ b/src/main/webapp/app/entities/leaves/leaves-update.component.ts @@ -0,0 +1,95 @@ +import { Component, OnInit } from '@angular/core'; +import { FormBuilder, Validators } from '@angular/forms'; +import { ActivatedRoute } from '@angular/router'; + +import { Leaves } from './leaves.model'; +import { LeavesService } from './leaves.service'; + +@Component({ + selector: 'jhi-leaves-update', + templateUrl: './leaves-update.component.html', +}) +export class LeavesUpdateComponent implements OnInit { + leaves!: Leaves; + isSaving = false; + + editForm = this.fb.group({ + id: [], + idPersona: ['', [Validators.required]], + cf: ['', [Validators.required]], + codiceAssenzaDescrizione: ['', [Validators.required]], + dataInizio: ['', [Validators.required]], + dataFine: [''], + codiceAssenzaCodice: ['', [Validators.required]], + codiceAssenzaCnr: ['', [Validators.required]], + durata: ['', [Validators.required]], + dataMod: ['', [Validators.required]], + }); + + constructor(private leavesService: LeavesService, private route: ActivatedRoute, private fb: FormBuilder) {} + + ngOnInit(): void { + this.route.data.subscribe(({ leaves }) => { + if (leaves) { + this.leaves = leaves; + this.updateForm(leaves); + } + }); + } + + previousState(): void { + window.history.back(); + } + + save(): void { + this.isSaving = true; + this.updateLeaves(this.leaves); + if (this.leaves.id !== undefined) { + this.leavesService.update(this.leaves).subscribe( + () => this.onSaveSuccess(), + () => this.onSaveError() + ); + } else { + this.leavesService.create(this.leaves).subscribe( + () => this.onSaveSuccess(), + () => this.onSaveError() + ); + } + } + + private updateForm(leaves: Leaves): void { + this.editForm.patchValue({ + id: leaves.id, + idPersona: leaves.idPersona, + cf: leaves.cf, + codiceAssenzaDescrizione: leaves.codiceAssenzaDescrizione, + dataInizio: leaves.dataInizio, + dataFine: leaves.dataFine, + codiceAssenzaCodice: leaves.codiceAssenzaCodice, + codiceAssenzaCnr: leaves.codiceAssenzaCnr, + durata: leaves.durata, + dataMod: leaves.dataMod, + }); + } + + private updateLeaves(leaves: Leaves): void { + leaves.idPersona = this.editForm.get(['idPersona'])!.value; + leaves.cf = this.editForm.get(['cf'])!.value; + leaves.codiceAssenzaDescrizione = this.editForm.get(['codiceAssenzaDescrizione'])!.value; + leaves.dataInizio = this.editForm.get(['dataInizio'])!.value; + leaves.dataFine = this.editForm.get(['dataFine'])!.value; + leaves.codiceAssenzaCodice = this.editForm.get(['codiceAssenzaCodice'])!.value; + leaves.codiceAssenzaCnr = this.editForm.get(['codiceAssenzaCnr'])!.value; + leaves.durata = this.editForm.get(['durata'])!.value; + leaves.dataMod = this.editForm.get(['dataMod'])!.value; + } + + private onSaveSuccess(): void { + this.isSaving = false; + this.previousState(); + } + + private onSaveError(): void { + this.isSaving = false; + } +} diff --git a/src/main/webapp/app/entities/leaves/leaves.component.html b/src/main/webapp/app/entities/leaves/leaves.component.html new file mode 100755 index 0000000..70d4290 --- /dev/null +++ b/src/main/webapp/app/entities/leaves/leaves.component.html @@ -0,0 +1,79 @@ +
+

+ Leaves + + +

+ + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
Id Id PersonaCodice FiscaleCodice Assenza DescrizioneData InizioData FineData Mod
{{ leave.id }}{{ leave.idPersona }}{{ leave.cf }}{{ leave.codiceAssenzaDescrizione }}{{ leave.dataInizio }}{{ leave.dataFine }}{{ leave.dataMod }} +
+ + + +
+
+
+ +
+
+ +
+ +
+ +
+
+
diff --git a/src/main/webapp/app/entities/leaves/leaves.component.ts b/src/main/webapp/app/entities/leaves/leaves.component.ts new file mode 100755 index 0000000..eff9614 --- /dev/null +++ b/src/main/webapp/app/entities/leaves/leaves.component.ts @@ -0,0 +1,102 @@ +import { Component, OnInit, OnDestroy } from '@angular/core'; +import { HttpResponse, HttpHeaders } from '@angular/common/http'; +import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; +import { Subscription, combineLatest } from 'rxjs'; +import { ActivatedRoute, ParamMap, Router, Data } from '@angular/router'; +import { JhiEventManager } from 'ng-jhipster'; + +import { ITEMS_PER_PAGE } from 'app/shared/constants/pagination.constants'; +// import { AccountService } from 'app/core/auth/account.service'; +// import { Account } from 'app/core/user/account.model'; +import { LeavesService } from './leaves.service'; +import { Leaves } from './leaves.model'; +import { LeavesDeleteDialogComponent } from './leaves-delete-dialog.component'; + +@Component({ + selector: 'jhi-leaves', + templateUrl: './leaves.component.html', +}) +export class LeavesComponent implements OnInit, OnDestroy { + // currentAccount: Account | null = null; + leavesArray: Leaves[] | null = null; + leavesListSubscription?: Subscription; + totalItems = 0; + itemsPerPage = ITEMS_PER_PAGE; + page!: number; + predicate!: string; + ascending!: boolean; + + constructor( + private leavesService: LeavesService, + // private accountService: AccountService, + private activatedRoute: ActivatedRoute, + private router: Router, + private eventManager: JhiEventManager, + private modalService: NgbModal + ) {} + + ngOnInit(): void { + // this.accountService.identity().subscribe(account => (this.currentAccount = account)); + this.leavesListSubscription = this.eventManager.subscribe('leavesListModification', () => this.loadAll()); + this.handleNavigation(); + } + + ngOnDestroy(): void { + if (this.leavesListSubscription) { + this.eventManager.destroy(this.leavesListSubscription); + } + } + + trackIdentity(index: number, item: Leaves): any { + return item.id; + } + + deleteLeaves(leaves: Leaves): void { + const modalRef = this.modalService.open(LeavesDeleteDialogComponent, { size: 'lg', backdrop: 'static' }); + modalRef.componentInstance.leaves = leaves; + } + + transition(): void { + this.router.navigate(['./'], { + relativeTo: this.activatedRoute.parent, + queryParams: { + page: this.page, + sort: this.predicate + ',' + (this.ascending ? 'asc' : 'desc'), + }, + }); + } + + private handleNavigation(): void { + combineLatest(this.activatedRoute.data, this.activatedRoute.queryParamMap, (data: Data, params: ParamMap) => { + const page = params.get('page'); + this.page = page !== null ? +page : 1; + const sort = (params.get('sort') ?? data['defaultSort']).split(','); + this.predicate = sort[0]; + this.ascending = sort[1] === 'asc'; + this.loadAll(); + }).subscribe(); + } + + private loadAll(): void { + this.leavesService + .query({ + page: this.page - 1, + size: this.itemsPerPage, + sort: this.sort(), + }) + .subscribe((res: HttpResponse) => this.onSuccess(res.body, res.headers)); + } + + private sort(): string[] { + const result = [this.predicate + ',' + (this.ascending ? 'asc' : 'desc')]; + if (this.predicate !== 'id') { + result.push('id'); + } + return result; + } + + private onSuccess(leavesArray: Leaves[] | null, headers: HttpHeaders): void { + this.totalItems = Number(headers.get('X-Total-Count')); + this.leavesArray = leavesArray; + } +} diff --git a/src/main/webapp/app/entities/leaves/leaves.model.ts b/src/main/webapp/app/entities/leaves/leaves.model.ts new file mode 100755 index 0000000..2bbf7b0 --- /dev/null +++ b/src/main/webapp/app/entities/leaves/leaves.model.ts @@ -0,0 +1,27 @@ +export interface ILeaves { + id?: any; + idPersona?: any; + cf?: string; + codiceAssenzaDescrizione?: string; + dataInizio?: any; + dataFine?: any; + codiceAssenzaCodice?: any; + codiceAssenzaCnr?: string; + durata?: any; + dataMod?: any; +} + +export class Leaves implements ILeaves { + constructor( + public id?: any, + public idPersona?: any, + public cf?: string, + public codiceAssenzaDescrizione?: string, + public dataInizio?: any, + public dataFine?: any, + public codiceAssenzaCodice?: any, + public codiceAssenzaCnr?: string, + public durata?: any, + public dataMod?: any + ) {} +} diff --git a/src/main/webapp/app/entities/leaves/leaves.module.ts b/src/main/webapp/app/entities/leaves/leaves.module.ts new file mode 100755 index 0000000..fc7e9ff --- /dev/null +++ b/src/main/webapp/app/entities/leaves/leaves.module.ts @@ -0,0 +1,16 @@ +import { NgModule } from '@angular/core'; +import { RouterModule } from '@angular/router'; + +import { EpasmedSharedModule } from 'app/shared/shared.module'; +import { LeavesComponent } from './leaves.component'; +import { LeavesDetailComponent } from './leaves-detail.component'; +import { LeavesUpdateComponent } from './leaves-update.component'; +import { LeavesDeleteDialogComponent } from './leaves-delete-dialog.component'; +import { leavesRoute } from './leaves.route'; + +@NgModule({ + imports: [EpasmedSharedModule, RouterModule.forChild(leavesRoute)], + declarations: [LeavesComponent, LeavesDetailComponent, LeavesUpdateComponent, LeavesDeleteDialogComponent], + entryComponents: [LeavesComponent], +}) +export class LeavesModule {} diff --git a/src/main/webapp/app/entities/leaves/leaves.route.ts b/src/main/webapp/app/entities/leaves/leaves.route.ts new file mode 100755 index 0000000..f0329a3 --- /dev/null +++ b/src/main/webapp/app/entities/leaves/leaves.route.ts @@ -0,0 +1,53 @@ +import { Injectable } from '@angular/core'; +import { Resolve, ActivatedRouteSnapshot, Routes } from '@angular/router'; +import { Observable, of } from 'rxjs'; + +import { Leaves, ILeaves } from './leaves.model'; +import { LeavesService } from './leaves.service'; +import { LeavesComponent } from './leaves.component'; +import { LeavesDetailComponent } from './leaves-detail.component'; +import { LeavesUpdateComponent } from './leaves-update.component'; + +@Injectable({ providedIn: 'root' }) +export class LeavesResolve implements Resolve { + constructor(private service: LeavesService) {} + + resolve(route: ActivatedRouteSnapshot): Observable { + const id = route.params['id']; + if (id) { + return this.service.find(id); + } + return of(new Leaves()); + } +} + +export const leavesRoute: Routes = [ + { + path: '', + component: LeavesComponent, + data: { + defaultSort: 'id,asc', + }, + }, + { + path: ':id/view', + component: LeavesDetailComponent, + resolve: { + leaves: LeavesResolve, + }, + }, + { + path: 'new', + component: LeavesUpdateComponent, + resolve: { + leaves: LeavesResolve, + }, + }, + { + path: ':id/edit', + component: LeavesUpdateComponent, + resolve: { + leaves: LeavesResolve, + }, + }, +]; diff --git a/src/main/webapp/app/entities/leaves/leaves.service.ts b/src/main/webapp/app/entities/leaves/leaves.service.ts new file mode 100755 index 0000000..26f91fc --- /dev/null +++ b/src/main/webapp/app/entities/leaves/leaves.service.ts @@ -0,0 +1,35 @@ +import { Injectable } from '@angular/core'; +import { HttpClient, HttpResponse } from '@angular/common/http'; +import { Observable } from 'rxjs'; + +import { SERVER_API_URL } from 'app/app.constants'; +import { createRequestOption, Pagination } from 'app/shared/util/request-util'; +import { ILeaves } from './leaves.model'; + +@Injectable({ providedIn: 'root' }) +export class LeavesService { + public resourceUrl = SERVER_API_URL + 'api/leaves'; + + constructor(private http: HttpClient) {} + + query(req?: Pagination): Observable> { + const options = createRequestOption(req); + return this.http.get(this.resourceUrl, { params: options, observe: 'response' }); + } + + create(leave: ILeaves): Observable { + return this.http.post(this.resourceUrl, leave); + } + + update(leave: ILeaves): Observable { + return this.http.put(this.resourceUrl, leave); + } + + find(id: string): Observable { + return this.http.get(`${this.resourceUrl}/${id}`); + } + + delete(id: string): Observable<{}> { + return this.http.delete(`${this.resourceUrl}/${id}`); + } +} diff --git a/src/main/webapp/app/layouts/navbar/navbar.component.html b/src/main/webapp/app/layouts/navbar/navbar.component.html index 3421a48..5a40f5d 100755 --- a/src/main/webapp/app/layouts/navbar/navbar.component.html +++ b/src/main/webapp/app/layouts/navbar/navbar.component.html @@ -17,7 +17,7 @@ -
  • +
  • @@ -37,12 +37,16 @@ TimeCards Reporting + + + Leaves +
    • -
  • - +
  • + Operations