mirror of
https://github.com/rickbarrette/redmine_qbo_calendar.git
synced 2026-10-03 20:40:43 -04:00
Add appointment time display in tooltip and show view
This commit is contained in:
1 parent
ddb16cd4bf
commit
c7d8486e00
3 files changed
+21
-5
No files matched your search
@@ -9,6 +9,13 @@
|
|||||||
|
|
||||||
<table class="attributes">
|
<table class="attributes">
|
||||||
|
|
||||||
|
<% if appointment.date %>
|
||||||
|
<tr>
|
||||||
|
<th><%= l(:label_time) %></th>
|
||||||
|
<td><%= appointment.date.strftime('%I:%M %p') %></td>
|
||||||
|
</tr>
|
||||||
|
<% end %>
|
||||||
|
|
||||||
<% if appointment.customer %>
|
<% if appointment.customer %>
|
||||||
<tr>
|
<tr>
|
||||||
<th><%= l(:label_customer, default: "Customer") %></th>
|
<th><%= l(:label_customer, default: "Customer") %></th>
|
||||||
|
|||||||
@@ -17,20 +17,22 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<h2>
|
<h2>
|
||||||
<% if @appointment.start_date %>
|
<% if @appointment.date %>
|
||||||
<div class="calendar-badge">
|
<div class="calendar-badge">
|
||||||
<div class="month"><%= @appointment.start_date.strftime('%b').upcase %></div>
|
<div class="month"><%= @appointment.date.strftime('%b').upcase %></div>
|
||||||
<div class="day"><%= @appointment.start_date.day %></div>
|
<div class="day"><%= @appointment.date.day %></div>
|
||||||
</div>
|
</div>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
<span class="appointment-title"><%= @appointment.subject %></span>
|
<span class="appointment-title"><%= @appointment.subject %></span>
|
||||||
|
|
||||||
<span class="appointment-dates">
|
<span class="appointment-dates">
|
||||||
(<%= format_date(@appointment.start_date) %>
|
<% if @appointment.date %>
|
||||||
<% if @appointment.duration > 1 %>
|
(<%= format_date(@appointment.date) %> <%= l(:label_at, default: 'at') %> <%= @appointment.date.strftime('%I:%M %p') %>
|
||||||
|
<% if @appointment.respond_to?(:due_date) && @appointment.due_date.present? && @appointment.duration.to_i > 1 %>
|
||||||
- <%= format_date(@appointment.due_date) %>
|
- <%= format_date(@appointment.due_date) %>
|
||||||
<% end %>)
|
<% end %>)
|
||||||
|
<% end %>
|
||||||
</span>
|
</span>
|
||||||
</h2>
|
</h2>
|
||||||
|
|
||||||
@@ -80,6 +82,12 @@
|
|||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="attribute">
|
||||||
|
<div class="label"><%= l(:label_time, default: 'Time') %>:</div>
|
||||||
|
<div class="value">
|
||||||
|
<%= @appointment.date ? @appointment.date.strftime('%I:%M %p') : '-' %>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
<div class="attribute">
|
<div class="attribute">
|
||||||
<div class="label"><%= l(:field_user) %>:</div>
|
<div class="label"><%= l(:field_user) %>:</div>
|
||||||
<div class="value"><%= link_to_user(@appointment.user) %></div>
|
<div class="value"><%= link_to_user(@appointment.user) %></div>
|
||||||
|
|||||||
@@ -29,6 +29,7 @@ en:
|
|||||||
label_open_appointment: Open Appointment
|
label_open_appointment: Open Appointment
|
||||||
label_start_date: Start Date
|
label_start_date: Start Date
|
||||||
label_status: Status
|
label_status: Status
|
||||||
|
label_time: Time
|
||||||
label_title: Title
|
label_title: Title
|
||||||
label_upcoming_appointments: "My Upcoming Appointments"
|
label_upcoming_appointments: "My Upcoming Appointments"
|
||||||
permission_manage_customer_appointments: Manage Customer Appointments
|
permission_manage_customer_appointments: Manage Customer Appointments
|
||||||
|
|||||||
Reference in new issue
Block a user