Added filter functionality and combined both base.html

This commit is contained in:
2025-07-30 18:42:33 +03:00
parent c1183c22ea
commit 2d0d33d525
42 changed files with 604 additions and 81 deletions
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends 'client-base.html' %}
{% extends 'common/base.html' %}
{% block content %}
<div id="preinfoContent" class="tab-content active">
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends 'client-base.html' %}
{% extends 'common/base.html' %}
{% block content %}
{# <div id="dashboardContent" class="tab-content active">#}
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends 'client-base.html' %}
{% extends 'common/base.html' %}
{% block content %}
<div id="ordersContent" class="tab-content">
<div class="bg-white rounded-lg shadow">
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends 'client-base.html' %}
{% extends 'common/base.html' %}
{% block content %}
<div id="preinfoContent" class="tab-content active">
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends 'client-base.html' %}
{% extends 'common/base.html' %}
{% load static %}
{% block content %}
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends 'client-base.html' %}
{% extends 'common/base.html' %}
{% load static %}
{% block content %}
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends 'client-base.html' %}
{% extends 'common/base.html' %}
{% load static %}
{% block content %}
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends 'client-base.html' %}
{% extends 'common/base.html' %}
{% load static %}
{% block content %}
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends 'client-base.html' %}
{% extends 'common/base.html' %}
{% load static %}
{% block content %}
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends 'client-base.html' %}
{% extends 'common/base.html' %}
{% load static %}
{% block content %}
+5
View File
@@ -17,6 +17,11 @@
<body>
<aside class="sidebar">
{% block aside %}
{% if user.user_type == 'AD' or user.user_type == 'EM' %}
{% include 'employee-sidebar.html' %}
{% elif user.user_type == 'CL' or user.user_type == 'CA' %}
{% include 'client-sidebar.html' %}
{% endif %}
{% endblock aside %}
</aside>
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends 'employee-base.html' %}
{% extends 'common/base.html' %}
{% block content %}
<div class="dashboard-wrapper">
+8
View File
@@ -2,6 +2,14 @@
{% load custom_filters %}
{% load static %}
{% block filter %}
<form id="filterForm" method="get" style="display: inline;">
<input type="hidden" name="filter" id="filterInput" value="{{ request.GET.filter|default:'active' }}">
<button type="button" class="btn btn-primary" id="activeBtn">Active</button>
<button type="button" class="btn btn-primary" id="allBtn">All</button>
</form>
{% endblock filter %}
{% block table_header %}
<th style="display: none;">Select</th>
<th>Line</th>
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends 'employee-base.html' %}
{% extends 'common/base.html' %}
{% load static %}
{% block content %}
+8
View File
@@ -1,6 +1,14 @@
{% extends 'list-crud.html' %}
{% load static %}
{% block filter %}
<form id="filterForm" method="get" style="display: inline;">
<input type="hidden" name="filter" id="filterInput" value="{{ request.GET.filter|default:'active' }}">
<button type="button" class="btn btn-primary" id="activeBtn">Active</button>
<button type="button" class="btn btn-primary" id="allBtn">All</button>
</form>
{% endblock filter %}
{% block table_header %}
<th style="display: none;">Select</th>
<th>Company name</th>
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends 'employee-base.html' %}
{% extends 'common/base.html' %}
{% load static %}
{% block content %}
+8
View File
@@ -1,6 +1,14 @@
{% extends 'list-crud.html' %}
{% load static %}
{% block filter %}
<form id="filterForm" method="get" style="display: inline;">
<input type="hidden" name="filter" id="filterInput" value="{{ request.GET.filter|default:'active' }}">
<button type="button" class="btn btn-primary" id="activeBtn">Active</button>
<button type="button" class="btn btn-primary" id="allBtn">All</button>
</form>
{% endblock filter %}
{% block table_header %}
<th>Container №</th>
<th>Container type</th>
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends 'employee-base.html' %}
{% extends 'common/base.html' %}
{% load static %}
{% block content %}
+8
View File
@@ -1,6 +1,14 @@
{% extends 'list-crud.html' %}
{% load static %}
{% block filter %}
<form id="filterForm" method="get" style="display: inline;">
<input type="hidden" name="filter" id="filterInput" value="{{ request.GET.filter|default:'active' }}">
<button type="button" class="btn btn-primary" id="activeBtn">Active</button>
<button type="button" class="btn btn-primary" id="allBtn">All</button>
</form>
{% endblock filter %}
{% block table_header %}
<th style="display: none;">Select</th>
<th>Company</th>
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends 'employee-base.html' %}
{% extends 'common/base.html' %}
{% load static %}
{% block content %}
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends "employee-base.html" %}
{% extends 'common/base.html' %}
{% block content %}
<form method="POST">
+8
View File
@@ -1,6 +1,14 @@
{% extends 'list-crud.html' %}
{% load static %}
{% block filter %}
<form id="filterForm" method="get" style="display: inline;">
<input type="hidden" name="filter" id="filterInput" value="{{ request.GET.filter|default:'active' }}">
<button type="button" class="btn btn-primary" id="activeBtn">Active</button>
<button type="button" class="btn btn-primary" id="allBtn">All</button>
</form>
{% endblock filter %}
{% block table_header %}
<th style="display: none;">Select</th>
<th>Preinfo №</th>
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends base_template %}
{% extends 'common/base.html' %}
{% load static %}
{% block content %}
@@ -0,0 +1,10 @@
{% extends 'common/base.html' %}
{% block content %}
<h2>Change Password</h2>
<form method="post">
{% csrf_token %}
{{ form.as_p }}
<button type="submit">Change Password</button>
</form>
{% endblock %}
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends 'employee-base.html' %}
{% extends 'common/base.html' %}
{% block content %}
<form method="post">
+9
View File
@@ -1,6 +1,15 @@
{% extends 'list-crud.html' %}
{% load static %}
{% block filter %}
<form id="filterForm" method="get" style="display: inline;">
<input type="hidden" name="filter" id="filterInput" value="{{ request.GET.filter|default:'active' }}">
<button type="button" class="btn btn-primary" id="activeBtn">Active</button>
<button type="button" class="btn btn-primary" id="allBtn">All</button>
</form>
{% endblock filter %}
{% block table_header %}
<th>Username</th>
<th>User Type</th>