CLERC/Reskreen
6
0
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects 1 Releases 1 Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Ambulance Clerc
2022-11-09 12:09:03 +01:00
parent 3b498b4504 4d24be4c7b
commit 0e8f4ab529
2 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mycaldav/templates/team/team_view.html
View File

@@ -10,9 +10,6 @@
<td style="vertical-align: top;font-weight: bold;" class="td_key" > <td style="vertical-align: top;font-weight: bold;" class="td_key" >
{{task.key}} {{task.key}}
{% if task.team_transfert %} {% if task.team_transfert %}
<svg class="team_svg_icon" x="0px" y="0px" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512">
<use class="team_svg_icon" xlink:href="{% static 'mycaldav/images/team_trans_1.svg' %}#icon"></use>
</svg>
<svg class="team_svg_icon" x="0px" y="0px" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"> <svg class="team_svg_icon" x="0px" y="0px" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512">
<use class="team_svg_icon" xlink:href="{% static 'mycaldav/images/team_trans_2.svg' %}#icon"></use> <use class="team_svg_icon" xlink:href="{% static 'mycaldav/images/team_trans_2.svg' %}#icon"></use>
</svg> </svg>
@@ -38,9 +35,6 @@
<tr style=""><td style="font-weight: bold;vertical-align: top;{% if task.team_transfert %}background-color: orange;{% endif %}" class="td_key" > <tr style=""><td style="font-weight: bold;vertical-align: top;{% if task.team_transfert %}background-color: orange;{% endif %}" class="td_key" >
{{task.key}} {{task.key}}
{% if task.team_transfert %} {% if task.team_transfert %}
<svg class="team_svg_icon" x="0px" y="0px" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512">
<use class="team_svg_icon" xlink:href="{% static 'mycaldav/images/team_trans_1.svg' %}#icon"></use>
</svg>
<svg class="team_svg_icon" x="0px" y="0px" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"> <svg class="team_svg_icon" x="0px" y="0px" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512">
<use class="team_svg_icon" xlink:href="{% static 'mycaldav/images/team_trans_2.svg' %}#icon"></use> <use class="team_svg_icon" xlink:href="{% static 'mycaldav/images/team_trans_2.svg' %}#icon"></use>
</svg> </svg>

6
mycaldav/views.py
View File

@@ -59,7 +59,7 @@ def view_rh_caldav(request):
o_caldav = cls_caldav(url=caldav_cfg["rh"]) o_caldav = cls_caldav(url=caldav_cfg["rh"])
o_caldav.get_caldav_data(periode=2) o_caldav.get_caldav_data(periode=2)
template = loader.get_template("rh/rh_view.html") template = loader.get_template("rh/rh_view.html")
context = {'latest_task_list': o_caldav.items} context = {'latest_task_list': o_caldav.items[::-1]}
return HttpResponse(template.render(context, request)) return HttpResponse(template.render(context, request))
@xframe_options_exempt @xframe_options_exempt
@@ -67,7 +67,7 @@ def view_road_caldav(request):
o_caldav = cls_caldav(url=caldav_cfg["road"]) o_caldav = cls_caldav(url=caldav_cfg["road"])
o_caldav.get_caldav_data(periode=2) o_caldav.get_caldav_data(periode=2)
template = loader.get_template("road/road_view.html") template = loader.get_template("road/road_view.html")
context = {'latest_task_list': o_caldav.items} context = {'latest_task_list': o_caldav.items[::-1]}
return HttpResponse(template.render(context, request)) return HttpResponse(template.render(context, request))
@xframe_options_exempt @xframe_options_exempt
def view_op_caldav(request): def view_op_caldav(request):
@@ -92,7 +92,7 @@ def view_manif_caldav(request):
o_caldav.get_caldav_data(periode=1) o_caldav.get_caldav_data(periode=1)
template = loader.get_template("manif/manif_view.html") template = loader.get_template("manif/manif_view.html")
o_caldav.sort_array_by_key(True) o_caldav.sort_array_by_key(True)
context = {'latest_task_list': o_caldav.day, 'night_task_list': o_caldav.night, 'today': datetime.today().strftime('%d.%m')} context = {'latest_task_list': o_caldav.items, 'night_task_list': o_caldav.night, 'today': datetime.today().strftime('%d.%m')}
return HttpResponse(template.render(context, request)) return HttpResponse(template.render(context, request))
@xframe_options_exempt @xframe_options_exempt