Compare commits
3 Commits
bdad7a38b1
...
6e57c28d4b
| Author | SHA1 | Date | |
|---|---|---|---|
| 6e57c28d4b | |||
| 153e937bfe | |||
| 719774dcf4 |
@@ -9,7 +9,9 @@ services:
|
||||
depends_on:
|
||||
- django-homepage
|
||||
volumes:
|
||||
- files-volume:/usr/src/app/files
|
||||
- files-volume:/usr/src/app/files
|
||||
- ./gallery:/usr/src/app/files/uploads/gallery
|
||||
- ./assets:/usr/src/app/assets:ro
|
||||
networks:
|
||||
- fet-network
|
||||
django-homepage:
|
||||
@@ -32,6 +34,7 @@ services:
|
||||
- ./fet2020:/usr/src/app
|
||||
- ./gallery:/usr/src/app/files/uploads/gallery:shared
|
||||
- files-volume:/usr/src/app/files
|
||||
- ./assets:/usr/src/app/assets:ro
|
||||
networks:
|
||||
- fet-network
|
||||
- django-db-network
|
||||
|
||||
@@ -1,78 +1,78 @@
|
||||
{% extends "base.html" %}
|
||||
|
||||
{% block title %}Meine Rechnungen / Honorarnoten{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<!-- Main Content -->
|
||||
<main class="container mx-auto w-full px-4 my-8 flex-1">
|
||||
<h1 class="page-title">Meine Rechnungen / Honorarnoten</h1>
|
||||
<a href="{% url 'finance:bill_create' %}" class="page-subtitle block btn-small btn-primary max-w-xs mx-auto sm:w-max sm:mr-0 sm:ml-auto">
|
||||
<i class="fa-solid fa-plus mr-1"></i> Rechnung einreichen
|
||||
</a>
|
||||
|
||||
<div class="mx-auto max-w-5xl">
|
||||
<div class="overflow-x-scroll shadow rounded">
|
||||
<table class="w-full">
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="text-right">Datum</th>
|
||||
<th class="text-left">Verwendungszweck / Tätigkeit</th>
|
||||
<th class="text-right">Summe</th>
|
||||
<th>Status</th>
|
||||
<th></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{% for result in object_list %}
|
||||
<tr>
|
||||
<td class="text-right">{{ result.date|date:"d.m.Y" }}</td>
|
||||
<td>{{ result.purpose }}</td>
|
||||
<td class="text-right">{{ result.amount }}€</td>
|
||||
<td class="text-center">
|
||||
{% if result.model == "BILL" %}
|
||||
{% if result.status == bill_status.SUBMITTED %}
|
||||
<span class="badge badge-info">{{ bill_status.SUBMITTED.label }}</span>
|
||||
{% elif result.status == bill_status.INCOMPLETED %}
|
||||
<span class="badge badge-danger">{{ bill_status.INCOMPLETED.label }}</span>
|
||||
{% elif result.status == bill_status.CLEARED %}
|
||||
<span class="badge badge-warning">{{ bill_status.CLEARED.label }}</span>
|
||||
{% elif result.status == bill_status.FINISHED %}
|
||||
<span class="badge badge-success">{{ bill_status.FINISHED.label }}</span>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
</td>
|
||||
<td>
|
||||
{% if result.model == "BILL" %}
|
||||
<a href="{% url 'finance:bill_update' result.id %}" class="btn btn-small btn-tertiary"><i class="fa-solid fa-pen-to-square" aria-label="Bearbeiten" title="Bearbeiten"></i></a>
|
||||
{% endif %}
|
||||
</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<div class="mt-4 w-full flex flex-col-reverse sm:flex-row gap-y-4 justify-between items-center">
|
||||
<div class="pagination-container">
|
||||
<div class="pagination">
|
||||
<span class="step-links">
|
||||
{% if page_obj.has_previous %}
|
||||
<a href="?page={{ page_obj.previous_page_number }}"><i class="fa-solid fa-arrow-left" aria-label="Eine Seite zurück"></i> Zurück</a>
|
||||
<a href="?page=1">1</a>
|
||||
{% endif %}
|
||||
|
||||
<span class="current active">
|
||||
<a href="#" class="active">{{ page_obj.number }}</a>
|
||||
</span>
|
||||
|
||||
{% if page_obj.has_next %}
|
||||
<a href="?page={{ page_obj.paginator.num_pages }}">{{ page_obj.paginator.num_pages }}</a>
|
||||
<a href="?page={{ page_obj.next_page_number }}">Vor <i class="fa-solid fa-arrow-right" aria-label="Eine Seite vor"></i></a>
|
||||
{% endif %}
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</main>
|
||||
{% endblock content %}
|
||||
{% extends "base.html" %}
|
||||
|
||||
{% block title %}Meine Rechnungen{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<!-- Main Content -->
|
||||
<main class="container mx-auto w-full px-4 my-8 flex-1">
|
||||
<h1 class="page-title">Meine Rechnungen</h1>
|
||||
<a href="{% url 'finance:bill_create' %}" class="page-subtitle block btn-small btn-primary max-w-xs mx-auto sm:w-max sm:mr-0 sm:ml-auto">
|
||||
<i class="fa-solid fa-plus mr-1"></i> Rechnung einreichen
|
||||
</a>
|
||||
|
||||
<div class="mx-auto max-w-5xl">
|
||||
<div class="overflow-x-scroll shadow rounded">
|
||||
<table class="w-full">
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="text-right">Datum</th>
|
||||
<th class="text-left">Verwendungszweck / Tätigkeit</th>
|
||||
<th class="text-right">Summe</th>
|
||||
<th>Status</th>
|
||||
<th></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{% for result in object_list %}
|
||||
<tr>
|
||||
<td class="text-right">{{ result.date|date:"d.m.Y" }}</td>
|
||||
<td>{{ result.purpose }}</td>
|
||||
<td class="text-right">{{ result.amount }}€</td>
|
||||
<td class="text-center">
|
||||
{% if result.model == "BILL" %}
|
||||
{% if result.status == bill_status.SUBMITTED %}
|
||||
<span class="badge badge-info">{{ bill_status.SUBMITTED.label }}</span>
|
||||
{% elif result.status == bill_status.INCOMPLETED %}
|
||||
<span class="badge badge-danger">{{ bill_status.INCOMPLETED.label }}</span>
|
||||
{% elif result.status == bill_status.CLEARED %}
|
||||
<span class="badge badge-warning">{{ bill_status.CLEARED.label }}</span>
|
||||
{% elif result.status == bill_status.FINISHED %}
|
||||
<span class="badge badge-success">{{ bill_status.FINISHED.label }}</span>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
</td>
|
||||
<td>
|
||||
{% if result.model == "BILL" %}
|
||||
<a href="{% url 'finance:bill_update' result.id %}" class="btn btn-small btn-tertiary"><i class="fa-solid fa-pen-to-square" aria-label="Bearbeiten" title="Bearbeiten"></i></a>
|
||||
{% endif %}
|
||||
</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<div class="mt-4 w-full flex flex-col-reverse sm:flex-row gap-y-4 justify-between items-center">
|
||||
<div class="pagination-container">
|
||||
<div class="pagination">
|
||||
<span class="step-links">
|
||||
{% if page_obj.has_previous %}
|
||||
<a href="?page={{ page_obj.previous_page_number }}"><i class="fa-solid fa-arrow-left" aria-label="Eine Seite zurück"></i> Zurück</a>
|
||||
<a href="?page=1">1</a>
|
||||
{% endif %}
|
||||
|
||||
<span class="current active">
|
||||
<a href="#" class="active">{{ page_obj.number }}</a>
|
||||
</span>
|
||||
|
||||
{% if page_obj.has_next %}
|
||||
<a href="?page={{ page_obj.paginator.num_pages }}">{{ page_obj.paginator.num_pages }}</a>
|
||||
<a href="?page={{ page_obj.next_page_number }}">Vor <i class="fa-solid fa-arrow-right" aria-label="Eine Seite vor"></i></a>
|
||||
{% endif %}
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</main>
|
||||
{% endblock content %}
|
||||
|
||||
@@ -58,7 +58,7 @@
|
||||
<li>
|
||||
<a href="{% url 'finance:bill_list' %}" class="flex items-center py-2 px-5 hover:bg-gray-100 dark:hover:bg-gray-600 hover:text-gray-900 dark:hover:text-white">
|
||||
<i class="fa-solid fa-list mr-2"></i>
|
||||
<span class="text-sm font-medium">Meine Rechnungen / Honorarnoten</span>
|
||||
<span class="text-sm font-medium">Meine Rechnungen</span>
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
|
||||
@@ -26,6 +26,12 @@ server {
|
||||
|
||||
location /files {
|
||||
alias /usr/src/app/files/;
|
||||
}
|
||||
|
||||
location /assets/ {
|
||||
alias /usr/src/app/assets/;
|
||||
try_files $uri $uri/ =404;
|
||||
add_header X-Content-Type-Options nosniff;
|
||||
}
|
||||
|
||||
# location /files/uploads/finance {
|
||||
|
||||
Reference in New Issue
Block a user