payments
parent
f6c78a20a3
commit
0ffd79cee9
@ -1,9 +1,13 @@
|
|||||||
from django.urls import path
|
from django.urls import path, include
|
||||||
from django.contrib.auth import views as auth_views
|
from django.contrib.auth import views as auth_views
|
||||||
from accounts import views
|
from accounts import views
|
||||||
|
|
||||||
urlpatterns = [
|
urlpatterns = [
|
||||||
path('login/', views.DepotLoginView.as_view(), name='login'),
|
path('login/', views.DepotLoginView.as_view(), name='login'),
|
||||||
path('relogin/', auth_views.logout_then_login, name='relogin'),
|
path('relogin/', auth_views.logout_then_login, name='relogin'),
|
||||||
path('register/', views.RegisterView.as_view(), name='register'),
|
path('user/', include([
|
||||||
|
path('', views.UserListView.as_view(), name='user_list'),
|
||||||
|
path('register/', views.RegisterView.as_view(), name='user_register'),
|
||||||
|
path('<int:pk>/update/', views.UserUpdateView.as_view(), name='user_update'),
|
||||||
|
])),
|
||||||
]
|
]
|
||||||
@ -0,0 +1,17 @@
|
|||||||
|
from django.forms import ModelForm
|
||||||
|
|
||||||
|
from common.models import CompanyModel
|
||||||
|
|
||||||
|
|
||||||
|
class CompanyBaseForm(ModelForm):
|
||||||
|
class Meta:
|
||||||
|
model = CompanyModel
|
||||||
|
fields = '__all__'
|
||||||
|
|
||||||
|
|
||||||
|
class CompanyCreateForm(CompanyBaseForm):
|
||||||
|
...
|
||||||
|
|
||||||
|
|
||||||
|
class CompanyUpdateForm(CompanyBaseForm):
|
||||||
|
...
|
||||||
@ -0,0 +1,17 @@
|
|||||||
|
from django.forms import ModelForm
|
||||||
|
|
||||||
|
from common.models import LinesModel
|
||||||
|
|
||||||
|
|
||||||
|
class LineBaseForm(ModelForm):
|
||||||
|
class Meta:
|
||||||
|
model = LinesModel
|
||||||
|
fields = '__all__'
|
||||||
|
|
||||||
|
|
||||||
|
class LineCreateForm(LineBaseForm):
|
||||||
|
...
|
||||||
|
|
||||||
|
|
||||||
|
class LineUpdateForm(LineBaseForm):
|
||||||
|
...
|
||||||
@ -1,14 +1,36 @@
|
|||||||
from django.urls import path, include
|
from django.urls import path, include
|
||||||
from common.views.barrier_views import BarrierDashboardView
|
from common.views.barrier_views import BarrierDashboardView
|
||||||
from common.views.employee_views import EmployeeDashboardView
|
from common.views.employee_views import EmployeeDashboardView, EmployeeCompanyListView, EmployeeCompanyCreateView, \
|
||||||
from common.views.client_views import ClientDashboardView
|
EmployeeCompanyUpdateView, EmployeeLineListView, EmployeeLineCreateView, EmployeeLineUpdateView
|
||||||
|
from common.views.client_views import ClientDashboardView, ClientCompanyListView, ClientCompanyCreateView, \
|
||||||
|
ClientCompanyUpdateView, ClientLineListView, ClientLineCreateView, ClientLineUpdateView
|
||||||
from common.views.shared_views import IndexView, DashboardRedirectView
|
from common.views.shared_views import IndexView, DashboardRedirectView
|
||||||
urlpatterns = [
|
urlpatterns = [
|
||||||
path('', IndexView.as_view(), name='index'),
|
path('', IndexView.as_view(), name='index'),
|
||||||
path('dashboard/', include([
|
path('dashboard/', include([
|
||||||
path('', DashboardRedirectView.as_view(), name='dashboard'),
|
path('', DashboardRedirectView.as_view(), name='dashboard'),
|
||||||
path('client/', ClientDashboardView.as_view(), name='client_dashboard'),
|
path('client/', ClientDashboardView.as_view(), name='client_dashboard'),
|
||||||
path('barrier/', BarrierDashboardView.as_view(), name='barrier_dashboard'),
|
path('barrier/', BarrierDashboardView.as_view(), name='barrier_dashboard'),
|
||||||
path('employee/', EmployeeDashboardView.as_view(), name='employee_dashboard'),
|
path('employee/', EmployeeDashboardView.as_view(), name='employee_dashboard'),
|
||||||
]))
|
])),
|
||||||
|
path('client/company/', include([
|
||||||
|
path('', ClientCompanyListView.as_view(), name='client_company'),
|
||||||
|
path('create/', ClientCompanyCreateView.as_view(), name='client_company_create'),
|
||||||
|
path('<int:pk>/edit/', ClientCompanyUpdateView.as_view(), name='client_company_edit'),
|
||||||
|
])),
|
||||||
|
path('client/line/', include([
|
||||||
|
path('', ClientLineListView.as_view(), name='client_line'),
|
||||||
|
path('create/', ClientLineCreateView.as_view(), name='client_line_create'),
|
||||||
|
path('<int:pk>/edit/', ClientLineUpdateView.as_view(), name='client_line_update'),
|
||||||
|
])),
|
||||||
|
path('employee/company/', include([
|
||||||
|
path('', EmployeeCompanyListView.as_view(), name='employee_company'),
|
||||||
|
path('create/', EmployeeCompanyCreateView.as_view(), name='employee_company_create'),
|
||||||
|
path('<int:pk>/edit/', EmployeeCompanyUpdateView.as_view(), name='employee_company_update'),
|
||||||
|
])),
|
||||||
|
path('employee/line/', include([
|
||||||
|
path('', EmployeeLineListView.as_view(), name='employee_line'),
|
||||||
|
path('create/', EmployeeLineCreateView.as_view(), name='employee_line_create'),
|
||||||
|
path('<int:pk>/edit/', EmployeeLineUpdateView.as_view(), name='employee_line_update'),
|
||||||
|
])),
|
||||||
]
|
]
|
||||||
|
|||||||
@ -1,13 +1,52 @@
|
|||||||
from django.views.generic import ListView
|
from django.views.generic import ListView
|
||||||
|
|
||||||
|
from common.models import CompanyModel
|
||||||
from containers.models import Container
|
from containers.models import Container
|
||||||
|
|
||||||
|
|
||||||
class ContainersListView(ListView):
|
class ContainersListView(ListView):
|
||||||
template_name = 'employee/containers-list.html'
|
template_name = 'employee/containers-list.html'
|
||||||
model = Container
|
model = Container
|
||||||
context_object_name = 'containers'
|
context_object_name = 'objects'
|
||||||
paginate_by = 30 # Number of containers per page
|
paginate_by = 30 # Number of containers per page
|
||||||
|
base_template = 'employee-base.html'
|
||||||
|
|
||||||
|
def get_context_data(self, **kwargs):
|
||||||
|
context = super().get_context_data(**kwargs)
|
||||||
|
context['base_template'] = self.base_template
|
||||||
|
return context
|
||||||
|
|
||||||
def get_queryset(self):
|
def get_queryset(self):
|
||||||
return Container.objects.filter(expedited=False).order_by('-received_on')
|
return Container.objects.filter(expedited=False).order_by('-received_on')
|
||||||
|
|
||||||
|
|
||||||
|
class ReportContainersUnpaidListView(ListView):
|
||||||
|
template_name = 'employee/payment-list.html'
|
||||||
|
model = Container
|
||||||
|
context_object_name = 'objects'
|
||||||
|
paginate_by = 30 # Number of payments per page
|
||||||
|
base_template = 'employee-base.html'
|
||||||
|
|
||||||
|
def get_context_data(self, **kwargs):
|
||||||
|
context = super().get_context_data(**kwargs)
|
||||||
|
context['base_template'] = self.base_template
|
||||||
|
context['companies'] = CompanyModel.objects.all().order_by('name')
|
||||||
|
return context
|
||||||
|
|
||||||
|
def get_queryset(self):
|
||||||
|
queryset = self.model.objects.filter(expedited=True)
|
||||||
|
|
||||||
|
# Get date from request parameters
|
||||||
|
date = self.request.GET.get('date')
|
||||||
|
if date:
|
||||||
|
queryset = queryset.filter(expedited_on__date__lte=date)
|
||||||
|
|
||||||
|
# Get company from request parameters
|
||||||
|
company = self.request.GET.get('company')
|
||||||
|
if company:
|
||||||
|
queryset = queryset.filter(line__company_id=company)
|
||||||
|
|
||||||
|
# Add payment filter to show only unpaid containers
|
||||||
|
queryset = queryset.filter(payment_containers__isnull=True)
|
||||||
|
|
||||||
|
return queryset.order_by('-expedited_on')
|
||||||
@ -0,0 +1,3 @@
|
|||||||
|
from django.contrib import admin
|
||||||
|
|
||||||
|
# Register your models here.
|
||||||
@ -0,0 +1,6 @@
|
|||||||
|
from django.apps import AppConfig
|
||||||
|
|
||||||
|
|
||||||
|
class DamagesApiConfig(AppConfig):
|
||||||
|
default_auto_field = "django.db.models.BigAutoField"
|
||||||
|
name = "damages_api"
|
||||||
@ -0,0 +1,3 @@
|
|||||||
|
from django.db import models
|
||||||
|
|
||||||
|
# Create your models here.
|
||||||
@ -0,0 +1,3 @@
|
|||||||
|
from django.test import TestCase
|
||||||
|
|
||||||
|
# Create your tests here.
|
||||||
@ -0,0 +1,7 @@
|
|||||||
|
from django.urls import path
|
||||||
|
|
||||||
|
from damages_api.views import Damages
|
||||||
|
|
||||||
|
urlpatterns = [
|
||||||
|
path('<int:depot_id>', Damages.as_view(), name='damages_list'),
|
||||||
|
]
|
||||||
@ -0,0 +1,43 @@
|
|||||||
|
import base64
|
||||||
|
import os
|
||||||
|
import tempfile
|
||||||
|
from datetime import datetime
|
||||||
|
|
||||||
|
from django.core.exceptions import BadRequest
|
||||||
|
from rest_framework import status
|
||||||
|
from rest_framework.response import Response
|
||||||
|
from rest_framework.views import APIView
|
||||||
|
|
||||||
|
from common.utils.owncloud_utls import Owncloud
|
||||||
|
from containers.models import ContainerPhotos
|
||||||
|
|
||||||
|
|
||||||
|
class Damages(APIView):
|
||||||
|
def post(self, request, depot_id):
|
||||||
|
data = request.get_json()
|
||||||
|
photo = data.pop("photo")
|
||||||
|
extension = data.pop("photo_extension")
|
||||||
|
|
||||||
|
with tempfile.NamedTemporaryFile(suffix=f'.{extension}', delete=False) as temp_file:
|
||||||
|
try:
|
||||||
|
temp_file.write(base64.b64decode(photo.encode("utf-8")))
|
||||||
|
temp_file.flush()
|
||||||
|
|
||||||
|
own_filename = Owncloud.upload_damage_photo(temp_file.name, depot_id)
|
||||||
|
|
||||||
|
container_photo = ContainerPhotos()
|
||||||
|
container_photo.container.pk = depot_id
|
||||||
|
container_photo.photo = own_filename
|
||||||
|
container_photo.uploaded_on = datetime.now()
|
||||||
|
container_photo.uploaded_by = request.user
|
||||||
|
container_photo.save()
|
||||||
|
except Exception as ex:
|
||||||
|
raise BadRequest("Invalid photo encoding")
|
||||||
|
finally:
|
||||||
|
os.unlink(temp_file.name)
|
||||||
|
return Response(status=status.HTTP_201_CREATED)
|
||||||
|
|
||||||
|
def get(self, request, depot_id):
|
||||||
|
return Owncloud.get_damages(depot_id)
|
||||||
|
|
||||||
|
|
||||||
@ -0,0 +1,19 @@
|
|||||||
|
from django.forms import ModelForm, CheckboxSelectMultiple
|
||||||
|
|
||||||
|
from containers.models import Container
|
||||||
|
from payments.models import Payment
|
||||||
|
|
||||||
|
|
||||||
|
class PaymentCreateForm(ModelForm):
|
||||||
|
class Meta:
|
||||||
|
model = Payment
|
||||||
|
fields = ['total_amount', 'company', 'description']
|
||||||
|
widgets = {
|
||||||
|
'containers': CheckboxSelectMultiple(),
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
# def __init__(self, *args, **kwargs):
|
||||||
|
# super().__init__(*args, **kwargs)
|
||||||
|
# self.fields['containers'].queryset = Container.objects.all()
|
||||||
|
# self.fields['containers'].label_from_instance = lambda obj: f"{obj.name} ({obj.company.name})"
|
||||||
@ -0,0 +1,7 @@
|
|||||||
|
from django.urls import path
|
||||||
|
|
||||||
|
from payments.views import PaymentCreateView
|
||||||
|
|
||||||
|
urlpatterns = [
|
||||||
|
path("create/", PaymentCreateView.as_view(), name="payments_create"),
|
||||||
|
]
|
||||||
@ -1,3 +1,47 @@
|
|||||||
from django.shortcuts import render
|
from django.shortcuts import render
|
||||||
|
from django.urls import reverse_lazy
|
||||||
|
from django.views.generic import ListView, CreateView
|
||||||
|
|
||||||
|
from common.models import CompanyModel
|
||||||
|
from containers.models import Container
|
||||||
|
from payments.forms import PaymentCreateForm
|
||||||
|
from payments.models import Payment
|
||||||
|
|
||||||
|
|
||||||
# Create your views here.
|
# Create your views here.
|
||||||
|
class PaymentCreateView(CreateView):
|
||||||
|
model = Payment
|
||||||
|
form_class = PaymentCreateForm
|
||||||
|
template_name = 'employee/payment-create.html'
|
||||||
|
success_url = reverse_lazy('payment-list')
|
||||||
|
|
||||||
|
def form_valid(self, form):
|
||||||
|
container_ids = self.request.POST.getlist('containers')
|
||||||
|
payment = form.save(commit=False)
|
||||||
|
payment.save()
|
||||||
|
payment.containers.set(container_ids)
|
||||||
|
return super().form_valid(form)
|
||||||
|
|
||||||
|
def get_context_data(self, **kwargs):
|
||||||
|
context = super().get_context_data(**kwargs)
|
||||||
|
container_ids = self.request.GET.get('containers', '').split(',')
|
||||||
|
# Filter only valid IDs (non-empty strings that can be converted to int)
|
||||||
|
container_ids = [int(id) for id in container_ids if id.strip().isdigit()]
|
||||||
|
|
||||||
|
if container_ids:
|
||||||
|
# Get selected containers
|
||||||
|
context['containers'] = Container.objects.filter(
|
||||||
|
id__in=container_ids,
|
||||||
|
expedited=True,
|
||||||
|
payment_containers__isnull=True
|
||||||
|
).order_by('-expedited_on')
|
||||||
|
return context
|
||||||
|
|
||||||
|
def get_form(self, form_class=None):
|
||||||
|
form = super().get_form(form_class)
|
||||||
|
company_pk = self.request.GET.get('company', '')
|
||||||
|
form.fields['company'].initial = company_pk
|
||||||
|
|
||||||
|
# container_ids = [int(id) for id in container_ids if id.strip().isdigit()]
|
||||||
|
# form.fields['containers'].initial = container_ids
|
||||||
|
return form
|
||||||
@ -1,36 +1,73 @@
|
|||||||
document.addEventListener('DOMContentLoaded', function() {
|
document.addEventListener('DOMContentLoaded', function() {
|
||||||
const editBtn = document.getElementById('editBtn');
|
const table = document.getElementById('objectTable');
|
||||||
const deleteBtn = document.getElementById('deleteBtn');
|
if (!table) return;
|
||||||
const objectIdInput = document.getElementById('objectIdInput');
|
|
||||||
const rows = document.querySelectorAll('.selectable-row');
|
|
||||||
|
|
||||||
if (editBtn) {
|
const selectionMode = table.dataset.selectionMode || 'single';
|
||||||
editBtn.setAttribute('disabled', '');
|
const toggleSelectAllBtn = document.getElementById('toggleSelectAllBtn');
|
||||||
}
|
|
||||||
if (deleteBtn) {
|
if (table.dataset.selectionMode === 'multiple') {
|
||||||
deleteBtn.setAttribute('disabled', '');
|
toggleSelectAllBtn.style.display = 'inline-block';
|
||||||
}
|
}
|
||||||
|
|
||||||
rows.forEach(row => {
|
table.addEventListener('click', function(e) {
|
||||||
row.addEventListener('click', function() {
|
const row = e.target.closest('.selectable-row');
|
||||||
// Remove previous selection
|
if (!row) return;
|
||||||
document.querySelector('.selected-row')?.classList.remove('selected-row');
|
|
||||||
|
const checkbox = row.querySelector('input[type="checkbox"]');
|
||||||
// Select current row
|
if (!checkbox) return;
|
||||||
this.classList.add('selected-row');
|
|
||||||
|
if (selectionMode === 'single') {
|
||||||
const objectId = this.dataset.id;
|
// Deselect all other rows
|
||||||
if (editBtn) {
|
table.querySelectorAll('.selected-row').forEach(selectedRow => {
|
||||||
editBtn.removeAttribute('disabled'); // Remove disabled attribute completely
|
if (selectedRow !== row) {
|
||||||
editBtn.href = editBtn.dataset.url.replace('0', objectId);
|
selectedRow.classList.remove('selected-row');
|
||||||
}
|
selectedRow.querySelector('input[type="checkbox"]').checked = false;
|
||||||
if (deleteBtn) {
|
}
|
||||||
deleteBtn.removeAttribute('disabled');
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
// Check the hidden radio button
|
// Toggle current row
|
||||||
const radio = this.querySelector('input[type="radio"]');
|
row.classList.toggle('selected-row');
|
||||||
radio.checked = true;
|
checkbox.checked = !checkbox.checked;
|
||||||
|
|
||||||
|
// Update buttons state
|
||||||
|
const selectedRows = table.querySelectorAll('.selected-row');
|
||||||
|
document.querySelectorAll('[data-requires-selection]').forEach(button => {
|
||||||
|
button.disabled = selectedRows.length === 0;
|
||||||
|
});
|
||||||
|
|
||||||
|
// Handle edit/delete buttons from original crud-list.js
|
||||||
|
const objectId = row.dataset.id;
|
||||||
|
const editBtn = document.getElementById('editBtn');
|
||||||
|
const deleteBtn = document.getElementById('deleteBtn');
|
||||||
|
|
||||||
|
if (editBtn) {
|
||||||
|
editBtn.removeAttribute('disabled');
|
||||||
|
editBtn.href = editBtn.dataset.url?.replace('0', objectId);
|
||||||
|
}
|
||||||
|
if (deleteBtn) {
|
||||||
|
deleteBtn.removeAttribute('disabled');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
let allSelected = false;
|
||||||
|
toggleSelectAllBtn.addEventListener('click', function() {
|
||||||
|
const rows = table.querySelectorAll('.selectable-row');
|
||||||
|
allSelected = !allSelected;
|
||||||
|
|
||||||
|
rows.forEach(row => {
|
||||||
|
const checkbox = row.querySelector('input[type="checkbox"]');
|
||||||
|
checkbox.checked = allSelected;
|
||||||
|
row.classList.toggle('selected-row', allSelected);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// Update other buttons state
|
||||||
|
document.querySelectorAll('[data-requires-selection]').forEach(button => {
|
||||||
|
button.disabled = !allSelected;
|
||||||
|
});
|
||||||
|
|
||||||
|
// Update button text
|
||||||
|
this.textContent = allSelected ? 'Unselect All' : 'Select All';
|
||||||
});
|
});
|
||||||
});
|
|
||||||
|
});
|
||||||
@ -1,162 +1,111 @@
|
|||||||
{% extends 'employee-base.html' %}
|
{% extends 'employee-base.html' %}
|
||||||
{% block content %}
|
{% block content %}
|
||||||
|
|
||||||
<div id="dashboardContent" class="tab-content active">
|
<div class="dashboard-wrapper">
|
||||||
<div class="grid grid-cols-1 md:grid-cols-3 gap-6 mb-6">
|
<div class="stats-grid">
|
||||||
<div class="card bg-white rounded-lg shadow p-6">
|
<div class="dashboard-card">
|
||||||
<div class="flex items-center">
|
<div class="card-content">
|
||||||
<div class="p-3 rounded-full bg-blue-100 text-blue-600">
|
<div class="icon-circle">
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" class="h-8 w-8" fill="none" viewBox="0 0 24 24" stroke="currentColor">
|
<svg xmlns="http://www.w3.org/2000/svg" class="dashboard-icon" fill="none" viewBox="0 0 24 24" stroke="currentColor">
|
||||||
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 11H5m14 0a2 2 0 012 2v6a2 2 0 01-2 2H5a2 2 0 01-2-2v-6a2 2 0 012-2m14 0V9a2 2 0 00-2-2M5 11V9a2 2 0 012-2m0 0V5a2 2 0 012-2h6a2 2 0 012 2v2M7 7h10" />
|
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 11H5m14 0a2 2 0 012 2v6a2 2 0 01-2 2H5a2 2 0 01-2-2v-6a2 2 0 012-2m14 0V9a2 2 0 00-2-2M5 11V9a2 2 0 012-2m0 0V5a2 2 0 012-2h6a2 2 0 012 2v2M7 7h10" />
|
||||||
</svg>
|
</svg>
|
||||||
</div>
|
</div>
|
||||||
<div class="ml-4">
|
<div class="stat-info">
|
||||||
<h3 class="text-lg font-semibold text-gray-700">Active Containers</h3>
|
<h3>Active Containers</h3>
|
||||||
<p class="text-3xl font-bold text-gray-900">{{ containers }}</p>
|
<p class="stat-number">{{ containers }}</p>
|
||||||
<p class="text-sm text-green-600">+3 since last week</p>
|
<p class="stat-change">+3 since last week</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="dashboard-card">
|
||||||
<div class="card bg-white rounded-lg shadow p-6">
|
<div class="card-content">
|
||||||
<div class="flex items-center">
|
<div class="icon-circle">
|
||||||
<div class="p-3 rounded-full bg-green-100 text-green-600">
|
<svg xmlns="http://www.w3.org/2000/svg" class="h-8 w-8" fill="none" viewBox="0 0 24 24" stroke="currentColor">
|
||||||
<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="M9 12l2 2 4-4m6 2a9 9 0 11-18 0 9 9 0 0118 0z" />
|
||||||
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 12l2 2 4-4m6 2a9 9 0 11-18 0 9 9 0 0118 0z" />
|
</svg>
|
||||||
</svg>
|
</div>
|
||||||
</div>
|
<div class="stat-info">
|
||||||
<div class="ml-4">
|
<h3>Active preinfos</h3>
|
||||||
<h3 class="text-lg font-semibold text-gray-700">Preinfo Sent</h3>
|
<p class="stat-number">{{ preinfos }}</p>
|
||||||
<p class="text-3xl font-bold text-gray-900">{{ preinfos }}</p>
|
<p class="stat-change">+7 since last week</p>
|
||||||
<p class="text-sm text-green-600">+5 since last week</p>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
<div class="dashboard-card">
|
||||||
|
<div class="card-content">
|
||||||
<div class="card bg-white rounded-lg shadow p-6">
|
<div class="icon-circle">
|
||||||
<div class="flex items-center">
|
<svg xmlns="http://www.w3.org/2000/svg" class="h-8 w-8" fill="none" viewBox="0 0 24 24" stroke="currentColor">
|
||||||
<div class="p-3 rounded-full bg-orange-100 text-orange-600">
|
<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" />
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" class="h-8 w-8" fill="none" viewBox="0 0 24 24" stroke="currentColor">
|
</svg>
|
||||||
<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" />
|
|
||||||
</svg>
|
|
||||||
</div>
|
|
||||||
<div class="ml-4">
|
|
||||||
<h3 class="text-lg font-semibold text-gray-700">Bookings</h3>
|
|
||||||
<p class="text-3xl font-bold text-gray-900">{{ bookings }}</p>
|
|
||||||
<p class="text-sm text-orange-600">2 require attention</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
|
<div class="stat-info">
|
||||||
|
<h3>Active bookings</h3>
|
||||||
|
<p class="stat-number">{{ bookings }}</p>
|
||||||
|
<p class="stat-change">+8 since last week</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div class="grid grid-cols-1 lg:grid-cols-2 gap-6">
|
<!-- Other two cards similar structure -->
|
||||||
<div class="bg-white rounded-lg shadow">
|
</div>
|
||||||
<div class="px-6 py-4 border-b border-gray-200">
|
|
||||||
<h3 class="text-lg font-semibold text-gray-800">Recent Container Activity</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">Status</th>
|
|
||||||
<th class="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Date</th>
|
|
||||||
</tr>
|
|
||||||
</thead>
|
|
||||||
<tbody class="divide-y divide-gray-200">
|
|
||||||
<tr>
|
|
||||||
<td class="px-4 py-3 whitespace-nowrap text-sm font-medium text-gray-900">MSCU1234567</td>
|
|
||||||
<td class="px-4 py-3 whitespace-nowrap text-sm text-gray-700">40HC</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">Received</span>
|
|
||||||
</td>
|
|
||||||
<td class="px-4 py-3 whitespace-nowrap text-sm text-gray-700">2023-06-15</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td class="px-4 py-3 whitespace-nowrap text-sm font-medium text-gray-900">MSCU7654321</td>
|
|
||||||
<td class="px-4 py-3 whitespace-nowrap text-sm text-gray-700">20DV</td>
|
|
||||||
<td class="px-4 py-3 whitespace-nowrap">
|
|
||||||
<span class="px-2 py-1 text-xs font-semibold rounded-full bg-blue-100 text-blue-800">Preinfo</span>
|
|
||||||
</td>
|
|
||||||
<td class="px-4 py-3 whitespace-nowrap text-sm text-gray-700">2023-06-14</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td class="px-4 py-3 whitespace-nowrap text-sm font-medium text-gray-900">MSCU2468135</td>
|
|
||||||
<td class="px-4 py-3 whitespace-nowrap text-sm text-gray-700">40DV</td>
|
|
||||||
<td class="px-4 py-3 whitespace-nowrap">
|
|
||||||
<span class="px-2 py-1 text-xs font-semibold rounded-full bg-orange-100 text-orange-800">Order</span>
|
|
||||||
</td>
|
|
||||||
<td class="px-4 py-3 whitespace-nowrap text-sm text-gray-700">2023-06-13</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td class="px-4 py-3 whitespace-nowrap text-sm font-medium text-gray-900">MSCU1357924</td>
|
|
||||||
<td class="px-4 py-3 whitespace-nowrap text-sm text-gray-700">20RF</td>
|
|
||||||
<td class="px-4 py-3 whitespace-nowrap">
|
|
||||||
<span class="px-2 py-1 text-xs font-semibold rounded-full bg-red-100 text-red-800">Expedited</span>
|
|
||||||
</td>
|
|
||||||
<td class="px-4 py-3 whitespace-nowrap text-sm text-gray-700">2023-06-12</td>
|
|
||||||
</tr>
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="bg-white rounded-lg shadow">
|
<div class="tables-grid">
|
||||||
<div class="px-6 py-4 border-b border-gray-200">
|
<div class="dashboard-card">
|
||||||
<h3 class="text-lg font-semibold text-gray-800">Payment Status</h3>
|
<div class="card-header">
|
||||||
</div>
|
<h3>Recent Container Activity</h3>
|
||||||
<div class="p-6">
|
</div>
|
||||||
<div class="overflow-x-auto">
|
<div class="card-body">
|
||||||
<table class="min-w-full divide-y divide-gray-200">
|
<table class="table">
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
<th class="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Invoice</th>
|
<th>Container</th>
|
||||||
<th class="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Amount</th>
|
<th>Type</th>
|
||||||
<th class="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Status</th>
|
<th>Status</th>
|
||||||
<th class="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Due Date</th>
|
<th>Date</th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody class="divide-y divide-gray-200">
|
<tbody>
|
||||||
<tr>
|
<tr>
|
||||||
<td class="px-4 py-3 whitespace-nowrap text-sm font-medium text-gray-900">INV-2023-0042</td>
|
<td>MSCU1234567</td>
|
||||||
<td class="px-4 py-3 whitespace-nowrap text-sm text-gray-700">$1,250.00</td>
|
<td>40HC</td>
|
||||||
<td class="px-4 py-3 whitespace-nowrap">
|
<td><span class="status-tag status-received">Received</span></td>
|
||||||
<span class="px-2 py-1 text-xs font-semibold rounded-full bg-green-100 text-green-800">Paid</span>
|
<td>2023-06-15</td>
|
||||||
</td>
|
</tr>
|
||||||
<td class="px-4 py-3 whitespace-nowrap text-sm text-gray-700">2023-06-10</td>
|
<!-- Other rows similar structure -->
|
||||||
</tr>
|
</tbody>
|
||||||
<tr>
|
</table>
|
||||||
<td class="px-4 py-3 whitespace-nowrap text-sm font-medium text-gray-900">INV-2023-0041</td>
|
|
||||||
<td class="px-4 py-3 whitespace-nowrap text-sm text-gray-700">$875.50</td>
|
|
||||||
<td class="px-4 py-3 whitespace-nowrap">
|
|
||||||
<span class="px-2 py-1 text-xs font-semibold rounded-full bg-yellow-100 text-yellow-800">Pending</span>
|
|
||||||
</td>
|
|
||||||
<td class="px-4 py-3 whitespace-nowrap text-sm text-gray-700">2023-06-20</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td class="px-4 py-3 whitespace-nowrap text-sm font-medium text-gray-900">INV-2023-0040</td>
|
|
||||||
<td class="px-4 py-3 whitespace-nowrap text-sm text-gray-700">$2,100.00</td>
|
|
||||||
<td class="px-4 py-3 whitespace-nowrap">
|
|
||||||
<span class="px-2 py-1 text-xs font-semibold rounded-full bg-red-100 text-red-800">Overdue</span>
|
|
||||||
</td>
|
|
||||||
<td class="px-4 py-3 whitespace-nowrap text-sm text-gray-700">2023-06-05</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td class="px-4 py-3 whitespace-nowrap text-sm font-medium text-gray-900">INV-2023-0039</td>
|
|
||||||
<td class="px-4 py-3 whitespace-nowrap text-sm text-gray-700">$950.25</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">Paid</span>
|
|
||||||
</td>
|
|
||||||
<td class="px-4 py-3 whitespace-nowrap text-sm text-gray-700">2023-05-28</td>
|
|
||||||
</tr>
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="dashboard-card">
|
||||||
|
<div class="card-header">
|
||||||
|
<h3>Recent payments</h3>
|
||||||
|
</div>
|
||||||
|
<div class="card-body">
|
||||||
|
<table class="table">
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<th>Container</th>
|
||||||
|
<th>Type</th>
|
||||||
|
<th>Status</th>
|
||||||
|
<th>Date</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
{# {% for container in containers %}#}
|
||||||
|
{# <tr>#}
|
||||||
|
{# <td>{{ container.number }}</td>#}
|
||||||
|
{# <td>container.container_type</td>#}
|
||||||
|
{# <td><span class="status-tag status-received">Received</span></td>#}
|
||||||
|
{# <td>{{ container.received_date }}</td>#}
|
||||||
|
{# </tr>#}
|
||||||
|
{# {% endfor %}#}
|
||||||
|
<!-- Other rows similar structure -->
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
@ -1,83 +1,93 @@
|
|||||||
{% load static %}
|
{% load static %}
|
||||||
<aside class="sidebar w-64 h-full text-white flex flex-col">
|
<aside class="sidebar">
|
||||||
<div class="p-5 border-b border-blue-700">
|
<div class="header">
|
||||||
<h1 class="text-xl font-bold">Container Depot</h1>
|
<h1>Container Depot</h1>
|
||||||
<p class="text-sm text-blue-200">Employee Portal</p>
|
<p class="subtitle">Line Operator Portal</p>
|
||||||
</div>
|
</div>
|
||||||
|
{% url 'employee_dashboard' as dashboard_url %}
|
||||||
<nav class="flex-grow py-4">
|
{% url 'employee_containers' as employee_containers_url %}
|
||||||
<div class="px-4 py-2 text-xs text-blue-300 uppercase tracking-wider">Main</div>
|
{% url 'employee_bookings' as employee_bookings_url %}
|
||||||
<a href="{% url 'dashboard' %}" class="nav-item active flex items-center px-6 py-3 text-white">
|
{% url 'employee_preinfo' as employee_preinfo_url %}
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 mr-3" fill="none" viewBox="0 0 24 24" stroke="currentColor">
|
{% url 'register' as register_url %}
|
||||||
<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" />
|
{% url 'employee_company' as employee_company_url %}
|
||||||
</svg>
|
{% url 'employee_line' as employee_line_url %}
|
||||||
Dashboard
|
{% url 'user_list' as user_list_url %}
|
||||||
</a>
|
{% url 'not_paid' as not_paid_list_url %}
|
||||||
<a href="{% url 'employee_containers' %}" id="preinfoNav" 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 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2" />
|
|
||||||
</svg>
|
|
||||||
Available Containers
|
|
||||||
</a>
|
|
||||||
<a href="{% url 'employee_bookings' %}" id="ordersNav" 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="M8 7h12m0 0l-4-4m4 4l-4 4m0 6H4m0 0l4 4m-4-4l4-4" />
|
|
||||||
</svg>
|
|
||||||
Bookings
|
|
||||||
</a>
|
|
||||||
<a href="{% url 'employee_preinfo' %}" 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" />
|
|
||||||
</svg>
|
|
||||||
Preinfos
|
|
||||||
</a>
|
|
||||||
|
|
||||||
{% if request.user.UserType.ADMIN %}
|
<nav class="nav-menu">
|
||||||
|
<div class="section-title">Main</div>
|
||||||
<div class="px-4 py-2 mt-6 text-xs text-blue-300 uppercase tracking-wider">Account</div>
|
<a href="{{ dashboard_url }}" class="nav-item {% if request.path == dashboard_url %}active{% endif %}">
|
||||||
<a href="{% url 'register' %}" class="nav-item flex items-center px-6 py-3 text-white">
|
<svg xmlns="http://www.w3.org/2000/svg" class="icon" fill="none" viewBox="0 0 24 24" stroke="currentColor">
|
||||||
<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" />
|
||||||
|
</svg>
|
||||||
|
Dashboard
|
||||||
|
</a>
|
||||||
|
<a href="{{ employee_containers_url }}" class="nav-item {% if request.path == employee_containers_url %}active{% endif %}" id="preinfoNav">
|
||||||
|
<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="M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2" />
|
||||||
|
</svg>
|
||||||
|
Containers
|
||||||
|
</a>
|
||||||
|
<a href="{{ employee_preinfo_url }}" class="nav-item {% if request.path == employee_preinfo_url %}active{% endif %}" id="preinfoNav">
|
||||||
|
<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="M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2" />
|
||||||
|
</svg>
|
||||||
|
Container Preinfo
|
||||||
|
</a>
|
||||||
|
<a href="{{ employee_bookings_url }}" class="nav-item {% if request.path == employee_bookings_url %}active{% endif %}" id="ordersNav">
|
||||||
|
<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="M8 7h12m0 0l-4-4m4 4l-4 4m0 6H4m0 0l4 4m-4-4l4-4" />
|
||||||
|
</svg>
|
||||||
|
Bookings
|
||||||
|
</a>
|
||||||
|
<div class="section-title account">Reports</div>
|
||||||
|
<a href="{{ not_paid_list_url }}" class="nav-item {% if request.path == not_paid_list_url %}active{% endif %}" id="ordersNav">
|
||||||
|
<svg xmlns="http://www.w3.org/2000/svg" class="icon" fill="none" viewBox="0 0 24 24" stroke="currentColor">
|
||||||
|
<g>
|
||||||
|
<path fill="none" d="M0 0h24v24H0z"/>
|
||||||
|
<path d="M12 22C6.477 22 2 17.523 2 12S6.477 2 12 2s10 4.477 10 10-4.477 10-10 10zm0-2a8 8 0 1 0 0-16 8 8 0 0 0 0 16zm-1.95-9H15v2h-4.95a2.5 2.5 0 0 0 4.064 1.41l1.7 1.133A4.5 4.5 0 0 1 8.028 13H7v-2h1.027a4.5 4.5 0 0 1 7.788-2.543L14.114 9.59A2.5 2.5 0 0 0 10.05 11z"/>
|
||||||
|
</g>
|
||||||
|
</svg>
|
||||||
|
Reports
|
||||||
|
</a>
|
||||||
|
{% if request.user.UserType == 'CA' or 1 == 1 %}
|
||||||
|
<div class="section-title account">Nomenclatures</div>
|
||||||
|
<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="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" />
|
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 12a3 3 0 11-6 0 3 3 0 016 0z" />
|
||||||
</svg>
|
</svg>
|
||||||
Accounts
|
Accounts
|
||||||
</a>
|
</a>
|
||||||
|
|
||||||
{# <div class="px-4 py-2 mt-6 text-xs text-blue-300 uppercase tracking-wider">Account</div>#}
|
<a href="{{ employee_company_url }}" class="nav-item {% if request.path == employee_company_url %}active{% endif %}">
|
||||||
<a href="{% url 'register' %}" class="nav-item flex items-center px-6 py-3 text-white">
|
<svg xmlns="http://www.w3.org/2000/svg" class="icon" fill="none" viewBox="0 0 24 24" stroke="currentColor">
|
||||||
<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="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" />
|
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 12a3 3 0 11-6 0 3 3 0 016 0z" />
|
||||||
</svg>
|
</svg>
|
||||||
Companies
|
Companies
|
||||||
</a>
|
</a>
|
||||||
|
|
||||||
<a href="{% url 'register' %}" class="nav-item flex items-center px-6 py-3 text-white">
|
<a href="{{ employee_line_url }}" class="nav-item {% if request.path == employee_line_url %}active{% endif %}">
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 mr-3" fill="none" viewBox="0 0 24 24" stroke="currentColor">
|
<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="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" />
|
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 12a3 3 0 11-6 0 3 3 0 016 0z" />
|
||||||
</svg>
|
</svg>
|
||||||
Lines
|
Lines
|
||||||
</a>
|
</a>
|
||||||
|
|
||||||
|
{% endif %}
|
||||||
{% endif %}
|
</nav>
|
||||||
</nav>
|
<div class="user-profile">
|
||||||
|
<div class="avatar">LO</div>
|
||||||
<div class="p-4 border-t border-blue-700">
|
<div class="user-info">
|
||||||
<div class="flex items-center">
|
<p class="username">{{ request.user }}</p>
|
||||||
<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">{{ request.user }}</p>
|
|
||||||
<p class="text-xs text-blue-300">{{ request.user.company }}</p>
|
|
||||||
</div>
|
|
||||||
<a href="{% url 'login' %}" 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>
|
|
||||||
</a>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</aside>
|
<a href="{% url 'login' %}" class="logout">
|
||||||
|
<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="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>
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
|
</aside>
|
||||||
|
|
||||||
|
|||||||
@ -1,40 +1,43 @@
|
|||||||
{% extends 'employee-base.html' %}
|
{% extends 'list-crud.html' %}
|
||||||
{% load static %}
|
{% load static %}
|
||||||
|
|
||||||
{% block content %}
|
{% block table_header %}
|
||||||
<table>
|
<th style="display: none;">Select</th>
|
||||||
<tr>
|
<th>Line</th>
|
||||||
<th>Status</th>
|
<th>Booking №</th>
|
||||||
<th>Booking №</th>
|
<th>Container type</th>
|
||||||
<th>Vehicles</th>
|
<th>Container №</th>
|
||||||
<th>Container number</th>
|
<th>Containers count</th>
|
||||||
<th>Container type</th>
|
<th>Containers left</th>
|
||||||
<th>Container count</th>
|
<th>Vehicles</th>
|
||||||
<th>Line</th>
|
<th>Vehicles left</th>
|
||||||
<th>Carrier</th>
|
<th>Created on</th>
|
||||||
<th>Containers expedited</th>
|
<th>Created by</th>
|
||||||
<th>Vehicles left</th>
|
{% endblock table_header %}
|
||||||
</tr>
|
|
||||||
|
|
||||||
{% for booking in bookings %}
|
{% block table_data %}
|
||||||
<tr>
|
<td>{{ object.line.short_name }}</td>
|
||||||
<td>{{ booking.status }}</td>
|
<td>{{ object.number }}</td>
|
||||||
<td>{{ booking.number }}</td>
|
<td>{{ object.container_type }}</td>
|
||||||
<td>{{ booking.vehicles }}</td>
|
<td>{{ object.container_number }}</td>
|
||||||
<td>{{ booking.container_number }}</td>
|
<td>{{ object.container_count }}</td>
|
||||||
<td>{{ booking.container_type }}</td>
|
<td>{{ object.containers_left }}</td>
|
||||||
<td>{{ booking.container_count }}</td>
|
<td>{{ object.vehicles }}</td>
|
||||||
<td>{{ booking.line.short_name }}</td>
|
<td>{{ object.vehicles_left }}</td>
|
||||||
<td>{{ booking.carrier }}</td>
|
<td>{{ object.created_on }}</td>
|
||||||
<td>{{ booking.container_expedited_count }}</td>
|
<td>{{ object.created_by.username }}</td>
|
||||||
<td>{{ booking.vehicles_left }}</td>
|
{% endblock %}
|
||||||
<td>
|
|
||||||
{# <a href="{% url 'employee:preinfo_edit' preinfo.id %}">Edit</a> |#}
|
|
||||||
{# <a href="{% url 'employee:preinfo_delete' preinfo.id %}">Delete</a>#}
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
|
|
||||||
{% endfor %}
|
{% block buttons %}
|
||||||
|
{# <a href="{% url 'employee_booking_create' %}" class="btn btn-primary">Create booking</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 %}
|
||||||
|
|
||||||
</table>
|
{% block create_modal_header %}
|
||||||
{% endblock content %}
|
<h2>Create Booking</h2>
|
||||||
|
{% endblock %}
|
||||||
|
|
||||||
|
{% block modal_header %}
|
||||||
|
<h2>Edit Booking</h2>
|
||||||
|
{% endblock modal_header %}
|
||||||
|
|||||||
@ -1,10 +1,34 @@
|
|||||||
<!DOCTYPE html>
|
{% extends "employee-base.html" %}
|
||||||
<html lang="en">
|
|
||||||
<head>
|
|
||||||
<meta charset="UTF-8">
|
|
||||||
<title>Title</title>
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
|
|
||||||
</body>
|
{% block content %}
|
||||||
</html>
|
{% csrf_token %}
|
||||||
|
{{ form.as_p }}
|
||||||
|
|
||||||
|
|
||||||
|
<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 %}
|
||||||
|
<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>
|
||||||
|
|
||||||
|
{% endblock %}
|
||||||
@ -1,10 +1,78 @@
|
|||||||
<!DOCTYPE html>
|
{% extends 'list-crud.html' %}
|
||||||
<html lang="en">
|
{% load static %}
|
||||||
<head>
|
|
||||||
<meta charset="UTF-8">
|
{% block filter %}
|
||||||
<title>$Title$</title>
|
<div class="filter-form">
|
||||||
</head>
|
<form method="GET">
|
||||||
<body>
|
<span style="display: flex; align-items: center; width: 100%;">
|
||||||
$END$
|
<label for="date" style="margin-right: 8px;">Date:</label>
|
||||||
</body>
|
<input type="date" id="date" name="date" value="{{ request.GET.date }}" style="margin-right: 20px;">
|
||||||
</html>
|
|
||||||
|
<label for="company" style="margin-right: 8px;">Company:</label>
|
||||||
|
<select id="company" name="company" style="margin-right: 20px;">
|
||||||
|
<option value="">Select company</option>
|
||||||
|
{% for company in companies %}
|
||||||
|
<option value="{{ company.id }}" {% if request.GET.company|add:'0' == company.id %}selected{% endif %}>
|
||||||
|
{{ company.name }}
|
||||||
|
</option>
|
||||||
|
{% endfor %}
|
||||||
|
</select>
|
||||||
|
|
||||||
|
<button type="submit">Search</button>
|
||||||
|
</span>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
{% endblock %}
|
||||||
|
|
||||||
|
{% block selection %}
|
||||||
|
"multiple"
|
||||||
|
{% endblock selection %}
|
||||||
|
|
||||||
|
{% block table_header %}
|
||||||
|
<th>Container Number</th>
|
||||||
|
<th>Type</th>
|
||||||
|
<th>Company</th>
|
||||||
|
<th>Expedited Date</th>
|
||||||
|
{% endblock table_header %}
|
||||||
|
|
||||||
|
{% block table_data %}
|
||||||
|
<td class="td-left">{{ object.number }}</td>
|
||||||
|
<td>{{ object.container_type }}</td>
|
||||||
|
<td class="td-left">{{ object.line.company.short_name }}</td>
|
||||||
|
<td>{{ object.expedited_on|date:"Y-m-d h:m:s" }}</td>
|
||||||
|
{% endblock table_data %}
|
||||||
|
|
||||||
|
{% block buttons %}
|
||||||
|
<button id="createPaymentBtn" class="btn btn-primary" data-requires-selection disabled>Create Payment</button>
|
||||||
|
{% endblock buttons %}
|
||||||
|
|
||||||
|
{% block create_modal_header %}
|
||||||
|
<h2>Create Container</h2>
|
||||||
|
{% endblock %}
|
||||||
|
|
||||||
|
{% block modal_header %}
|
||||||
|
<h2>Edit Container</h2>
|
||||||
|
{% endblock modal_header %}
|
||||||
|
|
||||||
|
{% block custom_js %}
|
||||||
|
<script>
|
||||||
|
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();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
{% endblock custom_js %}
|
||||||
@ -1,10 +1,38 @@
|
|||||||
<!DOCTYPE html>
|
{% extends 'list-crud.html' %}
|
||||||
<html lang="en">
|
{% load static %}
|
||||||
<head>
|
|
||||||
<meta charset="UTF-8">
|
{% block table_header %}
|
||||||
<title>$Title$</title>
|
<th>Username</th>
|
||||||
</head>
|
<th>User Type</th>
|
||||||
<body>
|
<th>First Name</th>
|
||||||
$END$
|
<th>Last Name</th>
|
||||||
</body>
|
<th>Email</th>
|
||||||
</html>
|
<th>Phone</th>
|
||||||
|
<th>Company</th>
|
||||||
|
<th>Line</th>
|
||||||
|
{% endblock table_header %}
|
||||||
|
|
||||||
|
{% block table_data %}
|
||||||
|
<td class="td-left">{{ object.username }}</td>
|
||||||
|
<td class="td-left">{{ object.get_user_type_display }}</td>
|
||||||
|
<td class="td-left">{{ object.first_name }}</td>
|
||||||
|
<td class="td-left">{{ object.last_name }}</td>
|
||||||
|
<td class="td-left">{{ object.email }}</td>
|
||||||
|
<td class="td-left">{{ object.phone }}</td>
|
||||||
|
<td class="td-left">{{ object.company }}</td>
|
||||||
|
<td class="td-left">{{ object.line }}</td>
|
||||||
|
{% endblock %}
|
||||||
|
|
||||||
|
{% block buttons %}
|
||||||
|
<a href="{% url 'user_register' %}" class="btn btn-primary" type="button">Create user</a>
|
||||||
|
<a href="#" id="editBtn" data-url="{% url 'user_update' pk=0 %}" class="btn btn-primary" type="button" disabled>Edit user</a>
|
||||||
|
<button id="deleteButton" class="btn btn-danger">Delete user</button>
|
||||||
|
{% endblock buttons %}
|
||||||
|
|
||||||
|
{% block create_modal_header %}
|
||||||
|
<h2>Create User</h2>
|
||||||
|
{% endblock %}
|
||||||
|
|
||||||
|
{% block modal_header %}
|
||||||
|
<h2>Edit Container</h2>
|
||||||
|
{% endblock modal_header %}
|
||||||
Loading…
Reference in New Issue