Improvements

Author: rimi-itk

docs/Users-manual.md

@@ -239,3 +239,26 @@ The render context contains three main parts:
 2. Information on files attached (uploaded) to the submission (grouped by element key)
 3. The handler settings: This includes the global OS2Forms Fordelingskomponent module settings and the settings on the
    handler
+
+## Twig extensions
+
+This modules adds some useful Twig functions,
+
+`os2forms_fordelingskomponent_intval`
+`os2forms_fordelingskomponent_floatval`
+`os2forms_fordelingskomponent_gettype`
+
+that basically wrap the build PHP functions [`intval`](https://www.php.net/manual/en/function.intval.php),
+[`floatval`](https://www.php.net/manual/en/function.floatval.php) and
+[`gettype`](https://www.php.net/manual/en/function.gettype.php).
+
+However, `os2forms_fordelingskomponent_floatval` accepts a second argument `langcode` that's used to help extract the
+float value based on a language code:
+
+``` twig
+{{ os2forms_fordelingskomponent_floatval('1,23') == 123 }}
+{{ os2forms_fordelingskomponent_floatval('1.23') == 1.23 }}
+
+{{ os2forms_fordelingskomponent_floatval('1,23', langcode: 'da') == 1.23 }}
+{{ os2forms_fordelingskomponent_floatval('1.23', langcode: 'da') == 123}}
+```

os2forms_fordelingskomponent.services.yml

@@ -29,3 +29,7 @@ services:
   Drupal\os2forms_fordelingskomponent\Repository\AnvenderKvitteringRepository:
 
   Drupal\os2forms_fordelingskomponent\Settings:
+
+  Drupal\os2forms_fordelingskomponent\Os2formsFordelingskomponentTwigExtension:
+    tags:
+      - { name: twig.extension }

src/Drush/Commands/ValidateXmlCommand.php

@@ -58,7 +58,7 @@ protected function configure(): void {
       ->addArgument('webform-id', InputArgument::REQUIRED, 'Webform ID')
       ->addArgument('handler-id', InputArgument::REQUIRED, 'Handler ID')
       ->addOption('show-xml', NULL, InputOption::VALUE_NONE, 'Show XML')
-      ->addOption('break-on-error', NULL, InputOption::VALUE_OPTIONAL, 'Break on error. If set, terminate after first error.', TRUE);
+      ->addOption('break-on-error', NULL, InputOption::VALUE_OPTIONAL, 'Break on error. If set, terminate after first error.', FALSE);
   }
 
   /**
@@ -78,29 +78,38 @@ protected function execute(InputInterface $input, OutputInterface $output): int
     $handler = $this->getHandler($handlerId, $webform);
     $submissions = $this->loadSubmissions($webform);
 
-    foreach ($submissions as $submission) {
-      $preview = $this->webformHelper->renderPreview($handler, $submission);
-      $hasErrors = count($preview['exceptions']) > 0;
-      if ($hasErrors) {
-        foreach ($preview['exceptions'] as $exception) {
-          $io->error([$submission->label(), $exception->getMessage()]);
+    if (0 === count($submissions)) {
+      $io->warning(sprintf('No submissions on form %s', $webform->label()));
+    }
+    else {
+      foreach ($submissions as $submission) {
+        $preview = $this->webformHelper->renderPreview($handler, $submission);
+        $hasErrors = count($preview['exceptions']) > 0;
+        if ($hasErrors) {
+          foreach ($preview['exceptions'] as $exception) {
+            $io->error([$submission->label(), $exception->getMessage()]);
+          }
+        }
+        else {
+          $io->success($submission->label());
         }
-      }
-      else {
-        $io->success($submission->label());
-      }
 
-      if ($showXml) {
-        $io->writeln($preview['xml']->rendered);
-      }
+        if ($showXml) {
+          if (NULL === $preview['xml']->rendered) {
+            $io->warning('Cannot render XML');
+          }
+          else {
+            $io->writeln($preview['xml']->rendered);
+          }
+        }
 
-      if ($hasErrors) {
-        if ($breakOnError) {
-          return self::FAILURE;
+        if ($hasErrors) {
+          if ($breakOnError) {
+            return self::FAILURE;
+          }
+          continue;
         }
-        continue;
       }
-
     }
 
     return self::SUCCESS;

src/Os2formsFordelingskomponentTwigExtension.php

@@ -0,0 +1,48 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Drupal\os2forms_fordelingskomponent;
+
+use Twig\Extension\AbstractExtension;
+use Twig\TwigFunction;
+
+/**
+ * Twig extension.
+ */
+final class Os2formsFordelingskomponentTwigExtension extends AbstractExtension {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getFunctions(): array {
+    $functions[] = new TwigFunction(
+      'os2forms_fordelingskomponent_intval',
+      intval(...),
+    );
+
+    $functions[] = new TwigFunction(
+      'os2forms_fordelingskomponent_floatval',
+      static function (string $argument, ?string $langcode = NULL): float {
+        $replacements = match ($langcode) {
+          // Remove group separators and replace comma with point.
+          'da' => ['.' => '', ',' => '.'],
+          // Remove group separators.
+          default => [',' => ''],
+        };
+
+        $argument = str_replace(array_keys($replacements), array_values($replacements), $argument);
+
+        return floatval($argument);
+      }
+    );
+
+    $functions[] = new TwigFunction(
+      'os2forms_fordelingskomponent_gettype',
+      gettype(...),
+    );
+
+    return $functions;
+  }
+
+}

templates/base.html.twig

@@ -59,7 +59,11 @@
                     <span disabled>{{ 'Previous submission'|t }}</span>
                 {% endif %}
 
-                <a href="{{ path('entity.webform_submission.yaml', {webform: submission.webform.id, webform_submission: submission.id}) }}">{{ 'Show submission'|t }}</a>
+                <div class="submission">
+                    <a href="{{ path('entity.webform_submission.yaml', {webform: submission.webform.id, webform_submission: submission.id}) }}">{{ submission.label }}</a>
+                    [<a href="{{ path('entity.webform_submission.edit_form.all', {webform: submission.webform.id, webform_submission: submission.id}) }}">{{ 'Edit'|t }}</a>]
+                </div>
+
                 {% if links.next %}
                     <a href="{{ links.next }}">{{ 'Next submission'|t }}</a>
                 {% else %}