Commit 4c9871db authored by Laurent's avatar Laurent
Browse files

dev #86039 bundled holds : functional testing fix

parent 51cc941b
Pipeline #8274 failed with stage
in 33 minutes and 12 seconds
'86039' =>
['Label' => $this->_('PAIRING [Contractuel] BDP89 Specs prêt malle'),
'Desc' => '',
['Label' => $this->_('SIGB Koha : réservation calendaire de lots d\'exemplaires'),
'Desc' => $this->_('Vous pouvez configurer Bokeh pour utiliser un autre formulaire de réservation sur les exemplaires considérés comme des malles. Ce formulaire affichera les réservations déjà enregistrées, ainsi que la saisie de dates de début et de fin de prêt souhaitées'),
'Image' => '',
'Video' => '',
'Category' => '',
'Video' => 'https://youtu.be/Wtg53t7dsGs',
'Category' => $this->('Circulation'),
'Right' => function($feature_description, $user) {return true;},
'Wiki' => '',
'Wiki' => 'http://wiki.bokeh-library-portal.org/index.php?title=R%C3%A9servation_calendaire_de_lots',
'Test' => '',
'Date' => '2019-07-26'],
\ No newline at end of file
- ticket #86039 : PAIRING [Contractuel] BDP89 Specs prêt malle
\ No newline at end of file
- ticket #86039 : SIGB Koha : ajout de la réservation calendaire de lots d'exemplaires (malles)
\ No newline at end of file
......@@ -774,15 +774,22 @@ class RechercheController extends ZendAfi_Controller_Action {
Class_ScriptLoader::getInstance()
->addAdminScript('jquery_ui_datepicker_i18n/datepicker-fr.js')
->addJQueryReady('$.datepicker.setDefaults($.datepicker.regional["' . ((Zend_Registry::get('locale') == 'en_US') ? '' : 'fr' ). '"]);
->addJQueryReady('
Date.prototype.withoutTime = function () {
var d = new Date(this);
d.setHours(0, 0, 0, 0);
return d;
}
$.datepicker.setDefaults($.datepicker.regional["' . ((Zend_Registry::get('locale') == 'en_US') ? '' : 'fr' ). '"]);
$("input").blur();
$("#holds_view").datepicker(
{
numberOfMonths: 4,
numberOfMonths: 3,
beforeShowDay: function(date) {
var holds = '. $js_holds . ';
var day = date.withoutTime();
var hold = holds.find( (hold) => {
return (new Date(hold[0]) <= date) && (new Date(hold[1]) >= date);
return (new Date(hold[0]).withoutTime() <= day) && (day <= new Date(hold[1]).withoutTime());
});
if (undefined == hold)
......@@ -792,7 +799,7 @@ class RechercheController extends ZendAfi_Controller_Action {
}}
);');
return '<div id="holds_view"></div>' . $this->view->tag('div', $this->view->tag('ul',$html));
return '<div id="holds_view"></div>' . $this->view->tag('ul',$html);
}
......
......@@ -68,7 +68,7 @@ class ZendAfi_Controller_Plugin_InspectorGadget extends Zend_Controller_Plugin_A
if (!$this->isEnabled())
return $params;
$params[self::PARAM_NAME] = 1;
$params[self::PARAM_NAME] = $this->_keep ? 'keep' : 1;
return $params;
}
......
......@@ -226,7 +226,7 @@ class ZendAfi_Form_Cosmo_DataProfile extends ZendAfi_Form {
'champ_genre' => $this->_('genre'),
'champ_emplacement' => $this->_('emplacement'),
'champ_annexe' => $this->_('annexe'),
'champ_availability' => $this->_('disponilité'),
'champ_availability' => $this->_('disponibilité'),
'champ_bundle_id' => $this->_('identifiant de la notice de lot')];
return $this
......
......@@ -3770,8 +3770,22 @@ a[href*="bookmarked-searches/notify"] img {
}
/** bundled holds dialog **/
#holds_view .day-with-hold,
#holds_view .day-without-hold {
opacity: 1;
}
#holds_view .day-with-hold span { background-color: orange !important; }
#holds_view .day-without-hold span { background-color: green !important; }
#holds_view .day-without-hold span { background-color: #9bd99b !important; }
#holds_view .ui-datepicker-inline.ui-widget-content { border-width: 0px }
#holds_view .ui-datepicker-inline {
margin: 0 auto;
}
#holds_view .ui-datepicker-inline.ui-widget-content { border-width: 0px }
\ No newline at end of file
#holds_view + ul {
justify-content: center;
display: flex;
}
\ No newline at end of file
......@@ -488,7 +488,7 @@ class CommSigbMeuseKohaTest extends CommSigbTestCase {
/** @test */
public function holdsForItemShouldCallHolsForItemOnKohaService() {
public function holdsForItemShouldCallHoldsForItemOnKohaService() {
$item = $this->fixture('Class_Exemplaire',
['id' => '123',
'id_notice' => 7888,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment