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

(-)a/C4/Serials.pm (+10 lines)
Lines 31-36 use C4::Log; # logaction Link Here
31
use C4::Debug;
31
use C4::Debug;
32
use C4::Serials::Frequency;
32
use C4::Serials::Frequency;
33
use C4::Serials::Numberpattern;
33
use C4::Serials::Numberpattern;
34
use Koha::AdditionalField;
34
35
35
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
36
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
36
37
Lines 293-299 sub GetSubscription { Link Here
293
    my $sth = $dbh->prepare($query);
294
    my $sth = $dbh->prepare($query);
294
    $sth->execute($subscriptionid);
295
    $sth->execute($subscriptionid);
295
    my $subscription = $sth->fetchrow_hashref;
296
    my $subscription = $sth->fetchrow_hashref;
297
296
    $subscription->{cannotedit} = not can_edit_subscription( $subscription );
298
    $subscription->{cannotedit} = not can_edit_subscription( $subscription );
299
300
    # Add additional fields to the subscription into a new key "additional_fields"
301
    my $additional_field_values = Koha::AdditionalField->fetch_all_values({
302
            tablename => 'subscription',
303
            record_id => $subscriptionid,
304
    });
305
    $subscription->{additional_fields} = $additional_field_values->{$subscriptionid};
306
297
    return $subscription;
307
    return $subscription;
298
}
308
}
299
309
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt (+34 lines)
Lines 839-844 $(document).ready(function() { Link Here
839
                                    </div>
839
                                    </div>
840
                                </ol>
840
                                </ol>
841
                            </fieldset>
841
                            </fieldset>
842
843
                            [% IF additional_fields_for_subscription %]
844
                              <div id="subscription_additional_fields">
845
                                <fieldset class="rows">
846
                                  <legend>Additional fields</legend>
847
                                  <ol>
848
                                    [% FOR field IN additional_fields_for_subscription %]
849
                                      <li>
850
                                        <label for="additional_fields_[% field.name %]"> [% field.name %]: </label>
851
                                        [% IF field.authorised_value_choices %]
852
                                          <select name="additional_fields_[% field.name %]">
853
                                            [% FOREACH av IN field.authorised_value_choices %]
854
                                              [% IF av.authorised_value == additional_fields.${field.name} %]
855
                                                <option value="[% av.authorised_value %]" selected="selected">[% av.lib %]</option>
856
                                              [% ELSE %]
857
                                                <option value="[% av.authorised_value %]">[% av.lib %]</option>
858
                                              [% END %]
859
                                            [% END %]
860
                                          </select> (Authorised values for [% field.authorised_value_category %])
861
                                        [% ELSE %]
862
                                          [% IF field.marcfield %]
863
                                            <input type="text" value="[% additional_fields.${field.name} %]" name="additional_fields_[% field.name %]" readonly="readonly" />
864
                                            This value will be filled with the [% field.marcfield %] subfield of the selected biblio.
865
                                          [% ELSE %]
866
                                            <input type="text" value="[% additional_fields.${field.name} %]" name="additional_fields_[% field.name %]" />
867
                                          [% END %]
868
                                        [% END %]
869
                                      </li>
870
                                    [% END %]
871
                                  </ol>
872
                                </fieldset>
873
                              </div>
874
                            [% END %]
875
842
                            <fieldset class="action">
876
                            <fieldset class="action">
843
                                <input type="button" value="<< Previous" onclick="show_page_1();" style="float:left;"/>
877
                                <input type="button" value="<< Previous" onclick="show_page_1();" style="float:left;"/>
844
                                <input id="testpatternbutton" type="button" value="Test prediction pattern" onclick="testPredictionPattern();" />
878
                                <input id="testpatternbutton" type="button" value="Test prediction pattern" onclick="testPredictionPattern();" />
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt (-1 / +24 lines)
Lines 1-4 Link Here
1
[% USE Branches %]
1
[% USE Branches %]
2
[% USE KohaAuthorisedValues %]
2
[% INCLUDE 'doc-head-open.inc' %]
3
[% INCLUDE 'doc-head-open.inc' %]
3
<title>Koha &rsaquo; Serials &rsaquo; Details for subscription #[% subscriptionid %]</title>
4
<title>Koha &rsaquo; Serials &rsaquo; Details for subscription #[% subscriptionid %]</title>
4
[% INCLUDE 'doc-head-close.inc' %]
5
[% INCLUDE 'doc-head-close.inc' %]
Lines 122-128 $(document).ready(function() { Link Here
122
     </ol>
123
     </ol>
123
     </div>
124
     </div>
124
     </div>
125
     </div>
125
</div>
126
     </div>
127
128
     [% IF additional_fields_for_subscription %]
129
    <div class="yui-g">
130
      <div class="yui-u first">
131
        <div class="rows">
132
          <legend>Additional fields:</legend>
133
          <ol>
134
            [% FOR field IN additional_fields_for_subscription %]
135
              <li>
136
                <span class="label">[% field.name %]:</span>
137
                [% IF field.authorised_value_category %]
138
                  [% KohaAuthorisedValues.GetByCode( field.authorised_value_category, additional_fields.${field.name} ) %]
139
                [% ELSE %]
140
                  [% additional_fields.${field.name} %]
141
                [% END %]
142
              </li>
143
            [% END %]
144
          </ol>
145
        </div>
146
      </div>
147
      </div>
148
     [% END %]
126
</div>
149
</div>
127
150
128
    <div id="subscription_planning">
151
    <div id="subscription_planning">
(-)a/serials/subscription-add.pl (+41 lines)
Lines 32-37 use C4::Serials; Link Here
32
use C4::Serials::Frequency;
32
use C4::Serials::Frequency;
33
use C4::Serials::Numberpattern;
33
use C4::Serials::Numberpattern;
34
use C4::Letters;
34
use C4::Letters;
35
use Koha::AdditionalField;
35
use Carp;
36
use Carp;
36
37
37
#use Smart::Comments;
38
#use Smart::Comments;
Lines 151-156 my $locations_loop = GetAuthorisedValues("LOC",$subs->{'location'}); Link Here
151
$template->param(branchloop => $branchloop,
152
$template->param(branchloop => $branchloop,
152
    locations_loop=>$locations_loop,
153
    locations_loop=>$locations_loop,
153
);
154
);
155
156
157
my $additional_fields = Koha::AdditionalField->all( { table => 'subscription' } );
158
for my $field ( @$additional_fields ) {
159
    if ( $field->{authorised_value_category} ) {
160
        $field->{authorised_value_choices} = GetAuthorisedValues( $field->{authorised_value_category} );
161
    }
162
}
163
$template->param( additional_fields_for_subscription => $additional_fields );
164
154
# prepare template variables common to all $op conditions:
165
# prepare template variables common to all $op conditions:
155
if ($op!~/^mod/) {
166
if ($op!~/^mod/) {
156
    my $letters = get_letter_loop();
167
    my $letters = get_letter_loop();
Lines 333-338 sub redirect_add_subscription { Link Here
333
        $skip_serialseq
344
        $skip_serialseq
334
    );
345
    );
335
346
347
    my $additional_fields = Koha::AdditionalField->all( { table => 'subscription' } );
348
    my @additional_field_values;
349
    for my $field ( @$additional_fields ) {
350
        my $af = Koha::AdditionalField->new({ id => $field->{id} });
351
        $af->{values} = {
352
            $subscriptionid => $query->param('additional_fields_' . $field->{name})
353
        };
354
        $af->insert_values;
355
    }
356
336
    print $query->redirect("/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=$subscriptionid");
357
    print $query->redirect("/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=$subscriptionid");
337
    return;
358
    return;
338
}
359
}
Lines 408-413 sub redirect_mod_subscription { Link Here
408
        $skip_serialseq
429
        $skip_serialseq
409
    );
430
    );
410
431
432
    my $additional_fields = Koha::AdditionalField->all( { table => 'subscription' } );
433
    my @additional_field_values;
434
    for my $field ( @$additional_fields ) {
435
        my $af = Koha::AdditionalField->new({ id => $field->{id} })->fetch;
436
        if ( $af->{marcfield} ) {
437
            my $record = GetMarcBiblio( $biblionumber, 1 );
438
            my ( $field, $subfield ) = split /\$/, $af->{marcfield};
439
            next unless $field and $subfield;
440
            my $value = $record->subfield( $field, $subfield );
441
            $af->{values} = {
442
                $subscriptionid => $value
443
            };
444
        } else {
445
            $af->{values} = {
446
                $subscriptionid => $query->param('additional_fields_' . $field->{name})
447
            };
448
        }
449
        $af->insert_values;
450
    }
451
411
    print $query->redirect("/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=$subscriptionid");
452
    print $query->redirect("/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=$subscriptionid");
412
    return;
453
    return;
413
}
454
}
(-)a/serials/subscription-detail.pl (-1 / +8 lines)
Lines 139-144 if ( defined $subscriptionid ) { Link Here
139
    }
139
    }
140
}
140
}
141
141
142
my $additional_fields = Koha::AdditionalField->all( { tablename => 'subscription' } );
143
for my $field ( @$additional_fields ) {
144
    if ( $field->{authorised_value_category} ) {
145
        $field->{authorised_value_choices} = GetAuthorisedValues( $field->{authorised_value_category} );
146
    }
147
}
148
$template->param( additional_fields_for_subscription => $additional_fields );
149
142
$template->param(
150
$template->param(
143
    subscriptionid => $subscriptionid,
151
    subscriptionid => $subscriptionid,
144
    serialslist => \@serialslist,
152
    serialslist => \@serialslist,
145
- 

Return to bug 10855