Merge pull request #147 from crf-devs/allow_near_availabilities_creat…

…aion Allow user near availabiity creation
crf-devs · Mar 26, 2020 · f9d0686 · f9d0686
2 parents 25f5994 + a0157db
commit f9d0686
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/src/Controller/User/Availability/ManageAvailabilityController.php b/src/Controller/User/Availability/ManageAvailabilityController.php
@@ -55,11 +55,12 @@ public function __invoke(Request $request): Response
 
         $end = $start->add(new \DateInterval('P7D'));
 
+        $blockedSlotsInterval = new \DateInterval('PT48H');
         $availabilitiesDomain = AvailabilitiesDomain::generate(
             $start,
             $end,
             $this->userAvailabilityRepository->findBetweenDates($user, $start, $end),
-            new \DateInterval('PT48H')
+            $blockedSlotsInterval
         );
 
         $form = $this
@@ -78,6 +79,7 @@ public function __invoke(Request $request): Response
 
         return $this->render('user/availability.html.twig', [
             'form' => $form->createView(),
+            'blockedSlotsInterval' => $blockedSlotsInterval,
         ]);
     }
 }
diff --git a/src/Domain/AvailabilityDomain.php b/src/Domain/AvailabilityDomain.php
@@ -35,7 +35,7 @@ public function isEditable(): bool
         $trueNow = new \DateTimeImmutable('now', new \DateTimeZone('Europe/Paris'));
         $fakeUTCnow = new \DateTimeImmutable($trueNow->format('Y-m-d H:i:s'));
 
-        if (null !== $this->disabledIntervalFromNow) {
+        if (null !== $this->availability && null !== $this->disabledIntervalFromNow && AvailabilityInterface::STATUS_UNKNOW !== $this->availability->getStatus()) {
             return $this->date > $fakeUTCnow->add($this->disabledIntervalFromNow);
         }
 

diff --git a/templates/availability/_table.html.twig b/templates/availability/_table.html.twig
@@ -7,7 +7,7 @@
         </div>
         <div class="col-12 col-md-8">
             <nav class="mt-3">
-                <ul class="pagination pagination-sm">
+                <ul class="pagination pagination-sm justify-content-end">
                     <li class="page-item{% if nowIsCurrent %} disabled{% endif %}">
                         <a class="page-link" href="{{ path(app.request.get('_route'), app.request.get('_route_params')|merge({week: 'now'|date('o-\\WW')})) }}">
                             <span aria-hidden="true">&laquo;</span>
@@ -59,8 +59,17 @@
         </tbody>
     </table>
 </div>
-<div class="float-right">{{ form_widget(form.submit) }}</div>
-<div class="clearfix"></div>
+
+<div class="row">
+    <div class="col-12 col-md-8">
+        {% if blockedSlotsInterval is defined %}
+            <p class="font-italic">Vous ne pouvez pas modifier les disponibilités saisies pour les prochaines {{ blockedSlotsInterval.format('%h heures') }}</p>
+        {% endif %}
+    </div>
+    <div class="col-12 col-md-4">
+        <div class="float-right mt-2">{{ form_widget(form.submit) }}</div>
+    </div>
+</div>
 
 {{ form_end(form) }}