Compare commits

...

4 Commits

Author SHA1 Message Date
Aiirondev_dev a5954ce8cb Correction of the filter naming in the upload_admin.html and edit_library.html
Release Inventarsystem / release-docker (push) Successful in 2m15s
2026-08-24 17:16:59 +02:00
Aiirondev_dev 06318d0d2d Correction of the filter naming in the upload_admin.html and edit_library.html
Release Inventarsystem / release-docker (push) Successful in 2m16s
2026-08-24 17:16:15 +02:00
Aiirondev_dev 5ed3c906dd Correction of the implementation of the Filter_names in the manage_filters.html.
Release Inventarsystem / release-docker (push) Successful in 2m14s
2026-08-24 16:53:40 +02:00
Aiirondev_dev 8ce74d3e62 Correction of the implementation of the Filter_names in the manage_filters.html.
Release Inventarsystem / release-docker (push) Successful in 2m14s
2026-08-24 16:42:15 +02:00
5 changed files with 16 additions and 10 deletions
+7 -1
View File
@@ -4710,12 +4710,15 @@ def upload_admin():
if not _action_access_allowed(permissions, 'can_insert'):
flash('Ihnen ist es nicht gestattet auf dieser Internetanwendung, die eben besuchte Adrrese zu nutzen, versuchen sie es erneut nach dem sie sich mit einem berechtigten Nutzer angemeldet haben!', 'error')
return redirect(url_for('login'))
filter_names = it.get_filter_names()
return render_template(
'upload_admin.html',
username=session['username'],
library_module_enabled=cfg.MODULES.is_enabled('library'),
student_cards_module_enabled=cfg.MODULES.is_enabled('student_cards'),
filter_names=filter_names,
show_library_features=False,
upload_mode='item',
page_title='Artikel hochladen',
@@ -7008,12 +7011,15 @@ def item_edit(id):
current_item['IndividualCodes'] = '\n'.join(individual_codes)
filter_names = it.get_filter_names()
return render_template(
'edit_library.html',
username=session['username'],
item=current_item,
show_library_features=show_library_features,
library_module_enabled=library_module_active,
filter_names=filter_names,
page_title=f"Bearbeiten: {current_item.get('Name', '')}"
)
+1 -1
View File
@@ -912,7 +912,7 @@ def get_filter_names():
return names_doc['names']
return {
'1': 'Jahrgangsstufe',
'2': 'Fach',
'2': 'Fachgebiet',
'3': 'Schlagwort'
}
+3 -3
View File
@@ -274,7 +274,7 @@
{% if not show_library_features %}
<!-- ================= SYSTEM FILTERS 1-3 (INVENTORY / OTHER ITEMS ONLY) ================= -->
<div class="filter-inputs">
<h3>Unterrichtsfach (Filter 1):</h3>
<h3>{{ filter_names.get('1', 'Jahrgangsstufe') }}</h3>
<div class="multi-filter">
{% for idx in range(4) %}
<div class="form-group">
@@ -286,7 +286,7 @@
{% endfor %}
</div>
<h3>Jahrgangsstufe (Filter 2):</h3>
<h3>{{ filter_names.get('2', 'Fachgebiet') }}</h3>
<div class="multi-filter">
{% for idx in range(4) %}
<div class="form-group">
@@ -298,7 +298,7 @@
{% endfor %}
</div>
<h3>Schlagwort (Filter 3):</h3>
<h3>{{ filter_names.get('3', 'Schlagwort') }}</h3>
<div class="multi-filter">
{% for idx in range(4) %}
<div class="form-group">
+2 -2
View File
@@ -19,7 +19,7 @@
<div class="col-md-4">
<div class="card mb-4">
<div class="card-header">
<h2 class="card-title h5 mb-0">{{ filter_names.get('1', 'Jahrgang') }} (Filter 1)</h2>
<h2 class="card-title h5 mb-0">{{ filter_names.get('1', 'Jahrgangsstufe') }} (Filter 1)</h2>
</div>
<div class="card-body">
<form method="POST" action="{{ url_for('add_filter_value', filter_num=1) }}" class="mb-4">
@@ -67,7 +67,7 @@
<div class="col-md-4">
<div class="card mb-4">
<div class="card-header">
<h2 class="card-title h5 mb-0">{{ filter_names.get('2', 'Fach') }} (Filter 2)</h2>
<h2 class="card-title h5 mb-0">{{ filter_names.get('2', 'Fachgebiet') }} (Filter 2)</h2>
</div>
<div class="card-body">
<form method="POST" action="{{ url_for('add_filter_value', filter_num=2) }}" class="mb-4">
+3 -3
View File
@@ -781,7 +781,7 @@
{% else %}
<!-- Normal Item Mode: Standard Filters -->
<div class="filter-inputs">
<h3>Unterrichtsfach:</h3>
<h3>{{ filter_names.get('1', 'Jahrgangsstufe') }}</h3>
<div class="multi-filter">
<div class="form-group">
<label for="filter1-1">Wert 1:</label>
@@ -813,7 +813,7 @@
</div>
</div>
<h3>Jahrgangsstufe:</h3>
<h3>{{ filter_names.get('2', 'Fachgebiet') }}</h3>
<div class="multi-filter">
<div class="form-group">
<label for="filter2-1">Wert 1:</label>
@@ -845,7 +845,7 @@
</div>
</div>
<h3>Schlagwort:</h3>
<h3>{{ filter_names.get('3', 'Schlagwort') }}</h3>
<div class="multi-filter">
<div class="form-group">
<label for="filter3-1">Wert 1:</label>