bofh/fet2020
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rename incomplete

Browse Source
This commit is contained in:
Patrick Mayr
2024-02-17 10:53:21 +00:00
parent c831000fae
commit 65b0e2494c
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fet2020/finance/forms.py
View File

@@ -206,7 +206,7 @@ class BillUpdateForm(forms.ModelForm):
rows = kwargs["instance"].comment.count("\n") + 1 rows = kwargs["instance"].comment.count("\n") + 1
self.fields["comment"].rows = rows self.fields["comment"].rows = rows
if kwargs["instance"].status == Bill.Status.INCOMPLETE: if kwargs["instance"].status == Bill.Status.INCOMPLETED:
# Bank data fields # Bank data fields
if kwargs["instance"].bankdata: if kwargs["instance"].bankdata:
self.fields["name_text"].initial = kwargs["instance"].bankdata.name self.fields["name_text"].initial = kwargs["instance"].bankdata.name

2
fet2020/finance/models.py
View File

@@ -173,7 +173,7 @@ class Bill(models.Model):
class Status(models.TextChoices): class Status(models.TextChoices):
SUBMITTED = "S", "Eingereicht" SUBMITTED = "S", "Eingereicht"
INCOMPLETE = "I", "Unvollständig" INCOMPLETED = "I", "Unvollständig"
CLEARED = "C", "Abgerechnet" CLEARED = "C", "Abgerechnet"
FINISHED = "F", "Abgeschlossen" FINISHED = "F", "Abgeschlossen"

2
fet2020/finance/views.py
View File

@@ -93,7 +93,7 @@ class BillUpdateView(LoginRequiredMixin, UserPassesTestMixin, UpdateView):
template_name = "finance/bill_update.html" template_name = "finance/bill_update.html"
def form_valid(self, form): def form_valid(self, form):
if self.object.status == Bill.Status.INCOMPLETE: if self.object.status == Bill.Status.INCOMPLETED:
# Set status to submitted if changes are valid and bill is incompleted. # Set status to submitted if changes are valid and bill is incompleted.
self.object.status = Bill.Status.SUBMITTED self.object.status = Bill.Status.SUBMITTED

8
fet2020/templates/finance/bill_update.html
View File

@@ -27,7 +27,7 @@
{% include "baseform/select.html" with field=form.payer %} {% include "baseform/select.html" with field=form.payer %}
</div> </div>
{% if form.status.value == object.Status.INCOMPLETE %} {% if form.status.value == object.Status.INCOMPLETED %}
<div class="sm:col-span-4"> <div class="sm:col-span-4">
{% include "baseform/text.html" with field=form.name_text %} {% include "baseform/text.html" with field=form.name_text %}
</div> </div>
@@ -91,7 +91,7 @@
</label> </label>
</div> </div>
{% if form.status.value == object.Status.INCOMPLETE %} {% if form.status.value == object.Status.INCOMPLETED %}
{% if form.file_field.value %} {% if form.file_field.value %}
<div class="col-span-full"> <div class="col-span-full">
<label> <label>
@@ -150,7 +150,7 @@
<div class="sm:col-span-3"> <div class="sm:col-span-3">
{% include "baseform/select.html" with field=form.affiliation %} {% include "baseform/select.html" with field=form.affiliation %}
</div> </div>
{% if form.status.value == object.Status.INCOMPLETE or form.resolution_text.value %} {% if form.status.value == object.Status.INCOMPLETED or form.resolution_text.value %}
<div class="sm:col-span-3"> <div class="sm:col-span-3">
{% include "baseform/text.html" with field=form.resolution_text %} {% include "baseform/text.html" with field=form.resolution_text %}
</div> </div>
@@ -167,7 +167,7 @@
</div> </div>
</div> </div>
</section> </section>
{% if form.status.value == object.Status.SUBMITTED or form.status.value == object.Status.INCOMPLETE %} {% if form.status.value == object.Status.SUBMITTED or form.status.value == object.Status.INCOMPLETED %}
<section class="flex justify-end"> <section class="flex justify-end">
<button type="submit" class="btn btn-primary w-full sm:w-auto" value="Speichern">Änderung speichern</button> <button type="submit" class="btn btn-primary w-full sm:w-auto" value="Speichern">Änderung speichern</button>
</section> </section>

2
fet2020/templates/finance/index.html
View File

@@ -31,7 +31,7 @@
<td class="text-center"> <td class="text-center">
{% if result.status == result.Status.SUBMITTED %} {% if result.status == result.Status.SUBMITTED %}
<span class="badge badge-info">{{ result.get_status_display }}</span> <span class="badge badge-info">{{ result.get_status_display }}</span>
{% elif result.status == result.Status.INCOMPLETE %} {% elif result.status == result.Status.INCOMPLETED %}
<span class="badge badge-danger">{{ result.get_status_display }}</span> <span class="badge badge-danger">{{ result.get_status_display }}</span>
{% elif result.status == result.Status.CLEARED %} {% elif result.status == result.Status.CLEARED %}
<span class="badge badge-warning">{{ result.get_status_display }}</span> <span class="badge badge-warning">{{ result.get_status_display }}</span>