Merge pull request #748 from campusdomar/bugfix_543_last_updates_scroll

#543 SchemaBundle: Changed limit search in LastestUploads
campusdomar · Jun 19, 2018 · 67f590c · 67f590c
2 parents fc3bab5 + 415692b
commit 67f590c
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 23 deletions.
diff --git a/src/Pumukit/SchemaBundle/Services/AnnounceService.php b/src/Pumukit/SchemaBundle/Services/AnnounceService.php
@@ -118,18 +118,28 @@ public function getLatestUploadsByDates($dateStart, $dateEnd, $withPudenewTag =
      */
     public function getNextLatestUploads($date, $withPudenewTag = true)
     {
-        $counter = 0;
         $dateStart = clone $date;
         $dateStart->modify('first day of next month');
         $dateEnd = clone $date;
         $dateEnd->modify('last day of next month');
         $dateEnd->setTime(23, 59, 59);
+
+        $queryBuilderMms = $this->mmobjRepo->createQueryBuilder();
+        $queryBuilderMms->sort('public_date', 'asc');
+        $queryBuilderMms->field('tags.cod')->equals('PUDENEW');
+        $queryBuilderMms->limit(1);
+
+        $lastMm = $queryBuilderMms->getQuery()->getSingleResult();
+
         do {
-            ++$counter;
             $dateStart->modify('first day of last month');
             $dateEnd->modify('last day of last month');
             $last = $this->getLatestUploadsByDates($dateStart, $dateEnd, $withPudenewTag);
-        } while (empty($last) && $counter < 24);
+        } while (empty($last) && $lastMm && $lastMm->getPublicDate() <= $dateEnd);
+
+        if (empty($last)) {
+            $dateEnd = null;
+        }
 
         return array($dateEnd, $last);
     }

diff --git a/src/Pumukit/SchemaBundle/Tests/Services/AnnounceServiceTest.php b/src/Pumukit/SchemaBundle/Tests/Services/AnnounceServiceTest.php
@@ -4,9 +4,6 @@
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use Pumukit\SchemaBundle\Document\Series;
-use Pumukit\SchemaBundle\Document\SeriesType;
-use Pumukit\SchemaBundle\Document\MultimediaObject;
-use Pumukit\SchemaBundle\Document\Role;
 use Pumukit\SchemaBundle\Document\Tag;
 
 class AnnounceServiceTest extends WebTestCase
@@ -93,6 +90,7 @@ public function testGetLast()
 
         $this->assertEquals(array(), $this->announceService->getLast());
     }
+
     public function testNextLatestUploads()
     {
         $tagPudenew = new Tag();
@@ -147,14 +145,6 @@ public function testNextLatestUploads()
         $dateEnd->modify('first day of last month');
         list($dateEnd, $last) = $this->announceService->getNextLatestUploads($dateEnd);
         $this->assertEquals(array(), $last);
-        $this->assertEquals('04/1997', $dateEnd->format('m/Y'));
-        $dateEnd->modify('first day of last month');
-        list($dateEnd, $last) = $this->announceService->getNextLatestUploads($dateEnd);
-        $this->assertEquals(array(), $last);
-        $this->assertEquals('04/1995', $dateEnd->format('m/Y'));
-        $dateEnd->modify('first day of last month');
-        list($dateEnd, $last) = $this->announceService->getNextLatestUploads($dateEnd, false);
-        $this->assertEquals(array(), $last);
-        $this->assertEquals('04/1993', $dateEnd->format('m/Y'));
+        $this->assertEquals(null, $dateEnd);
     }
 }
diff --git a/src/Pumukit/WebTVBundle/Controller/AnnouncesController.php b/src/Pumukit/WebTVBundle/Controller/AnnouncesController.php
@@ -40,16 +40,18 @@ public function latestUploadsPagerAction(Request $request)
             throw $this->createNotFoundException();
         }
         list($date, $last) = $announcesService->getNextLatestUploads($date, $showPudenew);
-        if (empty($last)) {
-            $dateHeader = '---';
-        } else {
+
+        $response = new Response();
+        $dateHeader = '---';
+
+        if (!empty($last)) {
+            $response = new Response($this->renderView('PumukitWebTVBundle:Announces:latestUploadsPager.html.twig', array('last' => $last, 'date' => $date, 'number_cols' => $numberCols)), 200);
             $dateHeader = $date->format('m/Y');
+            $response->headers->set('X-Date-Month', $date->format('m'));
+            $response->headers->set('X-Date-Year', $date->format('Y'));
         }
 
-        $response = new Response($this->renderView('PumukitWebTVBundle:Announces:latestUploadsPager.html.twig', array('last' => $last, 'date' => $date, 'number_cols' => $numberCols)), 200);
         $response->headers->set('X-Date', $dateHeader);
-        $response->headers->set('X-Date-Month', $date->format('m'));
-        $response->headers->set('X-Date-Year', $date->format('Y'));
 
         return $response;
     }

diff --git a/src/Pumukit/WebTVBundle/Resources/public/js/announces_ajax.js b/src/Pumukit/WebTVBundle/Resources/public/js/announces_ajax.js
@@ -32,8 +32,9 @@ jQuery(document).ready(function() {
     };
     var now = new Date();
     var anDate = new AnnounceDate( now.getMonth() + 1, now.getFullYear()  );
+    var emptyMmos = true;
 
-    function reloadMoreData()
+    function reloadMoreData(emptyMmos)
     {
         if( month_loaded && !in_array(anDate,loaded_months))
         {
@@ -53,11 +54,14 @@ jQuery(document).ready(function() {
                     if( $('.main-content').height() <= $(window).height() ) {
                         reloadMoreData();
                     }
+                }else if( emptyMmos ){
+                    emptyMmos = false;
+                    $(noMmo).show();
                 }
             });
         }
     }
-    reloadMoreData();
+    reloadMoreData(emptyMmos);
     $(window).scroll(function () {
         if ($(window).scrollTop() + window.innerHeight + $('footer').height() >= $(document).height()) {
             reloadMoreData();

diff --git a/src/Pumukit/WebTVBundle/Resources/translations/messages.es.xlf b/src/Pumukit/WebTVBundle/Resources/translations/messages.es.xlf
@@ -472,6 +472,10 @@
         <source>Try searching for something else:</source>
         <target>Prueba a buscar otra cosa:</target>
       </trans-unit>
+      <trans-unit id="004b3a52924c1c8012893ca4ed30ddc7" resname="There are no multimedia objects">
+        <source>There are no multimedia objects</source>
+        <target>No hay objetos multimedia</target>
+      </trans-unit>
     </body>
   </file>
 </xliff>
diff --git a/src/Pumukit/WebTVBundle/Resources/views/Announces/latestUploads.html.twig b/src/Pumukit/WebTVBundle/Resources/views/Announces/latestUploads.html.twig
@@ -9,6 +9,11 @@
   <h1 class="title-for-crumbs">{{template_title}}</h1>
   <div class="announces" id="announces">
   </div>
+  <div class="noMmo" id="noMmo" hidden>
+    <h2>
+      {% trans %}There are no multimedia objects{% endtrans %}
+    </h2>
+  </div>
   <div id="announces_loading" style="display:none"><img class="center-block" src="{{ asset('bundles/pumukitwebtv/images/icons/spinner.gif') }}"/></div>
   <script type="text/javascript">
    var url_latestuploads_pager = "{{ path('pumukit_webtv_announces_latestuploads_pager') }}";