...
 
Commits (8)
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-05-22 20:04+0200\n"
"POT-Creation-Date: 2020-06-04 10:28+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -1465,10 +1465,8 @@ msgstr "Search for territories"
#: templates/includes/search_bar.html:88
#, python-format
msgid ""
"Messaggio con data %(data_aggiornamento)s volendo anche un po' lunghetto, "
"che va su più righe."
msgstr ""
msgid "In corso di aggiornamento con i dati riferiti al %(data_aggiornamento)s"
msgstr "Update undergoing on data at %(data_aggiornamento)s"
#: templates/includes/totali.html:5
msgid "Progetti conclusi"
......
......@@ -31,7 +31,7 @@ class Config(object):
# [p for p in programmi0713 if p.descrizione_it.upper().startswith('PIANO STRALCIO')],
[p for p in programmi0713 if p.descrizione_it.upper().startswith('PIANO STRAORDINARIO')],
[p for p in programmi0713 if p.descrizione_it.upper().startswith('PROGRAMMA OBIETTIVI DI SERVIZIO')],
[p for p in programmi0713 if p.codice in ('2017NAPOLI-POZZ', '2007AN0021FA01', 'FSCMILITSPORT', 'FSCMUSEOTERME', '2015XMINTFSC016', 'FSCCOMUNI')],
[p for p in programmi0713 if p.codice in ('2017NAPOLI-POZZ', '2007AN0021FA01', 'FSCMILITSPORT', 'FSCMUSEOTERME', '2015XMINTFSC016', '2018TOSPIOMFSC', 'FSCCOMUNI', '2018FREJUSFSC')],
],
'pac_0713': [
[p for p in programmi0713 if p.descrizione_it.upper().startswith('PROGRAMMA PAC') and (' MINISTERO ' in p.descrizione_it.upper() or ' PCM ' in p.descrizione_it.upper() or ' GOVERNANCE ' in p.descrizione_it.upper())],
......@@ -64,14 +64,14 @@ class Config(object):
],
'fsc_1420_1': [
[p for p in programmi1420 if p.codice in('2017POAGRICOFSC', '2017POAMBIENFSC', '2017POIMPCOMFSC', '2017POINFRASFSC')],
[p for p in programmi1420 if p.codice in ('2016MBCSGFSC006', '2017FSCRICERCA', '2016XXAMPSAP00', '2015XXXXXPSO000', '2016MISEBULFSC1')],
[p for p in programmi1420 if p.codice in ('2016MBCSGFSC006', '2017FSCRICERCA', '2016XXAMPSAP00', '2015XXXXXPSO000', '2016MISEBULFSC1', 'FSCACTBENICONF')],
],
'fsc_1420_2': [
[p for p in programmi1420 if p.codice in ('2016PATTIBARI', '2018POFSCBO', '2016PATTICAGL', '2016PATTICAT', '2016PATTIFIR', '2016PATTIGEN', '2016PATTIMES', '2016PATTIMIL', '2016PATTINAP', '2016PATTIPAL', '2016PATTIVEN', '2016PATTIRC')],
[p for p in programmi1420 if p.codice in ('2016PATTIABR', '2016PATTIBASIL', '2016PATTICAL', '2016PATTICAMP', '2018POFSCEMROM', '2016PATTILAZ', '2016PATTILOMB', '2016PATTIMOL', '2016PATTIPUG', '2016PATTISARD', '2016PATTISICI')],
],
'fsc_1420_3': [
[p for p in programmi1420 if p.codice in ('2019AGCOEFSC001', '2014XXSMDFSC004', 'COMMTARANTOFSC', 'CISFOGGIAFSC', '2015MSIAIFSC011', 'FONDOGARANFSC', '2018FSCVOUCHER', '2017TOPIOMBIFSC', '2018REGTOSCFSC', '2018PIEMPOLTEC', '2016XXPCMFSC002', '2018CAPCULTFSC', '2018MATERAFSC', '2019MISEDLCRE01')],
[p for p in programmi1420 if p.codice in ('2018FSCGIOVIMP', '2019AGCOEFSC001', '2014XXSMDFSC004', 'COMMTARANTOFSC', 'CISFOGGIAFSC', '2015MSIAIFSC011', 'FONDOGARANFSC', '2018FSCVOUCHER', '2017TOPIOMBIFSC', '2018REGTOSCFSC', '2018PIEMPOLTEC', '2015MBACTFSC017', '2016XXPCMFSC002', '2018CAPCULTFSC', '2018MATERAFSC', '2019MISEDLCRE01')],
],
'pac_poc_1420': [
[p for p in programmi1420 if p.descrizione_it.upper().startswith('POC ')],
......
......@@ -108,7 +108,7 @@ class Command(BaseCommand):
'converters': None,
},
'ambiti': {
'files': ['ambito_FESR0713_{}.zip', 'ambito_FSE0713_{}.zip', 'ambito_FSC0713_{}.zip', 'ambito_PAC0713_{}.zip', 'ambito_FESR1420_{}.zip', 'ambito_FSE1420_{}.zip', 'ambito_FEASR1420_{}.zip', 'ambito_FSC1420_{}.zip', 'ambito_IOG1420_{}.zip', 'ambito_FEAMP1420_{}.zip', 'ambito_PAC1420_{}.zip', 'ambito_CTE1420_{}.zip', 'ambito_SNAI1420_{}.zip', 'inattivi/ambito_FESR0713_inattivi_{}.zip', 'inattivi/ambito_FSE0713_inattivi_{}.zip', 'inattivi/ambito_FSC0713_inattivi_{}.zip', 'inattivi/ambito_PAC0713_inattivi_{}.zip'],
'files': ['ambito_FESR0713_{}.zip', 'ambito_FSE0713_{}.zip', 'ambito_FSC0713_{}.zip', 'ambito_PAC0713_{}.zip', 'ambito_FESR1420_{}.zip', 'ambito_FSE1420_{}.zip', 'ambito_FEASR1420_{}.zip', 'ambito_FSC1420_{}.zip', 'ambito_IOG1420_{}.zip', 'ambito_FEAMP1420_{}.zip', 'ambito_PAC1420_{}.zip', 'ambito_CTE1420_{}.zip', 'ambito_SNAI1420_{}.zip', 'inattivi/ambito_FESR0713_inattivi_{}.zip', 'inattivi/ambito_FSE0713_inattivi_{}.zip', 'inattivi/ambito_FSC0713_inattivi_{}.zip', 'inattivi/ambito_PAC0713_inattivi_{}.zip', 'inattivi/ambito_FESR1420_inattivi_{}.zip', 'inattivi/ambito_FSE1420_inattivi_{}.zip', 'inattivi/ambito_FEAMP1420_inattivi_{}.zip', 'inattivi/ambito_IOG1420_inattivi_{}.zip', 'inattivi/ambito_FSC1420_inattivi_{}.zip', 'inattivi/ambito_PAC1420_inattivi_{}.zip'],
'import_method': '_import_ambiti',
'converters': {
'QSN_COD_TEMA_PRIORITARIO_UE': convert_ambito_qsn_cod_tema_prioritario_ue,
......@@ -188,7 +188,7 @@ class Command(BaseCommand):
# read csv files
for file in self.import_types[importtype]['files']:
csvfile = csvpath.rstrip('/') + '/' + file.format('201?????')
csvfile = csvpath.rstrip('/') + '/' + file.format('202?????')
files = sorted(glob.glob(csvfile))
if files:
......@@ -237,7 +237,7 @@ class Command(BaseCommand):
if len(df) == 0:
self.stdout.write(self.style.ERROR('Nessun dato da processare.'))
exit(1)
return
df.fillna('', inplace=True)
df.drop_duplicates(inplace=True)
......
# -*- coding: utf-8 -*-
# Generated by Django 1.11.29 on 2020-06-03 16:28
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('monitoraggio', '0021_auto_20190929_1650'),
]
operations = [
migrations.AlterField(
model_name='progettoindicatorerealizzazione',
name='valore_programmato',
field=models.DecimalField(decimal_places=2, max_digits=16),
),
migrations.AlterField(
model_name='progettoindicatorerealizzazione',
name='valore_realizzato',
field=models.DecimalField(blank=True, decimal_places=2, max_digits=16, null=True),
),
]
......@@ -542,8 +542,8 @@ class ProgettoIndicatoreRealizzazione(models.Model):
progetto = models.ForeignKey(Progetto, related_name='indicatori_realizzazione', on_delete=models.CASCADE)
indicatore_realizzazione = models.ForeignKey(IndicatoreRealizzazione, related_name='+', on_delete=models.CASCADE)
valore_programmato = models.DecimalField(max_digits=14, decimal_places=2)
valore_realizzato = models.DecimalField(max_digits=14, decimal_places=2, null=True, blank=True)
valore_programmato = models.DecimalField(max_digits=16, decimal_places=2)
valore_realizzato = models.DecimalField(max_digits=16, decimal_places=2, null=True, blank=True)
flag_visualizzazione = models.CharField(max_length=1, db_index=True)
......
# -*- coding: utf-8 -*-
import datetime
import zipfile
from collections import OrderedDict
from django import forms
......@@ -317,6 +318,8 @@ class ProgettoSearchView(OCMultiSelectWithRangeFacetedSearchViewSearchView):
context['metadata_file'] = OpenDataFile.objects.get(slug='progetti_metadata')
context['data_aggiornamento'] = datetime.datetime.strptime(settings.DATA_AGGIORNAMENTO, '%Y-%m-%d')
return context
......
......@@ -674,7 +674,7 @@ class OpendataView(TemplateView):
if file_path:
import datetime
import re
match = re.search('\_((201\d)(0[1-9]|1[012])(0[1-9]|[12][0-9]|3[01]))\.', file_path)
match = re.search('\_((202\d)(0[1-9]|1[012])(0[1-9]|[12][0-9]|3[01]))\.', file_path)
if match:
file_date = datetime.datetime.strptime(match.group(1), '%Y%m%d')
......@@ -719,7 +719,7 @@ class OpendataView(TemplateView):
opendata_path = os.path.join(settings.MEDIA_ROOT, 'open_data')
def add_wildcard(file_name):
wildcard = '201?????'
wildcard = '202?????'
file_name, file_ext = os.path.splitext(file_name)
return file_name + '_' + wildcard + file_ext
......
......@@ -1539,6 +1539,10 @@ ul.paginator li .active {
padding: 4px 0;
color: #A8A8A8;
}
.search-filter .panel .panel-collapse p {
margin: 0;
padding: 4px 14px 14px 14px;
}
#indicators {
margin-top: 40px;
}
......
This diff is collapsed.
......@@ -1913,6 +1913,11 @@ ul.paginator {
color: #A8A8A8;
}
}
p {
margin: 0;
padding: 4px @filterbarpadding @filterbarpadding @filterbarpadding;
}
}
}
}
......
......@@ -71,17 +71,25 @@
<h3 class="panel-title"><a data-toggle="collapse" href="#{{ id }}" class="collapsed">{{ facet_info.label }}</a></h3>
</div>
<div id="{{ id }}" class="panel-collapse collapse">
<ul>
{% for v in facet_info.values %}
<li>
{% if v.urls.add_filter %}
<a href="?{{ v.urls.add_filter }}"{% if v.label != v.short_label %} title="{{ v.label }}"{% endif %}>{{ v.short_label }} ({{ v.count|default_if_none:0 }})</a>
{% else %}
<span{% if v.label != v.short_label %} title="{{ v.label }}"{% endif %}>{{ v.short_label }} ({{ v.count|default_if_none:0 }})</span>
{% endif %}
</li>
{% endfor %}
</ul>
{% if facet_info.values %}
<ul>
{% for v in facet_info.values %}
<li>
{% if v.urls.add_filter %}
<a href="?{{ v.urls.add_filter }}"{% if v.label != v.short_label %} title="{{ v.label }}"{% endif %}>{{ v.short_label }} ({{ v.count|default_if_none:0 }})</a>
{% else %}
<span{% if v.label != v.short_label %} title="{{ v.label }}"{% endif %}>{{ v.short_label }} ({{ v.count|default_if_none:0 }})</span>
{% endif %}
</li>
{% endfor %}
</ul>
{% elif facet_name == 'focus' %}
<p>
{% blocktrans trimmed with data_aggiornamento=data_aggiornamento|date:'d/m/Y' %}
In corso di aggiornamento con i dati riferiti al {{ data_aggiornamento }}
{% endblocktrans %}
</p>
{% endif %}
</div>
</div>
{% endwith %}
......