IT-Naturschutz/konova
7
1
Fork 0
Code Issues 6 Pull Requests 1 Actions Projects Releases 28 Wiki Activity

# 177 Timespanreport and Excel download

Browse Source 
* fixes bug on excel download
* adds new order of columns to excel template for report download
* enhances subtitle for old data entries on timespanreport template
This commit is contained in:
mpeltriaux 2022-06-21 14:19:10 +02:00
parent 44ad156595
commit 0801b3f6ab
5 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
analysis/templates/analysis/reports/includes/old_data/card_old_interventions.html
View File

@ -10,7 +10,7 @@
{% fa5_icon 'pencil-ruler' %} {% fa5_icon 'pencil-ruler' %}
{% trans 'Old interventions' %} {% trans 'Old interventions' %}
</h5> </h5>
<span>{% trans 'Before' %} 16.06.2018</span> <span>{% trans 'Binding date before' %} 16.06.2018</span>
</div> </div>
</div> </div>
</div> </div>

2
analysis/utils/excel/excel.py
View File

@ -108,7 +108,7 @@ class TempExcelFile:
for _iter_entry in _iter_obj: for _iter_entry in _iter_obj:
j = 0 j = 0
for _iter_attr in _attrs: for _iter_attr in _attrs:
_new_cell = ws.cell(start_cell.row + i, start_cell.column + j, getattr(_iter_entry, _iter_attr)) _new_cell = ws.cell(start_cell.row + i, start_cell.column + j, _iter_entry.get(_iter_attr, "MISSING"))
_new_cell.border = border_style _new_cell.border = border_style
j += 1 j += 1
i += 1 i += 1

BIN
analysis/utils/excel/excel_report.xlsx
View File

Binary file not shown.

BIN
locale/de/LC_MESSAGES/django.mo
View File

Binary file not shown.

13
locale/de/LC_MESSAGES/django.po
View File

@ -26,7 +26,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-06-21 14:09+0200\n" "POT-Creation-Date: 2022-06-21 14:11+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -228,8 +228,8 @@ msgid ""
" " " "
msgstr "" msgstr ""
"\n" "\n"
"Verzeichnet = Anzahl der Abbuchungen welche zu bereits verzeichneten Eingriffen gehören" "Verzeichnet = Anzahl der Abbuchungen welche zu bereits verzeichneten "
" " "Eingriffen gehören "
#: analysis/templates/analysis/reports/includes/eco_account/deductions.html:14 #: analysis/templates/analysis/reports/includes/eco_account/deductions.html:14
#: analysis/templates/analysis/reports/includes/eco_account/deductions.html:16 #: analysis/templates/analysis/reports/includes/eco_account/deductions.html:16
@ -325,8 +325,8 @@ msgid "Old interventions"
msgstr "Altfälle" msgstr "Altfälle"
#: analysis/templates/analysis/reports/includes/old_data/card_old_interventions.html:13 #: analysis/templates/analysis/reports/includes/old_data/card_old_interventions.html:13
msgid "Before" msgid "Binding date before"
msgstr "Vor" msgstr "Bestandskraft- bzw. Rechtskraftdatum vor"
#: compensation/filters.py:122 #: compensation/filters.py:122
msgid "Show only unrecorded" msgid "Show only unrecorded"
@ -4333,6 +4333,9 @@ msgstr ""
msgid "Unable to connect to qpid with SASL mechanism %s" msgid "Unable to connect to qpid with SASL mechanism %s"
msgstr "" msgstr ""
#~ msgid "Before"
#~ msgstr "Vor"
#~ msgid "Groups" #~ msgid "Groups"
#~ msgstr "Gruppen" #~ msgstr "Gruppen"