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

fix date filter

Browse Source 
employee dashboard fully working
deploy_branch
kikimor 7 months ago
parent 75b3adfc71
commit 9167092f27
6 changed files with 60 additions and 49 deletions
Show Stats Download Patch File Download Diff File

14
.idea/workspace.xml
Unescape Escape View File

@ -6,19 +6,11 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="7410a44d-51b9-408b-85ad-4fa46776b372" name="Changes" comment="commit unversioned files ;)"> <list default="true" id="7410a44d-51b9-408b-85ad-4fa46776b372" name="Changes" comment="commit unversioned files ;)">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/accounts/views.py" beforeDir="false" afterPath="$PROJECT_DIR$/accounts/views.py" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/templatetags/filters.py" beforeDir="false" afterPath="$PROJECT_DIR$/common/templatetags/filters.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/booking/views/client_views.py" beforeDir="false" afterPath="$PROJECT_DIR$/booking/views/client_views.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/booking/views/employee_views.py" beforeDir="false" afterPath="$PROJECT_DIR$/booking/views/employee_views.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/common/views/barrier_views.py" beforeDir="false" afterPath="$PROJECT_DIR$/common/views/barrier_views.py" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/views/barrier_views.py" beforeDir="false" afterPath="$PROJECT_DIR$/common/views/barrier_views.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/common/views/client_views.py" beforeDir="false" afterPath="$PROJECT_DIR$/common/views/client_views.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/common/views/employee_views.py" beforeDir="false" afterPath="$PROJECT_DIR$/common/views/employee_views.py" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/views/employee_views.py" beforeDir="false" afterPath="$PROJECT_DIR$/common/views/employee_views.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/containers/views/barrier_views.py" beforeDir="false" afterPath="$PROJECT_DIR$/containers/views/barrier_views.py" afterDir="false" /> <change beforePath="$PROJECT_DIR$/templates/employee-dashboard-content.html" beforeDir="false" afterPath="$PROJECT_DIR$/templates/employee-dashboard-content.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/containers/views/client_views.py" beforeDir="false" afterPath="$PROJECT_DIR$/containers/views/client_views.py" afterDir="false" /> <change beforePath="$PROJECT_DIR$/web_depot.tar" beforeDir="false" afterPath="$PROJECT_DIR$/web_depot.tar" afterDir="false" />
<change beforePath="$PROJECT_DIR$/containers/views/common.py" beforeDir="false" afterPath="$PROJECT_DIR$/containers/views/common.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/containers/views/employee_views.py" beforeDir="false" afterPath="$PROJECT_DIR$/containers/views/employee_views.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/payments/views.py" beforeDir="false" afterPath="$PROJECT_DIR$/payments/views.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/preinfo/views/client_views.py" beforeDir="false" afterPath="$PROJECT_DIR$/preinfo/views/client_views.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/preinfo/views/employee_views.py" beforeDir="false" afterPath="$PROJECT_DIR$/preinfo/views/employee_views.py" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />

2
common/templatetags/filters.py
Unescape Escape View File

@ -8,7 +8,7 @@ register = template.Library()
@register.filter @register.filter
def bg_date(value): def bg_date(value):
if value: if value:
return date(value, "y.m.d h:m") return date(value, "d.m.Y H:i")
return "" return ""

2
common/views/barrier_views.py
Unescape Escape View File

@ -9,7 +9,7 @@ class BarrierDashboardView(LoginRequiredMixin, UserPassesTestMixin, TemplateView
template_name = 'barrier/barrier-dashboard.html' template_name = 'barrier/barrier-dashboard.html'
def test_func(self): def test_func(self):
return self.request.user.user_type == 'BA' return self.request.user.user_type == 'BS'
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs) context = super().get_context_data(**kwargs)

5
common/views/employee_views.py
Unescape Escape View File

@ -7,6 +7,7 @@ from common.forms.company import CompanyCreateForm, CompanyUpdateForm
from common.forms.line import LineCreateForm, LineUpdateForm from common.forms.line import LineCreateForm, LineUpdateForm
from common.models import CompanyModel, LinesModel from common.models import CompanyModel, LinesModel
from containers.models import Container from containers.models import Container
from payments.models import Payment
from preinfo.models import Preinfo from preinfo.models import Preinfo
@ -18,7 +19,7 @@ class EmployeeDashboardView(LoginRequiredMixin, UserPassesTestMixin, TemplateVie
} }
def test_func(self): def test_func(self):
return self.request.user.user_type == 'EMP' or self.request.user.is_superuser return self.request.user.user_type == 'EM' or self.request.user.is_superuser
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs) context = super().get_context_data(**kwargs)
@ -28,6 +29,8 @@ class EmployeeDashboardView(LoginRequiredMixin, UserPassesTestMixin, TemplateVie
context['containers'] = containers context['containers'] = containers
context['preinfos'] = preinfos context['preinfos'] = preinfos
context['bookings'] = bookings context['bookings'] = bookings
context['recent_containers'] = Container.objects.order_by('-expedited_on', '-received_on')[:10]
context['recent_payments'] = Payment.objects.order_by('-created_on')[:10]
return context return context

52
templates/employee-dashboard-content.html
Unescape Escape View File

@ -1,6 +1,7 @@
{% extends 'common/base.html' %} {% extends 'common/base.html' %}
{% block content %} {% block content %}
{% load filters %}
{% load permission_tags %}
<div class="dashboard-wrapper"> <div class="dashboard-wrapper">
<div class="stats-grid"> <div class="stats-grid">
<div class="dashboard-card"> <div class="dashboard-card">
@ -65,18 +66,29 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{% for container in recent_containers %}
<tr> <tr>
<td>MSCU1234567</td> <td>{{ container.number }}</td>
<td>40HC</td> <td>{{ container.container_type.name }}</td>
{% if container.expedited %}
<td><span class="status-tag status-expedited">Expedited</span></td>
<td>{{ container.expedited_on|bg_date }}</td>
{% else %}
<td><span class="status-tag status-received">Received</span></td> <td><span class="status-tag status-received">Received</span></td>
<td>2023-06-15</td> <td>{{ container.received_on|bg_date }}</td>
{% endif %}
</tr>
{% empty %}
<tr>
<td> No recent history</td>
</tr> </tr>
{% endfor %}
<!-- Other rows similar structure --> <!-- Other rows similar structure -->
</tbody> </tbody>
</table> </table>
</div> </div>
</div> </div>
{% if request.user|has_employee_perm:"can_view_payments" %}
<div class="dashboard-card"> <div class="dashboard-card">
<div class="card-header"> <div class="card-header">
<h3>Recent payments</h3> <h3>Recent payments</h3>
@ -85,26 +97,30 @@
<table class="table"> <table class="table">
<thead> <thead>
<tr> <tr>
<th>Container</th> <th>Invoice №</th>
<th>Type</th> <th>Company</th>
<th>Status</th> <th>Amount</th>
<th>Date</th> <th>Paid</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{# {% for container in containers %}#} {% for payment in recent_payments %}
{# <tr>#} <tr>
{# <td>{{ container.number }}</td>#} <td>{{ payment.invoice_number }}</td>
{# <td>container.container_type</td>#} <td>{{ payment.company.name }}</td>
{# <td><span class="status-tag status-received">Received</span></td>#} <td>{{ payment.total_amount }}</td>
{# <td>{{ container.received_date }}</td>#} <td><span class="status-tag status-received">{{ payment.paid }}</span></td>
{# </tr>#} </tr>
{# {% endfor %}#} {% empty %}
<!-- Other rows similar structure --> <tr>
<td> No recent history</td>
</tr>
{% endfor %}
</tbody> </tbody>
</table> </table>
</div> </div>
</div> </div>
{% endif %}
</div> </div>
</div> </div>

BIN
web_depot.tar
View File

Binary file not shown.
Write Preview
Loading…
Cancel
Save