Fix all comments on PR

itk-dev · Oct 24, 2023 · fa97e7d · fa97e7d
1 parent 510b7f9
commit fa97e7d
Show file tree

Hide file tree

Showing 18 changed files with 91 additions and 84 deletions.
diff --git a/.env b/.env
@@ -48,7 +48,7 @@ MAILER_SENDER_NAME=Kontrolgruppen
 
 DISPLAY_NO_SENSITIVE_INFORMATION_WARNING=true
 
-ROUTER_REQUEST_CONTEXT_HOST=0.0.0.0
+ROUTER_REQUEST_CONTEXT_HOST=kontrolgruppen.local.itkdev.dk
 ROUTER_REQUEST_CONTEXT_SCHEME=http
 # Optional (must start with a slash)
 #ROUTER_REQUEST_CONTEXT_BASE_URL=/some-path

diff --git a/composer.json b/composer.json
@@ -30,6 +30,7 @@
         "onelogin/php-saml": "^3.1",
         "phpdocumentor/reflection-docblock": "^5.3",
         "phpoffice/phpspreadsheet": "^1.8",
+        "sensio/framework-extra-bundle": "^6.2",
         "stof/doctrine-extensions-bundle": "^1.3",
         "symfony/apache-pack": "^1.0",
         "symfony/asset": "6.3.*",

diff --git a/composer.lock b/composer.lock
diff --git a/config/packages/dev/routing.yaml b/config/packages/dev/routing.yaml
@@ -1,3 +1,4 @@
 framework:
     router:
         strict_requirements: true
+        default_uri: 'http://localhost/'
diff --git a/config/packages/dev/swiftmailer.yaml b/config/packages/dev/swiftmailer.yaml
diff --git a/config/packages/swiftmailer.yaml b/config/packages/swiftmailer.yaml
diff --git a/config/packages/test/swiftmailer.yaml b/config/packages/test/swiftmailer.yaml
diff --git a/core/CVR/ServiceplatformenCvrService.php b/core/CVR/ServiceplatformenCvrService.php
@@ -11,7 +11,6 @@
 namespace Kontrolgruppen\CoreBundle\CVR;
 
 use ItkDev\Serviceplatformen\Service\Exception\ServiceException;
-use ItkDev\Serviceplatformen\Service\OnlineService;
 
 /**
  * Class ServiceplatformenCvrService.
@@ -20,16 +19,6 @@ class ServiceplatformenCvrService extends AbstractCvrService implements CvrServi
 {
     private $service;
 
-    /**
-     * ServiceplatformenCvrService constructor.
-     *
-     * @param OnlineService $service
-     */
-    public function __construct(/* OnlineService $service */)
-    {
-        // $this->service = $service;
-    }
-
     /**
      * {@inheritdoc}
      */

diff --git a/core/Controller/BIController.php b/core/Controller/BIController.php
@@ -19,6 +19,7 @@
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\IsGranted;
 
 /**
  * Class BusinessIntelligenceController.
@@ -102,6 +103,8 @@ public function download(BIExport $export, $_format)
 
     /**
      * @Route("/delete/{export}", name="delete", methods={"DELETE"})
+     * 
+     * @IsGranted("ROLE_ADMIN")
      *
      * @param BIExport            $export
      * @param Manager             $manager

diff --git a/core/Controller/VisitationController.php b/core/Controller/VisitationController.php
@@ -59,54 +59,12 @@ public function index(Request $request): Response
      */
     public function search(Request $request): Response
     {
-        // $visitation = new Visitation();
-        // try {
-        //     $client = $clientManager->createClient($request->get('clientType') ?? '');
-        // } catch (\Exception $exception) {
-        //     $this->addFlash('danger', $exception->getMessage());
-
-        //     return $this->render('process/select-client-type.html.twig');
-        // }
-
-        // $visitation->setVisitationClient($client);
-        // $form = $this->createForm(VisitationType::class, $visitation);
-
-        // $form->handleRequest($request);
         return $this->render(
             '@KontrolgruppenCore/visitation/search.html.twig',
             [
                 'client_type' => $request->get('clientType'),
-                // 'menuItems' => $this->menuService->getProcessMenu(
-                //     $request->getPathInfo(),
-                // ),
-                // 'visitation' => $visitation,
-                // 'form' => $form->createView()
             ]
         );
-        // if ($form->isSubmitted() && $form->isValid()) {
-        //     // You can now redirect to your desired route
-        //     return $this->render(
-        //         '@KontrolgruppenCore/visitation/search.html.twig',
-        //         [
-        //             'menuItems' => $this->menuService->getProcessMenu(
-        //                 $request->getPathInfo(),
-        //             ),
-        //             'visitation' => $visitation,
-        //             'form' => $form->createView()
-        //         ]
-        //     );
-        // }
-
-        // return $this->render(
-        //     '@KontrolgruppenCore/visitation/search.html.twig',
-        //     [
-        //         'menuItems' => $this->menuService->getProcessMenu(
-        //             $request->getPathInfo(),
-        //         ),
-        //         'visitation' => $visitation,
-        //         'form' => $form->createView()
-        //     ]
-        // );
     }
 
     /**
@@ -252,6 +210,8 @@ public function searchProcessesByCvr(Request $request): Response
     }
 
     /**
+     * Logs a visitation
+     * 
      * @Route("/visitation-log", name="log_visitation", methods={"POST"})
      *
      * @param Request $request
@@ -282,7 +242,6 @@ public function visitationLog(Request $request): Response
         $this->em->persist($visitationLog);
         $this->em->flush();
 
-        // return 200
         return new Response(Response::HTTP_OK);
     }
 }
diff --git a/core/Resources/translations/messages.da.yaml b/core/Resources/translations/messages.da.yaml
@@ -674,6 +674,7 @@ visitation:
     company_type: Virksomhedsform
     status: Status
     relations: Relationer
+    user_not_found: Bruger ikke fundet
     data:
         empty: Ingen data
     search:

diff --git a/core/Resources/views/visitation/company_tables/amount_workers.html.twig b/core/Resources/views/visitation/company_tables/amount_workers.html.twig
@@ -19,11 +19,6 @@
                     <tbody class="bg-light">
                         {# Loop through the data for this table if applicable. Otherwise, statically add rows. #}
                         <tr>
-                            {# <td>{{ data.Adresseoplysninger[0].SimpelAdresse.adresselinie1 }}</td> #}
-                            {# <td>{{ data.adresse_historik.post_nr_og_by }}</td>
-                            <td>{{ data.adresse_historik.kommune }}</td>
-                            <td>{{ data.adresse_historik.land }}</td>
-                            <td>{{ data.adresse_historik.dato_fra_til }}</td> #}
                         </tr>
                     </tbody>
                 </table>

diff --git a/core/Resources/views/visitation/company_tables/founders.html.twig b/core/Resources/views/visitation/company_tables/founders.html.twig
@@ -21,11 +21,6 @@
                     <tbody class="bg-light">
                         {# Loop through the data for this table if applicable. Otherwise, statically add rows. #}
                         <tr>
-                            {# <td>{{ data.Adresseoplysninger[0].SimpelAdresse.adresselinie1 }}</td> #}
-                            {# <td>{{ data.adresse_historik.post_nr_og_by }}</td>
-                            <td>{{ data.adresse_historik.kommune }}</td>
-                            <td>{{ data.adresse_historik.land }}</td>
-                            <td>{{ data.adresse_historik.dato_fra_til }}</td> #}
                         </tr>
                     </tbody>
                 </table>

diff --git a/core/Resources/views/visitation/company_tables/history.html.twig b/core/Resources/views/visitation/company_tables/history.html.twig
@@ -19,11 +19,6 @@
                     <tbody class="bg-light">
                         {# Loop through the data for this table if applicable. Otherwise, statically add rows. #}
                         <tr>
-                            {# <td>{{ data.Adresseoplysninger[0].SimpelAdresse.adresselinie1 }}</td> #}
-                            {# <td>{{ data.adresse_historik.post_nr_og_by }}</td>
-                            <td>{{ data.adresse_historik.kommune }}</td>
-                            <td>{{ data.adresse_historik.land }}</td>
-                            <td>{{ data.adresse_historik.dato_fra_til }}</td> #}
                         </tr>
                     </tbody>
                 </table>

diff --git a/core/Resources/views/visitation/company_tables/real_owners.html.twig b/core/Resources/views/visitation/company_tables/real_owners.html.twig
@@ -19,11 +19,6 @@
                     <tbody class="bg-light">
                         {# Loop through the data for this table if applicable. Otherwise, statically add rows. #}
                         <tr>
-                            {# <td>{{ data.Adresseoplysninger[0].SimpelAdresse.adresselinie1 }}</td> #}
-                            {# <td>{{ data.adresse_historik.post_nr_og_by }}</td>
-                            <td>{{ data.adresse_historik.kommune }}</td>
-                            <td>{{ data.adresse_historik.land }}</td>
-                            <td>{{ data.adresse_historik.dato_fra_til }}</td> #}
                         </tr>
                     </tbody>
                 </table>

diff --git a/core/Resources/views/visitation/company_tables/registration_history.html.twig b/core/Resources/views/visitation/company_tables/registration_history.html.twig
@@ -19,11 +19,6 @@
                     <tbody class="bg-light">
                         {# Loop through the data for this table if applicable. Otherwise, statically add rows. #}
                         <tr>
-                            {# <td>{{ data.Adresseoplysninger[0].SimpelAdresse.adresselinie1 }}</td> #}
-                            {# <td>{{ data.adresse_historik.post_nr_og_by }}</td>
-                            <td>{{ data.adresse_historik.kommune }}</td>
-                            <td>{{ data.adresse_historik.land }}</td>
-                            <td>{{ data.adresse_historik.dato_fra_til }}</td> #}
                         </tr>
                     </tbody>
                 </table>

diff --git a/core/Resources/views/visitation/cpr_error.html.twig b/core/Resources/views/visitation/cpr_error.html.twig
@@ -4,7 +4,7 @@
 
 {% block content %}
     <div>
-        TELL THE USER CPR IS NOT FOUND
+        {{ visitation.user_not_found|trans }}
     </div>
 {% endblock %}
 

diff --git a/docker-compose.server.yml b/docker-compose.server.yml
@@ -10,7 +10,7 @@ networks:
 
 services:
   phpfpm:
-    image: itkdev/php:8.2.9-fpm:alpine
+    image: itkdev/php:8.2-fpm:alpine
     restart: unless-stopped
     networks:
       - app