Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 8637: Lack of control on mandatory in orderreveive.tt

Browse source 
Just add a check in Jscript when the form is submited, the same as in additem.tt
On Owen's suggestion I have added the red color and 'Required', the same as in additem.
On Jonathan's suggestion I have used the CSS class for red and italic and I have changed a variable's name (alertString2).
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Mandatory fields are now correctly checked on saving.

On other Jonathan's suggestion I have created a new class "missing" and I have added the background to staff-global.css.
The same for additem.tt.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Retested because of minor CSS change. Works nicely.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
This commit is contained in:
Christophe Croullebois 2012-08-13 17:09:30 +02:00 committed by Paul Poulain
parent c9535a606a
commit 67556a733a
4 changed files with 33 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
View file

@ -1260,6 +1260,10 @@ span.required {
margin-left : .5em;
}
.missing{
background-color : #FFFFCC;
}
.term {
background-color: #FFC;
color : #990000;

22
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
View file

@ -7,6 +7,28 @@
//<![CDATA[
function Check(form) {
[% IF (AcqCreateItemReceiving) %]
var total_errors=0;
$("input[name='mandatory'],select[name='mandatory']").each(function(i){
if($(this).val() == 1){
var mandatory_field = $("input[name='field_value'],select[name='field_value']").eq(i);
if(mandatory_field.val() == ''){
mandatory_field.addClass("missing");
total_errors++;
}
}
});
var alertString;
if (total_errors==0) {
return true;
} else {
alertString = _("Form not submitted because of the following problem(s)");
alertString += "\n------------------------------------------------------------------------------------\n";
alertString += "\n- "+ total_errors+_(" mandatory fields empty (highlighted)");
alert(alertString);
return false;
}
// Remove last itemblock if it is not in items_list
var lastitemblock = $("#outeritemblock > div:last");
var tobedeleted = true;

2
koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
View file

@ -44,7 +44,7 @@ function Check(f) {
if($(this).val() == 1){
var mandatory_field = $("input[name='field_value'],select[name='field_value']").eq(i);
if(mandatory_field.val() == ''){
mandatory_field.css("background-color","#FFFFCC");
mandatory_field.addClass("missing");
total_errors++;
}
}

16
koha-tmpl/intranet-tmpl/prog/en/modules/services/itemrecorddisplay.tt
View file

@ -2,22 +2,18 @@
[% FOREACH iteminfo IN iteminformation %]
<li>
<div class="subfield_line" style="[% iteminfo.hidden %];" id="subfield[% iteminfo.serialid %][% iteminfo.countitems %][% iteminfo.subfield %][% iteminfo.random %]">
<label>
[% iteminfo.subfield %] -
[% IF ( iteminfo.mandatory ) %]
<b>
[% END %]
[% iteminfo.marc_lib %]
[% IF ( iteminfo.mandatory ) %]
*</b>
[% END %]
</label>
[% IF (iteminfo.mandatory) %]
<label class="required">[% iteminfo.subfield %] - [% iteminfo.marc_lib %]</label>
[% ELSE %]
<label>[% iteminfo.subfield %] - [% iteminfo.marc_lib %]</label>
[% END %]
[% iteminfo.marc_value %]
<input type="hidden" name="itemid" value="1" />
<input type="hidden" name="kohafield" value="[% iteminfo.kohafield %]" />
<input type="hidden" name="tag" value="[% iteminfo.tag %]" />
<input type="hidden" name="subfield" value="[% iteminfo.subfield %]" />
<input type="hidden" name="mandatory" value="[% iteminfo.mandatory %]" />
[% IF (iteminfo.mandatory) %] <span class="required">Required</span>[% END %]
</div>
</li>
[% END %]