Merge branch '9-napraviti-lako-filtriranje-timova-na-kalendaru' into 'master'
Merge branch '8-podrska-za-boje-na-kalendaru' into 'master' Closes #8 and #9 See merge request kbr4/zsterminator!7
This commit was merged in pull request #21.
This commit is contained in:
@@ -22,6 +22,19 @@
|
||||
</button>
|
||||
<span data-main-calendar-target="dateDisplay" class="ml-3 font-medium"></span>
|
||||
</div>
|
||||
|
||||
<!-- Team Filter Dropdown -->
|
||||
<div class="ml-6">
|
||||
<label for="team-filter" class="mr-2 font-medium"><%= t('.filter_by_team') %>:</label>
|
||||
<select id="team-filter" data-main-calendar-target="teamFilter" data-action="change->main-calendar#filterByTeam" class="rounded-md border-gray-300 shadow-sm px-3 py-1 bg-white">
|
||||
<option value="all"><%= t('.all_teams') %></option>
|
||||
<% @company.teams.each do |team| %>
|
||||
<option value="<%= team.id %>" style="background-color: <%= team_color(team.id) %>; color: #000000; padding-left: 10px;">
|
||||
<%= team.name %>
|
||||
</option>
|
||||
<% end %>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<%= link_to t('.new_reservation'), new_reservation_path, class: "rounded-lg py-3 px-5 bg-blue-600 text-white block font-medium ml-auto" %>
|
||||
</div>
|
||||
@@ -38,7 +51,8 @@
|
||||
delete_error: t('reservations.calendar.delete_error'),
|
||||
network_error: t('reservations.calendar.network_error'),
|
||||
edit: t('reservations.calendar.edit'),
|
||||
delete: t('reservations.calendar.delete')
|
||||
delete: t('reservations.calendar.delete'),
|
||||
all_teams: t('reservations.calendar.all_teams')
|
||||
}.to_json
|
||||
%>
|
||||
<%= tag.div nil,
|
||||
|
||||
Reference in New Issue
Block a user