resolve conflict

contracts/migrations/0002_contract_is_approved_alter_contract_valid_end_date.py

+# Generated by Django 4.1.4 on 2023-02-20 19:33
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('contracts', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='contract',
+            name='is_approved',
+            field=models.BooleanField(default=False, help_text='Může měnit jen schvalovatel. Pokud je smlouva veřejná, zaškrtnutím se vypustí ven.', verbose_name='Je schválená'),
+            preserve_default=False,
+        ),
+        migrations.AlterField(
+            model_name='contract',
+            name='valid_end_date',
+            field=models.DateField(verbose_name='Konec účinnosti'),
+        ),
+    ]

contracts/models.py

@@ -308,7 +308,7 @@ class Contract(models.Model):
         verbose_name="Začátek účinnosti",
     )
     valid_end_date = models.DateField(
-        verbose_name="Konec platnosti",
+        verbose_name="Konec účinnosti",
     )
 
     created_by = models.ForeignKey(
@@ -438,7 +438,13 @@ class Contract(models.Model):
         verbose_name="Očekávané výdaje (rok)",
     )
     
-    
+    is_approved = models.BooleanField(
+        verbose_name="Je schválená",
+        help_text=(
+            "Může měnit jen schvalovatel. Pokud je smlouva "
+            "veřejná, zaškrtnutím se vypustí ven."
+        )
+    )
     
     class Meta:
         verbose_name = "Smlouva"

contracts/templates/contracts/index.html

@@ -10,7 +10,7 @@
                 <td>Typ</td>
                 <td>Právní stav</td>
                 <td>Účinná od</td>
-                <td>Platná do</td>
+                <td>Účinná do</td>
                 <td>Podepsána s</td>
             </tr>
         </thead>

contracts/templates/contracts/view_contract.html

@@ -23,7 +23,7 @@
                 <td class="w-4/5 !p-2.5">{{ contract.valid_start_date }}</td>
             </tr>
             <tr>
-                <td class="w-1/5 !p-2.5">Konec platnosti</td>
+                <td class="w-1/5 !p-2.5">Konec účinnosti</td>
                 <td class="w-4/5 !p-2.5">{{ contract.valid_end_date }}</td>
             </tr>
             <tr>

contracts/views.py

@@ -8,7 +8,10 @@ from .models import Contract
 
 
 def index(request):
-    contracts = Contract.objects.order_by("valid_start_date").all()
+    contracts = Contract.objects.filter(
+        is_approved__is=True,
+        public_state=Contract.PublicStates.YES,  
+    ).order_by("valid_start_date").all()
     paginator = Paginator(contracts, 25)
     
     page = paginator.get_page(
@@ -32,7 +35,10 @@ def index(request):
 
 
 def view_contract(request, id: int):
-    contract = Contract.objects.get(id=id)
+    contract = Contract.objects.filter(
+        is_approved__is=True,
+        public_state=Contract.PublicStates.YES,
+    ).get(id=id)
 
     return render(
         request,