[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/es/acqui.simple addbiblio.tmpl,1.2,1.3
Ambrose Li
acli at users.sourceforge.net
Mon Feb 3 20:33:24 CET 2003
Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/es/acqui.simple
In directory sc8-pr-cvs1:/tmp/cvs-serv28577/es/acqui.simple
Modified Files:
addbiblio.tmpl
Log Message:
Added check for mandatory tags, and distinguish between mandatory subfields
in mandatory and optional tags
(Incomplete merge, new error messages need to be retranslated)
Index: addbiblio.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/es/acqui.simple/addbiblio.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** addbiblio.tmpl 3 Feb 2003 19:07:27 -0000 1.2
--- addbiblio.tmpl 3 Feb 2003 19:33:22 -0000 1.3
***************
*** 50,53 ****
--- 50,54 ----
<input type="hidden" name="subfield" value="<TMPL_VAR name="subfield">">
<input type="hidden" name="mandatory" value="<TMPL_VAR name="mandatory">">
+ <input type="hidden" name="tag_mandatory" value="<TMPL_VAR name="tag_mandatory">">
</td>
</tr>
***************
*** 71,74 ****
--- 72,76 ----
<input type="hidden" name="subfield" value="<TMPL_VAR name="subfield">">
<input type="hidden" name="mandatory" value="<TMPL_VAR name="mandatory">">
+ <input type="hidden" name="tag_mandatory" value="<TMPL_VAR name="tag_mandatory">">
</td>
</tr>
***************
*** 92,95 ****
--- 94,98 ----
<input type="hidden" name="subfield" value="<TMPL_VAR name="subfield">">
<input type="hidden" name="mandatory" value="<TMPL_VAR name="mandatory">">
+ <input type="hidden" name="tag_mandatory" value="<TMPL_VAR name="tag_mandatory">">
</td>
</tr>
***************
*** 113,116 ****
--- 116,120 ----
<input type="hidden" name="subfield" value="<TMPL_VAR name="subfield">">
<input type="hidden" name="mandatory" value="<TMPL_VAR name="mandatory">">
+ <input type="hidden" name="tag_mandatory" value="<TMPL_VAR name="tag_mandatory">">
</td>
</tr>
***************
*** 134,137 ****
--- 138,142 ----
<input type="hidden" name="subfield" value="<TMPL_VAR name="subfield">">
<input type="hidden" name="mandatory" value="<TMPL_VAR name="mandatory">">
+ <input type="hidden" name="tag_mandatory" value="<TMPL_VAR name="tag_mandatory">">
</td>
</tr>
***************
*** 155,158 ****
--- 160,164 ----
<input type="hidden" name="subfield" value="<TMPL_VAR name="subfield">">
<input type="hidden" name="mandatory" value="<TMPL_VAR name="mandatory">">
+ <input type="hidden" name="tag_mandatory" value="<TMPL_VAR name="tag_mandatory">">
</td>
</tr>
***************
*** 176,179 ****
--- 182,186 ----
<input type="hidden" name="subfield" value="<TMPL_VAR name="subfield">">
<input type="hidden" name="mandatory" value="<TMPL_VAR name="mandatory">">
+ <input type="hidden" name="tag_mandatory" value="<TMPL_VAR name="tag_mandatory">">
</td>
</tr>
***************
*** 197,200 ****
--- 204,208 ----
<input type="hidden" name="subfield" value="<TMPL_VAR name="subfield">">
<input type="hidden" name="mandatory" value="<TMPL_VAR name="mandatory">">
+ <input type="hidden" name="tag_mandatory" value="<TMPL_VAR name="tag_mandatory">">
</td>
</tr>
***************
*** 218,221 ****
--- 226,230 ----
<input type="hidden" name="subfield" value="<TMPL_VAR name="subfield">">
<input type="hidden" name="mandatory" value="<TMPL_VAR name="mandatory">">
+ <input type="hidden" name="tag_mandatory" value="<TMPL_VAR name="tag_mandatory">">
</td>
</tr>
***************
*** 239,242 ****
--- 248,252 ----
<input type="hidden" name="subfield" value="<TMPL_VAR name="subfield">">
<input type="hidden" name="mandatory" value="<TMPL_VAR name="mandatory">">
+ <input type="hidden" name="tag_mandatory" value="<TMPL_VAR name="tag_mandatory">">
</td>
</tr>
***************
*** 258,261 ****
--- 268,272 ----
<input type="hidden" name="subfield" value="<TMPL_VAR name="subfield">">
<input type="hidden" name="mandatory" value="<TMPL_VAR name="mandatory">">
+ <input type="hidden" name="tag_mandatory" value="<TMPL_VAR name="tag_mandatory">">
</td>
</tr>
***************
*** 272,275 ****
--- 283,287 ----
<input type="hidden" name="field_value" value="<TMPL_VAR name="oldbiblioitemnumber">">
<input type="hidden" name="mandatory" value="0">
+ <input type="hidden" name="tag_mandatory" value="<TMPL_VAR name="tag_mandatory">">
</TMPL_IF>
</form>
***************
*** 294,316 ****
}
function Check(f) {
! var total_errors=0;
! // alert(f.field_value.length);
for (i=0 ; i<f.field_value.length-2 ; i++) {
- // alert (f.field_value[i].value);
if (f.field_value[i].value.length==0 && f.mandatory[i].value==1) {
document.getElementById("error"+i).style.backgroundColor="#FF0000";
! total_errors++;
} else {
document.getElementById("error"+i).style.backgroundColor="#FFFFFF";
}
}
var alertString2;
! if (total_errors==0) {
! document.f.submit();
! } else {
alertString2 = "No se envío el formulario por los siguientes problemas\n";
alertString2 += "------------------------------------------------------------------------------------\n\n";
alertString2 += "- "+ total_errors+" campos vacíos (revise los campos en negrita)";
alert(alertString2);
}
}
--- 306,361 ----
}
function Check(f) {
! // Scan for nonempty fields
! var field_is_nonempty_p = new Array();
! for (i=0 ; i<f.field_value.length ; i++) {
! field_is_nonempty_p[f.tag[i].value] = 0;
! }
! for (i=0 ; i<f.field_value.length ; i++) {
! if (f.field_value[i].value.length != 0) {
! field_is_nonempty_p[f.tag[i].value] += 1;
! }
! }
!
! // Scan for missing mandatory subfields
! var total_missing_mandatory_subfields = 0;
for (i=0 ; i<f.field_value.length-2 ; i++) {
if (f.field_value[i].value.length==0 && f.mandatory[i].value==1) {
+ // We should not flag an error unless the tag is also
+ // mandatory, or if something else in the tag is entered
+
+ if (f.tag_mandatory[i].value == 1 || field_is_nonempty_p[f.tag[i].value]) {
document.getElementById("error"+i).style.backgroundColor="#FF0000";
! total_missing_mandatory_subfields++;
! }
} else {
document.getElementById("error"+i).style.backgroundColor="#FFFFFF";
}
}
+
+ // Scan for missing mandatory tags
+ var total_missing_mandatory_tags = 0;
+ var seen_mandatory_tag_p = new Array();
+ for (i=0 ; i<f.field_value.length ; i++) {
+ var j = f.tag[i].value;
+ if (!field_is_nonempty_p[j] && f.tag_mandatory[i].value == 1) {
+ if (seen_mandatory_tag_p[j] != 1) {
+ seen_mandatory_tag_p[j] = 1;
+ total_missing_mandatory_tags++;
+ }
+ document.getElementById("error"+i).style.backgroundColor="#ffff00";
+ }
+ }
+
+ var total_errors = total_missing_mandatory_tags + total_missing_mandatory_subfields;
var alertString2;
! if (total_errors!=0) {
alertString2 = "No se envío el formulario por los siguientes problemas\n";
alertString2 += "------------------------------------------------------------------------------------\n\n";
+ // alertString2 += "- "+ total_missing_mandatory_tags +" mandatory tags empty\n";
+ // alertString2 += "- "+ total_missing_mandatory_subfields +" mandatory fields empty (see bold subfields)";
alertString2 += "- "+ total_errors+" campos vacíos (revise los campos en negrita)";
alert(alertString2);
+ } else {
+ document.f.submit();
}
}
More information about the Koha-cvs
mailing list