Merge pull request #726 from maykinmedia/fix/1655-jaaropgave-pdf

[#1655] Fix SSD
maykinmedia · Aug 9, 2023 · 141896e · 141896e
2 parents 4e2861a + d03d954
commit 141896e
Show file tree

Hide file tree

Showing 9 changed files with 88 additions and 22 deletions.
diff --git a/src/open_inwoner/conf/fixtures/django-admin-index.json b/src/open_inwoner/conf/fixtures/django-admin-index.json
@@ -344,6 +344,14 @@
                 "openzaak",
                 "zaaktypeinformatieobjecttypeconfig"
             ],
+            [
+                "soap",
+                "soapservice"
+            ],
+            [
+                "ssd",
+                "ssdconfig"
+            ],
             [
                 "zgw_consumers",
                 "certificate"

diff --git a/src/open_inwoner/scss/pdf/_jaaropgave.scss b/src/open_inwoner/scss/pdf/_jaaropgave.scss
@@ -132,5 +132,14 @@
 
   .section__toelichting .subsection {
     line-height: 1.6;
+    font-size: 11px;
+
+    h1,
+    h2 {
+      font-size: 12px;
+    }
+    h1 {
+      text-transform: uppercase;
+    }
   }
 }
diff --git a/src/open_inwoner/scss/pdf/pdf_portrait.scss b/src/open_inwoner/scss/pdf/pdf_portrait.scss
@@ -1,4 +1,4 @@
-@import './overwrites';
+// @import './overwrites';
 @import './export';
 @import './portrait';
 @import './maandspecificatie';

diff --git a/src/open_inwoner/ssd/client.py b/src/open_inwoner/ssd/client.py
@@ -2,7 +2,7 @@
 from abc import ABC, abstractmethod
 from datetime import datetime
 from pathlib import Path
-from typing import Optional, get_type_hints
+from typing import Optional
 from uuid import uuid4
 
 from django.template import loader
@@ -20,12 +20,6 @@
 BASE_DIR = Path(__file__).absolute().parent.parent
 
 
-# Endpoints for maand/jaarspecificatie
-# https://2secure-test.enschede.nl/ENSC/Intern/SSD/UitkeringsSpecificatieClient-v0600
-# https://2secure-test.enschede.nl/ENSC/Intern/SSD/JaarOpgaveClient-v0400
-# Test with 900038937
-
-
 class SSDBaseClient(ABC):
     """Base class for SSD SOAP client"""
 

diff --git a/src/open_inwoner/ssd/forms.py b/src/open_inwoner/ssd/forms.py
@@ -1,6 +1,7 @@
 from datetime import date, datetime
 
 from django import forms
+from django.template.defaultfilters import date as django_date
 
 from dateutil.relativedelta import relativedelta
 
@@ -31,7 +32,7 @@ def get_monthly_report_dates() -> list[tuple[date, str]]:
 
     choices = []
     for report_date in dates:
-        formatted = report_date.strftime("%B %Y")
+        formatted = django_date(report_date, "M Y")
         choices.append((report_date.date(), formatted))
 
     return choices

diff --git a/src/open_inwoner/ssd/migrations/0004_auto_20230808_1043.py b/src/open_inwoner/ssd/migrations/0004_auto_20230808_1043.py
@@ -0,0 +1,60 @@
+# Generated by Django 3.2.15 on 2023-08-08 08:43
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("ssd", "0003_auto_20230802_1635"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="ssdconfig",
+            name="jaaropgave_display_text",
+            field=models.TextField(
+                blank=True,
+                help_text="The text displayed as overview of the 'Jaaropgave' tab",
+                verbose_name="Display text",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="ssdconfig",
+            name="jaaropgave_endpoint",
+            field=models.CharField(
+                default="JaarOpgaveClient-v0400",
+                help_text="Endpoint for the jaaropgave request",
+                max_length=256,
+                verbose_name="Jaaropgave endpoint",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="ssdconfig",
+            name="maandspecificatie_display_text",
+            field=models.TextField(
+                blank=True,
+                help_text="The text displayed as overview of the 'Maandspecificatie' tab",
+                verbose_name="Display text",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="ssdconfig",
+            name="maandspecificatie_endpoint",
+            field=models.CharField(
+                default="UitkeringsSpecificatieClient-v0600",
+                help_text="Endpoint for the maandspecificatie request",
+                max_length=256,
+                verbose_name="Maandspecificatie endpoint",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="ssdconfig",
+            name="mijn_uitkeringen_text",
+            field=models.TextField(
+                blank=True,
+                help_text="The text displayed as overview of the 'Mijn Uikeringen' section.",
+                verbose_name="Overview text",
+            ),
+        ),
+    ]
diff --git a/src/open_inwoner/ssd/models.py b/src/open_inwoner/ssd/models.py
@@ -24,14 +24,14 @@ class SSDConfig(SingletonModel):
     )
     maandspecificatie_endpoint = models.CharField(
         _("Maandspecificatie endpoint"),
-        max_length=32,
-        blank=True,
+        max_length=256,
+        default=("UitkeringsSpecificatieClient-v0600"),
         help_text=_("Endpoint for the maandspecificatie request"),
     )
     jaaropgave_endpoint = models.CharField(
         _("Jaaropgave endpoint"),
-        max_length=32,
-        blank=True,
+        max_length=256,
+        default=("JaarOpgaveClient-v0400"),
         help_text=_("Endpoint for the jaaropgave request"),
     )
     applicatie_naam = models.CharField(
@@ -57,7 +57,6 @@ class SSDConfig(SingletonModel):
     )
     mijn_uitkeringen_text = models.TextField(
         _("Overview text"),
-        max_length=704,
         blank=True,
         help_text=_("The text displayed as overview of the 'Mijn Uikeringen' section."),
     )
@@ -80,7 +79,6 @@ class SSDConfig(SingletonModel):
     )
     jaaropgave_display_text = models.TextField(
         _("Display text"),
-        max_length=704,
         blank=True,
         help_text=_("The text displayed as overview of the 'Jaaropgave' tab"),
     )
@@ -107,7 +105,6 @@ class SSDConfig(SingletonModel):
     )
     maandspecificatie_display_text = models.TextField(
         _("Display text"),
-        max_length=704,
         blank=True,
         help_text=_("The text displayed as overview of the 'Maandspecificatie' tab"),
     )

diff --git a/src/open_inwoner/ssd/templates/jaaropgave.html b/src/open_inwoner/ssd/templates/jaaropgave.html
@@ -132,11 +132,8 @@ <h2 class="h2">Participatiewet</h2>
     <br/>
     <!-- TOELICHTING -->
     <section class="section section__toelichting extra-margin">
-        <div class="heading">
-            <h3 class="h3">Toelichting</h3>
-        </div>
         <div class="subsection extra-margin">
-            <p class="yearly-report__p">{{ jaaropgave_comments|markdown|safe }}</p>
+            <p class="yearly-report__p yearly-report__comments" >{{ jaaropgave_comments|markdown|safe }}</p>
         </div>
     </section>
 </div>

diff --git a/src/open_inwoner/ssd/tests/test_forms.py b/src/open_inwoner/ssd/tests/test_forms.py
@@ -29,7 +29,7 @@ def test_get_monthly_choices(self, mock_solo):
         self.assertEqual(date.month, 1)
 
         date_repr = choices[0][1]
-        self.assertEqual(date_repr, "January 1985")
+        self.assertEqual(date_repr, "Jan 1985")
 
     @freeze_time("1985-01-25")
     @patch("open_inwoner.ssd.forms.SSDConfig.get_solo")
@@ -50,7 +50,7 @@ def test_current_month_not_yet_available(self, m):
         self.assertEqual(date.month, 12)
 
         date_repr = choices[0][1]
-        self.assertEqual(date_repr, "December 1984")
+        self.assertEqual(date_repr, "Dec 1984")
 
     @patch("open_inwoner.ssd.forms.SSDConfig.get_solo")
     def test_monthly_reports_not_enabled(self, mock_solo):