add: Calander and reservation mode implemented.

This commit is contained in:
serversdwn
2026-02-06 20:40:31 +00:00
parent e515bff1a9
commit eb0a99796d
15 changed files with 2847 additions and 27 deletions

View File

@@ -0,0 +1,40 @@
<!-- Available Units for Assignment -->
{% if units %}
<div class="space-y-1">
{% for unit in units %}
<label class="flex items-center gap-3 p-2 hover:bg-gray-50 dark:hover:bg-gray-700 rounded cursor-pointer">
<input type="checkbox" name="unit_ids" value="{{ unit.id }}"
class="w-4 h-4 text-blue-600 focus:ring-blue-500 rounded border-gray-300 dark:border-gray-600">
<span class="font-medium text-gray-900 dark:text-white">{{ unit.id }}</span>
<span class="text-sm text-gray-500 dark:text-gray-400 flex-1">
{% if unit.last_calibrated %}
Cal: {{ unit.last_calibrated }}
{% else %}
No cal date
{% endif %}
</span>
{% if unit.calibration_status == 'expiring_soon' %}
<span class="text-xs px-2 py-0.5 bg-yellow-100 dark:bg-yellow-900/30 text-yellow-700 dark:text-yellow-400 rounded-full">
Expiring soon
</span>
{% endif %}
{% if unit.deployed %}
<span class="text-xs px-2 py-0.5 bg-green-100 dark:bg-green-900/30 text-green-700 dark:text-green-400 rounded-full">
Deployed
</span>
{% else %}
<span class="text-xs px-2 py-0.5 bg-gray-100 dark:bg-gray-700 text-gray-600 dark:text-gray-400 rounded-full">
Benched
</span>
{% endif %}
</label>
{% endfor %}
</div>
{% else %}
<p class="text-gray-500 dark:text-gray-400 text-sm py-4 text-center">
No units available for this date range.
{% if start_date and end_date %}
<br><span class="text-xs">All units are either reserved, have expired calibrations, or are retired.</span>
{% endif %}
</p>
{% endif %}

View File

@@ -0,0 +1,186 @@
<!-- Day Detail Panel Content -->
<div class="flex items-center justify-between mb-6">
<h2 class="text-xl font-semibold text-gray-900 dark:text-white">{{ date_display }}</h2>
<button onclick="closeDayPanel()" class="text-gray-400 hover:text-gray-600 dark:hover:text-gray-300">
<svg class="w-6 h-6" fill="none" stroke="currentColor" viewBox="0 0 24 24">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12"/>
</svg>
</button>
</div>
<!-- Summary Stats -->
<div class="grid grid-cols-2 gap-3 mb-6">
<div class="bg-green-50 dark:bg-green-900/20 rounded-lg p-3 text-center">
<p class="text-2xl font-bold text-green-700 dark:text-green-300">{{ day_data.counts.available }}</p>
<p class="text-xs text-green-600 dark:text-green-400">Available</p>
</div>
<div class="bg-blue-50 dark:bg-blue-900/20 rounded-lg p-3 text-center">
<p class="text-2xl font-bold text-blue-700 dark:text-blue-300">{{ day_data.counts.reserved }}</p>
<p class="text-xs text-blue-600 dark:text-blue-400">Reserved</p>
</div>
<div class="bg-yellow-50 dark:bg-yellow-900/20 rounded-lg p-3 text-center">
<p class="text-2xl font-bold text-yellow-700 dark:text-yellow-300">{{ day_data.counts.expiring_soon }}</p>
<p class="text-xs text-yellow-600 dark:text-yellow-400">Expiring Soon</p>
</div>
<div class="bg-red-50 dark:bg-red-900/20 rounded-lg p-3 text-center">
<p class="text-2xl font-bold text-red-700 dark:text-red-300">{{ day_data.counts.expired }}</p>
<p class="text-xs text-red-600 dark:text-red-400">Cal. Expired</p>
</div>
</div>
<!-- Calibration Expiring TODAY - Important alert -->
{% if day_data.cal_expiring_today %}
<div class="mb-6 p-3 bg-red-50 dark:bg-red-900/30 border border-red-200 dark:border-red-800 rounded-lg">
<h3 class="text-sm font-semibold text-red-700 dark:text-red-400 mb-2 flex items-center gap-2">
<svg class="w-4 h-4" fill="currentColor" viewBox="0 0 20 20">
<path fill-rule="evenodd" d="M8.257 3.099c.765-1.36 2.722-1.36 3.486 0l5.58 9.92c.75 1.334-.213 2.98-1.742 2.98H4.42c-1.53 0-2.493-1.646-1.743-2.98l5.58-9.92zM11 13a1 1 0 11-2 0 1 1 0 012 0zm-1-8a1 1 0 00-1 1v3a1 1 0 002 0V6a1 1 0 00-1-1z" clip-rule="evenodd"/>
</svg>
Calibration Expires Today ({{ day_data.cal_expiring_today|length }})
</h3>
<div class="space-y-1">
{% for unit in day_data.cal_expiring_today %}
<div class="flex items-center justify-between p-2 bg-white dark:bg-gray-800 rounded text-sm">
<a href="/unit/{{ unit.id }}" class="font-medium text-red-600 dark:text-red-400 hover:underline">
{{ unit.id }}
</a>
<span class="text-red-500 text-xs">
Last cal: {{ unit.last_calibrated }}
</span>
</div>
{% endfor %}
</div>
</div>
{% endif %}
<!-- Reservations on this date -->
{% if day_data.reservations %}
<div class="mb-6">
<h3 class="text-sm font-semibold text-gray-700 dark:text-gray-300 mb-3">Reservations</h3>
{% for res in day_data.reservations %}
<div class="reservation-bar mb-2" style="background-color: {{ res.color }}20; border-left: 4px solid {{ res.color }};">
<div class="flex-1">
<p class="font-medium text-gray-900 dark:text-white">{{ res.name }}</p>
<p class="text-xs text-gray-500 dark:text-gray-400">
{{ res.start_date }} - {{ res.end_date }}
</p>
</div>
<div class="text-right">
<p class="font-semibold text-gray-900 dark:text-white">
{% if res.assignment_type == 'quantity' %}
{{ res.assigned_count }}/{{ res.quantity_needed or '?' }}
{% else %}
{{ res.assigned_count }} units
{% endif %}
</p>
</div>
</div>
{% endfor %}
</div>
{% endif %}
<!-- Available Units -->
{% if day_data.available_units %}
<div class="mb-6">
<h3 class="text-sm font-semibold text-gray-700 dark:text-gray-300 mb-3">
Available Units ({{ day_data.available_units|length }})
</h3>
<div class="max-h-48 overflow-y-auto space-y-1">
{% for unit in day_data.available_units %}
<div class="flex items-center justify-between p-2 bg-gray-50 dark:bg-gray-700/50 rounded text-sm">
<a href="/unit/{{ unit.id }}" class="font-medium text-blue-600 dark:text-blue-400 hover:underline">
{{ unit.id }}
</a>
<span class="text-gray-500 dark:text-gray-400 text-xs">
{% if unit.last_calibrated %}
Cal: {{ unit.last_calibrated }}
{% else %}
No cal date
{% endif %}
</span>
</div>
{% endfor %}
</div>
</div>
{% endif %}
<!-- Reserved Units -->
{% if day_data.reserved_units %}
<div class="mb-6">
<h3 class="text-sm font-semibold text-gray-700 dark:text-gray-300 mb-3">
Reserved Units ({{ day_data.reserved_units|length }})
</h3>
<div class="max-h-48 overflow-y-auto space-y-1">
{% for unit in day_data.reserved_units %}
<div class="flex items-center justify-between p-2 bg-blue-50 dark:bg-blue-900/20 rounded text-sm">
<a href="/unit/{{ unit.id }}" class="font-medium text-blue-600 dark:text-blue-400 hover:underline">
{{ unit.id }}
</a>
<span class="text-blue-600 dark:text-blue-400 text-xs">
{{ unit.reservation_name }}
</span>
</div>
{% endfor %}
</div>
</div>
{% endif %}
<!-- Calibration Expired -->
{% if day_data.expired_units %}
<div class="mb-6">
<h3 class="text-sm font-semibold text-red-600 dark:text-red-400 mb-3">
Calibration Expired ({{ day_data.expired_units|length }})
</h3>
<div class="max-h-48 overflow-y-auto space-y-1">
{% for unit in day_data.expired_units %}
<div class="flex items-center justify-between p-2 bg-red-50 dark:bg-red-900/20 rounded text-sm">
<a href="/unit/{{ unit.id }}" class="font-medium text-red-600 dark:text-red-400 hover:underline">
{{ unit.id }}
</a>
<span class="text-red-500 text-xs">
Expired: {{ unit.expiry_date }}
</span>
</div>
{% endfor %}
</div>
</div>
{% endif %}
<!-- Needs Calibration -->
{% if day_data.needs_calibration_units %}
<div class="mb-6">
<h3 class="text-sm font-semibold text-gray-600 dark:text-gray-400 mb-3">
Needs Calibration Date ({{ day_data.needs_calibration_units|length }})
</h3>
<div class="max-h-32 overflow-y-auto space-y-1">
{% for unit in day_data.needs_calibration_units %}
<div class="flex items-center justify-between p-2 bg-gray-100 dark:bg-gray-700/50 rounded text-sm">
<a href="/unit/{{ unit.id }}" class="font-medium text-gray-600 dark:text-gray-400 hover:underline">
{{ unit.id }}
</a>
<span class="text-gray-400 text-xs">No cal date set</span>
</div>
{% endfor %}
</div>
</div>
{% endif %}
<!-- Expiring Soon (informational) -->
{% if day_data.expiring_soon_units %}
<div class="mb-6">
<h3 class="text-sm font-semibold text-yellow-600 dark:text-yellow-400 mb-3">
Calibration Expiring Soon ({{ day_data.expiring_soon_units|length }})
</h3>
<div class="max-h-32 overflow-y-auto space-y-1">
{% for unit in day_data.expiring_soon_units %}
<div class="flex items-center justify-between p-2 bg-yellow-50 dark:bg-yellow-900/20 rounded text-sm">
<a href="/unit/{{ unit.id }}" class="font-medium text-yellow-700 dark:text-yellow-400 hover:underline">
{{ unit.id }}
</a>
<span class="text-yellow-600 text-xs">
Expires: {{ unit.expiry_date }}
</span>
</div>
{% endfor %}
</div>
</div>
{% endif %}

View File

@@ -0,0 +1,103 @@
<!-- Reservations List -->
{% if reservations %}
<div class="space-y-3">
{% for item in reservations %}
{% set res = item.reservation %}
<div class="flex items-center justify-between p-4 rounded-lg border border-gray-200 dark:border-gray-700 hover:bg-gray-50 dark:hover:bg-gray-700/50 transition-colors"
style="border-left: 4px solid {{ res.color }};">
<div class="flex-1">
<div class="flex items-center gap-2">
<h3 class="font-semibold text-gray-900 dark:text-white">{{ res.name }}</h3>
{% if item.has_conflicts %}
<span class="px-2 py-0.5 text-xs font-medium bg-red-100 dark:bg-red-900/30 text-red-700 dark:text-red-400 rounded-full"
title="{{ item.conflict_count }} unit(s) have calibration expiring during this job">
{{ item.conflict_count }} conflict{{ 's' if item.conflict_count != 1 else '' }}
</span>
{% endif %}
</div>
<p class="text-sm text-gray-500 dark:text-gray-400 mt-1">
{{ res.start_date.strftime('%b %d, %Y') }} -
{% if res.end_date %}
{{ res.end_date.strftime('%b %d, %Y') }}
{% elif res.end_date_tbd %}
<span class="text-yellow-600 dark:text-yellow-400 font-medium">TBD</span>
{% if res.estimated_end_date %}
<span class="text-gray-400">(est. {{ res.estimated_end_date.strftime('%b %d, %Y') }})</span>
{% endif %}
{% else %}
<span class="text-yellow-600 dark:text-yellow-400">Ongoing</span>
{% endif %}
</p>
{% if res.notes %}
<p class="text-sm text-gray-400 dark:text-gray-500 mt-1">{{ res.notes }}</p>
{% endif %}
</div>
<div class="text-right ml-4">
<p class="text-lg font-bold text-gray-900 dark:text-white">
{% if res.assignment_type == 'quantity' %}
{{ item.assigned_count }}/{{ res.quantity_needed or '?' }}
{% else %}
{{ item.assigned_count }}
{% endif %}
</p>
<p class="text-xs text-gray-500 dark:text-gray-400">
{{ 'units needed' if res.assignment_type == 'quantity' else 'units assigned' }}
</p>
</div>
<div class="ml-4 flex items-center gap-2">
<button onclick="editReservation('{{ res.id }}')"
class="p-2 text-gray-400 hover:text-blue-600 dark:hover:text-blue-400 rounded-lg hover:bg-gray-100 dark:hover:bg-gray-700"
title="Edit reservation">
<svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M11 5H6a2 2 0 00-2 2v11a2 2 0 002 2h11a2 2 0 002-2v-5m-1.414-9.414a2 2 0 112.828 2.828L11.828 15H9v-2.828l8.586-8.586z"/>
</svg>
</button>
<button onclick="deleteReservation('{{ res.id }}', '{{ res.name }}')"
class="p-2 text-gray-400 hover:text-red-600 dark:hover:text-red-400 rounded-lg hover:bg-gray-100 dark:hover:bg-gray-700"
title="Delete reservation">
<svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 7l-.867 12.142A2 2 0 0116.138 21H7.862a2 2 0 01-1.995-1.858L5 7m5 4v6m4-6v6m1-10V4a1 1 0 00-1-1h-4a1 1 0 00-1 1v3M4 7h16"/>
</svg>
</button>
</div>
</div>
{% endfor %}
</div>
<script>
async function deleteReservation(id, name) {
if (!confirm(`Delete reservation "${name}"?\n\nThis will remove all unit assignments.`)) {
return;
}
try {
const response = await fetch(`/api/fleet-calendar/reservations/${id}`, {
method: 'DELETE'
});
if (response.ok) {
window.location.reload();
} else {
const data = await response.json();
alert('Error: ' + (data.detail || 'Failed to delete'));
}
} catch (error) {
console.error('Error:', error);
alert('Error deleting reservation');
}
}
function editReservation(id) {
// For now, just show alert - can implement edit modal later
alert('Edit functionality coming soon. For now, delete and recreate the reservation.');
}
</script>
{% else %}
<div class="text-center py-8">
<svg class="w-12 h-12 mx-auto text-gray-400 dark:text-gray-500 mb-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M8 7V3m8 4V3m-9 8h10M5 21h14a2 2 0 002-2V7a2 2 0 00-2-2H5a2 2 0 00-2 2v12a2 2 0 002 2z"/>
</svg>
<p class="text-gray-500 dark:text-gray-400">No reservations for {{ year }}</p>
<p class="text-sm text-gray-400 dark:text-gray-500 mt-1">Click "New Reservation" to plan unit assignments</p>
</div>
{% endif %}