From 2e8f4220e583a31c9998d1a69b029d2a8edfb374 Mon Sep 17 00:00:00 2001
From: simith <simith@inlibro.com>
Date: Fri, 8 Aug 2014 15:04:49 -0400
Subject: [PATCH] Bug 8643 - Add important constraint to marc subfields
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This fix permits to add an "Important" option to the marc structure pages.

Testing:

I Apply the patch
II Run updatedatabase.pl

0) Define 100 as an "important" field ( Administration » MARC bibliographic framework » MARC structure ( Default Frameword) » Edit )
1) Define 100$a as an "important" subfield (Administration » MARC bibliographic framework » MARC structure (Default Frameword) » Subfield » Onglet a)
2) Edit a record to clear the field 100
3) Save the record.
4) Validate the following message:

A few important fields are not filled:

    * tag 100 subfield a Nom de personne in tab
    * Field 100 is important, at least one of its subfields should be filled.

Are you sure you want to save?

sponsored by the CCSR ( http://www.ccsr.qc.ca )
---
 C4/Biblio.pm                                       |  12 ++-
 admin/marc_subfields_structure.pl                  |  24 ++++-
 admin/marctagstructure.pl                          |  18 +++-
 cataloguing/addbiblio.pl                           |   9 +-
 installer/data/mysql/kohastructure.sql             |  14 +--
 installer/data/mysql/updatedatabase.pl             |   9 ++
 .../en/modules/admin/marc_subfields_structure.tt   |   2 +
 .../prog/en/modules/admin/marctagstructure.tt      |  21 ++++
 .../prog/en/modules/cataloguing/addbiblio.tt       | 119 ++++++++++++++++++++-
 9 files changed, 205 insertions(+), 23 deletions(-)

diff --git a/C4/Biblio.pm b/C4/Biblio.pm
index d3d2bf9..eece4a7 100644
--- a/C4/Biblio.pm
+++ b/C4/Biblio.pm
@@ -1103,23 +1103,24 @@ sub GetMarcStructure {
     return $cached if $cached;
 
     my $sth = $dbh->prepare(
-        "SELECT tagfield,liblibrarian,libopac,mandatory,repeatable 
+        "SELECT tagfield,liblibrarian,libopac,mandatory,repeatable,important
         FROM marc_tag_structure 
         WHERE frameworkcode=? 
         ORDER BY tagfield"
     );
     $sth->execute($frameworkcode);
-    my ( $liblibrarian, $libopac, $tag, $res, $tab, $mandatory, $repeatable );
+    my ( $liblibrarian, $libopac, $tag, $res, $tab, $mandatory, $repeatable, $important );
 
-    while ( ( $tag, $liblibrarian, $libopac, $mandatory, $repeatable ) = $sth->fetchrow ) {
+    while ( ( $tag, $liblibrarian, $libopac, $mandatory, $repeatable, $important ) = $sth->fetchrow ) {
         $res->{$tag}->{lib}        = ( $forlibrarian or !$libopac ) ? $liblibrarian : $libopac;
         $res->{$tag}->{tab}        = "";
         $res->{$tag}->{mandatory}  = $mandatory;
+        $res->{$tag}->{important}  = $important;
         $res->{$tag}->{repeatable} = $repeatable;
     }
 
     $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,important
          FROM   marc_subfield_structure 
          WHERE  frameworkcode=? 
          ORDER BY tagfield,tagsubfield
@@ -1143,13 +1144,14 @@ sub GetMarcStructure {
     while (
         (   $tag,          $subfield,      $liblibrarian, $libopac, $tab,    $mandatory, $repeatable, $authorised_value,
             $authtypecode, $value_builder, $kohafield,    $seealso, $hidden, $isurl,     $link,       $defaultvalue,
-            $maxlength
+            $maxlength, $important
         )
         = $sth->fetchrow
       ) {
         $res->{$tag}->{$subfield}->{lib}              = ( $forlibrarian or !$libopac ) ? $liblibrarian : $libopac;
         $res->{$tag}->{$subfield}->{tab}              = $tab;
         $res->{$tag}->{$subfield}->{mandatory}        = $mandatory;
+        $res->{$tag}->{$subfield}->{important}        = $important;
         $res->{$tag}->{$subfield}->{repeatable}       = $repeatable;
         $res->{$tag}->{$subfield}->{authorised_value} = $authorised_value;
         $res->{$tag}->{$subfield}->{authtypecode}     = $authtypecode;
diff --git a/admin/marc_subfields_structure.pl b/admin/marc_subfields_structure.pl
index c8b7815..ad37dd1 100755
--- a/admin/marc_subfields_structure.pl
+++ b/admin/marc_subfields_structure.pl
@@ -230,6 +230,13 @@ if ( $op eq 'add_form' ) {
             -label    => '',
             -id       => "mandatory$i"
         );
+        $row_data{important} = CGI::checkbox(
+            -name     => "important$i",
+            -checked  => $data->{'important'} ? 'checked' : '',
+            -value    => 1,
+            -label    => '',
+            -id       => "important$i"
+        );
         $row_data{hidden} = CGI::escapeHTML( $data->{hidden} );
         $row_data{isurl}  = CGI::checkbox(
             -name     => "isurl$i",
@@ -281,6 +288,13 @@ if ( $op eq 'add_form' ) {
             -value    => 1,
             -label    => ''
         );
+        $row_data{important} = CGI::checkbox(
+            -name     => "important$i",
+            -id       => "important$i",
+            -checked  => '',
+            -value    => 1,
+            -label    => ''
+        );
         $row_data{isurl} = CGI::checkbox(
             -name     => "isurl$i",
             -id       => "isurl$i",
@@ -329,11 +343,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,important,kohafield,tab,seealso,authorised_value,authtypecode,value_builder,hidden,isurl,frameworkcode, link,defaultvalue,maxlength)
+        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=?, important=?, kohafield=?, tab=?, seealso=?, authorised_value=?, authtypecode=?, value_builder=?, hidden=?, isurl=?, frameworkcode=?,  link=?, defaultvalue=?, maxlength=?
         where tagfield=? and tagsubfield=? and frameworkcode=?
     });
     my @tagsubfield       = $input->param('tagsubfield');
@@ -359,6 +373,7 @@ elsif ( $op eq 'add_validate' ) {
         my $libopac          = $libopac[$i];
         my $repeatable       = $input->param("repeatable$i") ? 1 : 0;
         my $mandatory        = $input->param("mandatory$i") ? 1 : 0;
+        my $important        = $input->param("important$i") ? 1 : 0;
         my $kohafield        = $kohafield[$i];
         my $tab              = $tab[$i];
         my $seealso          = $seealso[$i];
@@ -381,6 +396,7 @@ elsif ( $op eq 'add_validate' ) {
                         $libopac,
                         $repeatable,
                         $mandatory,
+                        $important,
                         $kohafield,
                         $tab,
                         $seealso,
@@ -407,6 +423,7 @@ elsif ( $op eq 'add_validate' ) {
                         $libopac,
                         $repeatable,
                         $mandatory,
+                        $important,
                         $kohafield,
                         $tab,
                         $seealso,
@@ -488,6 +505,7 @@ else {    # DEFAULT
         $row_data{kohafield}        = $results->[$i]{'kohafield'};
         $row_data{repeatable}       = $results->[$i]{'repeatable'};
         $row_data{mandatory}        = $results->[$i]{'mandatory'};
+        $row_data{important}        = $results->[$i]{'important'};
         $row_data{tab}              = $results->[$i]{'tab'};
         $row_data{seealso}          = $results->[$i]{'seealso'};
         $row_data{authorised_value} = $results->[$i]{'authorised_value'};
diff --git a/admin/marctagstructure.pl b/admin/marctagstructure.pl
index 7728687..70e061d 100755
--- a/admin/marctagstructure.pl
+++ b/admin/marctagstructure.pl
@@ -98,7 +98,7 @@ if ($op eq 'add_form') {
 	#---- if primkey exists, it's a modify action, so read values to modify...
 	my $data;
 	if ($searchfield) {
-		$sth=$dbh->prepare("select tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value from marc_tag_structure where tagfield=? and frameworkcode=?");
+        $sth=$dbh->prepare("select tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value, important from marc_tag_structure where tagfield=? and frameworkcode=?");
 		$sth->execute($searchfield,$frameworkcode);
 		$data=$sth->fetchrow_hashref;
 	}
@@ -123,6 +123,7 @@ if ($op eq 'add_form') {
 			libopac => $data->{'libopac'},
             repeatable => $data->{'repeatable'},
             mandatory => $data->{'mandatory'},
+            important => $data->{'important'},
 			authorised_value => $authorised_value,
 			frameworkcode => $frameworkcode,
     );  # FIXME: move checkboxes to presentation layer
@@ -135,23 +136,25 @@ if ($op eq 'add_form') {
 	my $libopac          = $input->param('libopac');
 	my $repeatable       = $input->param('repeatable') ? 1 : 0;
 	my $mandatory        = $input->param('mandatory')  ? 1 : 0;
+    my $important        = $input->param('important')  ? 1 : 0;
 	my $authorised_value = $input->param('authorised_value');
     unless (C4::Context->config('demo')) {
         if ($input->param('modif')) {
             $sth = $dbh->prepare(
-            "UPDATE marc_tag_structure SET liblibrarian=? ,libopac=? ,repeatable=? ,mandatory=? ,authorised_value=? WHERE frameworkcode=? AND tagfield=?"
+            "UPDATE marc_tag_structure SET liblibrarian=? ,libopac=? ,repeatable=? ,mandatory=? ,important=?, authorised_value=? WHERE frameworkcode=? AND tagfield=?"
             );
             $sth->execute(  $liblibrarian,
                             $libopac,
                             $repeatable,
                             $mandatory,
+                            $important,
                             $authorised_value,
                             $frameworkcode,
                             $tagfield
             );
         } else {
             $sth = $dbh->prepare(
-            "INSERT INTO marc_tag_structure (tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value,frameworkcode) values (?,?,?,?,?,?,?)"
+            "INSERT INTO marc_tag_structure (tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value,frameworkcode,important) values (?,?,?,?,?,?,?,?)"
             );
             $sth->execute($tagfield,
                           $liblibrarian,
@@ -159,7 +162,8 @@ if ($op eq 'add_form') {
                           $repeatable,
                           $mandatory,
                           $authorised_value,
-                          $frameworkcode
+                          $frameworkcode,
+                          $important
             );
         }
         $cache->clear_from_cache("MarcStructure-0-$frameworkcode");
@@ -231,6 +235,7 @@ if ($op eq 'add_form') {
 		              marc_tag_structure.libopac as mts_libopac,
 		              marc_tag_structure.repeatable as mts_repeatable,
 		              marc_tag_structure.mandatory as mts_mandatory,
+                      marc_tag_structure.important as mts_important,
 		              marc_tag_structure.authorised_value as mts_authorized_value,
 		              marc_subfield_structure.*
                 FROM marc_tag_structure 
@@ -252,6 +257,7 @@ if ($op eq 'add_form') {
 			$row_data{liblibrarian}     = $results[$i]->{'mts_liblibrarian'};
 			$row_data{repeatable}       = $results[$i]->{'mts_repeatable'};
 			$row_data{mandatory}        = $results[$i]->{'mts_mandatory'};
+            $row_data{important}        = $results[$i]->{'mts_important'};
 			$row_data{authorised_value} = $results[$i]->{'mts_authorised_value'};
 			$row_data{subfield_link} = "marc_subfields_structure.pl?op=add_form&amp;tagfield=".$results[$i]->{'mts_tagfield'}."&amp;frameworkcode=".$frameworkcode;
 			$row_data{edit}          = "$script_name?op=add_form&amp;searchfield="            .$results[$i]->{'mts_tagfield'}."&amp;frameworkcode=".$frameworkcode;
@@ -265,6 +271,7 @@ if ($op eq 'add_form') {
 				$subfield_data{kohafield}        = $results[$j]->{'kohafield'};
 				$subfield_data{repeatable}       = $results[$j]->{'repeatable'};
 				$subfield_data{mandatory}        = $results[$j]->{'mandatory'};
+                $subfield_data{important}        = $results[$j]->{'important'};
 				$subfield_data{tab}              = $results[$j]->{'tab'};
 				$subfield_data{seealso}          = $results[$j]->{'seealso'};
 				$subfield_data{authorised_value} = $results[$j]->{'authorised_value'};
@@ -291,6 +298,7 @@ if ($op eq 'add_form') {
 			$row_data{liblibrarian}     = $results->[$i]{'liblibrarian'};
 			$row_data{repeatable}       = $results->[$i]{'repeatable'};
 			$row_data{mandatory}        = $results->[$i]{'mandatory'};
+            $row_data{important}        = $results->[$i]{'important'};
 			$row_data{authorised_value} = $results->[$i]{'authorised_value'};
 			$row_data{subfield_link}    = "marc_subfields_structure.pl?tagfield="          .$results->[$i]{'tagfield'}."&amp;frameworkcode=".$frameworkcode;
 			$row_data{edit}             = "$script_name?op=add_form&amp;searchfield="      .$results->[$i]{'tagfield'}."&amp;frameworkcode=".$frameworkcode;
@@ -324,7 +332,7 @@ output_html_with_http_headers $input, $cookie, $template->output;
 sub StringSearch  {
 	my ($searchstring,$frameworkcode)=@_;
 	my $sth = C4::Context->dbh->prepare("
-    SELECT tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value
+    SELECT tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value,important
      FROM  marc_tag_structure
      WHERE (tagfield >= ? and frameworkcode=?)
     ORDER BY tagfield
diff --git a/cataloguing/addbiblio.pl b/cataloguing/addbiblio.pl
index 890db0f..f5b836d 100755
--- a/cataloguing/addbiblio.pl
+++ b/cataloguing/addbiblio.pl
@@ -325,6 +325,7 @@ sub create_input {
         marc_lib       => $tagslib->{$tag}->{$subfield}->{lib},
         tag_mandatory  => $tagslib->{$tag}->{mandatory},
         mandatory      => $tagslib->{$tag}->{$subfield}->{mandatory},
+        important      => $tagslib->{$tag}->{$subfield}->{important},
         repeatable     => $tagslib->{$tag}->{$subfield}->{repeatable},
         kohafield      => $tagslib->{$tag}->{$subfield}->{kohafield},
         index          => $index_tag,
@@ -338,13 +339,15 @@ sub create_input {
         $subfield_data{z3950_mandatory} = $mandatory_z3950->{$tag.$subfield};
     }
     # Subfield is hidden depending of hidden and mandatory flag, and is always
-    # shown if it contains anything or if its field is mandatory.
+    # shown if it contains anything or if its field is mandatory or important.
     my $tdef = $tagslib->{$tag};
     $subfield_data{visibility} = "display:none;"
         if $tdef->{$subfield}->{hidden} % 2 == 1 &&
            $value eq '' &&
            !$tdef->{$subfield}->{mandatory} &&
-           !$tdef->{mandatory};
+           !$tdef->{mandatory} &&
+           !$tdef->{$subfield}->{important} &&
+           !$tdef->{important};
     # expand all subfields of 773 if there is a host item provided in the input
     $subfield_data{visibility} ="" if ($tag eq 773 and $cgi->param('hostitemnumber'));
 
@@ -624,6 +627,7 @@ sub build_tabs {
                             tag_lib       => $tagslib->{$tag}->{lib},
                             repeatable       => $tagslib->{$tag}->{repeatable},
                             mandatory       => $tagslib->{$tag}->{mandatory},
+                            important       => $tagslib->{$tag}->{important},
                             subfield_loop => \@subfields_data,
                             fixedfield    => $tag < 10?1:0,
                             random        => CreateKey,
@@ -670,6 +674,7 @@ sub build_tabs {
                         tag_lib          => $tagslib->{$tag}->{lib},
                         repeatable       => $tagslib->{$tag}->{repeatable},
                         mandatory       => $tagslib->{$tag}->{mandatory},
+                        important       => $tagslib->{$tag}->{important},
                         indicator1       => $indicator1,
                         indicator2       => $indicator2,
                         subfield_loop    => \@subfields_data,
diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
index 6683125..c6918a8 100644
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -1410,6 +1410,7 @@ CREATE TABLE `marc_subfield_structure` (
   `libopac` varchar(255) NOT NULL default '',
   `repeatable` tinyint(4) NOT NULL default 0,
   `mandatory` tinyint(4) NOT NULL default 0,
+  `important` tinyint(4) NOT NULL DEFAULT '0',
   `kohafield` varchar(40) default NULL,
   `tab` tinyint(1) default NULL,
   `authorised_value` varchar(20) default NULL,
@@ -1441,6 +1442,7 @@ CREATE TABLE `marc_tag_structure` (
   `mandatory` tinyint(4) NOT NULL default 0,
   `authorised_value` varchar(10) default NULL,
   `frameworkcode` varchar(4) NOT NULL default '',
+  `important` tinyint(4) NOT NULL DEFAULT '0',
   PRIMARY KEY  (`frameworkcode`,`tagfield`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
@@ -2503,12 +2505,12 @@ CREATE TABLE `permissions` (
 
 DROP TABLE IF EXISTS `serialitems`;
 CREATE TABLE `serialitems` (
-	`itemnumber` int(11) NOT NULL,
-	`serialid` int(11) NOT NULL,
-	UNIQUE KEY `serialitemsidx` (`itemnumber`),
-	KEY `serialitems_sfk_1` (`serialid`),
-	CONSTRAINT `serialitems_sfk_1` FOREIGN KEY (`serialid`) REFERENCES `serial` (`serialid`) ON DELETE CASCADE ON UPDATE CASCADE,
-	CONSTRAINT `serialitems_sfk_2` FOREIGN KEY (`itemnumber`) REFERENCES `items` (`itemnumber`) ON DELETE CASCADE ON UPDATE CASCADE
+    `itemnumber` int(11) NOT NULL,
+    `serialid` int(11) NOT NULL,
+    UNIQUE KEY `serialitemsidx` (`itemnumber`),
+    KEY `serialitems_sfk_1` (`serialid`),
+    CONSTRAINT `serialitems_sfk_1` FOREIGN KEY (`serialid`) REFERENCES `serial` (`serialid`) ON DELETE CASCADE ON UPDATE CASCADE,
+    CONSTRAINT `serialitems_sfk_2` FOREIGN KEY (`itemnumber`) REFERENCES `items` (`itemnumber`) ON DELETE CASCADE ON UPDATE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 --
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index ee76d7d..a6196a3 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -8654,6 +8654,7 @@ if ( CheckVersion($DBversion) ) {
     SetVersion ($DBversion);
 }
 
+
 $DBversion = '3.17.00.014';
 if ( CheckVersion($DBversion) ) {
     $dbh->do("
@@ -10595,6 +10596,14 @@ if ( CheckVersion($DBversion) ) {
     SetVersion($DBversion);
 }
 
+$DBversion = "XXX";
+if ( CheckVersion($DBversion) ) {
+    $dbh->do("ALTER TABLE `marc_subfield_structure` ADD COLUMN `important` TINYINT(4) NOT NULL DEFAULT 0  AFTER `mandatory`");
+    $dbh->do("ALTER TABLE `marc_tag_structure` ADD COLUMN `important` TINYINT(4) NOT NULL DEFAULT 0  AFTER `frameworkcode`");
+    print "Upgrade to $DBversion done (Bug 8643 - Add important constraint to marc subfields)\n";
+    SetVersion($DBversion);
+}
+
 # DEVELOPER PROCESS, search for anything to execute in the db_update directory
 # SEE bug 13068
 # if there is anything in the atomicupdate, read and execute it.
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 bfa8815..7b8c274 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
@@ -229,6 +229,7 @@ function populateHiddenCheckboxes(tab) {
                 		<li><label for="libopac[% loo.row %]">Text for OPAC: </label><input type="text" id="libopac[% loo.row %]" name="libopac" value="[% loo.libopac %]" size="40" maxlength="80" /></li>
                 		<li><label for="repeatable[% loo.row %]">Repeatable: </label>[% loo.repeatable %]</li>
                 		<li><label for="mandatory[% loo.row %]">Mandatory: </label>[% loo.mandatory %]</li>
+                        <li><label for="important[% loo.row %]">Important: </label>[% loo.important %]</li>
                         <li><label for="tab[% loo.row %]">Managed in tab: </label>
                             <select name="tab" tabindex="" size="1" id="[% loo.tab.id %]">
                             [%- IF ( loo.tab.default ==  -1 ) -%]
@@ -408,6 +409,7 @@ function populateHiddenCheckboxes(tab) {
             [% IF ( loo.kohafield ) %] | Koha field: [% loo.kohafield %], [% END %]
             [% IF ( loo.repeatable ) %]Repeatable, [% ELSE %]Not repeatable,[% END %]
             [% IF ( loo.mandatory ) %]Mandatory, [% ELSE %]Not mandatory,[% END %]
+            [% IF ( loo.important ) %]Important, [% ELSE %]Not important,[% END %]
             [% IF ( loo.seealso ) %] | See Also: [% loo.seealso %],[% END %]
             [% IF ( loo.hidden ) %]hidden,[% END %]
             [% IF ( loo.isurl ) %]is a URL,[% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt
index fc8f463..11dea5d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt
@@ -104,6 +104,14 @@ $(document).ready(function() {
         [% END %]
         </select>
         (if you select a value here, the indicators will be limited to the authorized value list)</li>
+    <li><label for="important">Important: </label>
+        [% IF ( important ) %]
+            <input type="checkbox" name="important" id="important" value="1" checked="checked" />
+        [% ELSE %]
+            <input type="checkbox" name="important" id="important" value="1" />
+        [% END %]
+    </li>
+    <li><label for="authorised_value">Authorized value: </label>[% authorised_value %] (if you select a value here, the indicators will be limited to the authorized value list)</li>
 </ol></fieldset> 
     <fieldset class="action">
         <input type="submit" value="Save changes" />
@@ -184,6 +192,7 @@ $(document).ready(function() {
         <th>Lib</th>
         <th>Repeatable</th>
         <th>Mandatory</th>
+        <th>Important</th>
         <th>Auth value</th>
         <th>Subfields</th>
         <th>Edit</th>
@@ -206,11 +215,22 @@ $(document).ready(function() {
             </td>
             <td>[% IF ( loo.repeatable ) %]Yes[% ELSE %]No[% END %]</td>
             <td>[% IF ( loo.mandatory ) %]Yes[% ELSE %]No[% END %]</td>
+            <td>[% IF ( loo.important ) %]Yes[% ELSE %]No[% END %]</td>
             <td>[% loo.authorised_value %]</td>
             <td><a href="[% loo.subfield_link %]">subfields</a></td>
             <td><a href="[% loo.edit %]">Edit</a></td>
             <td><a href="[% loo.delete %]">Delete</a></td>
         </tr>
+        [% IF ( loop.odd ) %]<tr>[% ELSE %]<tr class="highlight">[% END %]
+            <td>&nbsp;</td>
+            <td colspan="7">
+                [% FOREACH subfield IN loo.subfields %]
+                    <p style="text-indent: 5em">Tab:[% subfield.tab %] | $[% subfield.tagsubfield %]
+                            [% subfield.liblibrarian %] [% IF ( subfield.kohafield ) %][% subfield.kohafield %][% END %][% IF ( subfield.repeatable ) %], repeatable[% END %][% IF ( subfield.mandatory ) %], Mandatory[% END %][% IF ( subfield.important ) %], Important[% END %][% IF ( subfield.seealso ) %], See [% subfield.seealso %][% END %][% IF ( subfield.authorised_value ) %], [% subfield.authorised_value %][% END %][% IF ( subfield.authtypecode ) %], [% subfield.authtypecode %][% END %][% IF ( subfield.value_builder ) %], [% subfield.value_builder %][% END %]
+                    </p>
+                [% END %]
+            </td>
+        </tr>
         [% END %]
     [% ELSE %]
     [% FOREACH loo IN loop %]
@@ -219,6 +239,7 @@ $(document).ready(function() {
         <td>[% loo.liblibrarian %]</td>
         <td>[% IF ( loo.repeatable ) %]Yes[% ELSE %]No[% END %]</td>
         <td>[% IF ( loo.mandatory ) %]Yes[% ELSE %]No[% END %]</td>
+        <td>[% IF ( loo.important ) %]Yes[% ELSE %]No[% END %]</td>
         <td>[% loo.authorised_value %]</td>
         <td><a href="[% loo.subfield_link %]">Subfields</a></td>
         <td><a href="[% loo.edit %]">Edit</a></td>
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 3bc00d5..d2cf9dd 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
@@ -227,7 +227,7 @@ function AreMandatoriesNotOk(){
     var flag=0;
     var tabflag= new Array();  
     [% FOREACH BIG_LOO IN BIG_LOOP %]
-    	[% FOREACH innerloo IN BIG_LOO.innerloop %]
+        [% FOREACH innerloo IN BIG_LOO.innerloop %]
 	        [% IF ( innerloo.mandatory ) %]
     	    	mandatoriesfields.push(new Array("[% innerloo.tag %]","[% innerloo.index %][% innerloo.random %]","[% innerloo.index %]"));
         	[% END %]
@@ -313,7 +313,7 @@ function AreMandatoriesNotOk(){
     	
     	if(isempty){
     		flag = 1;
-                StrAlert += "\t* " + _("Field %s is mandatory, at least one of its subfields must be filled.").format(arr[0]) + "\n";
+            StrAlert += "\t* " + _("Field %s is mandatory, at least one of its subfields must be filled.").format(arr[0]) + "\n";
     	}
     	
     }
@@ -332,6 +332,13 @@ function AreMandatoriesNotOk(){
 function Check(){
     var StrAlert = AreMandatoriesNotOk();
     if( ! StrAlert ){
+        var StrWarning = AreImportantsNotOk();
+        if (StrWarning){
+            var r=confirm(StrWarning);
+            if (! r){
+                return false;
+            }
+        }
         document.f.submit();
         return true;
     } else {
@@ -341,6 +348,113 @@ function Check(){
 }
 
 /** 
+ * check if mandatory subfields are written
+ */
+function AreImportantsNotOk(){
+    var importants = new Array();
+    var importantsfields = new Array();
+    var tab = new Array();
+    var label = new Array();
+    var flag=0;
+    var tabflag= new Array();
+    [% FOREACH BIG_LOO IN BIG_LOOP %]
+    [% FOREACH innerloo IN BIG_LOO.innerloop %]
+        [% IF ( innerloo.important ) %]
+           importantsfields.push(new Array("[% innerloo.tag %]","[% innerloo.index %][% innerloo.random %]","[% innerloo.index %]"));
+        [% END %]
+        [% FOREACH subfield_loo IN innerloo.subfield_loop %]
+            [% IF ( subfield_loo.important ) %]importants.push("[% subfield_loo.id %]");
+                tab.push("[% subfield_loo.number %]");
+                label.push("[% subfield_loo.marc_lib %]");
+                [% END %]
+            [% END %]
+        [% END %]
+    [% END %]
+    var StrWarning = _("A few important fields are not filled:");
+    StrWarning += "\n\n";
+    for(var i=0,len=importants.length; i<len ; i++){
+        var tag=importants[i].substr(4,3);
+        var subfield=importants[i].substr(17,1);
+        var tagnumber=importants[i].substr(19,importants[i].lastIndexOf("_")-19);
+        tabflag[tag+subfield+tagnumber]=new Array();
+        tabflag[tag+subfield+tagnumber][0]=0;
+        if( ! document.getElementById(importants[i]).value){
+            tabflag[tag+subfield+tagnumber][0] = 0 + tabflag[tag+subfield+tagnumber] ;
+            document.getElementById(importants[i]).setAttribute('class','subfield_not_filled');
+            document.getElementById(importants[i]).focus();
+            tabflag[tag+subfield+tagnumber][1]=label[i];
+            tabflag[tag+subfield+tagnumber][2]=tab[i];
+        } else {
+            tabflag[tag+subfield+tagnumber][0] = 1;
+        }
+    }
+    for (var tagsubfieldid in tabflag){
+      if (tabflag[tagsubfieldid][0]==0){
+        var tag=tagsubfieldid.substr(0,3);
+        var subfield=tagsubfieldid.substr(3,1);
+        StrWarning += "\t* "+_("tag ")+tag+_(" subfield ")+subfield+" "+tabflag[tagsubfieldid][1]+_(" in tab ")+tabflag[tagsubfieldid][2]+"\n";
+        //StrAlert += "\t* "+label[i]+_(" in tab ")+tab[i]+"\n";
+        flag=1;
+      }
+    }
+
+    /* Check for mandatories field(not subfields) */
+    for(var i=0,len=importantsfields.length; i<len; i++){
+        isempty  = true;
+        arr      = importantsfields[i];
+        divid    = "tag_" + arr[0] + "_" + arr[1];
+        varegexp = new RegExp("^tag_" + arr[0] + "_code_");
+
+        if(parseInt(arr[0]) >= 10){
+           elem = document.getElementById(divid);
+           eleminputs = elem.getElementsByTagName('input');
+           for(var j=0,len2=eleminputs.length; j<len2; j++){
+
+              if(eleminputs[j].name.match(varegexp) && eleminputs[j].value){
+                 inputregexp = new RegExp("^tag_" + arr[0] + "_subfield_" + eleminputs[j].value + "_" + arr[2]);
+
+                   for( var k=0; k<len2; k++){
+                        if(eleminputs[k].id.match(inputregexp) && eleminputs[k].value){
+                            isempty = false
+                        }
+                    }
+
+                    elemselect = elem.getElementsByTagName('select');
+                    for( var k=0; k<elemselect.length; k++){
+                        if(elemselect[k].id.match(inputregexp) && elemselect[k].value){
+                           isempty = false
+                        }
+                    }
+              }
+           }
+
+           elemtextareas = elem.getElementsByTagName('textarea');
+           for(var j=0,len2=elemtextareas.length; j<len2; j++){
+                // this bit assumes that the only textareas in this context would be for subfields
+               if (elemtextareas[j].value) {
+                   isempty = false;
+               }
+           }
+       }else{
+          isempty = false;
+       }
+
+       if(isempty){
+          flag = 1;
+          StrWarning += _("\t* Field ") + arr[0] + _(" is important, at least one of its subfields should be filled.") + "\n";
+       }
+    }
+
+    StrWarning += "\n" + _("Are you sure you want to save?");
+
+    if(flag){
+        return StrWarning;
+    } else {
+        return flag;
+    }
+}
+
+/**
  * check if z3950 mandatories are set or not
  */
 function GetZ3950Terms(){
@@ -611,6 +725,7 @@ function Changefwk(FwkList) {
                     [% IF ( subfield_loo.mandatory ) %]<span class="subfield subfield_mandatory">[% ELSE %]<span class="subfield">[% END %]
                         [% subfield_loo.marc_lib %]
                         [% IF ( subfield_loo.mandatory ) %]<span class="mandatory_marker" title="This field is mandatory">*</span>[% END %]
+                        [% IF ( subfield_loo.important ) %]<span style="color:black" title="This field is important">*</span>[% END %]
                     </span>
                     </label>
                 [% END %]
-- 
2.1.4