From d0229a96843ac74b875d400b723856194303212e Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 10 Jul 2012 14:11:26 +0200 Subject: [PATCH] Bug 7688: replace yui datepicker with jQuery datepicker (subscription-add) --- .../prog/en/modules/serials/subscription-add.tt | 96 +++----------------- serials/subscription-add.pl | 2 +- 2 files changed, 13 insertions(+), 85 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt index 3f0ac56..dfb0bd0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt @@ -81,11 +81,11 @@ function Check_page2(){ alert(_("You must choose a frequency")); return false; } - if($("#startdate").val().length == 0){ + if($("input[name='startdate']").val().length == 0){ alert(_("You must choose a start date")); return false; } - if($("#sublength").val().length == 0 && $("#enddate").val().length == 0){ + if($("#sublength").val().length == 0 && $("input[name='enddate']").val().length == 0){ alert(_("You must choose a subscription length or an end date.")); return false; } @@ -286,7 +286,7 @@ function testPredictionPattern() { 'firstacquidate': acquidate }; var ajaxParams = [ - 'enddate', 'subtype', 'sublength', 'frequency', 'numberingmethod', + 'to', 'subtype', 'sublength', 'frequency', 'numberingmethod', 'lastvalue1', 'lastvalue2', 'lastvalue3', 'add1', 'add2', 'add3', 'every1', 'every2', 'every3', 'innerloop1', 'innerloop2', 'innerloop3', 'setto1', 'setto2', 'setto3', 'numbering1', 'numbering2', 'numbering3', @@ -370,7 +370,7 @@ function show_page_2() { $(document).ready(function() { $("select#frequency").change(function(){ patternneedtobetested = 1; - $("#enddate").val(''); + $("input[name='enddate']").val(''); frequencyload(); }); $("select#numberpattern").change(function(){ @@ -378,10 +378,10 @@ $(document).ready(function() { numberpatternload(); }); $("#subtype").change(function(){ - $("#enddate").val(''); + $("input[name='enddate']").val(''); }); $("#sublength").change(function(){ - $("#enddate").val(''); + $("input[name='enddate']").val(''); }); $("#lastvaluetemp1").keyup(function(){ $("#lastvalue1").val($(this).val()); @@ -616,51 +616,16 @@ $(document).ready(function() {
  • [% UNLESS (more_than_one_serial) %] - - Show Calendar - - - + [% ELSE %] - [% firstacquidate %] - + [% firstacquidate | $KohaDates %] + [% END %]
  • [% IF (more_than_one_serial) %]
  • - - Show Calendar - - +
  • [% END %]
  • @@ -688,48 +653,11 @@ $(document).ready(function() {
  • - - Show Calendar - - - +
  • - - Χ - Show Calendar - - - +
  • diff --git a/serials/subscription-add.pl b/serials/subscription-add.pl index a02643f..cddd485 100755 --- a/serials/subscription-add.pl +++ b/serials/subscription-add.pl @@ -81,7 +81,7 @@ if ($op eq 'modify' || $op eq 'dup' || $op eq 'modsubscription') { if ($subs->{$_} eq '0000-00-00') { $subs->{$_} = '' } else { - $subs->{$_} = format_date($subs->{$_}); + $subs->{$_} = $subs->{$_}; } } if (!defined $subs->{letter}) { -- 1.7.7.3