gitea/depot_django
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed crud list

Browse Source 
fixed payments
upload -a
This commit is contained in:
kikimor
2025-07-23 11:08:25 +03:00
parent a4a91e0053
commit 4603953458
53 changed files with 1512 additions and 1078 deletions
Download Patch File Download Diff File Expand all files Collapse all files
templates/barrier/barrier-base.html
+54 -7
View File
@@ -5,19 +5,66 @@
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Line Operator Dashboard | Container Depot</title>
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css2?family=Noto+Sans:ital,wght@0,100..900;1,100..900&family=Urbanist:ital,wght@0,100..900;1,100..900&display=swap" rel="stylesheet">
<title>Barrier Dashboard | Container Depot</title>
{# <link rel="preconnect" href="https://fonts.googleapis.com">#}
{# <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>#}
{# <link href="https://fonts.googleapis.com/css2?family=Noto+Sans:wght@400;600&display=swap" rel="stylesheet">#}
<link rel="stylesheet" href="{% static 'styles/forms.css' %}?v={% now 'U' %}">
<link rel="stylesheet" href="{% static 'styles/base.css' %}?v={% now 'U' %}">
<link rel="stylesheet" href="{% static 'styles/tables.css' %}?v={% now 'U' %}">
{# <script src="https://cdn.tailwindcss.com"></script>#}
<style>
.barrier-container {
display: flex;
flex-direction: column;
gap: 20px;
padding: 20px;
max-width: 600px;
margin: 0 auto;
height: 100vh;
justify-content: center;
}
.barrier-button {
background-color: #F2E8DB;
border: 2px solid #a57d52;
border-radius: 8px;
padding: 40px;
font-size: 24px;
font-weight: 600;
color: #a57d52;
cursor: pointer;
text-align: center;
text-decoration: none;
display: flex;
align-items: center;
justify-content: center;
min-height: 75px;
}
.barrier-button:hover {
background-color: #EDDECB;
}
@media (max-height: 600px) {
.barrier-button {
min-height: 100px;
padding: 20px;
}
}
</style>
</head>
<body>
{% block content %}
{% endblock content %}
{% block extra_js %}
<script>
const validateContainerUrl = "{% url 'validate_container' 'placeholder' %}".replace('placeholder/', '');
</script>
<script src="{% static 'js/container_validation.js' %}"></script>
{% endblock %}
</body>
</html>
templates/barrier/barrier-dashboard.html
+39 -70
View File
@@ -1,73 +1,42 @@
{% extends 'barrier/barrier-base.html' %}
{% extends "barrier/barrier-base.html" %}
{% load static %}
{% block content %}
<div class="sidebar p-5 text-white border-b border-blue-700">
<h1 class="text-xl font-bold">Container Depot</h1>
<p class="text-sm text-blue-200">Line Operator Portal</p>
</div>
<div class="barrier-container">
<a href="{% url 'container_receive' %}" class="barrier-button">
Receive Container
</a>
<a href="{% url 'container_expedition' %}" class="barrier-button">
Expedite Container
</a>
<a href="{% url 'barrier_photos' %}" class="barrier-button">
Take Photos
</a>
<div class="flex min-h-screen items-center justify-center">
<div class="sidebar w-[400px] h-[600px] text-white flex flex-col rounded-lg overflow-hidden">
<div class="sidebar w-[100%] h-full text-white flex flex-col">
<div class="p-5 border-b border-blue-700">
<h1 class="text-xl font-bold">Container Depot</h1>
<p class="text-sm text-blue-200">Line Operator Portal</p>
</div>
<nav class="flex-grow py-4">
<div class="px-4 py-2 text-xs text-blue-300 uppercase tracking-wider">Main</div>
<a href="{% url 'barrier_dashboard' %}" class="nav-item active flex items-center px-6 py-10 text-white">
<svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 mr-3" fill="none" viewBox="0 0 24 24" stroke="currentColor">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M3 12l2-2m0 0l7-7 7 7M5 10v10a1 1 0 001 1h3m10-11l2 2m-2-2v10a1 1 0 01-1 1h-3m-6 0a1 1 0 001-1v-4a1 1 0 011-1h2a1 1 0 011 1v4a1 1 0 001 1m-6 0h6"></path>
</svg>
Dashboard
</a>
<a href="{% url 'preinfo_search' %}?param=container_receive" id="ordersNav" class="nav-item flex items-center px-6 py-10 text-white">
<svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 mr-3" fill="none" viewBox="0 0 24 24" stroke="currentColor">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M8 7h12m0 0l-4-4m4 4l-4 4m0 6H4m0 0l4 4m-4-4l4-4"></path>
</svg>
Receive container
</a>
<a href="{% url 'container_search' %}?param=container_expedition" id="ordersNav" class="nav-item flex items-center px-6 py-10 text-white">
<svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 mr-3" fill="none" viewBox="0 0 24 24" stroke="currentColor">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M8 7h12m0 0l-4-4m4 4l-4 4m0 6H4m0 0l4 4m-4-4l4-4"></path>
</svg>
Expedite container
</a>
<a href="#" class="nav-item flex items-center px-6 py-3 text-white">
<svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 mr-3" fill="none" viewBox="0 0 24 24" stroke="currentColor">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 17v-2m3 2v-4m3 4v-6m2 10H7a2 2 0 01-2-2V5a2 2 0 012-2h5.586a1 1 0 01.707.293l5.414 5.414a1 1 0 01.293.707V19a2 2 0 01-2 2z"></path>
</svg>
Photos
</a>
{# <div class="px-4 py-2 mt-6 text-xs text-blue-300 uppercase tracking-wider">Account</div>#}
{# <a href="#" class="nav-item flex items-center px-6 py-3 text-white">#}
{# <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 mr-3" fill="none" viewBox="0 0 24 24" stroke="currentColor">#}
{# <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M10.325 4.317c.426-1.756 2.924-1.756 3.35 0a1.724 1.724 0 002.573 1.066c1.543-.94 3.31.826 2.37 2.37a1.724 1.724 0 001.065 2.572c1.756.426 1.756 2.924 0 3.35a1.724 1.724 0 00-1.066 2.573c.94 1.543-.826 3.31-2.37 2.37a1.724 1.724 0 00-2.572 1.065c-.426 1.756-2.924 1.756-3.35 0a1.724 1.724 0 00-2.573-1.066c-1.543.94-3.31-.826-2.37-2.37a1.724 1.724 0 00-1.065-2.572c-1.756-.426-1.756-2.924 0-3.35a1.724 1.724 0 001.066-2.573c-.94-1.543.826-3.31 2.37-2.37.996.608 2.296.07 2.572-1.065z" />#}
{# <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 12a3 3 0 11-6 0 3 3 0 016 0z" />#}
{# </svg>#}
{# Settings#}
{# </a>#}
</nav>
{# <div class="p-4 border-t border-blue-700">#}
{# <div class="flex items-center">#}
{# <div class="w-10 h-10 rounded-full bg-blue-500 flex items-center justify-center text-white font-bold">#}
{# LO#}
{# </div>#}
{# <div class="ml-3">#}
{# <p class="text-sm font-medium">Maersk Line</p>#}
{# <p class="text-xs text-blue-300">Line Operator</p>#}
{# </div>#}
{# <button class="ml-auto text-white">#}
{# <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor">#}
{# <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M17 16l4-4m0 0l-4-4m4 4H7m6 4v1a3 3 0 01-3 3H6a3 3 0 01-3-3V7a3 3 0 013-3h4a3 3 0 013 3v1" />#}
{# </svg>#}
{# </button>#}
{# </div>#}
{# </div>#}
<h2 class="text-2xl font-bold mb-4">Recent History</h2>
<table>
<thead>
<tr>
<th>Date</th>
<th>Container Number</th>
<th>Status</th>
</tr>
</thead>
<tbody>
{% for container in recent_containers %}
<tr>
<td>{{ container.number }}</td>
{% if container.expedited %}
<td>{{ container.expedited_on }}</td>
<td>Expedited</td>
{% else %}
<td>{{ container.received_on }}</td>
<td>Received</td>
{% endif %}
</tr>
{% endfor %}
</tbody>
</table>
</div>
</div>
</div>
{% endblock content %}
{% endblock content %}
templates/client-base.html
+17
View File
@@ -24,6 +24,23 @@
{% endblock content %}
</div>
</main>
{% block custom_styles %}
{% endblock custom_styles %}
{% block extra_js %}
<script>
const validateContainerUrl = "{% url 'validate_container' 'placeholder' %}".replace('placeholder/', '');
</script>
<script src="{% static 'js/container_validation.js' %}"></script>
{% endblock extra_js %}
{% block crud_js %}
{% endblock crud_js %}
</body>
</html>
templates/client-sidebar.html
+2 -2
View File
@@ -10,7 +10,7 @@
{% url 'register' as register_url %}
{% url 'client_company' as client_company_url %}
{% url 'client_line' as client_line_url %}
{% url 'user_list' as user_list_url %}
<nav class="nav-menu">
<div class="section-title">Main</div>
<a href="{{ dashboard_url }}" class="nav-item {% if request.path == dashboard_url %}active{% endif %}">
@@ -43,7 +43,7 @@
</a>
{% if request.user.UserType == 'CA' or 1 == 1 %}
<div class="section-title account">Nomenclatures</div>
<a href="{{ register_url }}" class="nav-item {% if request.path == register_url %}active{% endif %}">
<a href="{{ user_list_url }}" class="nav-item {% if request.path == user_list_url %}active{% endif %}">
<svg xmlns="http://www.w3.org/2000/svg" class="icon" fill="none" viewBox="0 0 24 24" stroke="currentColor">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M10.325 4.317c.426-1.756 2.924-1.756 3.35 0a1.724 1.724 0 002.573 1.066c1.543-.94 3.31.826 2.37 2.37a1.724 1.724 0 001.065 2.572c1.756.426 1.756 2.924 0 3.35a1.724 1.724 0 00-1.066 2.573c.94 1.543-.826 3.31-2.37 2.37a1.724 1.724 0 00-2.572 1.065c-.426 1.756-2.924 1.756-3.35 0a1.724 1.724 0 00-2.573-1.066c-1.543.94-3.31-.826-2.37-2.37a1.724 1.724 0 00-1.065-2.572c-1.756-.426-1.756-2.924 0-3.35a1.724 1.724 0 001.066-2.573c-.94-1.543.826-3.31 2.37-2.37.996.608 2.296.07 2.572-1.065z" />
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 12a3 3 0 11-6 0 3 3 0 016 0z" />
templates/client/booking-list.html
+3 -9
View File
@@ -13,6 +13,7 @@
<th>Vehicles left</th>
<th>Created on</th>
<th>Created by</th>
<th>Status</th>
{% endblock table_header %}
{% block table_data %}
@@ -26,18 +27,11 @@
<td>{{ object.vehicles_left }}</td>
<td>{{ object.created_on }}</td>
<td>{{ object.created_by.username }}</td>
<td>{{ object.status }}</td>
{% endblock %}
{% block buttons %}
<a href="{% url 'client_booking_create' %}" class="btn btn-primary">Create Preinfo</a>
<a href="#" id="editBtn" data-url="{% url 'client_booking_update' pk=0 %}" class="btn btn-primary" disabled>Edit Preinfo</a>
<button id="deleteButton" class="btn btn-danger">Delete Preinfo</button>
{% endblock buttons %}
{% block create_modal_header %}
<h2>Create Booking</h2>
{% endblock %}
{% block modal_header %}
<h2>Edit Booking</h2>
{% endblock modal_header %}
{% endblock buttons %}
templates/client/preinfo-list.html
+4 -2
View File
@@ -9,15 +9,17 @@
<th>Line</th>
<th>Created on</th>
<th>Created by</th>
<th>Status</th>
{% endblock table_header %}
{% block table_data %}
<td>{{ object.id }}</td>
<td>{{ object.container_number }}</td>
<td>{{ object.container_number|upper }}</td>
<td>{{ object.container_type }}</td>
<td>{{ object.line.short_name }}</td>
<td>{{ object.created_on }}</td>
<td>{{ object.created_on|date:"d.m.Y h:m" }}</td>
<td>{{ object.created_by.username }}</td>
<td>{{ object.received|yesno:"Received,Pending" }}</td>
{% endblock %}
{% block buttons %}
templates/container-expedition.html
+58 -16
View File
@@ -1,20 +1,62 @@
{% extends 'barrier/barrier-base.html' %}
{% load static %}
{% block content %}
<form method="post">
<h2 style="color: #a57d52; margin-bottom: 20px; text-align: center;">Container Expedition</h2>
{% csrf_token %}
<input type="hidden" name="booking_id" value="{{ booking.id }}">
<input type="hidden" name="container_id" value="{{ container.id }}">
<p>
<label for="id_booking_number">Booking number:</label>
<input type="text" name="booking_number" value="{{ booking.number }}" maxlength="11" required id="id_booking_number" readonly disabled>
</p>
{{ form.as_p }}
<div >
<button type="submit" >
Expedite container
</button>
</div>
</form>
<div class="barrier-container">
{% if show_search %}
<form method="get" class="w-full">
<div class="p-6">
<label for="id_number" class="block text-2xl mb-4">
Enter Booking Number
</label>
<div class="form-group">
<input type="text"
id="id_number"
name="number"
value="{{ search_number }}"
class="px-4 py-3 text-xl border-2 rounded-lg"
required
autocomplete="off"
autofocus>
<div class="form-group">
<button type="submit" class="btn-primary">
Search
</button>
</div>
{% if error %}
<div class="text-red-600 text-xl text-center">
{{ error }}
</div>
{% endif %}
</div>
</div>
</form>
{% elif form %}
<form method="post" class="w-full">
{% csrf_token %}
<input type="hidden" name="booking_id" value="{{ booking.id }}">
<input type="hidden" name="container_id" value="{{ container.id }}">
<input type="hidden" name="search_number" value="{{ search_number }}">
<div class="p-6">
<div class="flex flex-col gap-4">
<div class="form-group">
<p>
<label for="id_booking_number">Booking number:</label>
<input type="text" name="booking_number" value="{{ booking.number }}" maxlength="11" required id="id_booking_number" readonly disabled>
</p>
{{ form.as_p }}
</div>
<div class="form-group">
<button type="submit" name="expedite" class="btn-primary">
Expedite container
</button>
<button type="button" onclick="window.location.href='{% url 'barrier_dashboard' %}'" class="btn-secondary">
Back
</button>
</div>
</div>
</div>
</form>
{% endif %}
</div>
{% endblock content %}
templates/container-photos.html
+90 -10
View File
@@ -1,10 +1,90 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>$Title$</title>
</head>
<body>
$END$
</body>
</html>
{# templates/container-photos.html #}
{% extends "barrier/barrier-base.html" %}
{% load static %}
{% block content %}
<div class="barrier-container">
<h2 class="text-2xl mb-4">Container Photos - {{ container.number }}</h2>
{% csrf_token %} {# Added CSRF token here #}
<div class="photo-upload-section mb-4">
<video id="video" class="mb-4 w-full" autoplay></video>
<canvas id="canvas" style="display:none;"></canvas>
<div class="flex justify-between mb-4">
<button id="capture" class="btn-primary" {% if photos_count >= 3 %}disabled{% endif %}>
Take Photo ({{ photos_count }}/3)
</button>
<a href="{% url 'barrier_dashboard' %}" class="btn-secondary">Back to Dashboard</a>
</div>
</div>
<div id="photos-preview" class="grid grid-cols-3 gap-4">
{% for photo in photos %}
<div class="photo-preview">
<img src="{{ photo.photo.url }}" alt="Container photo" class="w-full">
</div>
{% endfor %}
</div>
<script>
document.addEventListener('DOMContentLoaded', function() {
const video = document.getElementById('video');
const canvas = document.getElementById('canvas');
const captureButton = document.getElementById('capture');
let photoCount = {{ photos_count }};
const csrfToken = document.querySelector('[name=csrfmiddlewaretoken]').value;
navigator.mediaDevices.getUserMedia({ video: true })
.then(stream => {
video.srcObject = stream;
})
.catch(err => {
console.error('Camera error:', err);
alert('Could not access camera. Please check permissions.');
});
captureButton.addEventListener('click', () => {
if (photoCount >= 3) return;
canvas.width = video.videoWidth;
canvas.height = video.videoHeight;
canvas.getContext('2d').drawImage(video, 0, 0);
const photo = canvas.toDataURL('image/jpeg').split(',')[1];
fetch(`/api/damages/{{ container.pk }}/`, {
method: 'POST',
headers: {
'Content-Type': 'application/json',
'X-CSRFToken': csrfToken
},
body: JSON.stringify({
depot_id: {{ container.pk }},
photo_extension: 'jpg',
photo: photo
})
})
.then(async response => {
if (response.status === 201) {
photoCount++;
if (photoCount >= 3) {
captureButton.disabled = true;
}
location.reload();
} else {
const error = await response.json();
throw new Error(error.error || 'Upload failed');
}
})
.catch(error => {
console.error('Error:', error);
alert(error.message);
});
});
});
</script>
</div>
{% endblock %}
templates/container-receive.html
+45 -584
View File
@@ -1,593 +1,54 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Barrier Staff Interface | Container Depot</title>
{# <script src="https://cdn.tailwindcss.com"></script>#}
<style>
body {
font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
{#background-color: #f5f7fa;#}
}
.sidebar {
background: linear-gradient(180deg, #0f4c81 0%, #1a6baf 100%);
transition: all 0.3s;
}
.content-area {
transition: all 0.3s;
}
.nav-item {
transition: all 0.2s;
}
.nav-item:hover {
background-color: rgba(255, 255, 255, 0.1);
}
.nav-item.active {
background-color: rgba(255, 255, 255, 0.2);
border-left: 4px solid white;
}
.card {
transition: all 0.3s;
}
.card:hover {
transform: translateY(-2px);
box-shadow: 0 10px 15px -3px rgba(0, 0, 0, 0.1), 0 4px 6px -2px rgba(0, 0, 0, 0.05);
}
.tab {
transition: all 0.2s;
}
.tab-content {
display: none;
}
.tab-content.active {
display: block;
animation: fadeIn 0.5s ease-in-out;
}
@keyframes fadeIn {
from { opacity: 0; }
to { opacity: 1; }
}
.form-section {
animation: slideIn 0.5s ease-in-out;
}
@keyframes slideIn {
from { opacity: 0; transform: translateY(10px); }
to { opacity: 1; transform: translateY(0); }
}
.camera-overlay {
position: fixed;
top: 0;
left: 0;
right: 0;
bottom: 0;
background-color: rgba(0, 0, 0, 0.9);
z-index: 50;
display: none;
animation: fadeIn 0.3s ease-in-out;
}
.camera-frame {
border: 2px solid #fff;
box-shadow: 0 0 0 2000px rgba(0, 0, 0, 0.5);
}
.image-preview {
width: 120px;
height: 120px;
background-color: #f3f4f6;
border: 2px dashed #d1d5db;
display: flex;
align-items: center;
justify-content: center;
overflow: hidden;
}
.image-preview svg {
color: #9ca3af;
}
.image-preview.has-image {
border: none;
}
.image-preview.has-image svg {
display: none;
}
.pulse {
animation: pulse 2s infinite;
}
@keyframes pulse {
0% {
transform: scale(0.95);
box-shadow: 0 0 0 0 rgba(255, 0, 0, 0.7);
}
70% {
transform: scale(1);
box-shadow: 0 0 0 10px rgba(255, 0, 0, 0);
}
100% {
transform: scale(0.95);
box-shadow: 0 0 0 0 rgba(255, 0, 0, 0);
}
}
</style>
</head>
<body class="flex h-screen overflow-hidden">
<!-- Sidebar -->
<!-- Main Content -->
<main class="content-area flex-1 overflow-y-auto">
<!-- Top Navigation -->
<header class="bg-white shadow-sm">
<div class="flex items-center justify-between px-6 py-4">
<div class="flex items-center">
<h2 class="text-xl font-semibold text-gray-800">Receive Container</h2>
</div>
<div class="flex items-center space-x-4">
<div class="relative">
<span class="absolute top-0 right-0 -mt-1 -mr-1 flex h-4 w-4">
<span class="animate-ping absolute inline-flex h-full w-full rounded-full bg-red-400 opacity-75"></span>
<span class="relative inline-flex rounded-full h-4 w-4 bg-red-500 text-xs text-white justify-center items-center">3</span>
</span>
<button class="text-gray-500 hover:text-gray-700">
<svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6" fill="none" viewBox="0 0 24 24" stroke="currentColor">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 17h5l-1.405-1.405A2.032 2.032 0 0118 14.158V11a6.002 6.002 0 00-4-5.659V5a2 2 0 10-4 0v.341C7.67 6.165 6 8.388 6 11v3.159c0 .538-.214 1.055-.595 1.436L4 17h5m6 0v1a3 3 0 11-6 0v-1m6 0H9" />
</svg>
{% extends "barrier/barrier-base.html" %}
{% block content %}
<div class="barrier-container">
{% if show_search %}
<form method="get" class="w-full">
<div class="p-6">
<label for="id_number" class="block text-2xl mb-4">
Enter Container Number
</label>
<div>
<input type="text"
id="id_number"
name="number"
value="{{ search_number }}"
class="px-4 py-3 text-xl border-2 rounded-lg"
required
autocomplete="off"
autofocus>
<div class="form-group">
<button type="submit" class="btn-primary">
Search
</button>
</div>
<span class="text-gray-700 font-medium">Gate North</span>
{% if error %}
<div class="text-red-600 text-xl text-center">
{{ error }}
</div>
{% endif %}
</div>
</div>
</header>
<!-- Container Reception Content -->
<div id="receiveContent" class="tab-content active p-6">
<div class="bg-white rounded-lg shadow mb-6">
<div class="px-6 py-4 border-b border-gray-200 flex justify-between items-center">
<div>
<h3 class="text-lg font-semibold text-gray-800">Container Reception</h3>
<p class="text-sm text-gray-600 mt-1">Process incoming containers</p>
</form>
{% elif form %}
<form method="post" class="w-full">
{% csrf_token %}
<input type="hidden" name="search_number" value="{{ search_number }}">
<div class="p-6">
<div class="flex flex-col gap-4">
<div class="form-group">
{{ form.as_p }}
</div>
<div class="flex items-center">
<span class="bg-green-100 text-green-800 text-xs font-semibold px-3 py-1 rounded-full">Gate Open</span>
</div>
</div>
<form id="receiveForm" class="space-y-6" method="POST">
{% csrf_token %}
<div class="p-6">
<label for="id_number" class="block text-sm font-medium text-gray-700 mb-1">Container Number</label>
{# <label for="id_number" >Container Number</label>#}
{# <input type="text" id="id_number" name="number" placeholder="Enter Container Number" class="w-full px-4 py-2 border border-gray-300 rounded-md focus:outline-none focus:ring-2 focus:ring-blue-500 mb-4">#}
{# <button type="button" id="check-preinfo-btn">Check Preinfo</button>#}
{# <label for="containerNumber" class="block text-sm font-medium text-gray-700 mb-1">Container Number</label>#}
{# <div class="flex">#}
{# <input type="text" id="id_number" name="number" class="flex-1 px-4 py-2 border border-gray-300 rounded-l-md focus:outline-none focus:ring-2 focus:ring-blue-500" required>#}
{# <button type="button" id="check-preinfo-btn" class="px-4 py-2 bg-blue-600 text-white rounded-r-md hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-blue-500">#}
{# Search#}
{# </button>#}
{# </div>#}
</div>
<div id="preinfoData">
<div class="bg-blue-50 border border-blue-200 rounded-md p-4 mb-6">
<div class="flex items-start">
<div class="flex-shrink-0">
<svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 text-blue-600" fill="none" viewBox="0 0 24 24" stroke="currentColor">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M13 16h-1v-4h-1m1-4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z" />
</svg>
</div>
<div class="ml-3 flex-1">
<h3 class="text-sm font-medium text-blue-800">Preinfo Found</h3>
<div class="mt-2 text-sm text-blue-700">
<div class="grid grid-cols-2 gap-4">
<div>
<div>
<span class="font-medium">Container Number:</span>
<input type="text" id="id_number" name="number" value="{{ preinfo.container_number }}" readonly>
</div>
<div>
<span class="font-medium">Container Type:</span>
<input type="text" id="id_container_type" name="id_container_type" value="{{ preinfo.container_type }}" readonly>
</div>
<div>
<span class="font-medium">Line Operator:</span>
<input type="text" id="id_line" name="id_line" value="{{ preinfo.line.name }}" readonly>
</div>
</div>
</div>
{# <p class="mt-2"><span class="font-medium">Notes:</span> <span id="preinfoNotes">Container reported with minor damage on right side panel.</span></p>#}
</div>
</div>
</div>
</div>
</div>
<div>
<label for="id_receive_vehicle">Receive vehicle:</label>
<input type="text" name="receive_vehicle" maxlength="100" id="id_receive_vehicle">
</div>
<div>
<label for="id_damages">Damages:</label>
<textarea name="damages" cols="40" rows="10" id="id_damages"></textarea>
</div>
<div>
<label for="id_heavy_damaged">Heavy damaged:</label>
<input type="checkbox" name="heavy_damaged" id="id_heavy_damaged">
</div>
<div>
<label for="id_position">Position:</label>
<input type="text" name="position" maxlength="100" id="id_position">
</div>
<div class="form-section flex justify-end">
<button type="submit" class="px-6 py-2 bg-green-600 text-white rounded-md hover:bg-green-700 focus:outline-none focus:ring-2 focus:ring-green-500 flex items-center">
<svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 mr-2" fill="none" viewBox="0 0 24 24" stroke="currentColor">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M5 13l4 4L19 7" />
</svg>
Complete Reception
<div class="form-group">
<button type="submit" class="btn-primary">
Receive Container
</button>
</div>
<input type="hidden" name="preinfo_id" id="preinfo_id" value="{{ preinfo.pk }}">
</form>
</div>
<div class="bg-white rounded-lg shadow">
<div class="px-6 py-4 border-b border-gray-200">
<h3 class="text-lg font-semibold text-gray-800">Recent Container Movements</h3>
</div>
<div class="p-6">
<div class="overflow-x-auto">
<table class="min-w-full divide-y divide-gray-200">
<thead>
<tr>
<th class="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Container</th>
<th class="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Type</th>
<th class="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Line</th>
<th class="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Time</th>
{# <th class="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Direction</th>#}
{# <th class="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Status</th>#}
</tr>
</thead>
<tbody class="divide-y divide-gray-200">
{% for container in containers %}
<tr>
<td class="px-4 py-3 whitespace-nowrap text-sm font-medium text-gray-900">
{{ container.number }}</td>
<td class="px-4 py-3 whitespace-nowrap text-sm text-gray-700">{{ container.container_type }}</td>
<td class="px-4 py-3 whitespace-nowrap text-sm text-gray-700">{{ container.line.name }}</td>
<td class="px-4 py-3 whitespace-nowrap text-sm text-gray-700">{{ container.received_on }}</td>
{# <td class="px-4 py-3 whitespace-nowrap text-sm text-gray-700">IN</td>#}
{# <td class="px-4 py-3 whitespace-nowrap">#}
{# <span class="px-2 py-1 text-xs font-semibold rounded-full bg-green-100 text-green-800">Complete</span>#}
{# </td>#}
</tr>
{% endfor %}
</tbody>
</table>
<button type="button" onclick="window.location.href='{% url 'barrier_dashboard' %}'" class="btn-secondary">
Back
</button>
</div>
</div>
</div>
</div>
<!-- Container Expedition Content -->
</main>
<!-- Camera Overlay -->
<div id="cameraOverlay" class="camera-overlay">
<div class="h-full flex flex-col">
<div class="p-4 flex justify-between items-center">
<h3 class="text-lg font-semibold text-white">Take Container Photo</h3>
<button id="closeCamera" class="text-white hover:text-gray-300">
<svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6" fill="none" viewBox="0 0 24 24" stroke="currentColor">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12" />
</svg>
</button>
</div>
<div class="flex-grow flex items-center justify-center p-4">
<div class="relative">
<div class="camera-frame w-full max-w-2xl aspect-[4/3] bg-gray-800 flex items-center justify-center">
<svg xmlns="http://www.w3.org/2000/svg" class="h-24 w-24 text-gray-600" fill="none" viewBox="0 0 24 24" stroke="currentColor">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="1" d="M3 9a2 2 0 012-2h.93a2 2 0 001.664-.89l.812-1.22A2 2 0 0110.07 4h3.86a2 2 0 011.664.89l.812 1.22A2 2 0 0018.07 7H19a2 2 0 012 2v9a2 2 0 01-2 2H5a2 2 0 01-2-2V9z" />
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="1" d="M15 13a3 3 0 11-6 0 3 3 0 016 0z" />
</svg>
<!-- Guide lines for container positioning -->
<div class="absolute inset-0 border-2 border-dashed border-white opacity-50 m-8"></div>
<!-- Positioning guides -->
<div class="absolute top-8 left-8 border-t-2 border-l-2 border-white w-8 h-8"></div>
<div class="absolute top-8 right-8 border-t-2 border-r-2 border-white w-8 h-8"></div>
<div class="absolute bottom-8 left-8 border-b-2 border-l-2 border-white w-8 h-8"></div>
<div class="absolute bottom-8 right-8 border-b-2 border-r-2 border-white w-8 h-8"></div>
</div>
</div>
</div>
<div class="p-4 flex justify-center">
<button id="capturePhoto" class="w-16 h-16 rounded-full bg-red-600 border-4 border-white flex items-center justify-center pulse">
<div class="w-12 h-12 rounded-full bg-red-600"></div>
</button>
</div>
</div>
</div>
{# <script>#}
{# // Set current date as default#}
{# const today = new Date().toISOString().split('T')[0];#}
{# document.getElementById('arrivalDate').value = today;#}
{# document.getElementById('expeditionDate').value = today;#}
{# #}
{# // Tab Navigation#}
{# const receiveContent = document.getElementById('receiveContent');#}
{# const expediteContent = document.getElementById('expediteContent');#}
{# #}
{# const receiveNav = document.getElementById('receiveNav');#}
{# const expediteNav = document.getElementById('expediteNav');#}
{# #}
{# receiveNav.addEventListener('click', function(e) {#}
{# e.preventDefault();#}
{# #}
{# // Update content visibility#}
{# receiveContent.classList.add('active');#}
{# expediteContent.classList.remove('active');#}
{# #}
{# // Update navigation styling#}
{# document.querySelector('.nav-item.active').classList.remove('active');#}
{# receiveNav.classList.add('active');#}
{# #}
{# // Update header title#}
{# document.querySelector('header h2').textContent = 'Receive Container';#}
{# });#}
{# #}
{# expediteNav.addEventListener('click', function(e) {#}
{# e.preventDefault();#}
{# #}
{# // Update content visibility#}
{# receiveContent.classList.remove('active');#}
{# expediteContent.classList.add('active');#}
{# #}
{# // Update navigation styling#}
{# document.querySelector('.nav-item.active').classList.remove('active');#}
{# expediteNav.classList.add('active');#}
{# #}
{# // Update header title#}
{# document.querySelector('header h2').textContent = 'Expedite Container';#}
{# });#}
{# #}
{# // Container search functionality#}
{# document.getElementById('searchContainer').addEventListener('click', function() {#}
{# const containerNumber = document.getElementById('containerNumber').value;#}
{# if (containerNumber) {#}
{# document.getElementById('preinfoData').classList.remove('hidden');#}
{# } else {#}
{# alert('Please enter a container number');#}
{# }#}
{# });#}
{# #}
{# document.getElementById('searchExpediteContainer').addEventListener('click', function() {#}
{# const containerNumber = document.getElementById('expediteContainerNumber').value;#}
{# if (containerNumber) {#}
{# document.getElementById('orderData').classList.remove('hidden');#}
{# } else {#}
{# alert('Please enter a container number');#}
{# }#}
{# });#}
{# #}
{# // Camera functionality#}
{# const cameraOverlay = document.getElementById('cameraOverlay');#}
{# const takePhotoBtn = document.getElementById('takePhoto');#}
{# const expediteTakePhotoBtn = document.getElementById('expediteTakePhoto');#}
{# const closeCamera = document.getElementById('closeCamera');#}
{# const capturePhoto = document.getElementById('capturePhoto');#}
{# #}
{# let currentImageTarget = null;#}
{# #}
{# function openCamera(imageTarget) {#}
{# cameraOverlay.style.display = 'block';#}
{# currentImageTarget = imageTarget;#}
{# }#}
{# #}
{# takePhotoBtn.addEventListener('click', function() {#}
{# // Find the first empty preview slot#}
{# for (let i = 1; i <= 4; i++) {#}
{# const previewEl = document.getElementById(`preview${i}`);#}
{# if (!previewEl.classList.contains('has-image')) {#}
{# openCamera(`preview${i}`);#}
{# break;#}
{# }#}
{# }#}
{# });#}
{# #}
{# expediteTakePhotoBtn.addEventListener('click', function() {#}
{# // Find the first empty preview slot#}
{# for (let i = 1; i <= 2; i++) {#}
{# const previewEl = document.getElementById(`expeditePreview${i}`);#}
{# if (!previewEl.classList.contains('has-image')) {#}
{# openCamera(`expeditePreview${i}`);#}
{# break;#}
{# }#}
{# }#}
{# });#}
{# #}
{# closeCamera.addEventListener('click', function() {#}
{# cameraOverlay.style.display = 'none';#}
{# });#}
{# #}
{# capturePhoto.addEventListener('click', function() {#}
{# if (currentImageTarget) {#}
{# const previewEl = document.getElementById(currentImageTarget);#}
{# #}
{# // Create a container SVG image#}
{# const containerSvg = document.createElementNS("http://www.w3.org/2000/svg", "svg");#}
{# containerSvg.setAttribute("class", "w-full h-full");#}
{# containerSvg.setAttribute("viewBox", "0 0 120 120");#}
{# #}
{# // Random container color#}
{# const colors = ['#2563eb', '#059669', '#d97706', '#7c3aed'];#}
{# const randomColor = colors[Math.floor(Math.random() * colors.length)];#}
{# #}
{# // Create container body#}
{# const rect = document.createElementNS("http://www.w3.org/2000/svg", "rect");#}
{# rect.setAttribute("x", "10");#}
{# rect.setAttribute("y", "20");#}
{# rect.setAttribute("width", "100");#}
{# rect.setAttribute("height", "80");#}
{# rect.setAttribute("fill", randomColor);#}
{# containerSvg.appendChild(rect);#}
{# #}
{# // Add some container details#}
{# const detail1 = document.createElementNS("http://www.w3.org/2000/svg", "rect");#}
{# detail1.setAttribute("x", "20");#}
{# detail1.setAttribute("y", "30");#}
{# detail1.setAttribute("width", "80");#}
{# detail1.setAttribute("height", "20");#}
{# detail1.setAttribute("fill", shadeColor(randomColor, -20));#}
{# containerSvg.appendChild(detail1);#}
{# #}
{# const detail2 = document.createElementNS("http://www.w3.org/2000/svg", "rect");#}
{# detail2.setAttribute("x", "20");#}
{# detail2.setAttribute("y", "60");#}
{# detail2.setAttribute("width", "80");#}
{# detail2.setAttribute("height", "30");#}
{# detail2.setAttribute("fill", shadeColor(randomColor, -20));#}
{# containerSvg.appendChild(detail2);#}
{# #}
{# // Clear the preview and add the new SVG#}
{# previewEl.innerHTML = '';#}
{# previewEl.appendChild(containerSvg);#}
{# previewEl.classList.add('has-image');#}
{# #}
{# // Close the camera#}
{# cameraOverlay.style.display = 'none';#}
{# }#}
{# });#}
{# #}
{# // Helper function to darken/lighten colors#}
{# function shadeColor(color, percent) {#}
{# let R = parseInt(color.substring(1,3), 16);#}
{# let G = parseInt(color.substring(3,5), 16);#}
{# let B = parseInt(color.substring(5,7), 16);#}
{# #}
{# R = parseInt(R * (100 + percent) / 100);#}
{# G = parseInt(G * (100 + percent) / 100);#}
{# B = parseInt(B * (100 + percent) / 100);#}
{# #}
{# R = (R<255)?R:255; #}
{# G = (G<255)?G:255; #}
{# B = (B<255)?B:255; #}
{# #}
{# R = Math.round(R);#}
{# G = Math.round(G);#}
{# B = Math.round(B);#}
{# #}
{# const RR = ((R.toString(16).length==1)?"0"+R.toString(16):R.toString(16));#}
{# const GG = ((G.toString(16).length==1)?"0"+G.toString(16):G.toString(16));#}
{# const BB = ((B.toString(16).length==1)?"0"+B.toString(16):B.toString(16));#}
{# #}
{# return "#"+RR+GG+BB;#}
{# }#}
{# #}
{# // Form submissions#}
{# document.getElementById('receiveForm').addEventListener('submit', function(e) {#}
{# e.preventDefault();#}
{# #}
{# // Check if container data is loaded#}
{# if (document.getElementById('preinfoData').classList.contains('hidden')) {#}
{# alert('Please search for a container first');#}
{# return;#}
{# }#}
{# #}
{# // In a real app, this would send data to the server#}
{# alert('Container reception completed successfully!');#}
{# this.reset();#}
{# document.getElementById('preinfoData').classList.add('hidden');#}
{# #}
{# // Reset image previews#}
{# for (let i = 1; i <= 4; i++) {#}
{# const previewEl = document.getElementById(`preview${i}`);#}
{# previewEl.classList.remove('has-image');#}
{# previewEl.innerHTML = `#}
{# <svg xmlns="http://www.w3.org/2000/svg" class="h-8 w-8" fill="none" viewBox="0 0 24 24" stroke="currentColor">#}
{# <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 6v6m0 0v6m0-6h6m-6 0H6" />#}
{# </svg>#}
{# `;#}
{# }#}
{# #}
{# // Add the first two images back#}
{# document.getElementById('preview1').classList.add('has-image');#}
{# document.getElementById('preview1').innerHTML = `#}
{# <svg class="w-full h-full" viewBox="0 0 120 120" xmlns="http://www.w3.org/2000/svg">#}
{# <rect x="10" y="20" width="100" height="80" fill="#2563eb" />#}
{# <rect x="20" y="30" width="30" height="20" fill="#1e40af" />#}
{# <rect x="70" y="30" width="30" height="20" fill="#1e40af" />#}
{# <rect x="20" y="60" width="80" height="30" fill="#1e40af" />#}
{# <circle cx="85" cy="45" r="8" fill="#ef4444" />#}
{# </svg>#}
{# `;#}
{# #}
{# document.getElementById('preview2').classList.add('has-image');#}
{# document.getElementById('preview2').innerHTML = `#}
{# <svg class="w-full h-full" viewBox="0 0 120 120" xmlns="http://www.w3.org/2000/svg">#}
{# <rect x="10" y="20" width="100" height="80" fill="#2563eb" />#}
{# <rect x="20" y="30" width="80" height="20" fill="#1e40af" />#}
{# <rect x="20" y="60" width="80" height="30" fill="#1e40af" />#}
{# <path d="M85,40 Q95,50 85,60 Q75,50 85,40" fill="#ef4444" />#}
{# </svg>#}
{# `;#}
{# });#}
{# #}
{# document.getElementById('expediteForm').addEventListener('submit', function(e) {#}
{# e.preventDefault();#}
{# #}
{# // Check if order data is loaded#}
{# if (document.getElementById('orderData').classList.contains('hidden')) {#}
{# alert('Please search for a container first');#}
{# return;#}
{# }#}
{# #}
{# // In a real app, this would send data to the server#}
{# alert('Container expedition completed successfully!');#}
{# this.reset();#}
{# document.getElementById('orderData').classList.add('hidden');#}
{# #}
{# // Reset image previews#}
{# for (let i = 1; i <= 2; i++) {#}
{# const previewEl = document.getElementById(`expeditePreview${i}`);#}
{# previewEl.classList.remove('has-image');#}
{# previewEl.innerHTML = `#}
{# <svg xmlns="http://www.w3.org/2000/svg" class="h-8 w-8" fill="none" viewBox="0 0 24 24" stroke="currentColor">#}
{# <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 6v6m0 0v6m0-6h6m-6 0H6" />#}
{# </svg>#}
{# `;#}
{# }#}
{# });#}
{# </script>#}
{#<script>(function(){function c(){var b=a.contentDocument||a.contentWindow.document;if(b){var d=b.createElement('script');d.innerHTML="window.__CF$cv$params={r:'9498ddc2d702313f',t:'MTc0ODg4NzM5My4wMDAwMDA='};var a=document.createElement('script');a.nonce='';a.src='/cdn-cgi/challenge-platform/scripts/jsd/main.js';document.getElementsByTagName('head')[0].appendChild(a);";b.getElementsByTagName('head')[0].appendChild(d)}}if(document.body){var a=document.createElement('iframe');a.height=1;a.width=1;a.style.position='absolute';a.style.top=0;a.style.left=0;a.style.border='none';a.style.visibility='hidden';document.body.appendChild(a);if('loading'!==document.readyState)c();else if(window.addEventListener)document.addEventListener('DOMContentLoaded',c);else{var e=document.onreadystatechange||function(){};document.onreadystatechange=function(b){e(b);'loading'!==document.readyState&&(document.onreadystatechange=e,c())}}}})();</script></body>#}
{##}
{#<script>#}
{#document.getElementById('check-preinfo-btn').onclick = function() {#}
{# const number = document.getElementById('id_number').value;#}
{# fetch(`/preinfo/check-preinfo/?number=${encodeURIComponent(number)}`)#}
{# .then(response => response.json())#}
{# .then(data => {#}
{# if (data.found) {#}
{# alert('Preinfo found ' + data.container_type);#}
{# document.getElementById('id_line').value = data.line;#}
{# document.getElementById('id_container_type').value = data.container_type;#}
{# document.getElementById('preinfo_id').value = data.preinfo_id;#}
{# } else {#}
{# alert('No preinfo found or already received.');#}
{# }#}
{# });#}
{#;#}
{#</script>#}
</body>
</html>
</form>
{% endif %}
</div>
{% endblock content %}
templates/email.html
+11 -4
View File
@@ -1,10 +1,17 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>$Title$</title>
<meta charset="UTF-8">
<title>Payment Request</title>
</head>
<body>
$END$
<body style="margin: 0; padding: 0; font-family: Arial, sans-serif;">
<div style="max-width: 600px; margin: 0 auto; padding: 20px;">
<h1>Welcome to {{ site_name }}!</h1>
<p>Hello {{ user_email }},</p>
<p>There is a new payment request, see details in the attachments. You can pay via ePay:</p>
<a href="{{ link1 }}" style="background-color: #211FA6; border: none; color: white; padding: 15px 32px; text-align: center; text-decoration: none; display: inline-block; font-size: 16px; margin: 4px 2px; cursor: pointer; border-radius: 10px;">ePay account</a>
<p>or credit card:</p>
<a href="{{ link2 }}" style="background-color: #211FA6; border: none; color: white; padding: 15px 32px; text-align: center; text-decoration: none; display: inline-block; font-size: 16px; margin: 4px 2px; cursor: pointer; border-radius: 10px;">Credit card</a>
</div>
</body>
</html>
templates/employee-base.html
+9
View File
@@ -24,6 +24,15 @@
{% endblock content %}
</div>
</main>
{% block extra_js %}
<script>
const validateContainerUrl = "{% url 'validate_container' 'placeholder' %}".replace('placeholder/', '');
</script>
<script src="{% static 'js/container_validation.js' %}"></script>
{% endblock %}
</body>
</html>
templates/employee/container-search.html
+47 -10
View File
@@ -1,10 +1,47 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>$Title$</title>
</head>
<body>
$END$
</body>
</html>
{# templates/barrier/container-search.html #}
{% extends "barrier/barrier-base.html" %}
{% block content %}
<div class="barrier-container">
<form method="post" class="w-full">
{% csrf_token %}
<input type="hidden" name="search_type" value="{{ search_type }}">
<div class="p-6">
<label for="id_number" class="block text-2xl mb-4">
{% if search_type == 'container_receive' %}
Enter Booking Number
{% else %}
Enter Container Number
{% endif %}
</label>
<div class="flex flex-col gap-4">
<input type="text"
id="id_number"
name="number"
class="px-4 py-3 text-xl border-2 rounded-lg"
required
autocomplete="off"
autofocus>
<button type="submit"
class="barrier-button">
Search
</button>
{% if error %}
<div class="text-red-600 text-xl text-center">
{{ error }}
</div>
{% endif %}
<a href="{% url 'barrier_dashboard' %}"
class="barrier-button"
style="background-color: #f5f5f5;">
Back
</a>
</div>
</div>
</form>
</div>
{% endblock %}
templates/employee/containers-list.html
+3 -3
View File
@@ -16,10 +16,10 @@
<td>{{ object.number }}</td>
<td>{{ object.container_type }}</td>
<td>{{ object.line.short_name }}</td>
<td>{{ object.received_on }}</td>
<td>{{ object.received_on|date:"y.m.d h:m" }}</td>
<td>{{ object.position }}</td>
<td>{{ object.swept }}</td>
<td>{{ object.washed }}</td>
<td>{{ object.swept|yesno:"Yes," }}</td>
<td>{{ object.washed|yesno:"Yes," }}</td>
<td>{{ object.booking.number }}</td>
{% endblock %}
templates/employee/payment-create.html
+36 -26
View File
@@ -1,34 +1,44 @@
{% extends "employee-base.html" %}
{% block content %}
{% csrf_token %}
{{ form.as_p }}
<form method="POST">
{% csrf_token %}
{{ form.as_p }}
{% for container in containers %}
<input type="hidden" name="containers" value="{{ container.id }}">
{% endfor %}
<div class="selected-containers">
<h3>Selected Containers</h3>
<table class="table">
<thead>
<tr>
<th>Container Number</th>
<th>Type</th>
<th>Company</th>
<th>Received Date</th>
<th>Expedited Date</th>
</tr>
</thead>
<tbody>
{% for container in containers %}
<div>
<button id="createPaymentBtn" class="btn btn-primary" type="submit">Create Payment</button>
</div>
<div class="selected-containers">
<h3>Selected Containers</h3>
<table class="table">
<thead>
<tr>
<td>{{ container.number }}</td>
<td>{{ container.container_type }}</td>
<td>{{ container.line.company.short_name }}</td>
<td>{{ container.received_on|date:"Y-m-d" }}</td>
<td>{{ container.expedited_on|date:"Y-m-d" }}</td>
<th>Container Number</th>
<th>Type</th>
<th>Company</th>
<th>Received Date</th>
<th>Expedited Date</th>
</tr>
{% endfor %}
</tbody>
</table>
</div>
</thead>
<tbody>
{% for container in containers %}
<tr>
<td>{{ container.number }}</td>
<td>{{ container.container_type }}</td>
<td>{{ container.line.company.short_name }}</td>
<td>{{ container.received_on|date:"Y-m-d" }}</td>
<td>{{ container.expedited_on|date:"Y-m-d" }}</td>
</tr>
{% endfor %}
</tbody>
</table>
</div>
</form>
{% endblock %}
templates/employee/payment-list.html
+7 -7
View File
@@ -2,7 +2,7 @@
{% load static %}
{% block filter %}
<div class="filter-form">
{#<div class="filter-form">#}
<form method="GET">
<span style="display: flex; align-items: center; width: 100%;">
<label for="date" style="margin-right: 8px;">Date:</label>
@@ -17,11 +17,11 @@
</option>
{% endfor %}
</select>
<button type="submit">Search</button>
</span>
</form>
</div>
{#</div>#}
{% endblock %}
{% block selection %}
@@ -59,18 +59,18 @@
document.getElementById('createPaymentBtn').addEventListener('click', function() {
const selectedIds = Array.from(document.querySelectorAll('.selected-row'))
.map(row => row.dataset.id);
const dateInput = document.getElementById('date').value;
const companySelect = document.getElementById('company').value;
if (selectedIds.length > 0) {
const params = new URLSearchParams({
containers: selectedIds.join(','),
date: dateInput,
company: companySelect
});
window.location.href = '{% url "payments_create" %}?' + params.toString();
}
});
templates/landing-page.html
+1 -1
View File
@@ -13,7 +13,7 @@
font-family: Arial, sans-serif;
margin: 0;
padding: 0;
background-color: #f4f4f4;
background-color: #ead9cb;
}
header {
position: relative;
templates/list-crud.html
+27 -23
View File
@@ -1,11 +1,10 @@
{% extends base_template %}
{% load static %}
{% block content %}
{% block filter %}
{% endblock filter %}
{% block filter %}
{% endblock filter %}
<table id="objectTable" class="table" data-selection-mode=
{% block selection %}
@@ -24,6 +23,10 @@
{% block table_data %}
{% endblock table_data %}
</tr>
{% empty %}
<tr>
<td colspan="100%">No data to display</td>
</tr>
{% endfor %}
</tbody>
<tfoot>
@@ -60,25 +63,26 @@
{#footerCell.style.textAlign = 'center';#}
</script>
{% block custom_styles %}
<style>
.selectable-row {
cursor: pointer;
}
.selected-row {
background-color: #e6f3ff;
}
.btn[disabled] {
opacity: 0.5;
cursor: not-allowed;
}
</style>
{% endblock custom_styles %}
{% block extra_js %}
<script src="{% static 'js/crud-list.js' %}"></script>
{% endblock extra_js %}
{% block custom_js %}
{% block custom_styles %}
<style>
.selectable-row {
cursor: pointer;
}
.selected-row {
background-color: #e6f3ff;
}
.btn[disabled] {
opacity: 0.5;
cursor: not-allowed;
}
</style>
{% endblock custom_styles %}
{% block crud_js %}
<script src="{% static 'js/crud-list.js' %}"></script>
{% endblock crud_js %}
{% endblock content %}
{% endblock custom_js %}
{% endblock content %}
templates/registration/login.html
-1
View File
@@ -8,7 +8,6 @@
<link rel="stylesheet" href="{% static '/styles/styles.css' %}"/>
</head>
<body>
{# {{ title|default:"Container Depot Management System" }} {{ description|default:"Login to the Container Depot Management System" }}#}
<div class="background-image"></div>
<div class="wave"></div>