Changeset 80ddcae for sources/app/src/main/java/parkup
- Timestamp:
- 02/02/22 20:21:58 (3 years ago)
- Branches:
- master
- Children:
- 0c049e9
- Parents:
- 98f448a
- Location:
- sources/app/src/main/java/parkup
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
sources/app/src/main/java/parkup/data/WorkerDemoParkingZones.java
r98f448a r80ddcae 38 38 this.role = v.getRole(); 39 39 this.status = v.getStatus(); 40 this.locked= v.isEnabled();40 this.locked= !v.isAccountNonLocked(); 41 41 this.pzNames = v.getParkingZones().stream().map(ParkingZone::getPzName).collect(Collectors.toList()); 42 42 } -
sources/app/src/main/java/parkup/data/enumarations/SessionStatus.java
r98f448a r80ddcae 2 2 3 3 public enum SessionStatus { 4 STARTED_UNVERIFIED, 4 5 STARTED_VERIFIED, 5 STARTED_UNVERIFIED,6 6 ENDED_UNPAID, 7 7 ENDED_PAID -
sources/app/src/main/java/parkup/entities/ParkingZone.java
r98f448a r80ddcae 54 54 @OneToMany(cascade = {CascadeType.ALL}) 55 55 private List<ParkingSpace> parkingSpaces; 56 57 @Transient 58 private List<String> responsibleWorkers; 56 59 57 60 … … 119 122 this.price = price; 120 123 } 124 public List<String> getResponsibleWorkers() { 125 return responsibleWorkers; 126 } 121 127 128 public void setResponsibleWorkers(List<String> responsibleWorkers) { 129 this.responsibleWorkers = responsibleWorkers; 130 } 122 131 public int getCapacity() { 123 132 return this.capacity; -
sources/app/src/main/java/parkup/entities/Worker.java
r98f448a r80ddcae 60 60 private UserRole role; 61 61 62 @ManyToMany 62 @ManyToMany(fetch = FetchType.EAGER) 63 63 private List<ParkingZone> parkingZones; 64 64 -
sources/app/src/main/java/parkup/services/ParkingZoneService.java
r98f448a r80ddcae 133 133 } 134 134 }else{ 135 parkingZoneNov.setParkingSpaces(n ull);135 parkingZoneNov.setParkingSpaces(new ArrayList<>()); 136 136 } 137 137 if (!responsibleWorkers.isEmpty()) { … … 182 182 pz.setCapacity(calculateCapacity(pz.getId())); 183 183 pz.setTakenSpaces(calculateTakenSpaces(pz.getId())); 184 pz.setResponsibleWorkers(getWorkers(pz.getId())); 184 185 } 185 186 public List<WorkerDemo> getResponsibleWorkers(int pzId){ … … 187 188 return workerRepository.findAll().stream().filter(w->w.getParkingZones().contains(parkingZone)).map(WorkerDemo::new).collect(Collectors.toList()); 188 189 } 190 public List<String> getWorkers(int pzId){ 191 ParkingZone parkingZone =parkingZoneRepository.findByPzId(pzId); 192 return workerRepository.findAll().stream().filter(w->w.getParkingZones().contains(parkingZone)).map(w->w.getFirstName() + " " + w.getLastName()).collect(Collectors.toList()); 193 194 } 189 195 } 190 196 -
sources/app/src/main/java/parkup/services/WorkerService.java
r98f448a r80ddcae 115 115 workerOpt.get().setPassword(bCryptPasswordEncoder.encode(password)); 116 116 } 117 workerOpt.get().set Account(locked);117 workerOpt.get().setLocked(locked); 118 118 119 119 if (firstName != null && firstName.length() > 1 && !Objects.equals(workerOpt.get().getFirstName(), firstName)) {
Note:
See TracChangeset
for help on using the changeset viewer.