password fix and overview's effect fixed

biagioboi · Jan 15, 2020 · c5b085e · c5b085e
1 parent bd0e7bd
commit c5b085e
Show file tree

Hide file tree

Showing 22 changed files with 134 additions and 133 deletions.
diff --git a/src/main/java/storage/dao/UtenteDao.java b/src/main/java/storage/dao/UtenteDao.java
@@ -45,8 +45,7 @@ public synchronized boolean doCheckLogin(String email, String password) throws S
       ResultSet rs = preparedStatement.executeQuery();
 
       while (rs.next()) {
-        if (rs.getString("password").equals(password) || PasswordManager
-            .validatePassword(password, rs.getString("password"))) {
+        if (PasswordManager.validatePassword(password, rs.getString("password"))) {
           result = true;
         } else {
           result = false;

diff --git a/src/main/webapp/js/script.js b/src/main/webapp/js/script.js
@@ -1,9 +1,8 @@
 $(function () {
 
-
   //toggle sidebar
   $("#toggle-sidebar").click(function () {
-    $(".page-wrapper").toggleClass("toggled");
+    $(".page-wrapper").toggleClass("toggled").trigger('pageToggled');
     $("#toggle-sidebar").toggleClass("toggled");
   });
 
@@ -13,22 +12,21 @@ $(function () {
     $("#toggle-sidebar").toggleClass("toggled");
   });
 
-
   restyleBadge();
 
   checkForLogin();
 
 });
 
-function restyleBadge(){
+function restyleBadge() {
   $(".addbadge").each(function () {
     var html = $(this).html();
 
     if (html == "Non completo") {
       $(this).addClass("badge-info");
     } else if (html == "Accettata") {
       $(this).addClass("badge-success");
-    } else if (html =="Rifiutata"){
+    } else if (html == "Rifiutata") {
       $(this).addClass("badge-danger");
     } else {
       $(this).addClass("badge-warning");
@@ -42,7 +40,6 @@ function percentageToDegrees(percentage) {
 
 }
 
-
 function checkForLogin() {
   $.ajax({
     url: 'SessionServlet',
@@ -52,15 +49,15 @@ function checkForLogin() {
     },
     success: (response) => {
       response = JSON.parse(response);
-      if (response!=null) {
+      if (response != null) {
         if (!response.tipo.localeCompare("studente")) {
           let nome = response.nome;
           let cognome = response.cognome;
           let matricola = response.matricola;
 
           $("#numeroMatricola").html(matricola);
           $("#nomeUtente").html(`${nome} ${cognome}`);
-        }else if (!response.tipo.localeCompare("azienda")){
+        } else if (!response.tipo.localeCompare("azienda")) {
           let nome = response.nome;
           let partitaIva = response.partitaIva;
 
@@ -99,7 +96,7 @@ function timeConvert(n) {
   let rhours = Math.floor(hours);
   let minutes = (hours - rhours) * 60;
   let rminutes = Math.round(minutes);
-  return rhours +":"+ rminutes;
+  return rhours + ":" + rminutes;
 }
 
 function updateValueSpinner() {
@@ -110,7 +107,7 @@ function updateValueSpinner() {
     let right = $(this).find('.progress-right .progress-bar');
     $("#percentoTotale").html(value);
 
-    if(value > 100){
+    if (value > 100) {
       value = 100;
     }
 

diff --git a/src/main/webapp/js/studente.js b/src/main/webapp/js/studente.js
@@ -41,6 +41,10 @@ $(() => {
 
   chargeAvailabilityRequest();
 
+  $('.page-wrapper').on('pageToggled', function () {
+    updateValueSpinner()
+  });
+
   $("#caricaScaricaPDFModal").on('show.bs.modal', (e) => {
     var tirocinio = $(e.relatedTarget).data('idtirocinio');
     $("#linkPDF").attr("href", "PdfServlet?tirocinio=" + tirocinio);
@@ -100,7 +104,7 @@ function checkIfExistTirocinio() {
         let oreSvolte = x.oreSvolte;
         let percentage = parseInt(oreSvolte / oreTotali * 100);
         $("#percentoOreSvolte").attr("data-value", percentage);
-        updateValueSpinner();
+        //updateValueSpinner();
         $("#oreFatte").html(timeConvert(oreSvolte));
         $("#oreTotali").html(timeConvert(oreTotali));
         let email = x.azienda.email;

diff --git a/src/test/java/applicationlogic/richiestadisponibilitamanagment/RichiestaDServletTest.java b/src/test/java/applicationlogic/richiestadisponibilitamanagment/RichiestaDServletTest.java
@@ -29,11 +29,11 @@ public class RichiestaDServletTest extends Mockito {
   @BeforeAll
   static void setUtente() {
     try {
-      utente = new Utente("[email protected]", "Frank", PasswordManager.createHash("password"), "studente");
+      utente = new Utente("[email protected]", "Frank", "2:02:44e9f86136f9b41ce62a1d2605e79ac4be5d5793dac00302553500d1dff4af65d2baa89503990c2114a9b95184", "studente");
       TestingUtility.createUtente(utente);
 
       Date d = Date.valueOf("1998-06-01");
-      Studente studente = new Studente("[email protected]", "Frank", PasswordManager.createHash("password"),
+      Studente studente = new Studente("[email protected]", "Frank", "2:02:44e9f86136f9b41ce62a1d2605e79ac4be5d5793dac00302553500d1dff4af65d2baa89503990c2114a9b95184",
           "RCCFNC98H01H501E", "1234567891", d, "Italia", "Vallo", "3485813158", "Ruocco");
       TestingUtility.createStudente(studente);
 

diff --git a/.../java/applicationlogic/richiestadisponibilitamanagment/RichiestaDServletWhiteBoxTest.java b/.../java/applicationlogic/richiestadisponibilitamanagment/RichiestaDServletWhiteBoxTest.java
@@ -40,27 +40,27 @@ public class RichiestaDServletWhiteBoxTest extends Mockito {
   public void load() {
 
     try {
-      Utente aziendaData = new Utente("[email protected]", "Prova", "password", "azienda");
+      Utente aziendaData = new Utente("[email protected]", "Prova", "2:02:44e9f86136f9b41ce62a1d2605e79ac4be5d5793dac00302553500d1dff4af65d2baa89503990c2114a9b95184", "azienda");
       TestingUtility.createUtente(aziendaData);
 
-      azienda = new Azienda("[email protected]", "Prova", "password", "03944080652",
+      azienda = new Azienda("[email protected]", "Prova", "2:02:44e9f86136f9b41ce62a1d2605e79ac4be5d5793dac00302553500d1dff4af65d2baa89503990c2114a9b95184", "03944080652",
           "via prova 2", "pippo", "5485", 55);
       TestingUtility.createAzienda(azienda);
 
-      Utente studenteData = new Utente("[email protected]", "Frank", "password",
+      Utente studenteData = new Utente("[email protected]", "Frank", "2:02:44e9f86136f9b41ce62a1d2605e79ac4be5d5793dac00302553500d1dff4af65d2baa89503990c2114a9b95184",
           "studente");
       TestingUtility.createUtente(studenteData);
 
       Date d = Date.valueOf("1998-06-01");
-      studente = new Studente("[email protected]", "Frank", "password",
+      studente = new Studente("[email protected]", "Frank", "2:02:44e9f86136f9b41ce62a1d2605e79ac4be5d5793dac00302553500d1dff4af65d2baa89503990c2114a9b95184",
           "RCCFNC98H01H501E", "1234567891", d, "Italia", "Vallo", "3485813158", "Ruocco");
       TestingUtility.createStudente(studente);
 
-      ufficioCarriere = new Utente("[email protected]", "Ufficio Carriere", "password",
+      ufficioCarriere = new Utente("[email protected]", "Ufficio Carriere", "2:02:44e9f86136f9b41ce62a1d2605e79ac4be5d5793dac00302553500d1dff4af65d2baa89503990c2114a9b95184",
           "ufficio_carriere");
       TestingUtility.createUtente(ufficioCarriere);
 
-      admin = new Utente("[email protected]", "Admin", "password",
+      admin = new Utente("[email protected]", "Admin", "2:02:44e9f86136f9b41ce62a1d2605e79ac4be5d5793dac00302553500d1dff4af65d2baa89503990c2114a9b95184",
           "admin");
       TestingUtility.createUtente(admin);
 

diff --git a/src/test/java/applicationlogic/tirociniomanagment/PdfServletTest.java b/src/test/java/applicationlogic/tirociniomanagment/PdfServletTest.java
@@ -47,29 +47,29 @@ public class PdfServletTest extends Mockito {
   static void setUp() {
 
     try {
-      azienda = new Utente("[email protected]", "Prova", PasswordManager.createHash("password"), "azienda");
+      azienda = new Utente("[email protected]", "Prova", "2:02:44e9f86136f9b41ce62a1d2605e79ac4be5d5793dac00302553500d1dff4af65d2baa89503990c2114a9b95184", "azienda");
       TestingUtility.createUtente(azienda);
 
-      Azienda az = new Azienda("[email protected]", "Prova", PasswordManager.createHash("password"), "03944080652", "via prova 2",
+      Azienda az = new Azienda("[email protected]", "Prova", "2:02:44e9f86136f9b41ce62a1d2605e79ac4be5d5793dac00302553500d1dff4af65d2baa89503990c2114a9b95184", "03944080652", "via prova 2",
           "pippo", "5485", 55);
       TestingUtility.createAzienda(az);
 
-      studente = new Utente("[email protected]", "Frank", PasswordManager.createHash("password"), "studente");
+      studente = new Utente("[email protected]", "Frank", "2:02:44e9f86136f9b41ce62a1d2605e79ac4be5d5793dac00302553500d1dff4af65d2baa89503990c2114a9b95184", "studente");
       TestingUtility.createUtente(studente);
 
       Date d = Date.valueOf("1998-06-01");
-      Studente st = new Studente("[email protected]", "Frank", PasswordManager.createHash("password"),
+      Studente st = new Studente("[email protected]", "Frank", "2:02:44e9f86136f9b41ce62a1d2605e79ac4be5d5793dac00302553500d1dff4af65d2baa89503990c2114a9b95184",
           "RCCFNC98H01H501E", "1234567891", d, "Italia", "Vallo", "3485813158", "Ruocco");
       TestingUtility.createStudente(st);
 
       tirocinio = new Tirocinio(999, Tirocinio.NON_COMPLETO, 7000, "pippo", 500, "not extis", st,
           az, "not extist");
       TestingUtility.createTirocinio(tirocinio);
 
-      secondAzienda = new Utente("[email protected]", "Prova", PasswordManager.createHash("password"), "azienda");
+      secondAzienda = new Utente("[email protected]", "Prova", "2:02:44e9f86136f9b41ce62a1d2605e79ac4be5d5793dac00302553500d1dff4af65d2baa89503990c2114a9b95184", "azienda");
       TestingUtility.createUtente(secondAzienda);
 
-      Azienda azi = new Azienda("[email protected]", "Prova", PasswordManager.createHash("password"), "03944080650",
+      Azienda azi = new Azienda("[email protected]", "Prova", "2:02:44e9f86136f9b41ce62a1d2605e79ac4be5d5793dac00302553500d1dff4af65d2baa89503990c2114a9b95184", "03944080650",
           "via prova 2",
           "pippo", "5485", 55);
       TestingUtility.createAzienda(azi);

diff --git a/src/test/java/applicationlogic/tirociniomanagment/PdfServletWhiteBoxTest.java b/src/test/java/applicationlogic/tirociniomanagment/PdfServletWhiteBoxTest.java
@@ -41,27 +41,27 @@ public class PdfServletWhiteBoxTest extends Mockito {
   public void load() {
 
     try {
-      Utente aziendaData = new Utente("[email protected]", "Prova", "password", "azienda");
+      Utente aziendaData = new Utente("[email protected]", "Prova", "2:02:44e9f86136f9b41ce62a1d2605e79ac4be5d5793dac00302553500d1dff4af65d2baa89503990c2114a9b95184", "azienda");
       TestingUtility.createUtente(aziendaData);
 
-      azienda = new Azienda("[email protected]", "Prova", "password", "03944080652",
+      azienda = new Azienda("[email protected]", "Prova", "2:02:44e9f86136f9b41ce62a1d2605e79ac4be5d5793dac00302553500d1dff4af65d2baa89503990c2114a9b95184", "03944080652",
           "via prova 2", "pippo", "5485", 55);
       TestingUtility.createAzienda(azienda);
 
-      Utente studenteData = new Utente("[email protected]", "Frank", "password",
+      Utente studenteData = new Utente("[email protected]", "Frank", "2:02:44e9f86136f9b41ce62a1d2605e79ac4be5d5793dac00302553500d1dff4af65d2baa89503990c2114a9b95184",
           "studente");
       TestingUtility.createUtente(studenteData);
 
       Date d = Date.valueOf("1998-06-01");
-      studente = new Studente("[email protected]", "Frank", "password",
+      studente = new Studente("[email protected]", "Frank", "2:02:44e9f86136f9b41ce62a1d2605e79ac4be5d5793dac00302553500d1dff4af65d2baa89503990c2114a9b95184",
           "RCCFNC98H01H501E", "1234567891", d, "Italia", "Vallo", "3485813158", "Ruocco");
       TestingUtility.createStudente(studente);
 
-      ufficioCarriere = new Utente("[email protected]", "Ufficio Carriere", "password",
+      ufficioCarriere = new Utente("[email protected]", "Ufficio Carriere", "2:02:44e9f86136f9b41ce62a1d2605e79ac4be5d5793dac00302553500d1dff4af65d2baa89503990c2114a9b95184",
           "ufficio_carriere");
       TestingUtility.createUtente(ufficioCarriere);
 
-      admin = new Utente("[email protected]", "Admin", "password",
+      admin = new Utente("[email protected]", "Admin", "2:02:44e9f86136f9b41ce62a1d2605e79ac4be5d5793dac00302553500d1dff4af65d2baa89503990c2114a9b95184",
           "admin");
       TestingUtility.createUtente(admin);
 

diff --git a/src/test/java/applicationlogic/tirociniomanagment/RegistroServletTest.java b/src/test/java/applicationlogic/tirociniomanagment/RegistroServletTest.java
@@ -36,18 +36,18 @@ class RegistroServletTest extends Mockito {
   static void setUp() {
 
     try {
-      azienda = new Utente("[email protected]", "Prova", PasswordManager.createHash("password"), "azienda");
+      azienda = new Utente("[email protected]", "Prova", "2:02:44e9f86136f9b41ce62a1d2605e79ac4be5d5793dac00302553500d1dff4af65d2baa89503990c2114a9b95184", "azienda");
       TestingUtility.createUtente(azienda);
 
-      Azienda prova = new Azienda("[email protected]", "Prova", PasswordManager.createHash("password"), "03944080652",
+      Azienda prova = new Azienda("[email protected]", "Prova", "2:02:44e9f86136f9b41ce62a1d2605e79ac4be5d5793dac00302553500d1dff4af65d2baa89503990c2114a9b95184", "03944080652",
           "via prova 2", "pippo", "5485", 55);
       TestingUtility.createAzienda(prova);
 
-      studente = new Utente("[email protected]", "Frank", PasswordManager.createHash("password"), "studente");
+      studente = new Utente("[email protected]", "Frank", "2:02:44e9f86136f9b41ce62a1d2605e79ac4be5d5793dac00302553500d1dff4af65d2baa89503990c2114a9b95184", "studente");
       TestingUtility.createUtente(studente);
 
       Date d = Date.valueOf("1998-06-01");
-      Studente ruocco = new Studente("[email protected]", "Frank", PasswordManager.createHash("password"),
+      Studente ruocco = new Studente("[email protected]", "Frank", "2:02:44e9f86136f9b41ce62a1d2605e79ac4be5d5793dac00302553500d1dff4af65d2baa89503990c2114a9b95184",
           "RCCFNC98H01H501E", "1234567891", d, "Italia", "Vallo", "3485813158", "Ruocco");
       TestingUtility.createStudente(ruocco);
 

diff --git a/src/test/java/applicationlogic/tirociniomanagment/RegistroServletWhiteBoxTest.java b/src/test/java/applicationlogic/tirociniomanagment/RegistroServletWhiteBoxTest.java
@@ -46,36 +46,36 @@ public class RegistroServletWhiteBoxTest extends Mockito {
   public void load() {
 
     try {
-      azienda = new Utente("[email protected]", "Prova", "password", "azienda");
+      azienda = new Utente("[email protected]", "Prova", "2:02:44e9f86136f9b41ce62a1d2605e79ac4be5d5793dac00302553500d1dff4af65d2baa89503990c2114a9b95184", "azienda");
       TestingUtility.createUtente(azienda);
 
-      realAzienda = new Azienda("[email protected]", "Prova", "password", "03944080652",
+      realAzienda = new Azienda("[email protected]", "Prova", "2:02:44e9f86136f9b41ce62a1d2605e79ac4be5d5793dac00302553500d1dff4af65d2baa89503990c2114a9b95184", "03944080652",
           "via prova 2", "pippo", "5485", 55);
       TestingUtility.createAzienda(realAzienda);
 
 
-      fakeAzienda = new Utente("[email protected]", "Prova", "password", "azienda");
+      fakeAzienda = new Utente("[email protected]", "Prova", "2:02:44e9f86136f9b41ce62a1d2605e79ac4be5d5793dac00302553500d1dff4af65d2baa89503990c2114a9b95184", "azienda");
       TestingUtility.createUtente(fakeAzienda);
 
-      Azienda secondAzienda = new Azienda("[email protected]", "Prova", "password", "03944080680",
+      Azienda secondAzienda = new Azienda("[email protected]", "Prova", "2:02:44e9f86136f9b41ce62a1d2605e79ac4be5d5793dac00302553500d1dff4af65d2baa89503990c2114a9b95184", "03944080680",
           "via prova 2", "pippo", "5485", 55);
       TestingUtility.createAzienda(secondAzienda);
 
-      studente = new Utente("[email protected]", "Frank", "password",
+      studente = new Utente("[email protected]", "Frank", "2:02:44e9f86136f9b41ce62a1d2605e79ac4be5d5793dac00302553500d1dff4af65d2baa89503990c2114a9b95184",
           "studente");
       TestingUtility.createUtente(studente);
 
       Date d = Date.valueOf("1998-06-01");
-      realStudente = new Studente("[email protected]", "Frank", "password",
+      realStudente = new Studente("[email protected]", "Frank", "2:02:44e9f86136f9b41ce62a1d2605e79ac4be5d5793dac00302553500d1dff4af65d2baa89503990c2114a9b95184",
           "RCCFNC98H01H501E", "1234567891", d, "Italia", "Vallo", "3485813158", "Ruocco");
       TestingUtility.createStudente(realStudente);
 
-      fakeStudente = new Utente("[email protected]", "Frank", "password",
+      fakeStudente = new Utente("[email protected]", "Frank", "2:02:44e9f86136f9b41ce62a1d2605e79ac4be5d5793dac00302553500d1dff4af65d2baa89503990c2114a9b95184",
           "studente");
       TestingUtility.createUtente(fakeStudente);
 
       d = Date.valueOf("1998-06-01");
-      Studente secondStudente = new Studente("[email protected]", "Frank", "password",
+      Studente secondStudente = new Studente("[email protected]", "Frank", "2:02:44e9f86136f9b41ce62a1d2605e79ac4be5d5793dac00302553500d1dff4af65d2baa89503990c2114a9b95184",
           "RCCFNC98H01H501R", "1234567890", d, "Italia", "Vallo", "3485813158", "Ruocco");
       TestingUtility.createStudente(secondStudente);
 

diff --git a/src/test/java/applicationlogic/tirociniomanagment/TirocinioServletTest.java b/src/test/java/applicationlogic/tirociniomanagment/TirocinioServletTest.java
@@ -42,26 +42,26 @@ public class TirocinioServletTest extends Mockito {
   static void setUp() {
 
     try {
-      firstAzienda = new Utente("[email protected]", "Prova", PasswordManager.createHash("password"), "azienda");
+      firstAzienda = new Utente("[email protected]", "Prova", "2:02:44e9f86136f9b41ce62a1d2605e79ac4be5d5793dac00302553500d1dff4af65d2baa89503990c2114a9b95184", "azienda");
       TestingUtility.createUtente(firstAzienda);
 
-      Azienda prova = new Azienda("[email protected]", "Prova", PasswordManager.createHash("password"), "03944080652",
+      Azienda prova = new Azienda("[email protected]", "Prova", "2:02:44e9f86136f9b41ce62a1d2605e79ac4be5d5793dac00302553500d1dff4af65d2baa89503990c2114a9b95184", "03944080652",
           "via prova 2", "pippo", "5485", 55);
       TestingUtility.createAzienda(prova);
 
-      firstStudente = new Utente("[email protected]", "Frank", PasswordManager.createHash("password"), "studente");
+      firstStudente = new Utente("[email protected]", "Frank", "2:02:44e9f86136f9b41ce62a1d2605e79ac4be5d5793dac00302553500d1dff4af65d2baa89503990c2114a9b95184", "studente");
       TestingUtility.createUtente(firstStudente);
 
       Date d = Date.valueOf("1998-06-01");
-      Studente ruocco = new Studente("[email protected]", "Frank", PasswordManager.createHash("password"),
+      Studente ruocco = new Studente("[email protected]", "Frank", "2:02:44e9f86136f9b41ce62a1d2605e79ac4be5d5793dac00302553500d1dff4af65d2baa89503990c2114a9b95184",
           "RCCFNC98H01H501E", "1234567891", d, "Italia", "Vallo", "3485813158", "Ruocco");
       TestingUtility.createStudente(ruocco);
 
-      secondStudente = new Utente("[email protected]", "Mario", PasswordManager.createHash("password"), "studente");
+      secondStudente = new Utente("[email protected]", "Mario", "2:02:44e9f86136f9b41ce62a1d2605e79ac4be5d5793dac00302553500d1dff4af65d2baa89503990c2114a9b95184", "studente");
       TestingUtility.createUtente(secondStudente);
 
       d = Date.valueOf("1998-01-05");
-      Studente rossi = new Studente("[email protected]", "Mario", PasswordManager.createHash("password"),
+      Studente rossi = new Studente("[email protected]", "Mario", "2:02:44e9f86136f9b41ce62a1d2605e79ac4be5d5793dac00302553500d1dff4af65d2baa89503990c2114a9b95184",
           "MRORSS98A05H703Q", "1234567891", d, "Italia", "Rofrano", "3485813158", "Rossi");
       TestingUtility.createStudente(rossi);
 
@@ -73,7 +73,7 @@ static void setUp() {
           prova, "not extist");
       TestingUtility.createTirocinio(secondTirocinio);
 
-      carrierOffice = new Utente("[email protected]", "Ufficio Carriere", PasswordManager.createHash("password"),
+      carrierOffice = new Utente("[email protected]", "Ufficio Carriere", "2:02:44e9f86136f9b41ce62a1d2605e79ac4be5d5793dac00302553500d1dff4af65d2baa89503990c2114a9b95184",
           "ufficio_carriere");
       TestingUtility.createUtente(carrierOffice);