From e861a794c38340a61c10204c3bd46a15419e9fe9 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 15 Aug 2013 10:06:29 -0400 Subject: [PATCH] Bug 10661 - Mandatory item fields should be formatted the same on all forms Mandatory item fields are not indicated the same way in all places. This patch corrects two places where required fields were shown in bold rather than using the standard "required" class: When adding an order from a staged file and when adding an item for a new issue of a serial. This patch also normalizes the text input size on item entry forms: In some places it was 50, others 67. I have changed the latter to 50. Unrelated changes: Added $KohaDates formatting of date and time and corrected capitalization on a heading on the add order from staged file page. It would be nice to be able to use the same method for displaying the item form as we use on neworderentry.tt -- pulling in the form from a separate include. However that system is designed for handling multiple items and would need to be adapted for these cases. To test, you must have a staged file from which to add an order. Open an existing basket or create a new one and choose to add an order "From a staged file." Choose a staged file from which to order. The item entry form under the "Import all" heading should show required fields in red. To test in serials: Begin the process for receiving an item from an existing subscription. On the serials-edit page, find the "Click to add item" links and click to open the item edit forms. There should be one under the numbered issue and the supplemental issue forms. In both cases the item edit screen should show the mandatory item fields in red. Confirm that the cataloging add item form looks correct and works correctly. Revision: Left out the "required" note which should appear after each required field. Signed-off-by: David Cook Signed-off-by: Brendan Gallagher --- C4/Items.pm | 10 +++++----- cataloguing/additem.pl | 2 +- .../prog/en/modules/acqui/addorderiso2709.tt | 12 ++++++++---- .../prog/en/modules/serials/serials-edit.tt | 17 ++++++++++++----- tools/batchMod.pl | 2 +- 5 files changed, 27 insertions(+), 16 deletions(-) diff --git a/C4/Items.pm b/C4/Items.pm index 67d8736..98a9e8d 100644 --- a/C4/Items.pm +++ b/C4/Items.pm @@ -2780,21 +2780,21 @@ sub PrepareItemrecordDisplay { my $extended_param = plugin_parameters( $dbh, undef, $tagslib, $subfield_data{id}, undef ); my ( $function_name, $javascript ) = plugin_javascript( $dbh, undef, $tagslib, $subfield_data{id}, undef ); $subfield_data{random} = int(rand(1000000)); # why do we need 2 different randoms? - $subfield_data{marc_value} = qq[ ... $javascript]; } else { warn "Plugin Failed: $plugin"; - $subfield_data{marc_value} = qq(); # supply default input form + $subfield_data{marc_value} = qq(); # supply default input form } } elsif ( $tag eq '' ) { # it's an hidden field - $subfield_data{marc_value} = qq(); + $subfield_data{marc_value} = qq(); } elsif ( $tagslib->{$tag}->{$subfield}->{'hidden'} ) { # FIXME: shouldn't input type be "hidden" ? - $subfield_data{marc_value} = qq(); + $subfield_data{marc_value} = qq(); } elsif ( length($defaultvalue) > 100 or (C4::Context->preference("marcflavour") eq "UNIMARC" and @@ -2803,7 +2803,7 @@ sub PrepareItemrecordDisplay { 500 <= $tag && $tag < 600 ) ) { # oversize field (textarea) - $subfield_data{marc_value} = qq(\n"); + $subfield_data{marc_value} = qq(\n"); } else { $subfield_data{marc_value} = ""; } diff --git a/cataloguing/additem.pl b/cataloguing/additem.pl index a819019..c1eb2e2 100755 --- a/cataloguing/additem.pl +++ b/cataloguing/additem.pl @@ -154,7 +154,7 @@ sub generate_subfield_form { my $input = new CGI; $value = $input->param('barcode'); } - my $attributes_no_value = qq(tabindex="1" id="$subfield_data{id}" name="field_value" class="input_marceditor" size="67" maxlength="$subfield_data{maxlength}" ); + my $attributes_no_value = qq(tabindex="1" id="$subfield_data{id}" name="field_value" class="input_marceditor" size="50" maxlength="$subfield_data{maxlength}" ); my $attributes_no_value_textarea = qq(tabindex="1" id="$subfield_data{id}" name="field_value" class="input_marceditor" rows="5" cols="64" ); my $attributes = qq($attributes_no_value value="$value" ); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt index 62f1519..0dee110 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt @@ -50,7 +50,7 @@
[% IF ( batch_details ) %]

Add orders from [% comments %] - ([% file_name %] staged on [% upload_timestamp %]) + ([% file_name %] staged on [% upload_timestamp | $KohaDates with_hours => 1 %])

@@ -121,7 +121,7 @@
[% IF ( import_batch_id ) %]
-

Import All

+

Import all

Import all the lines in the basket with the following parameters:

@@ -146,14 +146,18 @@
    [% FOREACH iteminformatio IN item.iteminformation %]
  1. - - + [% IF (iteminformatio.mandatory) %] + + [% ELSE %] + + [% END %] [% iteminformatio.marc_value %] + [% IF ( iteminformatio.mandatory ) %] Required[% END %]
    2. [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt index 8f9ea5f..1599bfd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt @@ -236,8 +236,11 @@ $(document).ready(function() {
    [% FOREACH iteminformatio IN item.iteminformation %]
  1. - - + [% IF (iteminformatio.mandatory) %] + + [% ELSE %] + + [% END %] [% iteminformatio.marc_value %] @@ -249,7 +252,7 @@ $(document).ready(function() { Clone [% END %] - + [% IF ( iteminformatio.mandatory ) %] Required[% END %]
    2. [% END %]
@@ -344,8 +347,11 @@ $(document).ready(function() {
    [% FOREACH iteminformatio IN newserialloo.iteminformation %]
  1. - - + [% IF (iteminformatio.mandatory) %] + + [% ELSE %] + + [% END %] [% iteminformatio.marc_value %] @@ -357,6 +363,7 @@ $(document).ready(function() { Clone [% END %] + [% IF ( iteminformatio.mandatory ) %] Required[% END %]
    2. [% END %]
diff --git a/tools/batchMod.pl b/tools/batchMod.pl index 69762b1..5069d91 100755 --- a/tools/batchMod.pl +++ b/tools/batchMod.pl @@ -331,7 +331,7 @@ foreach my $tag (sort keys %{$tagslib}) { $subfield_data{visibility} = "display:none;" if (($tagslib->{$tag}->{$subfield}->{hidden} > 4) || ($tagslib->{$tag}->{$subfield}->{hidden} < -4)); # testing branch value if IndependentBranches. - my $attributes_no_value = qq(tabindex="1" id="$subfield_data{id}" name="field_value" class="input_marceditor" size="67" maxlength="255" ); + my $attributes_no_value = qq(tabindex="1" id="$subfield_data{id}" name="field_value" class="input_marceditor" size="50" maxlength="255" ); my $attributes = qq($attributes_no_value value="$value" ); if ( $tagslib->{$tag}->{$subfield}->{authorised_value} ) { -- 1.7.10.4