View | Details | Raw Unified | Return to bug 22188
Collapse All | Expand All

(-)a/C4/Serials.pm (-1 / +2 lines)
Lines 340-346 sub GetFullSubscription { Link Here
340
            aqbooksellers.name as aqbooksellername,
340
            aqbooksellers.name as aqbooksellername,
341
            biblio.title as bibliotitle,
341
            biblio.title as bibliotitle,
342
            subscription.branchcode AS branchcode,
342
            subscription.branchcode AS branchcode,
343
            subscription.subscriptionid AS subscriptionid
343
            subscription.subscriptionid AS subscriptionid,
344
            subscription.pubdatepatternformat AS dateformat
344
  FROM      serial 
345
  FROM      serial 
345
  LEFT JOIN subscription ON 
346
  LEFT JOIN subscription ON 
346
          (serial.subscriptionid=subscription.subscriptionid )
347
          (serial.subscriptionid=subscription.subscriptionid )
(-)a/koha-tmpl/intranet-tmpl/prog/js/subscription-add.js (-1 / +1 lines)
Lines 353-359 function testPredictionPattern() { Link Here
353
    for(i in ajaxParams) {
353
    for(i in ajaxParams) {
354
        var param = ajaxParams[i];
354
        var param = ajaxParams[i];
355
        var value = $("#"+param).val();
355
        var value = $("#"+param).val();
356
        if(value.length > 0)
356
        if(value && value.length > 0)
357
            ajaxData[param] = value;
357
            ajaxData[param] = value;
358
    }
358
    }
359
359
(-)a/serials/serials-collection.pl (+13 lines)
Lines 180-185 if (@subscriptionid){ Link Here
180
180
181
  $template->param(closed => $closed);
181
  $template->param(closed => $closed);
182
  $subscriptions=PrepareSerialsData(\@subscriptioninformation);
182
  $subscriptions=PrepareSerialsData(\@subscriptioninformation);
183
  foreach (@{$subscriptions->[0]->{serials}}) {
184
      if ( $_->{serialseq} eq "pubdate" ) {
185
          if ( $_->{dateformat} eq 'dmy' ){
186
              $_->{serialseq} = dt_from_string( $_->{publisheddate} )->strftime('%d %B %Y');
187
          } elsif ( $_->{dateformat} eq 'mdy' ){
188
              $_->{serialseq} = dt_from_string( $_->{publisheddate} )->strftime('%B %d %Y');
189
          } elsif ( $_->{dateformat} eq 'ydm' ){
190
              $_->{serialseq} = dt_from_string( $_->{publisheddate} )->strftime('%Y %d %B');
191
          } else {
192
              $_->{serialseq} = dt_from_string( $_->{publisheddate} )->strftime('%Y %B %d');
193
          }
194
      }
195
  }
183
  $subscriptioncount = CountSubscriptionFromBiblionumber($subscriptiondescs->[0]{'biblionumber'});
196
  $subscriptioncount = CountSubscriptionFromBiblionumber($subscriptiondescs->[0]{'biblionumber'});
184
} else {
197
} else {
185
  $subscriptiondescs = GetSubscriptionsFromBiblionumber($biblionumber);
198
  $subscriptiondescs = GetSubscriptionsFromBiblionumber($biblionumber);
(-)a/serials/showpredictionpattern.pl (-2 / +1 lines)
Lines 121-127 if(defined $subscriptionid) { Link Here
121
my @predictions_loop;
121
my @predictions_loop;
122
my ($calculated) = GetSeq(\%subscription, \%pattern);
122
my ($calculated) = GetSeq(\%subscription, \%pattern);
123
123
124
my $dateformat = scalar $input->param('date_format');
124
my $dateformat = scalar $input->param('date_format') // '';
125
125
126
if ($calculated eq "pubdate"){
126
if ($calculated eq "pubdate"){
127
    if ( $dateformat eq 'dmy' ){
127
    if ( $dateformat eq 'dmy' ){
128
- 

Return to bug 22188