From e1e072633296d4bfec08d27123cb9421ba763c44 Mon Sep 17 00:00:00 2001
From: "jindra12.underdark" <jindra12.underdark@gmail.com>
Date: Tue, 30 May 2023 22:12:57 +0200
Subject: [PATCH] Add until date for project
#202
---
.../migrations/0026_donateprojectpage_until.py | 17 +++++++++++++++++
donate/models.py | 9 ++++++++-
.../templates/donate/donate_project_page.html | 6 +++++-
3 files changed, 30 insertions(+), 2 deletions(-)
create mode 100644 donate/migrations/0026_donateprojectpage_until.py
diff --git a/donate/migrations/0026_donateprojectpage_until.py b/donate/migrations/0026_donateprojectpage_until.py
new file mode 100644
index 00000000..1dd51973
--- /dev/null
+++ b/donate/migrations/0026_donateprojectpage_until.py
@@ -0,0 +1,17 @@
+# Generated by Django 4.1.8 on 2023-05-30 20:06
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+ dependencies = [
+ ("donate", "0025_alter_donateprojectpage_crowdfunding_and_more"),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name="donateprojectpage",
+ name="until",
+ field=models.DateField(blank=True, null=True, verbose_name="běží do"),
+ ),
+ ]
diff --git a/donate/models.py b/donate/models.py
index 9acb4d32..6a2adcf0 100644
--- a/donate/models.py
+++ b/donate/models.py
@@ -432,6 +432,7 @@ class DonateProjectPage(
### FIELDS
date = models.DateField("běží od")
+ until = models.DateField("běží do", null=True, blank=True)
perex = models.TextField("krátký popis")
body = RichTextField("obsah")
is_new = models.BooleanField('označení "nový projekt"', default=False)
@@ -477,7 +478,13 @@ class DonateProjectPage(
[FieldPanel("is_new"), FieldPanel("perex"), FieldPanel("photo")],
"info do přehledu projektů",
),
- FieldPanel("date"),
+ MultiFieldPanel(
+ [
+ FieldPanel("date"),
+ FieldPanel("until"),
+ ],
+ "Časový interval projektu",
+ ),
FieldPanel("body"),
FieldPanel("gallery"),
]
diff --git a/donate/templates/donate/donate_project_page.html b/donate/templates/donate/donate_project_page.html
index 907c6876..c1867d07 100644
--- a/donate/templates/donate/donate_project_page.html
+++ b/donate/templates/donate/donate_project_page.html
@@ -12,7 +12,11 @@
<div class="row align-items-center">
<div class="col-12 col-md-6 mb-3 mb-md-0">
- <p class="project__date">běží od {{ page.date|date:"j.n.Y" }}</p>
+ {% if page.until %}
+ <p class="project__date">běží od {{ page.date|date:"j.n.Y" }} do {{ page.until|date:"j.n.Y" }}</p>
+ {% else %}
+ <p class="project__date">běží od {{ page.date|date:"j.n.Y" }}</p>
+ {% endif %}
</div><!-- /column -->
<div class="col-12 col-md-6 text-md-right">
<div class="project__badges">
--
GitLab