[intranet/impression, lib/impression_canon] modifications de l'AJAX

Ignore-this: 8beebdd91330205ba08932d269ccb6b
 * Ajout de l'option livret
 * agra{f,ph}es -> agrafage
 * paper -> papier
 * True & False au lieu d'utiliser des noms de constantes à rallonge

darcs-hash:20090516014010-bd074-69a54cc50369c5351542a7b82ddf6b5215e421d1.gz
This commit is contained in:
Antoine Durand-Gasselin 2009-05-16 03:40:10 +02:00
parent fdfd2254d3
commit d87c41e637
4 changed files with 50 additions and 36 deletions

View file

@ -129,6 +129,7 @@ Impression.settings.disableField = function(afield) {
//
Impression.settings.update = function () {
var orientation = "portrait";
Impression.settings.livret="False"
if (this.theform.type_impression_couleur.checked)
this.getValue(this.theform.type_impression_couleur);
else
@ -139,22 +140,25 @@ Impression.settings.update = function () {
else if (this.theform.disposition_recto_verso.checked)
this.getValue(this.theform.disposition_recto_verso);
else
this.getValue(this.theform.disposition_recto_verso_short);
this.getValue(this.theform.papier);
{
this.getValue(this.theform.disposition_livret);
Impression.settings.livret="True";
}
this.getValue(this.theform.papier);
this.getCopies(this.theform.nb_copies);
this.getValue(this.theform.agrafes);
// Contraintes
this.getValue(this.theform.agrafage);
// Contraintes
if (
( this.papier != "A4" ) ||
( (this.disposition == "recto") && (this.nb_pages>50) ) ||
( (this.disposition == "rectoverso") && (this.nb_pages>100) ) ||
( (this.disposition == "rectoversoshort") && (this.nb_pages>100) ))
/* ( this.papier != "A4" ) || */
( (this.disposition == "recto") && (this.nb_pages>50) ) ||
( (this.disposition == "rectoverso") && (this.nb_pages>100) )
)
{
this.setValue(this.theform.agrafes, "pasdagraphes");
this.disableField(this.theform.agrafes);
this.getValue(this.theform.agrafes);
this.setValue(this.theform.agrafage, "None");
this.disableField(this.theform.agrafage);
this.getValue(this.theform.agrafage);
} else {
this.setDisableField(this.theform.agrafes, false);
this.setDisableField(this.theform.agrafage, false);
}
if (this.papier == "A4tr")
{
@ -317,11 +321,12 @@ Impression.AJAX.analysefini = function(AJAXResp)
Impression.AJAX.recalcPrix = function()
{
settings = Impression.settings;
var url = "changeSettings?copies=" + settings.copies
+"&couleurs="+ settings.type_impression
+"&papier="+ settings.papier
+"&recto_verso="+ settings.disposition
+"&agrafes="+ settings.agrafes;
var url = "changeSettings?copies=" + settings.copies
+"&couleur="+ settings.type_impression
+"&papier="+ settings.papier
+"&recto_verso="+ settings.disposition
+"&agrafage="+ settings.agrafage
+"&livret="+ settings.livret;
this.modifPrix("Calcul en cours", true);
this.call(url, this.changePrix);
}