From ade882aad19c8ed5c1e8c0f4bfe3b7e911eaa384 Mon Sep 17 00:00:00 2001 From: "vittorio.dargenio" Date: Tue, 2 Apr 2019 15:16:51 +0200 Subject: [PATCH 1/2] fix elechi Trasferimento --- ufficio_soci/elenchi.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/ufficio_soci/elenchi.py b/ufficio_soci/elenchi.py index a5fa7c012..474689747 100644 --- a/ufficio_soci/elenchi.py +++ b/ufficio_soci/elenchi.py @@ -452,13 +452,16 @@ def risultati(self): def excel_colonne(self): def _data(p): - return Trasferimento.objects.filter(persona=p.id, ritirata=False).order_by('creazione').first().protocollo_data + d = Trasferimento.objects.filter(persona=p.id, ritirata=False).order_by('creazione') + return d.first().protocollo_data if d else '' def _motivo(p): - return Trasferimento.objects.filter(persona=p.id, ritirata=False).order_by('creazione').first().motivo + d = Trasferimento.objects.filter(persona=p.id, ritirata=False).order_by('creazione') + return d.first().motivo if d else '' def _destinazione(p): - return Trasferimento.objects.filter(persona=p.id, ritirata=False).order_by('creazione').first().destinazione + d = Trasferimento.objects.filter(persona=p.id, ritirata=False).order_by('creazione') + return d.first().destinazione if d else '' return super(ElencoTrasferiti, self).excel_colonne() + ( ('Data del trasferimento', lambda p: _data(p)), @@ -824,4 +827,4 @@ def risultati(self): ).distinct('cognome', 'nome', 'codice_fiscale') def template(self): - return "us_elenchi_inc_tesserini_rifiutati.html" \ No newline at end of file + return "us_elenchi_inc_tesserini_rifiutati.html" From 19303a21845f245fc41c92cb70069eff1a55d962 Mon Sep 17 00:00:00 2001 From: "vittorio.dargenio" Date: Tue, 2 Apr 2019 16:33:51 +0200 Subject: [PATCH 2/2] fix requirements --- requirements.txt | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/requirements.txt b/requirements.txt index 9885778e3..43bd25cc6 100755 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ --extra-index-url https://devpi.iast.it/nephila/public/+simple/ -Django==1.9.12 +Django==1.9.13 Markdown==2.6 django-bootstrap3==7.0.0 django-filter==0.9.2 @@ -29,19 +29,22 @@ newrelic==2.60.0.46 django_compressor==2.0 csscompressor==0.9.4 slimit==0.8.1 -pyBarcode==0.7 cssselect==0.9.1 splinter==0.7.7 tblib==1.3.0 selenium==3.8.1 -https://github.com/nephila/django-filer/archive/296fa6170a3749532b85ceb033eeae0fb839e9a6.zip django-ckeditor-filebrowser-filer==0.2.0 django-nocaptcha-recaptcha==0.0.19 django-two-factor-auth==1.4.0 django-otp-yubikey==0.3.4 freezegun==0.3.9 unicodecsv==0.14.1 -celery[redis]==4.1.0 +celery[redis]==4.1.1 django-oauth-toolkit==0.12.0 django-cors-middleware djangorestframework==3.6 +xhtml2pdf +xlwt==1.3.0 +django-oidc-provider==0.6.2 +https://github.com/emfcamp/python-barcode/archive/0.7.zip # pyBarcode==0.7 +https://github.com/nephila/django-filer/archive/296fa6170a3749532b85ceb033eeae0fb839e9a6.zip