From fbc4e01ef33b0297b40e9d1fffe89b99f343c0fa Mon Sep 17 00:00:00 2001
From: Harrys Ravalomanana <hra@esokia.com>
Date: Tue, 17 Mar 2020 15:34:24 +0400
Subject: [PATCH] PHRAS-2978 #comment update feedback expiration date #time 6h

---
 .../Controller/Prod/PushController.php        | 35 +++++++++++++++-
 .../Phrasea/ControllerProvider/Prod/Push.php  |  3 ++
 templates/web/prod/Tooltip/Basket.html.twig   |  6 ++-
 templates/web/prod/WorkZone/Basket.html.twig  | 40 +++++++++++++++----
 4 files changed, 74 insertions(+), 10 deletions(-)

diff --git a/lib/Alchemy/Phrasea/Controller/Prod/PushController.php b/lib/Alchemy/Phrasea/Controller/Prod/PushController.php
index 6e650aefaa..c1fd5d8751 100644
--- a/lib/Alchemy/Phrasea/Controller/Prod/PushController.php
+++ b/lib/Alchemy/Phrasea/Controller/Prod/PushController.php
@@ -98,7 +98,7 @@ class PushController extends Controller
                 $Basket->setUser($user_receiver);
                 $Basket->setPusher($this->getAuthenticatedUser());
                 $Basket->markUnread();
-                
+
                 $manager->persist($Basket);
 
                 foreach ($pusher->get_elements() as $element) {
@@ -600,6 +600,38 @@ class PushController extends Controller
         );
     }
 
+    public function updateExpirationAction(Request $request)
+    {
+        $ret = [
+            'success' => false,
+            'message' => $this->app->trans('Unable to save the expiration date')
+        ];
+        if (is_null($request->request->get('date'))) {
+            $ret['message'] = $this->app->trans('The provided date is null!');
+            return $this->app->json($ret);
+        }
+        $repository = $this->app['repo.baskets'];
+        $manager = $this->getEntityManager();
+        $manager->beginTransaction();
+        try {
+            $basket = $repository->findUserBasket($request->request->get('basket_id'), $this->app->getAuthenticatedUser(), true);
+            $date = new \DateTime($request->request->get('date'));
+            $validation = $basket->getValidation();
+            if (is_null($validation)) {
+                return $this->app->json($ret);
+            }
+            $validation->setExpires($date);
+            $manager->persist($validation);
+            $manager->flush();
+            $manager->commit();
+            $ret['message'] = $this->app->trans('Expiration date successfully updated!');
+        } catch (\Exception $e) {
+            $ret['message'] = $e->getMessage();
+            $manager->rollback();
+        }
+        return $this->app->json($ret);
+    }
+
     private function formatUser(User $user)
     {
         $subtitle = array_filter([$user->getJob(), $user->getCompany()]);
@@ -734,4 +766,5 @@ class PushController extends Controller
     {
         return $this->app['random.medium'];
     }
+
 }
diff --git a/lib/Alchemy/Phrasea/ControllerProvider/Prod/Push.php b/lib/Alchemy/Phrasea/ControllerProvider/Prod/Push.php
index 48352e1e39..40b93220c0 100644
--- a/lib/Alchemy/Phrasea/ControllerProvider/Prod/Push.php
+++ b/lib/Alchemy/Phrasea/ControllerProvider/Prod/Push.php
@@ -59,6 +59,9 @@ class Push implements ControllerProviderInterface, ServiceProviderInterface
         $controllers->post('/validate/', 'controller.prod.push:validateAction')
             ->bind('prod_push_validate');
 
+        $controllers->post('/update-expiration/', 'controller.prod.push:updateExpirationAction')
+            ->bind('prod_push_do_update_expiration');
+
         $controllers->get('/user/{usr_id}/', 'controller.prod.push:getUserAction')
             ->assert('usr_id', '\d+');
 
diff --git a/templates/web/prod/Tooltip/Basket.html.twig b/templates/web/prod/Tooltip/Basket.html.twig
index 9905cbf49c..49eeec04ba 100644
--- a/templates/web/prod/Tooltip/Basket.html.twig
+++ b/templates/web/prod/Tooltip/Basket.html.twig
@@ -11,7 +11,11 @@
             <span class="expiredDate">
         {% if basket.getValidation() %}
             {% set dateExpired = app['date-formatter'].getPrettyString(basket.getValidation().getExpires()) %}
-            {{ 'workzone:feedback:expiration' | trans }} : {{ dateExpired }}
+            {% if date(dateExpired) < date() %}
+                <span>{{ 'workzone:feedback:expiration-closed' | trans }} :</span>
+                {% else %}
+                <span>{{ 'workzone:feedback:expiration-open' | trans }} :</span>
+            {% endif %} {{ dateExpired }}
         {% endif %}
               </span>
     <div style="margin:5px 0;max-height:160px;overflow:hidden;text-overflow:ellipsis;">
diff --git a/templates/web/prod/WorkZone/Basket.html.twig b/templates/web/prod/WorkZone/Basket.html.twig
index fb028812d5..d46d0f2f55 100644
--- a/templates/web/prod/WorkZone/Basket.html.twig
+++ b/templates/web/prod/WorkZone/Basket.html.twig
@@ -1,4 +1,4 @@
-
+<script src="https://rawgithub.com/trentrichardson/jQuery-Timepicker-Addon/master/jquery-ui-timepicker-addon.js"></script>
 <div>
     <button class="tools-accordion">Actions</button>
     <div class="tools-panel">
@@ -101,13 +101,19 @@
 
             {% set dateExpired = app['date-formatter'].getPrettyString(basket.getValidation().getExpires()) %}
             <div class="expiredDate">
-                <span>{{ 'workzone:feedback:expiration' | trans }} :</span>
+                {% if date(dateExpired) < date() %}
+                    <span>{{ 'workzone:feedback:expiration-closed' | trans }} :</span>
+                {% else %}
+                    <span>{{ 'workzone:feedback:expiration-open' | trans }} :</span>
+                {% endif %}
+
                 <form class="update-feed-validation">
-                    <input type="hidden" name="feedback-id" value={{ basket.getValidation().getId}} />
-                    <input type="hidden" name="feedback-deadline-format" class="alternate" />
-                <input type="text" class="btn datepicker" name="feedback-deadline" value="{{ dateExpired }}">
+                    <input type="hidden" name="feedbackId" value={{ basket.getId}} />
+                    <input type="hidden" name="feedbackDate" class="alternate" />
+                <input type="text" class="btn feed-datepicker" name="feedback-deadline" value="{{ dateExpired }}">
                     <button type="submit" class="submit" title="{{ 'workzone:feedback:update' | trans }}"><i class="fa fa-save"></i></button>
                 </form>
+                <p class="message text-right" style="opacity: 0;transition: all 0.2s; color: green; display: block; ">{{ 'prod:workzone:basket:updated-message' | trans }}</p>
             </div>
 
             {% endif %}
@@ -135,7 +141,24 @@
 <script type="text/javascript">
     $( ".update-feed-validation" ).on( "submit", function( event ) {
         event.preventDefault();
-        console.log( $( this ).serialize() );
+        var formData = $(this).serializeArray();
+
+        $.ajax({
+            type: 'POST',
+            url: '/prod/push/update-expiration/',
+            data: {
+                basket_id: formData[0].value,
+                date: formData[1].value
+            },
+            beforeSend: function() {
+                console.log(formData[0].value);
+                console.log(formData[1].value);
+            },
+            success: function (data) {
+                $('.message').css('opacity',1);
+                setTimeout(function(){ $('.message').css('opacity',0); }, 2000);
+            },
+        });
     });
     $( function() {
         $.datepicker.regional['default'] = {
@@ -149,11 +172,12 @@
             dayNamesMin: [ "D","L","M","M","J","V","S" ],
             dateFormat: "d MM yy",
             altField: ".alternate",
-            altFormat: "yy-mm-dd"
+            altFormat: "yy-mm-dd",
+            minDate: 0
 
         };
 
-        $( ".datepicker" ).datepicker( $.datepicker.regional[ 'default' ]);
+        $( ".feed-datepicker" ).datepicker( $.datepicker.regional[ 'default' ]);
     })
 
 </script>