diff --git a/DepoT/mixins/LineFiltweFormMixin.py b/DepoT/mixins/LineFiltweFormMixin.py new file mode 100644 index 0000000..e69de29 diff --git a/booking/views/__init__.py b/booking/views/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/booking/views.py b/booking/views/client_views.py similarity index 100% rename from booking/views.py rename to booking/views/client_views.py diff --git a/booking/views/employee_views.py b/booking/views/employee_views.py new file mode 100644 index 0000000..e69de29 diff --git a/common/views/__init__.py b/common/views/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/common/views/barrier_views.py b/common/views/barrier_views.py new file mode 100644 index 0000000..e69de29 diff --git a/common/views/client_views.py b/common/views/client_views.py new file mode 100644 index 0000000..e69de29 diff --git a/common/views/employee_views.py b/common/views/employee_views.py new file mode 100644 index 0000000..e69de29 diff --git a/common/views.py b/common/views/shared_views.py similarity index 98% rename from common/views.py rename to common/views/shared_views.py index aebee98..df521d2 100644 --- a/common/views.py +++ b/common/views/shared_views.py @@ -50,7 +50,7 @@ class ClientDashboardView(TemplateView): return render(request, self.template_name, self.extra_context) class BarrierDashboardView(TemplateView): - template_name = 'barrier-dashboard.html' + template_name = 'barrier/barrier-dashboard.html' extra_context = { 'title': 'Client Dashboard', 'description': 'This is the client dashboard page.', diff --git a/containers/views.py b/containers/views.py deleted file mode 100644 index 1718ee6..0000000 --- a/containers/views.py +++ /dev/null @@ -1,105 +0,0 @@ -from django.shortcuts import render, redirect -from django.urls import reverse_lazy -from django.views import View -from django.views.generic import CreateView, UpdateView, FormView, ListView - -from common.utils.utils import get_container_by_number -from containers.forms import ContainerReceiveForm, ContainerExpeditionForm -from containers.models import Container -from preinfo.models import Preinfo - - -# Create your views here. -class ContainerReceive(CreateView): - template_name = 'container-receive.html' - model = Container - form_class = ContainerReceiveForm - success_url = reverse_lazy('dashboard') - - def get_context_data(self, **kwargs): - context = super().get_context_data(**kwargs) - pk = self.kwargs.get('pk') - try: - preinfo =Preinfo.objects.filter(pk=pk, received=False).first() - except Preinfo.DoesNotExist: - preinfo = None - - if preinfo: - context['preinfo'] = preinfo - context['containers'] = Container.objects.order_by('-received_on').all()[:10] # Fetch the last 10 containers - return context - return redirect(reverse_lazy('container_search')) - - def form_valid(self, form): - - # Get the preinfo_id from the POST data - preinfo_id = self.request.POST.get('preinfo_id') - try: - preinfo = Preinfo.objects.get(id=preinfo_id) - except Preinfo.DoesNotExist: - preinfo = None - - # validate if data is correct, comparing user data with preinfo data - if preinfo and preinfo.container_number == form.cleaned_data.get('number') and not preinfo.received: - preinfo.received = True - preinfo.save() - - form.instance.received_by = self.request.user - form.instance.line = preinfo.line - form.instance.container_type = preinfo.container_type - else: - form.add_error('number', 'Invalid data') - - return super().form_valid(form) - - -class ContainerSearchView(View): - template_name = 'container-search.html' - - def get(self, request): - return render(request, self.template_name) - - def post(self, request): - number = request.POST.get('number') - container = get_container_by_number(number) - if container: - if container.booking: - next_url = request.POST.get('param') - return redirect(next_url, pk=container.booking.pk) - else: - return render(request, self.template_name, {'error': 'Booking not found'}) - - return render(request, self.template_name, {'error': 'Not found'}) - - -class ContainerExpedition(UpdateView): - template_name = 'container-expedition.html' - model = Container - form_class = ContainerExpeditionForm - success_url = reverse_lazy('dashboard') - - def get_context_data(self, **kwargs): - context = super().get_context_data(**kwargs) - pk = self.kwargs.get('pk') - try: - preinfo =Preinfo.objects.filter(pk=pk, received=False).first() - except Preinfo.DoesNotExist: - preinfo = None - - if preinfo: - context['preinfo'] = preinfo - context['containers'] = Container.objects.order_by('-received_on').all()[:10] # Fetch the last 10 containers - return context - return redirect(reverse_lazy('container_search')) - - - -class ContainersListView(ListView): - template_name = 'employee/containers-list.html' - model = Container - context_object_name = 'containers' - paginate_by = 30 # Number of containers per page - # def get(self, request): - # containers = Container.objects.order_by('-received_on').all()[:10] # Fetch the last 10 containers - # return render(request, self.template_name, {'containers': containers}) - diff --git a/containers/views/__init__.py b/containers/views/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/containers/views/barrier_views.py b/containers/views/barrier_views.py new file mode 100644 index 0000000..e69de29 diff --git a/containers/views/employee_views.py b/containers/views/employee_views.py new file mode 100644 index 0000000..8c013b5 --- /dev/null +++ b/containers/views/employee_views.py @@ -0,0 +1,174 @@ +from django.shortcuts import render, redirect +from django.urls import reverse_lazy +from django.utils import timezone +from django.views import View +from django.views.generic import CreateView, UpdateView, FormView, ListView + +from booking.models import Booking +from common.utils.utils import get_container_by_number +from containers.forms import ContainerReceiveForm, ContainerExpeditionForm +from containers.models import Container +from containers.services import get_container_for_booking +from preinfo.models import Preinfo + + +# Create your views here. +class ContainerReceive(CreateView): + template_name = 'container-receive.html' + model = Container + form_class = ContainerReceiveForm + success_url = reverse_lazy('dashboard') + + def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) + pk = self.kwargs.get('pk') + try: + preinfo =Preinfo.objects.filter(pk=pk, received=False).first() + except Preinfo.DoesNotExist: + preinfo = None + + if preinfo: + context['preinfo'] = preinfo + context['containers'] = Container.objects.order_by('-received_on').all()[:10] # Fetch the last 10 containers + return context + return redirect(reverse_lazy('container_search')) + + def form_valid(self, form): + + # Get the preinfo_id from the POST data + preinfo_id = self.request.POST.get('preinfo_id') + try: + preinfo = Preinfo.objects.get(id=preinfo_id) + except Preinfo.DoesNotExist: + preinfo = None + + # validate if data is correct, comparing user data with preinfo data + if preinfo and preinfo.container_number == form.cleaned_data.get('number') and not preinfo.received: + preinfo.received = True + preinfo.save() + + form.instance.received_by = self.request.user + form.instance.line = preinfo.line + form.instance.container_type = preinfo.container_type + else: + form.add_error('number', 'Invalid data') + + return super().form_valid(form) + + +class ContainerSearchView(View): + template_name = 'container-search.html' + + def get(self, request): + return render(request, self.template_name) + + def post(self, request): + booking = Booking.objects.get(number=request.POST.get('number')) + if not booking: + return render(request, self.template_name, {'error': 'Booking not found'}) + + filters = { + 'expedited': False, + } + if booking.container_number: + filters['container_number'] = booking.container_number + else: + filters['container_type'] = booking.container_type + filters['line'] = booking.line + + container = Container.objects.filter(**filters).order_by('received_on').first() + if not container: + return render(request, self.template_name, {'error': 'Not found'}) + next_url = request.POST.get('param') + return redirect(next_url, pk=booking.pk) + + +class ContainerExpedition(UpdateView): + template_name = 'container-expedition.html' + model = Container + form_class = ContainerExpeditionForm + success_url = reverse_lazy('dashboard') + + def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) + pk = self.kwargs.get('pk') + booking = Booking.objects.get(pk=pk) + filters = { + 'expedited': False, + } + if booking.container_number: + filters['container_number'] = booking.container_number + else: + filters['container_type'] = booking.container_type + filters['line'] = booking.line + + container = Container.objects.filter(**filters).order_by('received_on').first() + context['container'] = container + context['booking'] = booking + return context + + def form_valid(self, form): + booking_id = self.request.POST.get('booking_id') + container_id = self.request.POST.get('container_id') + + try: + booking = Booking.objects.get(id=booking_id) + container = Container.objects.get(id=container_id) + vehicle = form.cleaned_data['expedition_vehicle'] + # Update container + container.expedited = True + container.expedited_on = timezone.now() + container.expedited_by = self.request.user + container.expedition_vehicle = vehicle + container.booking = booking + container.save() + + # Update booking status if needed + booking.container_expedited_count += 1 + if booking.vehicles: + vehicles_list = booking.vehicles.split(',') + if vehicle in vehicles_list: + vehicles_list.remove(vehicle) + booking.vehicles = ','.join(vehicles_list) + if booking.container_expedited_count >= booking.container_count: + booking.status = 'completed' # or any other status you want to set + booking.save() + + return redirect(self.success_url) + + except (Booking.DoesNotExist, Container.DoesNotExist): + form.add_error(None, 'Invalid booking or container') + return self.form_invalid(form) + + + # try: + # booking = Booking.objects.get(id=booking_id) + # except Booking.DoesNotExist: + # booking = None + # # validate if data is correct, comparing user data with booking data + # if booking and booking.container_number == form.cleaned_data.get('container_number') and not booking.expedited: + # booking.expedited = True + # booking.save() + # + # form.instance.expedited_by = self.request.user + # form.instance.line = booking.line + # form.instance.container_type = booking.container_type + # else: + # form.add_error('container_number', 'Invalid data') + + # if preinfo: + # context['preinfo'] = preinfo + # context['containers'] = Container.objects.order_by('-received_on').all()[:10] # Fetch the last 10 containers + # return context + # return redirect(reverse_lazy('container_search')) + + + +class ContainersListView(ListView): + template_name = 'employee/containers-list.html' + model = Container + context_object_name = 'containers' + paginate_by = 30 # Number of containers per page + + def get_queryset(self): + return Container.objects.filter(expedited=False).order_by('-received_on') \ No newline at end of file diff --git a/templates/client/preinfo-create.html b/templates/client/preinfo-create.html new file mode 100644 index 0000000..4bdcfcb --- /dev/null +++ b/templates/client/preinfo-create.html @@ -0,0 +1,10 @@ + + + + + $Title$ + + +$END$ + + \ No newline at end of file diff --git a/templates/client/preinfo-edit.html b/templates/client/preinfo-edit.html new file mode 100644 index 0000000..fa935f3 --- /dev/null +++ b/templates/client/preinfo-edit.html @@ -0,0 +1,16 @@ +{% extends 'client-base.html' %} +{% load static %} + +{% block content %} +
+

Container Preinfo

+

Manage your container preinfo details here.

+
+
+ {% csrf_token %} + {{ form.as_p }} + +
+{%endblock content %} + +