Merge pull request #560 from jan-stanek/skryti-prihlasky

skrytí přihlášky pokud není registrovatlná role

Author: jan-stanek

app/WebModule/components/ApplicationContentControl.php

@@ -90,6 +90,9 @@ public function render(ApplicationContent $content) : void
 
             $template->unapprovedRole      = $user->isInRole($this->roleRepository->findBySystemName(Role::UNAPPROVED)->getName());
             $template->nonregisteredRole   = $user->isInRole($this->roleRepository->findBySystemName(Role::NONREGISTERED)->getName());
+            $template->noRegisterableRole  = $this->roleRepository->findAllRegisterableNowOrderedByName()->isEmpty();
+            $template->registrationStart   = $this->roleRepository->getRegistrationStart();
+            $template->registrationEnd     = $this->roleRepository->getRegistrationEnd();
             $template->bankAccount         = $this->settingsRepository->getValue(Settings::ACCOUNT_NUMBER);
             $template->dbuser              = $dbuser;
             $template->userHasFixedFeeRole = $userHasFixedFeeRole;

app/WebModule/components/templates/application_content.latte

@@ -24,45 +24,59 @@
                     <a href="{plink :Auth:login, 'backlink' => $backlink}">{_web.application_content.login_required_link}</a>{_web.application_content.login_required_end}
                 </div>
             {elseif $nonregisteredRole}
-                <script>
-                    Nette.validators.AppWebModuleFormsApplicationForm_toggleArrivalDeparture = function (elem, arg, value) {
-                        var i;
-                        for (i = 0; i < value.length; i++) {
-                            if (jQuery.inArray(value[i], arg) != -1)
-                                return true;
-                        }
-                        return false;
-                    };
-                </script>
-
-                {if $explicitSubeventsExists}
+                {if $noRegisterableRole}
+                    <div class="alert alert-info alert-forever">
+                        {if $registrationStart && $registrationEnd}
+                            {_web.application_content.no_registerable_role_start_end, ['start' => $registrationStart->format('j. n. Y H:i'), 'end' => $registrationEnd->format('j. n. Y H:i')]}
+                        {elseif $registrationStart}
+                            {_web.application_content.no_registerable_role_start, ['start' => $registrationStart->format('j. n. Y H:i')]}
+                        {elseif $registrationEnd}
+                            {_web.application_content.no_registerable_role_end, ['end' => $registrationEnd->format('j. n. Y H:i')]}
+                        {else}
+                            {_web.application_content.no_registerable_role}
+                        {/if}
+                    </div>
+                {else}
                     <script>
-                        $(function () {
-                            $("select[name='roles[]']").on("change", function () {
+                        Nette.validators.AppWebModuleFormsApplicationForm_toggleArrivalDeparture = function (elem, arg, value) {
+                            var i;
+                            for (i = 0; i < value.length; i++) {
+                                if (jQuery.inArray(value[i], arg) != -1)
+                                    return true;
+                            }
+                            return false;
+                        };
+                    </script>
+
+                    {if $explicitSubeventsExists}
+                        <script>
+                            $(function () {
+                                $("select[name='roles[]']").on("change", function () {
+                                    changeSubeventsRequired();
+                                });
                                 changeSubeventsRequired();
                             });
-                            changeSubeventsRequired();
-                        });
 
-                        function changeSubeventsRequired() {
-                            var value = $("select[name='roles[]']").val();
-                            var label = $("label[for='frm-applicationContent-applicationForm-subevents']");
-                            var rolesWithSubevents = JSON.parse({$rolesWithSubevents});
-                            var i;
-                            for (i = 0; i < value.length; i++) {
-                                if (jQuery.inArray(parseInt(value[i]), rolesWithSubevents) != -1) {
-                                    label.addClass('required');
-                                    return;
+                            function changeSubeventsRequired() {
+                                var value = $("select[name='roles[]']").val();
+                                var label = $("label[for='frm-applicationContent-applicationForm-subevents']");
+                                var rolesWithSubevents = JSON.parse({$rolesWithSubevents});
+                                var i;
+                                for (i = 0; i < value.length; i++) {
+                                    if (jQuery.inArray(parseInt(value[i]), rolesWithSubevents) != -1) {
+                                        label.addClass('required');
+                                        return;
+                                    }
                                 }
+                                label.removeClass('required');
                             }
-                            label.removeClass('required');
-                        }
-                    </script>
-                {/if}
+                        </script>
+                    {/if}
 
-                <div class="well">
-                    {control applicationForm}
-                </div>
+                    <div class="well">
+                        {control applicationForm}
+                    </div>
+                {/if}
             {else}
                 {if $unapprovedRole}
                     <div class="alert alert-warning alert-forever">

app/lang/web.cs_CZ.neon

@@ -120,6 +120,10 @@ application_content:
     login_required_begin: "Pro registraci na seminář se musíte nejprve"
     login_required_link: "přihlásit přes skautIS"
     login_required_end: "."
+    no_registerable_role: "Aktuálně není možné se na seminář přihlásit."
+    no_registerable_role_start: "Na seminář je možné se přihlásit od %start%."
+    no_registerable_role_end: "Na seminář bylo možné se přihlásit do %end%."
+    no_registerable_role_start_end: "Na seminář je možné se přihlásit od %start% do %end%."
     unapproved_registration: "Na seminář jste se registrovali jako: %roles%. Vaše registrace zatím nebyla potvrzena."
     approved_registration_not_paying: "Na seminář jste se registrovali jako: %roles%. Vaše registrace již byla potvrzena."
     approved_registration_paid: "Na seminář jste se registrovali jako: %roles%. Poplatek byl úspěšně uhrazen."

app/model/ACL/RoleRepository.php

@@ -435,4 +435,30 @@ public function decrementOccupancy(Role $role) : void
             ->setParameter('rid', $role->getId())
             ->getResult();
     }
+
+    public function getRegistrationStart() : ?\DateTime
+    {
+        $result = $this->createQueryBuilder('r')
+            ->select('r.registerableFrom')
+            ->where('r.registerable = TRUE')
+            ->andWhere('r.registerableFrom IS NOT NULL')
+            ->orderBy('r.registerableFrom')
+            ->setMaxResults(1)
+            ->getQuery()
+            ->getOneOrNullResult();
+        return $result ? $result['registerableFrom'] : null;
+    }
+
+    public function getRegistrationEnd() : ?\DateTime
+    {
+        $result = $this->createQueryBuilder('r')
+            ->select('r.registerableTo')
+            ->where('r.registerable = TRUE')
+            ->andWhere('r.registerableTo IS NOT NULL')
+            ->orderBy('r.registerableTo', 'DESC')
+            ->setMaxResults(1)
+            ->getQuery()
+            ->getOneOrNullResult();
+        return $result ? $result['registerableTo'] : null;
+    }
 }