From 91f6ab56fd3b191ebe4b5ea87a70e612b9ed2b6d Mon Sep 17 00:00:00 2001 From: Juan Romay Sieira Date: Thu, 21 Jun 2012 12:03:36 +0200 Subject: [PATCH] Bug 6138 - Show local help and isbd punctuation automatically when we are cataloguing --- C4/Biblio.pm | 8 ++- admin/marc_subfields_structure.pl | 16 ++++-- cataloguing/addbiblio.pl | 11 ++++ installer/data/mysql/kohastructure.sql | 2 + installer/data/mysql/updatedatabase.pl | 9 ++++ koha-tmpl/intranet-tmpl/prog/en/css/addbiblio.css | 5 ++ koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js | 55 ++++++++++++++++++++ .../en/modules/admin/marc_subfields_structure.tt | 4 ++ .../prog/en/modules/cataloguing/addbiblio.tt | 25 ++++++++- 9 files changed, 129 insertions(+), 6 deletions(-) diff --git a/C4/Biblio.pm b/C4/Biblio.pm index 7d28ccd..b47319c 100644 --- a/C4/Biblio.pm +++ b/C4/Biblio.pm @@ -1118,7 +1118,7 @@ sub GetMarcStructure { } $sth = $dbh->prepare( - "SELECT tagfield,tagsubfield,liblibrarian,libopac,tab,mandatory,repeatable,authorised_value,authtypecode,value_builder,kohafield,seealso,hidden,isurl,link,defaultvalue,maxlength + "SELECT tagfield,tagsubfield,liblibrarian,libopac,tab,mandatory,repeatable,authorised_value,authtypecode,value_builder,kohafield,seealso,hidden,isurl,link,defaultvalue,maxlength,punctuation,help FROM marc_subfield_structure WHERE frameworkcode=? ORDER BY tagfield,tagsubfield @@ -1138,11 +1138,13 @@ sub GetMarcStructure { my $link; my $defaultvalue; my $maxlength; + my $punctuation; + my $help; while ( ( $tag, $subfield, $liblibrarian, $libopac, $tab, $mandatory, $repeatable, $authorised_value, $authtypecode, $value_builder, $kohafield, $seealso, $hidden, $isurl, $link, $defaultvalue, - $maxlength + $maxlength, $punctuation, $help ) = $sth->fetchrow ) { @@ -1160,6 +1162,8 @@ sub GetMarcStructure { $res->{$tag}->{$subfield}->{'link'} = $link; $res->{$tag}->{$subfield}->{defaultvalue} = $defaultvalue; $res->{$tag}->{$subfield}->{maxlength} = $maxlength; + $res->{$tag}->{$subfield}->{punctuation} = $punctuation; + $res->{$tag}->{$subfield}->{help} = $help; } $marc_structure_cache->{$forlibrarian}->{$frameworkcode} = $res; diff --git a/admin/marc_subfields_structure.pl b/admin/marc_subfields_structure.pl index 615fbcf..bda1ed5 100755 --- a/admin/marc_subfields_structure.pl +++ b/admin/marc_subfields_structure.pl @@ -179,6 +179,8 @@ if ( $op eq 'add_form' ) { my %row_data; # get a fresh hash for the row data $row_data{defaultvalue} = $data->{defaultvalue}; $row_data{maxlength} = $data->{maxlength}; + $row_data{punctuation} = $data->{'punctuation'}; + $row_data{help} = CGI::escapeHTML( $data->{'help'} ); $row_data{tab} = CGI::scrolling_list( -name => 'tab', -id => "tab$i", @@ -385,11 +387,11 @@ elsif ( $op eq 'add_validate' ) { # values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)" # ); my $sth_insert = $dbh->prepare(qq{ - insert into marc_subfield_structure (tagfield,tagsubfield,liblibrarian,libopac,repeatable,mandatory,kohafield,tab,seealso,authorised_value,authtypecode,value_builder,hidden,isurl,frameworkcode, link,defaultvalue,maxlength) - values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) + insert into marc_subfield_structure (tagfield,tagsubfield,liblibrarian,libopac,repeatable,mandatory,kohafield,tab,seealso,authorised_value,authtypecode,value_builder,hidden,isurl,frameworkcode, link,defaultvalue,maxlength,punctuation,help) + values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) }); my $sth_update = $dbh->prepare(qq{ - update marc_subfield_structure set tagfield=?, tagsubfield=?, liblibrarian=?, libopac=?, repeatable=?, mandatory=?, kohafield=?, tab=?, seealso=?, authorised_value=?, authtypecode=?, value_builder=?, hidden=?, isurl=?, frameworkcode=?, link=?, defaultvalue=?, maxlength=? + update marc_subfield_structure set tagfield=?, tagsubfield=?, liblibrarian=?, libopac=?, repeatable=?, mandatory=?, kohafield=?, tab=?, seealso=?, authorised_value=?, authtypecode=?, value_builder=?, hidden=?, isurl=?, frameworkcode=?, link=?, defaultvalue=?, maxlength=?, punctuation=?, help=? where tagfield=? and tagsubfield=? and frameworkcode=? }); my @tagsubfield = $input->param('tagsubfield'); @@ -405,6 +407,8 @@ elsif ( $op eq 'add_validate' ) { my @link = $input->param('link'); my @defaultvalue = $input->param('defaultvalue'); my @maxlength = $input->param('maxlength'); + my @punctuation = $input->param('punctuation'); + my @help = $input->param('help'); for ( my $i = 0 ; $i <= $#tagsubfield ; $i++ ) { my $tagfield = $input->param('tagfield'); @@ -426,6 +430,8 @@ elsif ( $op eq 'add_validate' ) { my $link = $link[$i]; my $defaultvalue = $defaultvalue[$i]; my $maxlength = $maxlength[$i]; + my $punctuation = $punctuation[$i]; + my $help = $help[$i]; if (defined($liblibrarian) && $liblibrarian ne "") { unless ( C4::Context->config('demo') eq 1 ) { @@ -449,6 +455,8 @@ elsif ( $op eq 'add_validate' ) { $link, $defaultvalue, $maxlength, + $punctuation, + $help, ( $tagfield, $tagsubfield, @@ -475,6 +483,8 @@ elsif ( $op eq 'add_validate' ) { $link, $defaultvalue, $maxlength, + $punctuation, + $help, ); } } diff --git a/cataloguing/addbiblio.pl b/cataloguing/addbiblio.pl index caacd91..d3ca345 100755 --- a/cataloguing/addbiblio.pl +++ b/cataloguing/addbiblio.pl @@ -330,6 +330,8 @@ sub create_input { id => "tag_".$tag."_subfield_".$id_subfield."_".$index_tag."_".$index_subfield, value => $value, maxlength => $tagslib->{$tag}->{$subfield}->{maxlength}, + punctuation => $tagslib->{$tag}->{$subfield}->{punctuation}, + help => $tagslib->{$tag}->{$subfield}->{help}, random => CreateKey(), ); @@ -478,11 +480,20 @@ sub create_input { name=\"".$subfield_data{id}."\" value=\"$value\" tabindex=\"1\" + punctuation=\"".$subfield_data{punctuation}."\" size=\"67\" maxlength=\"".$subfield_data{maxlength}."\" class=\"input_marceditor\" + onfocus=\"javascript:GetPunctuation(this);\" + onblur=\"javascript:CheckPunctuation(this);\" \/> "; + if ($subfield_data{help}){ + $subfield_data{marc_value} .= " +  Show help +
 " . $subfield_data{help} . "
+ "; + } } } $subfield_data{'index_subfield'} = $index_subfield; diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql index ed673da..21b492a 100644 --- a/installer/data/mysql/kohastructure.sql +++ b/installer/data/mysql/kohastructure.sql @@ -1235,6 +1235,8 @@ CREATE TABLE `marc_subfield_structure` ( `link` varchar(80) default NULL, `defaultvalue` text default NULL, `maxlength` int(4) NOT NULL DEFAULT '9999', + `punctuation` varchar(5) default NULL, + `help` varchar(255) default NULL, PRIMARY KEY (`frameworkcode`,`tagfield`,`tagsubfield`), KEY `kohafield_2` (`kohafield`), KEY `tab` (`frameworkcode`,`tab`), diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 77265f4..ded37fe 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -6339,6 +6339,15 @@ if ( CheckVersion($DBversion) ) { SetVersion ($DBversion); } +$DBversion = "3.11.00.XXX"; +if (C4::Context->preference("Version") < TransformToNum($DBversion)) { + $dbh->do(" + ALTER TABLE `marc_subfield_structure` ADD `punctuation` VARCHAR( 5 ) NULL , ADD `help` VARCHAR( 255 ) NULL; + "); + print "Upgrade to $DBversion done (Punctuation and cataloguing help)\n"; + SetVersion($DBversion); +} + =head1 FUNCTIONS =head2 TableExists($table) diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/addbiblio.css b/koha-tmpl/intranet-tmpl/prog/en/css/addbiblio.css index 79ceb48..40cabd7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/css/addbiblio.css +++ b/koha-tmpl/intranet-tmpl/prog/en/css/addbiblio.css @@ -89,6 +89,11 @@ a.tagnum { text-decoration : none; } +.divsubfieldhelp { + background-color: #F0FFEF; + border: #EFEFEF 1px solid; +} + .subfield { color : #00698a; float: left; diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js b/koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js index 125cd52..5eb347f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js +++ b/koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js @@ -110,3 +110,58 @@ function openWindow(link,name,width,height) { height = (typeof height == "undefined")?'400':height; var newin=window.open(link,name,'width='+width+',height='+height+',resizable=yes,toolbar=false,scrollbars=yes,top'); } + +/* + * Place punctuation when cataloguing + */ + +function trim(s) { + while (s.length>0 && (s[0]==' '||s[0]=='\n')) s=s.substring(1, s.length); + while (s.length>0 && (s[s.length-1]==' '||s[s.length-1]=='\n')) s=s.substring(0, s.length-1); + while (s.search (" ") != -1){ + s = s.replace (" ",""); + } + return s; +} + +/* + * Place the cursor in a determinate place into a textbox +*/ + +function placePositionTextbox(elem, myPos) { + + if(elem != null) { + if(elem.createTextRange) { + var range = elem.createTextRange(); + range.move('character', myPos); + range.select(); + } + else { + if(elem.selectionStart) { + elem.focus(); + elem.setSelectionRange(myPos, myPos); + } + else + elem.focus(); + } + } +} + +function GetPunctuation(field){ + var val = field.value; + if (trim(val) == ""){ + field.value = field.getAttribute('punctuation'); + placePositionTextbox(field,field.value.length); + } +} + +function CheckPunctuation(field){ + var val = field.value; + if (val == field.getAttribute('punctuation')){ + field.value = ""; + } +} + +/* + * END - Place punctuation when cataloguing + */ diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt index a0177db..03b4a47 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt @@ -110,6 +110,10 @@ $(document).ready(function() { Advanced constraints:
  1. +
  2. +
  3. +

  4. +
  5. (see online help)
  6. (see online help)
  7. [% loo.isurl %] (if checked, it means that the subfield is a URL and can be clicked)
  8. diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt index 7d54142..5c25205 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt @@ -11,7 +11,30 @@ $('#addbibliotabs').tabs().bind('show.ui-tabs', function(e, ui) { $("#"+ui.panel.id+" input:eq(0)").focus(); }); - + $('.tag').each(function() { + var field_id = this.getAttribute('id').substring(0, 7); + if (field_id in fields_in_use) { + fields_in_use[field_id]++; + } else { + fields_in_use[field_id] = 1; + } + }); + $("a.showhelp").click(function(){ + $("#"+$(this).attr("href").replace("#","")).toggle(); + if($(this).html() == "Show help"){ + $(this).html("Hide help"); + } else { + $(this).html("Show help"); + } + }); + $('.subfield_line').each(function() { + var field_id = this.getAttribute('id').substring(0, 12); + if (field_id in fields_in_use) { + fields_in_use[field_id]++; + } else { + fields_in_use[field_id] = 1; + } + }); /* check cookie to hide/show marcdocs*/ if($.cookie("marcdocs_[% borrowernumber %]") == 'false'){ hideMARCdocLinks(); -- 1.7.10.4