Merge branch '2.x' of https://github.com/GemsTracker/gemstracker-library

into 2.x
GemsTracker · Dec 18, 2024 · 27ad609 · 27ad609
2 parents b02df08 + a8d4f49
commit 27ad609
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 56 deletions.
diff --git a/src/Handlers/Respondent/RespondentHandler.php b/src/Handlers/Respondent/RespondentHandler.php
@@ -25,7 +25,6 @@
 use Gems\Snippets\Generic\CurrentButtonRowSnippet;
 use Gems\Snippets\Respondent\DeleteRespondentSnippet;
 use Gems\Snippets\Respondent\RespondentDetailsSnippet;
-use Gems\Snippets\Respondent\TrafficLightTokenSnippet;
 use Gems\SnippetsLoader\GemsSnippetResponder;
 use Gems\User\Mask\MaskRepository;
 use Psr\Cache\CacheItemPoolInterface;
@@ -177,7 +176,6 @@ class RespondentHandler extends RespondentChildHandlerAbstract
      * @var array Mixed key => value array for snippet initialization
      */
     protected array $deleteParameters = [
-        'baseUrl' => 'getItemUrlArray',
         'formTitle' => null,
         'forOtherOrgs' => 'getOtherOrgs',
         // 'respondentData' => 'getRespondentData',
@@ -601,24 +599,6 @@ public function getIndexTitle(): string
         return $this->_('Respondents');
     }
 
-    /**
-     * Return the array with items that should be used to find this item
-     *
-     * @return array
-     */
-    public function getItemUrlArray(): array
-    {
-        $queryParams = $this->request->getQueryParams();
-        $patientNr = isset($queryParams[Model::REQUEST_ID1]) ? $queryParams[Model::REQUEST_ID1] : null;
-        $organizationId = isset($queryParams[Model::REQUEST_ID2]) ? $queryParams[Model::REQUEST_ID2] : null;
-        $this->currentUserRepository->assertAccessToOrganizationId($organizationId);
-
-        return [
-            Model::REQUEST_ID1 => $patientNr,
-            Model::REQUEST_ID2 => $organizationId,
-        ];
-    }
-
     /**
      * The organizations whose tokens are shown.
      *

diff --git a/src/Model/OrganizationModel.php b/src/Model/OrganizationModel.php
@@ -69,6 +69,8 @@ public function __construct(
     ) {
         parent::__construct('gems__organizations', $metaModelLoader, $sqlRunner, $translate, 'organization');
 
+        $this->metaModelLoader->setChangeFields($this->metaModel, 'gor');
+
         $this->addColumn("CASE WHEN gor_active = 1 THEN '' ELSE 'deleted' END", 'row_class');
 
         $yesNo      = $this->translatedUtil->getYesNo();

diff --git a/src/Screens/Respondent/Show/GemsDefaultShow.php b/src/Screens/Respondent/Show/GemsDefaultShow.php
@@ -30,7 +30,6 @@ class GemsDefaultShow extends ShowScreenAbstract
     public function getParameters(): array
     {
         return [
-            'baseUrl'        => 'getItemUrlArray',
             'forOtherOrgs'   => 'getOtherOrgs',
             '-run-once'      => 'openedRespondent',
             ];

diff --git a/src/Screens/Respondent/Show/GemsRoundTabsShow.php b/src/Screens/Respondent/Show/GemsRoundTabsShow.php
@@ -30,7 +30,6 @@ class GemsRoundTabsShow extends ShowScreenAbstract
     public function getParameters(): array
     {
         return [
-            'baseUrl'        => 'getItemUrlArray',
             'forOtherOrgs'   => 'getOtherOrgs',
             '-run-once'      => 'openedRespondent',
             ];

diff --git a/src/Snippets/Respondent/RoundsTabsSnippet.php b/src/Snippets/Respondent/RoundsTabsSnippet.php
@@ -44,15 +44,6 @@ class RoundsTabsSnippet extends TabSnippetAbstract
      */
     protected $_tabs = [];
 
-    /**
-     * Default href parameter values
-     *
-     * Clicking a tab always resets the page counter
-     *
-     * @var array
-     */
-    protected array $href = ['page' => null];
-
     /**
      * The RESPONDENT model, not the token model
      *

diff --git a/src/Snippets/TabSnippetAbstract.php b/src/Snippets/TabSnippetAbstract.php
@@ -11,13 +11,6 @@
 
 abstract class TabSnippetAbstract extends SnippetAbstract
 {
-    /**
-     * Optional standard url parts
-     *
-     * @var array
-     */
-    protected array $baseUrl = [];
-
     /**
      * Shortfix to add class attribute
      *
@@ -27,13 +20,13 @@ abstract class TabSnippetAbstract extends SnippetAbstract
 
     /**
      *
-     * @var string Id of the current tab
+     * @var ?string Id of the current tab
      */
     protected ?string $currentTab = null;
 
     /**
      *
-     * @var string Id of default tab
+     * @var ?string Id of default tab
      */
     protected ?string $defaultTab = null;
 
@@ -44,13 +37,6 @@ abstract class TabSnippetAbstract extends SnippetAbstract
      */
     protected bool $displaySingleTab = false;
 
-    /**
-     * Default href parameter values
-     *
-     * @var array
-     */
-    protected array $href = [];
-
     /**
      *
      * @var string Class attribute for active tab
@@ -73,7 +59,7 @@ public function __construct(SnippetOptions $snippetOptions, RequestInfo $request
     /**
      * Sets the default and current tab and returns the current
      *
-     * @return string The current tab
+     * @return ?string The current tab
      */
     public function getCurrentTab(): ?string
     {
@@ -115,11 +101,6 @@ public function getHtmlOutput(): ?HtmlInterface
             // Set the correct parameters
             $this->getCurrentTab();
 
-            // Let loose
-            if (is_array($this->baseUrl)) {
-                $this->href = $this->href + $this->baseUrl;
-            }
-
             $tabRow = Html::create()->ul();
 
             foreach ($tabs as $tabId => $content) {
@@ -167,7 +148,7 @@ protected function getParameterKeysFor(string $tabId): array
             return array($paramKey => $tabId);
         }
 
-        return array();
+        return [];
     }
 
     /**

diff --git a/src/Snippets/User/OwnAccountEditAuthSnippet.php b/src/Snippets/User/OwnAccountEditAuthSnippet.php
@@ -311,7 +311,7 @@ private function sendMailCode(string $mailAddress, string $code): bool
         $language = $this->communicationRepository->getCommunicationLanguage($this->currentUser->getLocale());
         $templateId = $this->communicationRepository->getConfirmChangeEmailTemplate($organization);
 
-        $variables = $this->communicationRepository->getUserMailFields($this->currentUser, $language);
+        $variables = $this->communicationRepository->getUserPasswordMailFields($this->currentUser, $language);
         $variables += [
             'confirmation_code' => $code,
         ];
@@ -349,7 +349,7 @@ private function sendPhoneCode(string $phoneNumber, string $code): bool
         $language = $this->communicationRepository->getCommunicationLanguage($this->currentUser->getLocale());
         $templateId = $this->communicationRepository->getConfirmChangePhoneTemplate($organization);
 
-        $variables = $this->communicationRepository->getUserMailFields($this->currentUser, $language);
+        $variables = $this->communicationRepository->getUserPasswordMailFields($this->currentUser, $language);
         $variables += [
             'confirmation_code' => $code,
         ];