AISG9700407/covi-serv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

changes on simptoms and updates on secretary visualization, also avoiding from some errors

Browse Source
This commit is contained in:
Axel Iván Solano González
2022-04-16 08:40:56 -05:00
parent 9cff2c7ec7
commit cb5d851143
3 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/unam/acatlan/coviserv/Service/SicknesService.java
+4 -3
View File
@@ -36,9 +36,10 @@ public class SicknesService {
if (symptoms.getSymptoms().length > 0) {
for (int i = 0; i < symptoms.getSymptoms().length; i++) {
Symptoms symptom = symptomsRepository.findById(symptoms.getSymptoms()[i]).get();
List ev = evolutions(student.getUser().getUsername()).stream().filter(evolution -> evolution.getSymptoms().equals(symptom) && evolution.getDateTime().isAfter(LocalDateTime.now().minusDays(1))).collect(Collectors.toList());
List ev = evolutions(student.getUser().getUsername()).stream().filter(evolution -> evolution.getSymptoms().equals(symptom) && evolution.getDateTime().isAfter(LocalDateTime.now().truncatedTo(ChronoUnit.DAYS).minusDays(1))).collect(Collectors.toList());
//to use in test to probo
//List ev = evolutions(student.getUser().getUsername()).stream().filter(evolution -> evolution.getSymptoms().equals(symptom) && evolution.getDateTime().isAfter(LocalDateTime.now().minusMinutes(1))).collect(Collectors.toList());List ev = evolutions(student.getUser().getUsername()).stream().filter(evolution -> evolution.getSymptoms().equals(symptom) && evolution.getDateTime().isAfter(LocalDateTime.now().minusMinutes(1))).collect(Collectors.toList());
//List ev = evolutions(student.getUser().getUsername()).stream().filter(evolution -> evolution.getSymptoms().equals(symptom) && evolution.getDateTime().isAfter(LocalDateTime.now().minusMinutes(1))).collect(Collectors.toList());
//List ev = evolutions(student.getUser().getUsername()).stream().filter(evolution -> evolution.getSymptoms().equals(symptom) && evolution.getDateTime().isAfter(LocalDateTime.now().minusMinutes(1))).collect(Collectors.toList());
if (symptomsRepository.existsById(symptoms.getSymptoms()[i]) && ev.isEmpty()) {
Evolution evolution = Evolution.builder()
.student(student)
@@ -77,7 +78,7 @@ public class SicknesService {
lastDay[0] = evolution.getDateTime().truncatedTo(ChronoUnit.DAYS);
firstTime[0] = false;
}
return !evolution.getDateTime().isBefore(lastDay[0]);
return (!evolution.getDateTime().isBefore(lastDay[0]) && evolution.getDateTime().isAfter(lastDay[0].minusDays(1)));
}).collect(Collectors.toList());
}
src/main/java/com/unam/acatlan/coviserv/controller/SecretaryController.java
+9 -7
View File
@@ -21,6 +21,7 @@ import javax.validation.Valid;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.nio.file.Files;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
@@ -84,14 +85,15 @@ public class SecretaryController {
@GetMapping("/files/{student}")
List<String> files(@Autowired Authentication authentication, @PathVariable String student) {
AuthUser authUser = (AuthUser) authentication.getPrincipal();
File folder = new File(student);
File[] files = folder.listFiles();
ArrayList<String> urls = new ArrayList<>();
for (int i = 0; i < files.length; i++) {
System.out.println(files[i].getAbsolutePath());
urls.add("http://132.248.80.77:9707/api/user/media" + files[i].getAbsolutePath());
//urls.add("http://localhost:9707/api/user/media" + files[i].getAbsolutePath());
File folder = new File(student);
if (folder.exists()) {
File[] files = folder.listFiles();
for (int i = 0; i < files.length; i++) {
System.out.println(files[i].getAbsolutePath());
urls.add("http://132.248.80.77:9707/api/user/media" + files[i].getAbsolutePath());
//urls.add("http://localhost:9707/api/user/media" + files[i].getAbsolutePath());
}
}
return urls;
}
src/main/java/com/unam/acatlan/coviserv/controller/UserController.java
+2 -1
View File
@@ -25,6 +25,7 @@ import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.time.LocalDateTime;
import java.time.temporal.ChronoUnit;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
@@ -83,7 +84,7 @@ public class UserController {
List<Symptoms> lastSymptoms = new ArrayList<>();
List<Evolution> evolutions = sicknesService.evolutions(authUser.getUsername());
for (Evolution evolution : evolutions) {
if (!lastSymptoms.contains(evolution.getSymptoms())) {
if (!lastSymptoms.contains(evolution.getSymptoms()) && evolution.getDateTime().truncatedTo(ChronoUnit.DAYS).isAfter(LocalDateTime.now().truncatedTo(ChronoUnit.DAYS).minusDays(1))) {
lastSymptoms.add(evolution.getSymptoms());
}
}