12068758305

Committed 28 Nov 2024 12:19PM UTC coverage: 84.877%. Remained the same

Build # 12068758305

Build Type

Pull #1435

github

Committed by

web-flow

Commit Message

Merge 11ced6516 into 81067736c

Pull Request Pull Request #1435: eventtype badge visual fixes

Run Details

2956 of 3501 branches covered (84.43%)

Branch coverage included in aggregate %.

5 of 7 new or added lines in 5 files covered. (71.43%)

8 existing lines in 2 files now uncovered.

12018 of 14141 relevant lines covered (84.99%)

0.85 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

50.0

/ephios/core/templates/core/home.html

{% extends "base.html" %}
{% load logentries %}
{% load user_extras %}
{% load event_extras %}
{% load cache %}
{% load i18n %}
{% load static %}


{% block title %}
    {% translate "Home" %}
{% endblock %}

{% block javascript %}
    <script type="text/javascript" src="{% static "ephios/js/consequences.js" %}"></script>
{% endblock %}

{% block content %}
    <h1 class="page-header">
        {% blocktranslate trimmed with organization_name=global_preferences.general__organization_name %}
            Welcome to {{ organization_name }}!
        {% endblocktranslate%}
    </h1>

    <style nonce="{{ request.csp_nonce }}">
        {% cache 900 eventtype_colors_css %}
            {% eventtype_colors %}
        {% endcache %}
    </style>

    {% with request.user|confirmed_participations as confirmed_participations %}
        <div class="card mb-3">
            <div class="card-body">
                <h5 class="card-title mb-0">{% translate "Your upcoming events" %}</h5>
            </div>
            <ul class="list-group list-group-flush">
                {% for participation in confirmed_participations %}
                    <li class="list-group-item flex-column">
                        <div class="row">
                            <div class="col-auto px-0">
                                <span class="text-success fa fa-user-check ps-2"></span>
                            </div>
                            <div class="col">
                                <div class="row">
                                    <span class="col col-lg-6 text-break">
                                        {{ participation.shift.event.title }}
                                    </span>
                                    <span class="col-auto col-lg-2">
                                        <span class="badge badge-eventtype eventtype-{{ participation.shift.event.type.pk }}-color">{{ participation.shift.event.type }}</span>
                                    </span>
                                    <span class="col-lg-4">
                                        {{ participation.start_time|date:"D" }}, {{ participation.start_time|date:"SHORT_DATE_FORMAT" }}, {{ participation.get_time_display }}
                                    </span>
                                </div>
                            </div>
                            <div class="col-auto">
                                <a class="btn btn-outline-primary btn-sm"
                                   href="{{ participation.shift.get_absolute_url }}"><span
                                    class="fa fa-eye"></span> <span
                                        class="d-none d-md-inline">{% translate "View" %}</span></a>
                            </div>
                        </div>
                    </li>
                {% empty %}
                    <li class="list-group-item d-flex flex-column align-items-center justify-content-center">
                        <span class="pb-1 text-body-secondary">{% translate "None yet" context "empty list of upcoming shifts" %}</span>
                        <a class="btn btn-sm btn-primary" href="{% url "core:event_list" %}">{% translate "View events" %}</a>
                    </li>

                {% endfor %}
            </ul>
        </div>
    {% endwith %}

    {% with request.user|shifts_needing_disposition as shifts %}
        {% if shifts|length > 0 %}
            <div class="card mb-3">
                <div class="card-body">
                    <h5 class="card-title mb-0">{% translate "Events with requested participations" %}</h5>
                </div>
                <ul class="list-group list-group-flush">
                    {% for shift in shifts %}
                        <li class="list-group-item flex-column">
                            <div class="row">
                                <div class="col-auto px-0">
                                    <span class="text-info fa fa-hand-point-right ps-2"></span>
                                </div>
                                <div class="col">
                                    <div class="row">
                                        <span class="col col-lg-6 text-break">
                                            {{ shift.event.title }}
                                        </span>
                                        <span class="col-auto col-lg-2">
                                            <span class="badge badge-eventtype eventtype-{{ shift.event.type.pk }}-color">{{ shift.event.type }}</span>
                                        </span>
                                        <span class="col-lg-4">
                                            {{ shift.start_time|date:"D" }}, {{ shift.start_time|date:"SHORT_DATE_FORMAT" }}, {{ shift.get_time_display }}
                                        </span>
                                    </div>
                                </div>
                                <div class="col-auto">
                                    <a class="btn btn-outline-primary btn-sm"
                                       href="{% url "core:event_detail" shift.event.pk shift.event.get_canonical_slug %}"><span
                                        class="fa fa-eye"></span> <span
                                            class="d-none d-md-inline">{% translate "View" %}</span></a>
                                    <a class="btn btn-outline-primary btn-sm"
                                       href="{% url "core:shift_disposition" shift.pk %}"><span
                                        class="fas fa-hand-point-right"></span> <span
                                            class="d-none d-md-inline">{% translate "Disposition" %}</span></a>
                                </div>
                            </div>
                        </li>
                    {% endfor %}
                </ul>
            </div>
        {% endif %}
    {% endwith %}

    {% include "core/fragments/approve_consequences.html" %}
    {% include "core/fragments/pending_consequences.html" %}

    {% with logentries=request.user|visible_logentries %}
        {% if logentries %}
            <div class="card mb-3">
                <div class="card-body">
                    <h5 class="card-title mb-0">
                        {% translate "Edit history" %}
                        <a class="btn btn-outline-primary btn-sm float-end" href="{% url "core:log" %}">
                            <span class="fas fa-eye"></span>
                            <span class="d-none d-md-inline">{% translate "View everything" %}</span>
                        </a>
                    </h5>
                </div>
                {% include 'modellogging/logentry_grouped_list.html' with logentries=logentries %}
            </div>
        {% endif %}
    {% endwith %}

    {% homepage_plugin_content request as plugin_content %}
    {% for item in plugin_content %}
        <div class="card mb-3">
            <div class="card-body">
                {{ item }}
            </div>
        </div>
    {% endfor %}

{% endblock %}

1	{% extends "base.html" %}	1✔
2	{% load logentries %}
3	{% load user_extras %}
4	{% load event_extras %}
5	{% load cache %}
6	{% load i18n %}
7	{% load static %}
8
9
10	{% block title %}
11	{% translate "Home" %}	1✔
12	{% endblock %}
13
14	{% block javascript %}
15	<script type="text/javascript" src="{% static "ephios/js/consequences.js" %}"></script>	1✔
16	{% endblock %}
17
18	{% block content %}
19	<h1 class="page-header">	1✔
20	{% blocktranslate trimmed with organization_name=global_preferences.general__organization_name %}	1✔
21	Welcome to {{ organization_name }}!	1✔
22	{% endblocktranslate%}	1✔
23	</h1>
24
25	<style nonce="{{ request.csp_nonce }}">	1✔
26	{% cache 900 eventtype_colors_css %}
27	{% eventtype_colors %}
28	{% endcache %}
29	</style>
30
31	{% with request.user\|confirmed_participations as confirmed_participations %}
32	<div class="card mb-3">
33	<div class="card-body">
34	<h5 class="card-title mb-0">{% translate "Your upcoming events" %}</h5>
35	</div>
36	<ul class="list-group list-group-flush">
37	{% for participation in confirmed_participations %}
38	<li class="list-group-item flex-column">
39	<div class="row">
40	<div class="col-auto px-0">
41	<span class="text-success fa fa-user-check ps-2"></span>
42	</div>
43	<div class="col">
44	<div class="row">
45	<span class="col col-lg-6 text-break">
46	{{ participation.shift.event.title }}	×
47	</span>
48	<span class="col-auto col-lg-2">
NEW UNCOV 49	<span class="badge badge-eventtype eventtype-{{ participation.shift.event.type.pk }}-color">{{ participation.shift.event.type }}</span>	×
50	</span>
51	<span class="col-lg-4">
UNCOV 52	{{ participation.start_time\|date:"D" }}, {{ participation.start_time\|date:"SHORT_DATE_FORMAT" }}, {{ participation.get_time_display }}	×
53	</span>
54	</div>
55	</div>
56	<div class="col-auto">
57	<a class="btn btn-outline-primary btn-sm"
UNCOV 58	href="{{ participation.shift.get_absolute_url }}"><span	×
59	class="fa fa-eye"></span> <span
60	class="d-none d-md-inline">{% translate "View" %}</span></a>
61	</div>
62	</div>
63	</li>
64	{% empty %}
65	<li class="list-group-item d-flex flex-column align-items-center justify-content-center">
66	<span class="pb-1 text-body-secondary">{% translate "None yet" context "empty list of upcoming shifts" %}</span>
67	<a class="btn btn-sm btn-primary" href="{% url "core:event_list" %}">{% translate "View events" %}</a>
68	</li>
69
70	{% endfor %}
71	</ul>
72	</div>
73	{% endwith %}
74
75	{% with request.user\|shifts_needing_disposition as shifts %}
76	{% if shifts\|length > 0 %}
77	<div class="card mb-3">
78	<div class="card-body">
79	<h5 class="card-title mb-0">{% translate "Events with requested participations" %}</h5>
80	</div>
81	<ul class="list-group list-group-flush">
82	{% for shift in shifts %}
83	<li class="list-group-item flex-column">
84	<div class="row">
85	<div class="col-auto px-0">
86	<span class="text-info fa fa-hand-point-right ps-2"></span>
87	</div>
88	<div class="col">
89	<div class="row">
90	<span class="col col-lg-6 text-break">
91	{{ shift.event.title }}	×
92	</span>
93	<span class="col-auto col-lg-2">
NEW 94	<span class="badge badge-eventtype eventtype-{{ shift.event.type.pk }}-color">{{ shift.event.type }}</span>	×
95	</span>
96	<span class="col-lg-4">
UNCOV 97	{{ shift.start_time\|date:"D" }}, {{ shift.start_time\|date:"SHORT_DATE_FORMAT" }}, {{ shift.get_time_display }}	×
98	</span>
99	</div>
100	</div>
101	<div class="col-auto">
102	<a class="btn btn-outline-primary btn-sm"
103	href="{% url "core:event_detail" shift.event.pk shift.event.get_canonical_slug %}"><span
104	class="fa fa-eye"></span> <span
105	class="d-none d-md-inline">{% translate "View" %}</span></a>
106	<a class="btn btn-outline-primary btn-sm"
107	href="{% url "core:shift_disposition" shift.pk %}"><span
108	class="fas fa-hand-point-right"></span> <span
109	class="d-none d-md-inline">{% translate "Disposition" %}</span></a>
110	</div>
111	</div>
112	</li>
113	{% endfor %}
114	</ul>
115	</div>
116	{% endif %}
117	{% endwith %}
118
119	{% include "core/fragments/approve_consequences.html" %}
120	{% include "core/fragments/pending_consequences.html" %}
121
122	{% with logentries=request.user\|visible_logentries %}
123	{% if logentries %}
124	<div class="card mb-3">
125	<div class="card-body">
126	<h5 class="card-title mb-0">
127	{% translate "Edit history" %}
128	<a class="btn btn-outline-primary btn-sm float-end" href="{% url "core:log" %}">
129	<span class="fas fa-eye"></span>
130	<span class="d-none d-md-inline">{% translate "View everything" %}</span>
131	</a>
132	</h5>
133	</div>
134	{% include 'modellogging/logentry_grouped_list.html' with logentries=logentries %}
135	</div>
136	{% endif %}
137	{% endwith %}
138
139	{% homepage_plugin_content request as plugin_content %}
140	{% for item in plugin_content %}
141	<div class="card mb-3">
142	<div class="card-body">
UNCOV 143	{{ item }}	×
144	</div>
145	</div>
146	{% endfor %}
147
148	{% endblock %}

ephios-dev / ephios / 12068758305

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous