Skip to content
This repository has been archived by the owner on Apr 17, 2021. It is now read-only.

Commit

Permalink
Fix date comparison in liquid, use unix date (#819)
Browse files Browse the repository at this point in the history
  • Loading branch information
Tahir Poduska committed Nov 14, 2016
2 parents 60b8daf + b8dd610 commit 2ce94a8
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 24 deletions.
8 changes: 5 additions & 3 deletions app/views/snippets/equipment-availability-badge.liquid
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
{% if equipment.due_date == nil %}
{% assign due_back = nil %}
{% assign due_back_string = nil %}
{% assign availability = 'Available' %}
{% assign badge = 'badge-success' %}
{% else %}
{% assign due_back = ' Due back ' | append: equipment.due_date %}
{% if now > equipment.due_date %}
{% assign current_time = now | date: '%s' %}
{% assign due_back = equipment.due_date | date: '%s' %}
{% assign due_back_string = ' Due back ' | append: equipment.due_date %}
{% if current_time > due_back %}
{% assign availability = 'Overdue' %}
{% assign badge = 'badge-danger' %}
{% else %}
Expand Down
14 changes: 7 additions & 7 deletions app/views/snippets/equipment-list-setup.liquid
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,25 @@
{% for equipment in mann_equipment.equipment_list %}
{% if equipment.equipment_type == 'digital-video-camera-0' or equipment.equipment_type == 'digital-camera-0' %}
{% include 'equipment-availability-badge' %}
{% capture camera_items %} {{ camera_items }} <tr><td class="selectable"><a href="{% path_to cameras %}">{{ equipment.name }}</a></td><td><span class="badge {{ badge }}">{{ availability }}</span><br>{{ due_back }}</td></tr> {% endcapture %}
{% capture camera_items %} {{ camera_items }} <tr><td class="selectable"><a href="{% path_to cameras %}">{{ equipment.name }}</a></td><td><span class="badge {{ badge }}">{{ availability }}</span><br>{{ due_back_string }}</td></tr> {% endcapture %}
{% elsif equipment.equipment_type == 'digital-video-camera-1' or equipment.equipment_type == 'digital-video-camera-2'%}
{% include 'equipment-availability-badge' %}
{% capture camcorder_items %} {{ camcorder_items }} <tr><td class="selectable"><a href="{% path_to camcorders %}">{{ equipment.name }}</a></td><td><span class="badge {{ badge }}">{{ availability }}</span><br>{{ due_back }}</td></tr> {% endcapture %}
{% capture camcorder_items %} {{ camcorder_items }} <tr><td class="selectable"><a href="{% path_to camcorders %}">{{ equipment.name }}</a></td><td><span class="badge {{ badge }}">{{ availability }}</span><br>{{ due_back_string }}</td></tr> {% endcapture %}
{% elsif equipment.equipment_type == 'audio-recorder' or equipment.equipment_type == 'audio-recorder-0' %}
{% include 'equipment-availability-badge' %}
{% capture audio_recorder_items %} {{ audio_recorder_items }} <tr><td class="selectable"><a href="{% path_to audio_recorders %}">{{ equipment.name }}</a></td><td><span class="badge {{ badge }}">{{ availability }}</span><br>{{ due_back }}</td></tr> {% endcapture %}
{% capture audio_recorder_items %} {{ audio_recorder_items }} <tr><td class="selectable"><a href="{% path_to audio_recorders %}">{{ equipment.name }}</a></td><td><span class="badge {{ badge }}">{{ availability }}</span><br>{{ due_back_string }}</td></tr> {% endcapture %}
{% elsif equipment.equipment_type == 'epson-projector' or equipment.equipment_type == 'epson-projector-0' %}
{% include 'equipment-availability-badge' %}
{% capture projector_items %} {{ projector_items }} <tr><td class="selectable"><a href="{% path_to projectors %}">{{ equipment.name }}</a></td><td><span class="badge {{ badge }}">{{ availability }}</span><br>{{ due_back }}</td></tr> {% endcapture %}
{% capture projector_items %} {{ projector_items }} <tr><td class="selectable"><a href="{% path_to projectors %}">{{ equipment.name }}</a></td><td><span class="badge {{ badge }}">{{ availability }}</span><br>{{ due_back_string }}</td></tr> {% endcapture %}
{% elsif equipment.equipment_type == 'snowball' or equipment.equipment_type == 'microphone-kit' %}
{% include 'equipment-availability-badge' %}
{% capture microphone_items %} {{ microphone_items }} <tr><td class="selectable"><a href="{% path_to microphones %}">{{ equipment.name }}</a></td><td><span class="badge {{ badge }}">{{ availability }}</span><br>{{ due_back }}</td></tr> {% endcapture %}
{% capture microphone_items %} {{ microphone_items }} <tr><td class="selectable"><a href="{% path_to microphones %}">{{ equipment.name }}</a></td><td><span class="badge {{ badge }}">{{ availability }}</span><br>{{ due_back_string }}</td></tr> {% endcapture %}
{% elsif equipment.equipment_type == 'gps/datalog-gps' or equipment.equipment_type == 'gps/garmin-gps' %}
{% include 'equipment-availability-badge' %}
{% capture gps_unit_items %} {{ gps_unit_items }} <tr><td class="selectable"><a href="{% path_to gps_units %}">{{ equipment.name }}</a></td><td><span class="badge {{ badge }}">{{ availability }}</span><br>{{ due_back }}</td></tr> {% endcapture %}
{% capture gps_unit_items %} {{ gps_unit_items }} <tr><td class="selectable"><a href="{% path_to gps_units %}">{{ equipment.name }}</a></td><td><span class="badge {{ badge }}">{{ availability }}</span><br>{{ due_back_string }}</td></tr> {% endcapture %}
{% elsif equipment.equipment_type == 'portable-screen' or equipment.equipment_type == 'tripods' or equipment.equipment_type == 'tripods-3' or equipment.equipment_type == 'tripods-4'%}
{% include 'equipment-availability-badge' %}
{% capture additional_equipment_items %} {{ additional_equipment_items }} <tr><td class="selectable"><a href="{% path_to additional_equipment %}">{{ equipment.name }}</a></td><td><span class="badge {{ badge }}">{{ availability }}</span><br>{{ due_back }}</td></tr> {% endcapture %}
{% capture additional_equipment_items %} {{ additional_equipment_items }} <tr><td class="selectable"><a href="{% path_to additional_equipment %}">{{ equipment.name }}</a></td><td><span class="badge {{ badge }}">{{ availability }}</span><br>{{ due_back_string }}</td></tr> {% endcapture %}
{% else %}
{% endif %}
{% endfor %}
Expand Down
28 changes: 14 additions & 14 deletions app/views/snippets/equipment-type-setup.liquid
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,65 +7,65 @@
{% if equipment.equipment_type == 'digital-video-camera-0' %}
{% assign camera_type_1_title = 'Canon EOS Rebel'%}
{% include 'equipment-availability-badge' %}
{% capture camera_type_1_items %} {{ camera_type_1_items }} <tr><td>{{ equipment.name }}</td><td><span class="badge {{ badge }}">{{ availability }}</span><br>{{ due_back }}</td></tr> {% endcapture %}
{% capture camera_type_1_items %} {{ camera_type_1_items }} <tr><td>{{ equipment.name }}</td><td><span class="badge {{ badge }}">{{ availability }}</span><br>{{ due_back_string }}</td></tr> {% endcapture %}
{% elsif equipment.equipment_type == 'digital-camera-0' %}
{% assign camera_type_2_title = 'Sony Cyber-shot'%}
{% include 'equipment-availability-badge' %}
{% capture camera_type_2_items %} {{ camera_type_2_items }} <tr><td>{{ equipment.name }}</td><td><span class="badge {{ badge }}">{{ availability }}</span><br>{{ due_back }}</td></tr> {% endcapture %}
{% capture camera_type_2_items %} {{ camera_type_2_items }} <tr><td>{{ equipment.name }}</td><td><span class="badge {{ badge }}">{{ availability }}</span><br>{{ due_back_string }}</td></tr> {% endcapture %}
{% comment %}Camcorder types{% endcomment %}
{% elsif equipment.equipment_type == 'digital-video-camera-2'%}
{% assign camcorder_type_1_title = 'Sony HDR-PJ380'%}
{% include 'equipment-availability-badge' %}
{% capture camcorder_type_1_items %} {{ camcorder_type_1_items }} <tr><td>{{ equipment.name }}</td><td><span class="badge {{ badge }}">{{ availability }}</span><br>{{ due_back }}</td></tr> {% endcapture %}
{% capture camcorder_type_1_items %} {{ camcorder_type_1_items }} <tr><td>{{ equipment.name }}</td><td><span class="badge {{ badge }}">{{ availability }}</span><br>{{ due_back_string }}</td></tr> {% endcapture %}
{% elsif equipment.equipment_type == 'digital-video-camera-1'%}
{% assign camcorder_type_2_title = 'Panasonic HX-WA03'%}
{% include 'equipment-availability-badge' %}
{% capture camcorder_type_2_items %} {{ camcorder_type_2_items }} <tr><td>{{ equipment.name }}</td><td><span class="badge {{ badge }}">{{ availability }}</span><br>{{ due_back }}</td></tr> {% endcapture %}
{% capture camcorder_type_2_items %} {{ camcorder_type_2_items }} <tr><td>{{ equipment.name }}</td><td><span class="badge {{ badge }}">{{ availability }}</span><br>{{ due_back_string }}</td></tr> {% endcapture %}
{% comment %}Audio recorder types{% endcomment %}
{% elsif equipment.equipment_type == 'audio-recorder'%}
{% assign audio_recorder_type_1_title = 'Zoom H1'%}
{% include 'equipment-availability-badge' %}
{% capture audio_recorder_type_1_items %} {{ audio_recorder_type_1_items }} <tr><td>{{ equipment.name }}</td><td><span class="badge {{ badge }}">{{ availability }}</span><br>{{ due_back }}</td></tr> {% endcapture %}
{% capture audio_recorder_type_1_items %} {{ audio_recorder_type_1_items }} <tr><td>{{ equipment.name }}</td><td><span class="badge {{ badge }}">{{ availability }}</span><br>{{ due_back_string }}</td></tr> {% endcapture %}
{% elsif equipment.equipment_type == 'audio-recorder-0'%}
{% assign audio_recorder_type_2_title = 'Zoom H4n'%}
{% include 'equipment-availability-badge' %}
{% capture audio_recorder_type_2_items %} {{ audio_recorder_type_2_items }} <tr><td>{{ equipment.name }}</td><td><span class="badge {{ badge }}">{{ availability }}</span><br>{{ due_back }}</td></tr> {% endcapture %}
{% capture audio_recorder_type_2_items %} {{ audio_recorder_type_2_items }} <tr><td>{{ equipment.name }}</td><td><span class="badge {{ badge }}">{{ availability }}</span><br>{{ due_back_string }}</td></tr> {% endcapture %}
{% comment %}Projector types{% endcomment %}
{% elsif equipment.equipment_type == 'epson-projector'%}
{% assign projector_type_1_title = 'Epson EX3212'%}
{% include 'equipment-availability-badge' %}
{% capture projector_type_1_items %} {{ projector_type_1_items }} <tr><td>{{ equipment.name }}</td><td><span class="badge {{ badge }}">{{ availability }}</span><br>{{ due_back }}</td></tr> {% endcapture %}
{% capture projector_type_1_items %} {{ projector_type_1_items }} <tr><td>{{ equipment.name }}</td><td><span class="badge {{ badge }}">{{ availability }}</span><br>{{ due_back_string }}</td></tr> {% endcapture %}
{% elsif equipment.equipment_type == 'epson-projector-0'%}
{% assign projector_type_2_title = 'Epson VS230'%}
{% include 'equipment-availability-badge' %}
{% capture projector_type_2_items %} {{ projector_type_2_items }} <tr><td>{{ equipment.name }}</td><td><span class="badge {{ badge }}">{{ availability }}</span><br>{{ due_back }}</td></tr> {% endcapture %}
{% capture projector_type_2_items %} {{ projector_type_2_items }} <tr><td>{{ equipment.name }}</td><td><span class="badge {{ badge }}">{{ availability }}</span><br>{{ due_back_string }}</td></tr> {% endcapture %}
{% comment %}Microphone types{% endcomment %}
{% elsif equipment.equipment_type == 'microphone-kit'%}
{% assign microphone_type_1_title = 'Sony Wireless'%}
{% include 'equipment-availability-badge' %}
{% capture microphone_type_1_items %} {{ microphone_type_1_items }} <tr><td>{{ equipment.name }}</td><td><span class="badge {{ badge }}">{{ availability }}</span><br>{{ due_back }}</td></tr> {% endcapture %}
{% capture microphone_type_1_items %} {{ microphone_type_1_items }} <tr><td>{{ equipment.name }}</td><td><span class="badge {{ badge }}">{{ availability }}</span><br>{{ due_back_string }}</td></tr> {% endcapture %}
{% elsif equipment.equipment_type == 'snowball'%}
{% assign microphone_type_2_title = 'Blue Snowball'%}
{% include 'equipment-availability-badge' %}
{% capture microphone_type_2_items %} {{ microphone_type_2_items }} <tr><td>{{ equipment.name }}</td><td><span class="badge {{ badge }}">{{ availability }}</span><br>{{ due_back }}</td></tr> {% endcapture %}
{% capture microphone_type_2_items %} {{ microphone_type_2_items }} <tr><td>{{ equipment.name }}</td><td><span class="badge {{ badge }}">{{ availability }}</span><br>{{ due_back_string }}</td></tr> {% endcapture %}
{% comment %}GPS types{% endcomment %}
{% elsif equipment.equipment_type == 'gps/garmin-gps'%}
{% assign gps_type_1_title = 'Garmin 76CS'%}
{% include 'equipment-availability-badge' %}
{% capture gps_type_1_items %} {{ gps_type_1_items }} <tr><td>{{ equipment.name }}</td><td><span class="badge {{ badge }}">{{ availability }}</span><br>{{ due_back }}</td></tr> {% endcapture %}
{% capture gps_type_1_items %} {{ gps_type_1_items }} <tr><td>{{ equipment.name }}</td><td><span class="badge {{ badge }}">{{ availability }}</span><br>{{ due_back_string }}</td></tr> {% endcapture %}
{% elsif equipment.equipment_type == 'gps/datalog-gps'%}
{% assign gps_type_2_title = 'Locosys BGT-31'%}
{% include 'equipment-availability-badge' %}
{% capture gps_type_2_items %} {{ gps_type_2_items }} <tr><td>{{ equipment.name }}</td><td><span class="badge {{ badge }}">{{ availability }}</span><br>{{ due_back }}</td></tr> {% endcapture %}
{% capture gps_type_2_items %} {{ gps_type_2_items }} <tr><td>{{ equipment.name }}</td><td><span class="badge {{ badge }}">{{ availability }}</span><br>{{ due_back_string }}</td></tr> {% endcapture %}
{% comment %}Additional equipment types{% endcomment %}
{% elsif equipment.equipment_type == 'portable-screen'%}
{% assign additional_type_1_title = 'Da-Lite 50" Screen'%}
{% include 'equipment-availability-badge' %}
{% capture additional_type_1_items %} {{ additional_type_1_items }} <tr><td>{{ equipment.name }}</td><td><span class="badge {{ badge }}">{{ availability }}</span><br>{{ due_back }}</td></tr> {% endcapture %}
{% capture additional_type_1_items %} {{ additional_type_1_items }} <tr><td>{{ equipment.name }}</td><td><span class="badge {{ badge }}">{{ availability }}</span><br>{{ due_back_string }}</td></tr> {% endcapture %}
{% elsif equipment.equipment_type == 'tripods' or equipment.equipment_type == 'tripods-3' or equipment.equipment_type == 'tripods-4'%}
{% assign additional_type_2_title = 'Tri-pods'%}
{% include 'equipment-availability-badge' %}
{% capture additional_type_2_items %} {{ additional_type_2_items }} <tr><td>{{ equipment.name }}</td><td><span class="badge {{ badge }}">{{ availability }}</span><br>{{ due_back }}</td></tr> {% endcapture %}
{% capture additional_type_2_items %} {{ additional_type_2_items }} <tr><td>{{ equipment.name }}</td><td><span class="badge {{ badge }}">{{ availability }}</span><br>{{ due_back_string }}</td></tr> {% endcapture %}
{% endif %}
{% endfor %}

Expand Down

0 comments on commit 2ce94a8

Please sign in to comment.