diff --git a/lib/Alchemy/Phrasea/Controller/LightboxController.php b/lib/Alchemy/Phrasea/Controller/LightboxController.php index 42546d93ce..0369341102 100644 --- a/lib/Alchemy/Phrasea/Controller/LightboxController.php +++ b/lib/Alchemy/Phrasea/Controller/LightboxController.php @@ -96,7 +96,7 @@ class LightboxController extends Controller $basket = $basketElement->getBasket(); $ret = []; - $ret['number'] = $basketElement->getRecord($this->app)->get_number(); + $ret['number'] = $basketElement->getRecord($this->app)->getNumber(); $ret['title'] = $basketElement->getRecord($this->app)->get_title(); $ret['preview'] = $this->render( @@ -143,7 +143,7 @@ class LightboxController extends Controller } $ret = []; - $ret['number'] = $record->get_number(); + $ret['number'] = $record->getNumber(); $ret['title'] = $record->get_title(); $ret['preview'] = $this->render('common/preview.html.twig', [ 'record' => $record, diff --git a/lib/Alchemy/Phrasea/Controller/Prod/EditController.php b/lib/Alchemy/Phrasea/Controller/Prod/EditController.php index 1e66c96b56..f32732a336 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/EditController.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/EditController.php @@ -144,7 +144,7 @@ class EditController extends Controller /** @var \record_adapter $record */ foreach ($records as $record) { - $indice = $record->get_number(); + $indice = $record->getNumber(); $elements[$indice] = [ 'bid' => $record->get_base_id(), 'rid' => $record->get_record_id(), diff --git a/lib/Alchemy/Phrasea/Controller/Prod/RecordController.php b/lib/Alchemy/Phrasea/Controller/Prod/RecordController.php index 65d83526bd..2bfa7d30aa 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/RecordController.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/RecordController.php @@ -104,7 +104,7 @@ class RecordController extends Controller "tools" => $this->render('prod/preview/tools.html.twig', [ 'record' => $record, ]), - "pos" => $record->get_number(), + "pos" => $record->getNumber(), "title" => str_replace(array('[[em]]', '[[/em]]'), array('', ''), $record->get_title($query, $searchEngine)), "collection_name" => $record->get_collection()->get_name(), "collection_logo" => $record->get_collection()->getLogo($record->get_base_id(), $this->app), diff --git a/lib/Alchemy/Phrasea/Controller/RecordsRequest.php b/lib/Alchemy/Phrasea/Controller/RecordsRequest.php index 7968c189d5..0d3257c290 100644 --- a/lib/Alchemy/Phrasea/Controller/RecordsRequest.php +++ b/lib/Alchemy/Phrasea/Controller/RecordsRequest.php @@ -65,7 +65,7 @@ class RecordsRequest extends ArrayCollection $i = 0; $records = $this->toArray(); array_walk($records, function ($record) use (&$i) { - $record->set_number($i++); + $record->setNumber($i++); }); } diff --git a/lib/Alchemy/Phrasea/Out/Module/PDF.php b/lib/Alchemy/Phrasea/Out/Module/PDF.php index 1f69fb1076..20658b6e27 100644 --- a/lib/Alchemy/Phrasea/Out/Module/PDF.php +++ b/lib/Alchemy/Phrasea/Out/Module/PDF.php @@ -75,7 +75,7 @@ class PDF break; } - $record->set_number(count($list) + 1); + $record->setNumber(count($list) + 1); $list[] = $record; } @@ -194,7 +194,7 @@ class PDF if ($links) { $lk = $this->pdf->AddLink(); - $this->pdf->SetLink($lk, 0, $npages + $rec->get_number()); + $this->pdf->SetLink($lk, 0, $npages + $rec->getNumber()); $this->pdf->Image( $fimg , $x + (($DiapoW - $wimg) / 2) @@ -327,7 +327,7 @@ class PDF $this->pdf->AddPage(); if ($withtdm === "CALCPAGES") { - $rec->set_number($this->pdf->PageNo()); + $rec->setNumber($this->pdf->PageNo()); } $lmargin = $this->pdf->GetX(); $himg = 0; diff --git a/lib/classes/record/adapter.php b/lib/classes/record/adapter.php index 979a064684..c13e037920 100644 --- a/lib/classes/record/adapter.php +++ b/lib/classes/record/adapter.php @@ -150,7 +150,7 @@ class record_adapter implements RecordInterface, cache_cacheableInterface /** * @return int */ - public function get_number() + public function getNumber() { return $this->number; } @@ -158,10 +158,10 @@ class record_adapter implements RecordInterface, cache_cacheableInterface /** * Set a relative number (order) for the current in its set * - * @param int $number - * @return record_adapter + * @param int $number + * @return $this */ - public function set_number($number) + public function setNumber($number) { $this->number = (int) $number; diff --git a/lib/classes/record/preview.php b/lib/classes/record/preview.php index e8d55eef60..43dddeb701 100644 --- a/lib/classes/record/preview.php +++ b/lib/classes/record/preview.php @@ -129,7 +129,7 @@ class record_preview extends record_adapter $sbas_id = $child->get_sbas_id(); $this->original_item = $child; $record_id = $child->get_record_id(); - if ($child->get_number() == $pos) + if ($child->getNumber() == $pos) break; } $number = $pos; @@ -277,20 +277,20 @@ class record_preview extends record_adapter switch ($this->env) { case "RESULT": - $this->title .= $this->app->trans('resultat numero %number%', ['%number%' => '' . ($this->get_number() + 1) . ' : ']); + $this->title .= $this->app->trans('resultat numero %number%', ['%number%' => '' . ($this->getNumber() + 1) . ' : ']); $this->title .= parent::get_title($highlight, $searchEngine); break; case "BASK": $this->title .= $this->name . ' - ' . parent::get_title($highlight, $searchEngine) - . ' (' . $this->get_number() . '/' . $this->total . ') '; + . ' (' . $this->getNumber() . '/' . $this->total . ') '; break; case "REG": $title = parent::get_title(); - if ($this->get_number() == 0) { + if ($this->getNumber() == 0) { $this->title .= $title; } else { $this->title .= sprintf( - '%s %s', $title, $this->get_number() . '/' . $this->total + '%s %s', $title, $this->getNumber() . '/' . $this->total ); } break; diff --git a/templates/web/client/answers.html.twig b/templates/web/client/answers.html.twig index b233cd326c..f70c21f41e 100644 --- a/templates/web/client/answers.html.twig +++ b/templates/web/client/answers.html.twig @@ -161,7 +161,7 @@ {% if record.is_grouping %} {% set on_click_html = "openPreview('REG',0, '" ~ record.get_serialize_key() ~ "');" %} {% else %} - {% set on_click_html = "openPreview('RESULT','" ~ record.get_number() ~ "');" %} + {% set on_click_html = "openPreview('RESULT','" ~ record.getNumber() ~ "');" %} {% endif %} {% if mod_col == 1 %} diff --git a/templates/web/client/baskets.html.twig b/templates/web/client/baskets.html.twig index 5cba6afbb3..d298633141 100644 --- a/templates/web/client/baskets.html.twig +++ b/templates/web/client/baskets.html.twig @@ -94,13 +94,13 @@ {% set tooltip = '' %} {% if app['conf'].get(['registry', 'classic', 'basket-rollover']) %} - {% set tooltip = path('prod_tooltip_caption', { 'sbas_id' : record.get_sbas_id(), 'record_id' : record.get_record_id(), 'context' : 'basket', 'number' : record.get_number() }) %} + {% set tooltip = path('prod_tooltip_caption', { 'sbas_id' : record.get_sbas_id(), 'record_id' : record.get_record_id(), 'context' : 'basket', 'number' : record.getNumber() }) %} {% endif %}
-
{{element.getRecord(app).get_number()}}
+
{{element.getRecord(app).getNumber()}}
{% if basket.getValidation() %}
- {% set record = element.getRecord(app).set_number(loop.index) %} -
{{record.get_number()}}
+ {% set record = element.getRecord(app).setNumber(loop.index) %} +
{{record.getNumber()}}
{% if basket.getValidation() %}
{% for element in story.get_children() %} - + {% endfor %}
@@ -28,7 +28,7 @@
- +
{% endfor %} diff --git a/templates/web/prod/WorkZone/Macros.html.twig b/templates/web/prod/WorkZone/Macros.html.twig index a1e63b2dae..7938de1ac1 100644 --- a/templates/web/prod/WorkZone/Macros.html.twig +++ b/templates/web/prod/WorkZone/Macros.html.twig @@ -294,7 +294,7 @@
{% endif %}
- {{record.get_number()}} + {{record.getNumber()}}
{{thumbnail.format(record.get_thumbnail,82,82, '', true, false)}}
@@ -312,7 +312,7 @@ X {% if app['settings'].getUserSetting(app.getAuthenticatedUser(), 'basket_caption_display') == '1' %} -
+
{% endif %}
diff --git a/templates/web/prod/WorkZone/Story.html.twig b/templates/web/prod/WorkZone/Story.html.twig index d8316c7b70..ff03cc52e3 100644 --- a/templates/web/prod/WorkZone/Story.html.twig +++ b/templates/web/prod/WorkZone/Story.html.twig @@ -75,7 +75,7 @@ {% for record in Story.get_children().get_elements() %} - {{ Macros.element('groupings', Story, record, record, record.get_number()) }} + {{ Macros.element('groupings', Story, record, record, record.getNumber()) }} {% endfor %}
diff --git a/templates/web/prod/actions/edit_default.html.twig b/templates/web/prod/actions/edit_default.html.twig index c101d66807..702973b1a5 100644 --- a/templates/web/prod/actions/edit_default.html.twig +++ b/templates/web/prod/actions/edit_default.html.twig @@ -8,7 +8,7 @@ {% set cont_height = app['settings'].getUserSetting(app.getAuthenticatedUser(), 'editing_images_size') %} {% endif %} - {% set i = record.get_number() %} + {% set i = record.getNumber() %} {% set thumbnail = record.get_thumbnail().get_url() %} {% set ratio = 80 %} {% set width = record.get_thumbnail().get_width() %} diff --git a/templates/web/prod/preview/basket_train.html.twig b/templates/web/prod/preview/basket_train.html.twig index 3741fa220f..3e3fbfb768 100644 --- a/templates/web/prod/preview/basket_train.html.twig +++ b/templates/web/prod/preview/basket_train.html.twig @@ -29,7 +29,7 @@ ) %} -
  • +
  • +
  • - +
    @@ -66,7 +66,7 @@ class="previewTips">
    {% endif %} {% if rollover_thumbnail == 'preview' %} -
    {% endif %} {% if technical_display == '1' %} diff --git a/tests/classes/record/adapterTest.php b/tests/classes/record/adapterTest.php index 50f7b318e2..d8460a6988 100644 --- a/tests/classes/record/adapterTest.php +++ b/tests/classes/record/adapterTest.php @@ -121,22 +121,17 @@ class record_adapterTest extends \PhraseanetAuthenticatedTestCase ); } - public function testGet_number() + public function testNumber() { $record_1 = $this->getRecord1(); - $record_1->set_number(24); - $this->assertEquals(24, $record_1->get_number()); - $record_1->set_number(42); - $this->assertEquals(42, $record_1->get_number()); - $record_1->set_number(0); - $this->assertEquals(0, $record_1->get_number()); - $record_1->set_number(null); - $this->assertEquals(0, $record_1->get_number()); - } - - public function testSet_number() - { - $this->testGet_number(); + $record_1->setNumber(24); + $this->assertEquals(24, $record_1->getNumber()); + $record_1->setNumber(42); + $this->assertEquals(42, $record_1->getNumber()); + $record_1->setNumber(0); + $this->assertEquals(0, $record_1->getNumber()); + $record_1->setNumber(null); + $this->assertEquals(0, $record_1->getNumber()); } public function testSet_type()