diff --git a/horilla_views/templates/generic/horilla_card.html b/horilla_views/templates/generic/horilla_card.html index 65e934009..9c9b614a7 100644 --- a/horilla_views/templates/generic/horilla_card.html +++ b/horilla_views/templates/generic/horilla_card.html @@ -1,16 +1,42 @@ {% load static i18n generic_template_filters %}
- {% if queryset|length %} - {% if card_status_indications %} -
- {% for indication in card_status_indications %} - - - {{indication.1}} - - {% endfor %} + +
+
+ {% for filter in stored_filters %} +
+ +
+ + + +
+
+ {% endfor %} +
+ {% if card_status_indications %} +
+ {% for indication in card_status_indications %} + + + {{indication.1}} + + {% endfor %} +
- {% endif %} {% if show_filter_tags %} @@ -29,8 +55,8 @@
- {{details.title|format:instance|safe}} - {{details.subtitle|format:instance|safe}} + {{details.title|format:instance|selected_format:request.user.employee_get.employee_work_info.company_id|safe}} + {{details.subtitle|format:instance|selected_format:request.user.employee_get.employee_work_info.company_id|safe}}
{% if actions %}
diff --git a/horilla_views/templates/generic/horilla_tabs.html b/horilla_views/templates/generic/horilla_tabs.html index b62a9d22c..d73c83be0 100644 --- a/horilla_views/templates/generic/horilla_tabs.html +++ b/horilla_views/templates/generic/horilla_tabs.html @@ -4,7 +4,11 @@ {% comment %} {% include "attendance/attendance/attendance_nav.html" %} {% endcomment %} {% load i18n generic_template_filters %} -
+
+ +
    {% for tab in tabs %}