Merge pull request #1882 from watchdogpolska/develop

v1.5.24

feder/__init__.py

@@ -1,5 +1,5 @@
 # PEP 396: The __version__ attribute's value SHOULD be a string.
-__version__ = "1.5.23"
+__version__ = "1.5.24"
 
 
 # Compatibility to eg. django-rest-framework

feder/letters/formsets.py

@@ -1,10 +1,10 @@
 from atom.ext.crispy_forms.forms import BaseTableFormSet
-from extra_views import InlineFormSet
+from extra_views import InlineFormSetFactory
 
 from feder.letters.models import Attachment
 
 
-class AttachmentInline(InlineFormSet):
+class AttachmentInline(InlineFormSetFactory):
     model = Attachment
     formset_class = BaseTableFormSet
     fields = ["attachment"]

feder/letters/serializers.py

@@ -54,6 +54,7 @@ class Meta:
             "html_quote",
             "email",
             "note",
+            "ai_evaluation",
             "is_spam",
             "is_draft",
             "is_incoming",

feder/main/views.py

@@ -45,6 +45,13 @@ def generate_voivodeship_table(self):
                 + str(Institution.objects.area(voivodeship).count())
                 + "</td></tr>"
             )
+        table += (
+            "<tr><td><b>Wszystkie</b></td><td><b>"
+            + str(Case.objects.all().count())
+            + "</b></td><td><b>"
+            + str(Institution.objects.all().count())
+            + "</b></td></tr>"
+        )
         table += "</table>"
         return table
 

feder/monitorings/models.py

@@ -255,7 +255,8 @@ def generate_voivodeship_table(self):
             <tr>
                 <th>Województwo</th>
                 <th>Liczba spraw</th>
-                <th>Liczba spraw w kwarantannie</th>
+                <th>Liczba spraw z potw. odbioru</th>
+                <th>Liczba spraw z odpowiedzią</th>
             </tr>"""
         for voivodeship in voivodeship_list:
             table += (
@@ -265,10 +266,27 @@ def generate_voivodeship_table(self):
                 + str(self.case_set.area(voivodeship).count())
                 + "</td><td>"
                 + str(
-                    self.case_set.filter(is_quarantined=True).area(voivodeship).count()
+                    self.case_set.filter(confirmation_received=True)
+                    .area(voivodeship)
+                    .count()
+                )
+                + "</td><td>"
+                + str(
+                    self.case_set.filter(response_received=True)
+                    .area(voivodeship)
+                    .count()
                 )
                 + "</td></tr>"
             )
+        table += (
+            "<tr><td><b>Wszystkie</b></td><td><b>"
+            + str(str(self.case_set.all().count()))
+            + "</b></td><td><b>"
+            + str(self.case_set.filter(confirmation_received=True).all().count())
+            + "</b></td><td><b>"
+            + str(self.case_set.filter(response_received=True).all().count())
+            + "</b></td></tr>"
+        )
         table += "</table>"
         return table
 

feder/static/css/style.css

@@ -3005,7 +3005,7 @@ tbody.collapse.in {
   padding-left: 8px;
 }
 
-.btn-group > .btn-lg + .dropdown-toggle, .btn-group-lg.btn-group > .btn + .dropdown-toggle {
+.btn-group > .btn-lg + .dropdown-toggle, .btn-group.btn-group-lg > .btn + .dropdown-toggle {
   padding-right: 12px;
   padding-left: 12px;
 }