Merge branch 'master' into amministratore

aggiungo le piccole modifiche in master

documento/managefile.py

@@ -296,8 +296,8 @@ def save_and_load_file_indice(request,fileindice,azienda=None,sede=None):
           if count==1: continue
           print(count,'sr',sr,len(sr))
 
-          if len(sr) >= 1: # la lunghezza del record segnala qualcosa
-            print('lunghezza ok',sr[0])
+          if len(sr) >= 1 and len("".join(sr)) > 0: # la lunghezza del record segnala qualcosa
+            print('record sr',sr)
             utente = None
             codicefiscale = sr[1].strip()
             print('codice fiscale',sr[1].strip().upper())
@@ -348,7 +348,7 @@ def save_and_load_file_indice(request,fileindice,azienda=None,sede=None):
                 print("Codice Fiscale NON valido o mancante")
                 listaNotOk.append({"nome":utente.nome,"codicefiscale":utente.codicefiscale,"errore":"Codice Fiscale"})
 
-  return (listaOk,listaNotOk)
+  return (listaOk,listaNotOk,count)
 
 def PrepareZipFile(listafile=[]):
   zip_path = os.path.join(settings.BASE_DIR,getConfig('DocZipFile'))

gd/settings.py

@@ -109,7 +109,6 @@ AUTH_PASSWORD_VALIDATORS = [
     },
 ]
 
-
 # Internationalization
 # https://docs.djangoproject.com/en/5.0/topics/i18n/
 
@@ -121,7 +120,6 @@ USE_I18N = True
 
 USE_TZ = True
 
-
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/5.0/howto/static-files/
 

static/upload/Index/1743408181.4905593.saved

@@ -0,0 +1,66 @@
+Nome Cognome;Codice Fiscale;Data di Nascita;Luogo di Nascita;email;Sede
+BIRBES ROBERTA;BRBRRT78H53B157I;13/06/1978;ITALIA;birbes.roberta0@gmail.com;STEREO S.R.L.
+HUNDE MAHLET ASHEBIR;HNDMLT67B52Z315U;12/02/1967;ETIOPIA;mahlet0ashebir0hunde@gmail.com;STEREO S.R.L.
+MARIANI MARISA;MRNMRS71C45B157A;05/03/1971;ITALIA;marianimarisa1971@gmail.com;STEREO S.R.L.
+BOUDOUBI RACHID;BDBRHD61C16Z301F;16/03/1961;ALGERIA;rachidboudoubi@gmail.com;STEREO S.R.L.
+SCARATTI ROSALBA;SCRRLB66D68B157Q;28/04/1966;ITALIA;scarattirosalba@gmail.com;STEREO S.R.L.
+ZEWEDU HAILEMARIAM YODET;ZWDYDT81A66Z315I;29/01/1981;ETIOPIA;zeweduyodet@gmail.com;STEREO S.R.L.
+BOZHKO TETIANA;BZHTTN76H60Z138A;20/06/1976;UCRAINA;bozhkotatiana1@gmail.com;STEREO S.R.L.
+MADULI IRENE;MDLRNI83C49D918K;09/03/1983;ITALIA;Iry.83m@gmail.com;STEREO S.R.L.
+COLOMBO MONICA;CLMMNC67P51B157R;11/09/1967;ITALIA;monicolombo31@gmail.com;STEREO S.R.L.
+TONASSI  ROSANNA;TNSRNN60S53C883I;13/11/1960;ITALIA;rosanna.tonassi@gmail.com;STEREO S.R.L.
+DOMINIC FATTI;DMNFTT66P61Z318D;21/09/1966;GHANA;dominicfatti@gmail.com;STEREO S.R.L.
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;

static/upload/Index/1743413103.2650099.saved

@@ -0,0 +1,18 @@
+Nome Cognome;Codice Fiscale;Data di Nascita;Luogo di Nascita;email;Sede
+HOSSAIN SAMIM;HSSSMM96A01Z249W;01/01/1996;BANGLADESH;;BAOBAO ISTRIA
+ALMOUJUELA DELIO;LMJDLE82M07Z216U;07/08/1982;FILIPPINE;;BAOBAO ISTRIA
+RAZZAK ABDUL;RZZBDL89C09Z249C;10/03/1989;BANGLADESH;;BAOBAO ISTRIA
+DELENA KEVIN BRYAN ATAJAR;DLNKNB03P09Z216N;09/09/2003;FILIPPINE;;BAOBAO ISTRIA
+BERNALES JOVENCIO JR ;BRNJNC93H03Z216G;03/06/1993;FILIPPINE;;BAOBAO ISTRIA
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;

static/upload/Index/1743499647.7287152.saved

@@ -0,0 +1,106 @@
+Nome Cognome;Codice Fiscale;Data di Nascita;Luogo di Nascita;email;Sede
+MUCILEANU BOGDAN VASILE;MCLBDN85S17Z129R;17/11/1985;ROMANIA;bobomucileanu85@gmail.com;PERUGIA
+PASCALIN ANDREI MIHAIL;PSCNRM97R24Z129Y;24/10/1997;ROMANIA;deyuprod@gmail.com;PERUGIA
+PIRIIALA STEFAN ALEXANDRU;PRLSFN99P13Z129B;13/09/1999;ROMANIA;alextreme76@yahoo.it;PERUGIA
+TOSKA TAFIL;TSKTFL84C23Z100K;23/03/1984;ALBANIA;toskatafil1984@gmail.com;PERUGIA
+IGHALO CHARLES;GHLCRL94B20Z335T;20/02/1994;NIGERIA;ighalocharles1988@gmail.com;PERUGIA
+JALLOW BUBACARR;JLLBCR96T25Z317J;25/12/1996;GAMBIA;jalbubacarr25@gmail.com;PERUGIA
+JOHN MOSES;JHNMSS88T12Z335D;12/12/1988;NIGERIA;johnmosesp4@gmail.com;PERUGIA
+LANZUISI EMANUEL;LNZMNL90H04D662D;04/06/1990;FONDI;emanuel040690@gmail.com;PERUGIA
+LUTA RUSLAN;LTURLN87E13Z140Q;13/05/1987;MOLDAVIA;ruslanluta856@gmail.com;PERUGIA
+MICHEAL PETER;MCHPTR89T05Z335E;05/12/1989;NIGERIA;peter.petermike01@gmail.com;PERUGIA
+OSAGHAEDE RICHARD OMONHEFE;SGHRHR80S22Z335Q;22/11/1980;NIGERIA;kesteromon22@yahoo.com;PERUGIA
+PELELUNGA BOGDAN;PLLBDN87B12Z129P;12/02/1987;ROMANIA;bogdanpelelunga@gmail.com;PERUGIA
+PINTRIJEL PAUL;PNTPLA97P27Z129R;27/09/1997;ROMANIA;pintrijelp@gmail.com;PERUGIA
+ROJAS PUJOL JOSE ANTONIO;RJSJNT98B17Z504P;17/02/1998;CUBA;joseantoniorojaspujol@gmail.com;PERUGIA
+SHEVCHUK MYKHAILO;SHVMKH77S14Z138N;14/11/1977;UCRAINA;mykhailoshevchuk1977@icloud.com;PERUGIA
+TRAORE SALIF;TRRSLF93H12Z329M;12/06/1993;MALI;tsalif595@gmail.com;PERUGIA
+VAITI VISAR;VTAVSR89D13Z148P;13/04/1989;MACEDONIA;visarvaiti68@gmail.com;PERUGIA
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;

static/upload/Index/1743515916.3063955.saved

@@ -0,0 +1,27 @@
+Nome Cognome;Codice Fiscale;Data di Nascita;Luogo di Nascita;email;Sede
+KENESBECK  ALIYA;KNSLYA99L43Z255Z;03/07/1999;KAZAKISTAN;;CHOPSTICK PRATI
+PALMIERI LORENZO   ;PLMLNZ05T29E506H;29/12/2005;LECCE;;CHOPSTICK PRATI
+SURIANO  LORENZO;SRNLNZ04E15H501X;15/05/2004;ROMA;;CHOPSTICK PRATI
+FABBRI ASIA;FBBSAI01M58I608X;18/08/2001;SENIGALLIA;;CHOPSTICK PRATI
+HOSSAN FOYSAL;HSSFSL93R04Z249P;04/10/1993;BANGLADESH;;CHOPSTICK PRATI
+KIRTANIA  OPURBA ;KRTPRB03S03Z249F;03/11/2003;BANGALDESH;;CHOPSTICK PRATI
+MIAH EMRAN   ;MHIMRN93B20Z249D;20/02/1993;BANGLADESH;;CHOPSTICK PRATI
+HOSSAIN FOYSAL;HSSFSL93R04Z249P;04/10/1993;BANGLADESH;;CHOPSTICK PRATI
+SHEIKH  MD EMRAN ;SHKMMR02T31Z249N;31/12/2002;BANGLADESH;;CHOPSTICK PRATI
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;

static/upload/Index/1743607136.0057454.saved

@@ -0,0 +1,106 @@
+Nome Cognome;Codice Fiscale;Data di Nascita;Luogo di Nascita;email;Sede
+ZHAN SHUHUI;ZHNSHH03E56Z210B; 16/05/2003;CINA;;DUCA STORE S.R.L.
+XU XIAYONG;XUXXNG93E04Z210L;04/05/1993;CINA;;DUCA STORE S.R.L.
+ROHAMAN MOHAMMAD BOZLUR;RHMMMM92H17Z249G; 17/06/1992;BANGLADESH;;DUCA STORE S.R.L.
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;

static/upload/Index/1743607136.0057454.saved.cvtd

@@ -0,0 +1,106 @@
+Nome Cognome;Codice Fiscale;Data di Nascita;Luogo di Nascita;email;Sede
+ZHAN SHUHUI;ZHNSHH03E56Z210B; 16/05/2003;CINA;;DUCA STORE S.R.L.
+XU XIAYONG;XUXXNG93E04Z210L;04/05/1993;CINA;;DUCA STORE S.R.L.
+ROHAMAN MOHAMMAD BOZLUR;RHMMMM92H17Z249G; 17/06/1992;BANGLADESH;;DUCA STORE S.R.L.
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;

static/upload/Index/1743776094.9648664.saved

@@ -0,0 +1,12 @@
+Nome Cognome;Codice Fiscale;Data di Nascita;Luogo di Nascita;email;Sede
+CATIPON MARICEL;CTPMCL75S46Z216Y;06/11/1975;FILIPPINE;bhockscatipon11@gmail.com;MILANO
+OANDASAN ERIC;NDSRCE88T05Z216F;05/12/1988;FILIPPINE;darkcire1205@gmail.com;MILANO
+CASTRO PABLO JR;CSTPLJ59L31Z216K;31/07/1959;FILIPPINE;pecjunior31@gmail.com;MILANO
+DONCILLO PAOLO RICARDO;DNCPRC83R20Z216Z;20/10/1983;FILIPPINE;estrelita.david2753@gmail.com;MILANO
+ALCANTRA JOEL;LCNJLO82A22Z216Y;22/01/1982;FILIPPINE;alcantrajoel333@gmail.com;MILANO
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;

static/upload/Index/1743776094.9648664.saved.cvtd

@@ -0,0 +1,12 @@
+Nome Cognome;Codice Fiscale;Data di Nascita;Luogo di Nascita;email;Sede
+CATIPON MARICEL;CTPMCL75S46Z216Y;06/11/1975;FILIPPINE;bhockscatipon11@gmail.com;MILANO
+OANDASAN ERIC;NDSRCE88T05Z216F;05/12/1988;FILIPPINE;darkcire1205@gmail.com;MILANO
+CASTRO PABLO JR;CSTPLJ59L31Z216K;31/07/1959;FILIPPINE;pecjunior31@gmail.com;MILANO
+DONCILLO PAOLO RICARDO;DNCPRC83R20Z216Z;20/10/1983;FILIPPINE;estrelita.david2753@gmail.com;MILANO
+ALCANTRA JOEL;LCNJLO82A22Z216Y;22/01/1982;FILIPPINE;alcantrajoel333@gmail.com;MILANO
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;
+;;;;;

utente/templates/utente.welcome.html

@@ -167,17 +167,7 @@ function toggle(source) {
     </table>
   {% endif %}
 
-  {% if listaok %}
-    {% for i in listaok %}
-      {{i }}
-    {% endfor %}
-  {% endif %}
-
-  {% if listanotok %}
-    {% for i in listanotok %}
-      {{i }}
-    {% endfor %}
-  {% endif %}
+  totale record letti nel file: {{ count }}
 
 {% endblock %}
 

utente/views.py

@@ -129,7 +129,11 @@ def welcome(request):
           print('record filecaricati validi')
           print('presente file indice')
           fileindiceottenuto = fileindicecaricato.cleaned_data.get('indice')
-          save_and_load_file_indice(request,fileindiceottenuto,data['azienda'],data['sede'])
+          listaok,listanotok,count = save_and_load_file_indice(request,fileindiceottenuto,data['azienda'],data['sede'])
+          data['listaok'] = listaok
+          data['listanotok'] = listanotok
+          data['count'] = count
+
         else:
           print('request non valida')
       if 'select' in request.POST: