Merge pull request #161 from itk-dev/feature/3.1.0-updates

Feature/3.1.0 updates

Author: ahma0942

docker/php-fpm/Dockerfile .docker/php-fpm/Dockerfile

@@ -36,8 +36,7 @@ MAILER_URL=smtp://mailhog:1020
 # Format described at http://docs.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/configuration.html#connecting-using-a-url
 # For an SQLite database, use: "sqlite:///%kernel.project_dir%/var/data.db"
 # Configure your db driver and server_version in config/packages/doctrine.yaml
-DATABASE_URL=mysql://db_user:db_password@127.0.0.1:3306/db_name
-# Defaults to mysql 5.7
+DATABASE_URL=mysql://root:password@mariadb:3306/db?serverVersion=mariadb-10.11.5
 DATABASE_SERVER_VERSION='5.7'
 ###< doctrine/doctrine-bundle ###
 
@@ -65,7 +64,6 @@ DATAFORDELER_CVR_PRIVATE_KEY_FILE=''
 DATAFORDELER_CVR_PUBLIC_KEY_FILE=''
 DATAFORDELER_CVR_PUBLIC_KEY_PASSWORD=''
 
-
 SAML_SP_ENTITY_ID='https://kontrolgruppen.example.com'
 SAML_IDP_CONFIG_FILE='%kernel.project_dir%/saml/idp/idp.xml'
 # Optional
@@ -84,8 +82,6 @@ EXPORT_DIRECTORY='%kernel.project_dir%/files/export'
 # CPR Service
 CPR_SERVICE_URL=http://borgerdata:8081
 
-
-
 AZURE_TENANT_ID=''
 AZURE_APPLICATION_ID=''
 AZURE_CLIENT_SECRET=''

docker/php-fpm/php-overrides.ini .docker/php-fpm/php-overrides.ini

@@ -10,6 +10,32 @@ Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+## [3.1.0] - 2023-11-08
+
+### Changed
+
+#### Features
+
+- Name updates in database if changed in azure when user logs in with SAML
+- Case worker will be added automatically when case is created
+- Existing case columns removed
+- Texts has been updated
+
+#### Bugfixes
+
+- SAML working
+- Clicking on spouse will not show wrong person if there is a child in the list
+- Routing works from base url
+- Roles updates in database from Azure when logging in with SAML
+- Dash has been added to CPR when creating a case
+- OIS SSL bug will not longer break the visitation
+- There is no longer duplicate buttons in case page
+- Controllers use `EntityManagerInterface` from `BaseController` instead of\
+  using `Doctrine`
+- Cases can be ended without breaking
+- Filters works in dashboard
+- Filters works in client journal
+
 ## [3.0.0] - 2023-11-08
 
 ### Changed
@@ -208,7 +234,8 @@ Versioning](https://semver.org/spec/v2.0.0.html).
 
 - [KON-361](https://github.com/aakb/kontrolgruppen/pull/81): Changed datepicker
 
-[Unreleased]: https://github.com/itk-dev/kontrolgruppen/compare/2.0.3...HEAD
+[Unreleased]: https://github.com/itk-dev/kontrolgruppen/compare/3.1.0...HEAD
+[3.1.0]: https://github.com/itk-dev/kontrolgruppen/compare/3.0.0...3.1.0
 [3.0.0]: https://github.com/itk-dev/kontrolgruppen/compare/2.0.3...3.0.0
 [2.0.3]: https://github.com/itk-dev/kontrolgruppen/compare/2.0.2...2.0.3
 [2.0.2]: https://github.com/itk-dev/kontrolgruppen/compare/2.0.1...2.0.2

docker/vhost.conf .docker/vhost.conf

@@ -1,25 +1,38 @@
 <!-- markdownlint-disable MD024 -->
 
-# Release Notes
+# Upgrade notes
 
 All upgrade notes for this project will be documented in this file.
 
 ## [Unreleased]
 
+## [3.1.0] - 2023-11-20
+
+Nothing has been changed
+
 ## [3.0.0] - 2023-11-08
 
 - Run migrations
 - Run composer install
-- Create a `certs` folder in the root of the project and add Datafordeler certificates in the folder (ask @ahma0942 for certificates)
-- The following environment keys has been introduced (ask @ahma0942 for URLs & Public key passwords):
-    ```
-    DATAFORDELER_CPR_URL=''
-    DATAFORDELER_CPR_PRIVATE_KEY_FILE=''
-    DATAFORDELER_CPR_PUBLIC_KEY_FILE=''
-    DATAFORDELER_CPR_PUBLIC_KEY_PASSWORD=''
-
-    DATAFORDELER_CVR_URL=''
-    DATAFORDELER_CVR_PRIVATE_KEY_FILE=''
-    DATAFORDELER_CVR_PUBLIC_KEY_FILE=''
-    DATAFORDELER_CVR_PUBLIC_KEY_PASSWORD=''
-    ```
+- Create a `certs` folder in the root of the project and add Datafordeler\
+  certificates in the folder (ask @ahma0942 for certificates)
+- The following environment keys has been introduced (ask @ahma0942 for URLs &\
+  Public key passwords):
+
+  ```yaml
+  DATAFORDELER_CPR_URL=''
+  DATAFORDELER_CPR_PRIVATE_KEY_FILE=''
+  DATAFORDELER_CPR_PUBLIC_KEY_FILE=''
+  DATAFORDELER_CPR_PUBLIC_KEY_PASSWORD=''
+
+  DATAFORDELER_CVR_URL=''
+  DATAFORDELER_CVR_PRIVATE_KEY_FILE=''
+  DATAFORDELER_CVR_PUBLIC_KEY_FILE=''
+  DATAFORDELER_CVR_PUBLIC_KEY_PASSWORD=''
+
+  DEFAULT_URI=''
+  ```
+
+[Unreleased]: https://github.com/itk-dev/kontrolgruppen/compare/3.1.0...HEAD
+[3.1.0]: https://github.com/itk-dev/kontrolgruppen/compare/3.0.0...3.1.0
+[3.0.0]: https://github.com/itk-dev/kontrolgruppen/compare/2.0.3...3.0.0

docker/vhost.prod.conf .docker/vhost.prod.conf

@@ -15,6 +15,8 @@
 use Kontrolgruppen\CoreBundle\CPR\CprException;
 use Kontrolgruppen\CoreBundle\CPR\CprServiceInterface;
 use Kontrolgruppen\CoreBundle\Entity\AbstractProcessClient;
+use Kontrolgruppen\CoreBundle\Entity\Car;
+use Kontrolgruppen\CoreBundle\Entity\ContactPerson;
 use Kontrolgruppen\CoreBundle\Entity\Process;
 use Kontrolgruppen\CoreBundle\Entity\ProcessClientCompany;
 use Kontrolgruppen\CoreBundle\Entity\ProcessClientPerson;
@@ -201,6 +203,56 @@ public function update(Request $request, Process $process, TranslatorInterface $
         return $this->redirectToRoute('client_show', ['process' => $process]);
     }
 
+    /**
+     * @Route("/update_client", name="client_update_info", methods={"POST"})
+     *
+     * @param Request $request
+     * @param Process $process
+     *
+     * @return Response
+     */
+    public function updateClient(Request $request, Process $process): Response
+    {
+        $this->denyAccessUnlessGranted('edit', $process);
+
+        // Redirect to show if process is completed.
+        if (null !== $process->getCompletedAt()) {
+            return $this->redirectToRoute('client_show', [
+                'process' => $process->getId(),
+            ]);
+        }
+
+        $client = $process->getProcessClient();
+
+        // Get the ProcessClient Identifier from process
+        $processClientIdentifier = $client->getIdentifier();
+        // Get client type
+        $clientType = $client->getType();
+
+        if (ProcessClientPerson::PERSON === $clientType) {
+            $client->setTelephone($request->get('telephone'));
+            $car = new Car();
+            $car->setRegistrationNumber($request->get('registrationNumber'));
+            $client->addCar($car);
+            $this->em->flush();
+            $this->em->persist($client);
+            $this->em->flush();
+        } elseif (ProcessClientCompany::COMPANY === $clientType) {
+            $contactPerson = new ContactPerson();
+            $contactPerson->setName($request->get('contactPersonName'));
+            $contactPerson->setTelephone($request->get('contactPersonPhone'));
+            $client->setContactPerson($contactPerson);
+            $client->setPNumber($request->get('pNumber'));
+            $this->em->flush();
+            $this->em->persist($client);
+            $this->em->flush();
+        }
+
+        return $this->redirectToRoute('client_show', [
+            'process' => $process->getId(),
+        ]);
+    }
+
     /**
      * Check if new info is available for a client.
      *

docker/vhost.test.conf .docker/vhost.test.conf

@@ -205,13 +205,12 @@ public function new(Request $request, ProcessManager $processManager, ProcessCli
         } catch (\Exception $exception) {
             $this->addFlash('danger', $exception->getMessage());
         }
-        $case_worker = $request->get('case_worker');
+        $caseWorker = $request->get('case_worker');
         $identifier = $request->get('identifier');
 
-
-        $case_worker = $userRepository->findOneBy(['username' => $case_worker]);
+        $caseWorker = $userRepository->findOneBy(['username' => $caseWorker]);
         $process->setProcessClient($client);
-        $process->setCaseWorker($case_worker);
+        $process->setCaseWorker($caseWorker);
 
         $form = $this->createForm(ProcessType::class, $process, [
             // Add the `personnummer` option to the form.
@@ -241,7 +240,7 @@ public function new(Request $request, ProcessManager $processManager, ProcessCli
                     $dataFordelerData = $datafordelerService->getPersonData($processClientIdentifier);
                 } elseif (ProcessClientCompany::COMPANY === $clientType) {
                     $dataFordelerData = $datafordelerService->getVirksomhedData($processClientIdentifier);
-                    $client->setAddress($dataFordelerData['beliggenhedsadresse']['CVRAdresse_vejnavn'] . " " . $dataFordelerData['beliggenhedsadresse']['CVRAdresse_husnummerFra'] ?? null);
+                    $client->setAddress($dataFordelerData['beliggenhedsadresse']['CVRAdresse_vejnavn'].' '.$dataFordelerData['beliggenhedsadresse']['CVRAdresse_husnummerFra'] ?? null);
                     $client->setPostalCode($dataFordelerData['beliggenhedsadresse']['CVRAdresse_postnummer'] ?? null);
                     $client->setCity($dataFordelerData['beliggenhedsadresse']['CVRAdresse_postdistrikt'] ?? null);
 

.env

@@ -215,6 +215,10 @@ common:
     title: Kontrolgruppen
     loading: Henter data ...
     empty_field_value: Feltet er ikke udfyldt
+    enter_name: Indtast navn
+    enter_p_number: Tilknyt relateret p-nummer
+    enter_phone: Indtast telefonnummer
+    enter_register: Indtast nummerplade
 
 conclusion:
     edit:
@@ -634,7 +638,7 @@ visitation:
         address: Adresse
         phone: Telefon
         mail: Mail
-        registration_history: Registrations Historik
+        registration_history: Registreringshistorik
         p_number_history: Hent Flere
         period: Periode
         workers: Ansatte
@@ -1169,6 +1173,7 @@ sidebar:
         cpr: CPR nummer
         name: Navn
         car_shared_ownership: Fælles ejet
+        plate: Nummerplade
 
 weighted_conclusion:
     form:

CHANGELOG.md

@@ -13,34 +13,108 @@
         {% endif %}
     {% endif %}
 
-    <h1>{{ 'client.show.title'|trans }}</h1>
+    <h1 class="mt-5">{{ 'client.show.title'|trans }}</h1>
 
     {% if process.completedAt %}
         <div class="alert alert-warning">{{ 'process.completed_message'|trans }}</div>
     {% endif %}
+    {% if canEdit %}
+    <hr class="mt-2">
+    <div class="row col-md-12">
+        <div class="col-md-12 mb-5">
+            <form method="POST" action="{{ path('client_update_info', {'process': process}) }}">
+                <div class="form-group col-md-6">
+                    <div class="form-group">
+                        <label for="pNumber">{{ 'visitation.company.p_numbers'|trans }}</label>
+                        <select name="pNumber" id="pNumber" class="form-control" placeholder="{{ 'common.enter_p_numbers'|trans }}">
+                            {% for all_pnumbers in data.produktionsenheder %}
+                                <option value="{{ all_pnumbers.pNummer|e }}" {% if client.pNumber is not empty and client.pNumber == all_pnumbers.pNummer %}selected{% endif %}>{{ all_pnumbers.pNummer|e }}</option>
+                            {% endfor %}
+                        </select>
+                    </div>
+                </div>
+                <div class="form-group col-md-12">
+                    <div class="row">
+                        <div class="col-md-12">
+                            <label>{{ 'client.sections.contact_person'|trans }}</label>
+                        </div>
+                        <div class="col-md-6">
+                            <input type="text" id="contactPersonName" name="contactPersonName" class="form-control" placeholder="{{ 'common.enter_name'|trans }}" value="{{ client.contactPerson.name ? client.contactPerson.name : '' }}">
+                        </div>
+                        <div class="col-md-6">
+                            <input type="text" id="contactPersonPhone" name="contactPersonPhone" class="form-control" placeholder="{{ 'common.enter_phone'|trans }}" value="{{ client.contactPerson.telephone ? client.contactPerson.telephone : '' }}">
+                        </div>
+                    </div>
+                </div>
+                <div class="col-md-12">
+                    <button type="submit" id="submit-button" class="btn btn-primary mt-4 float-right">{{ 'common.actions.save'|trans }}</button>
+                </div>
+            </form>
+        </div>
+    </div>
+    <hr class="mt-2">
 
-    <div class="col-md-9 left-tables">
-        {# Adresse historik Table #}
-        {% include '@KontrolgruppenCore/visitation/company_tables/created_date.html.twig' with {'data': data} %}
+    {% endif %}
+    <div class="row col-md-12">
+        <div class="col-md-12 left-tables mt-2">
+            {# Adresse historik Table #}
+            {% include '@KontrolgruppenCore/visitation/company_tables/created_date.html.twig' with {'data': data} %}
 
-        {# Bopælssamling Table #}
-        {% include '@KontrolgruppenCore/visitation/company_tables/real_owners.html.twig' %}
+            {# Bopælssamling Table #}
+            {% include '@KontrolgruppenCore/visitation/company_tables/real_owners.html.twig' %}
 
-        {# Bolig Table #}
-        {% include '@KontrolgruppenCore/visitation/company_tables/registration_history.html.twig' %}
+            {# Bolig Table #}
+            {% include '@KontrolgruppenCore/visitation/company_tables/registration_history.html.twig' %}
 
-        {# Børn Table #}
-        {% include '@KontrolgruppenCore/visitation/company_tables/history.html.twig' %}
+            {# Børn Table #}
+            {% include '@KontrolgruppenCore/visitation/company_tables/history.html.twig' %}
 
-        {# Civilstatus Table #}
-        {% include '@KontrolgruppenCore/visitation/company_tables/p_number.html.twig' %}
+            {# Civilstatus Table #}
+            {% include '@KontrolgruppenCore/visitation/company_tables/p_number.html.twig' %}
 
-        {# CPR historik Table #}
-        {% include '@KontrolgruppenCore/visitation/company_tables/amount_workers.html.twig' %}
-        <div class="d-flex justify-content-between">
-            <div></div>
-            {% if canEdit %}
-                <a href="{{ path('client_edit', {'process': process.id}) }}" class="btn btn-primary float-right pl-5 pr-5">{{ 'common.actions.edit'|trans }}</a>
-            {% endif %}
+            {# CPR historik Table #}
+            {% include '@KontrolgruppenCore/visitation/company_tables/amount_workers.html.twig' %}
+
+        </div>
     </div>
 {% endblock %}
+{% block javascripts %}
+    {{ parent() }}
+    <script>
+        $(document).ready(function() {
+            // Function to check the state of inputs and toggle the button's disabled state
+            function toggleSubmitButtonState() {
+                var ispNumber = $('#pNumber').val() === '';
+                var isContactPersonName = $('#contactPersonName').val() === '';
+
+                // If either input is empty, disable the button, else enable it
+                $('#submit-button').prop('disabled', ispNumber || isContactPersonName);
+            }
+
+            // Call the function to set the initial state of the button
+            toggleSubmitButtonState();
+
+            // Bind the input fields to the keyup event to check their state every time the user types
+            $('#pNumber, #contactPersonName').on('keyup', toggleSubmitButtonState);
+        });
+    </script>
+{% endblock %}
+{% block stylesheets %}
+    {{ parent() }}
+    <style>
+        .form-button-top-left {
+            position: absolute;
+            top: 0;
+            left: 150%;
+            margin-top: 1rem; /* Adjust as needed */
+            margin-left: 1rem; /* Adjust as needed */
+        }
+        .parent-relative {
+            position: relative;
+        }
+        hr{
+            border-top: 1px solid #000000;
+        }
+    </style>
+{% endblock %}
+