diff --git a/intranet/conf/intranet.cfg b/intranet/conf/intranet.cfg index 0ad170c8..ca0d7945 100644 --- a/intranet/conf/intranet.cfg +++ b/intranet/conf/intranet.cfg @@ -15,6 +15,8 @@ templatesEngine.on = True [/impression] crans.activate = True crans.activate.errorMsg = u"Suite à un problème technique grave, l'imprimante est en attente de réparation. Les Nounous ont été prévenues et s'en chargent au plus vite" +crans.impression.codes.batJ = u"B1364" + [/static] sessionAuthenticateFilter.on=False diff --git a/intranet/modules/impression/static/impression.js b/intranet/modules/impression/static/impression.js index afcee03c..af80c542 100644 --- a/intranet/modules/impression/static/impression.js +++ b/intranet/modules/impression/static/impression.js @@ -195,12 +195,13 @@ Impression.settings.updatePreview = function() *****************************/ Impression.popup = {}; -Impression.popup.popupImpression = function(code) { +Impression.popup.popupImpression = function(code, codeJ) { Popup.hide(); Popup.create({}, "Impression en cours...", DIV( {"id":"printingPopupContent", "style":"background-image:url(./static/dialog-printer.png)"}, SPAN("code: "+code), + SPAN("Batiment J: "+codeJ), A({"href":"https://wiki.crans.org/VieCrans/ImpressionReseau", "class":"aide", "target":"_blank"}, "Comment récupérer mon impression ? "), A({"href":"index", "class":"aide", "style":"text-align:right;"}, "Nouvelle impression") ) @@ -353,8 +354,8 @@ Impression.AJAX.finImpression = function(AJAXResp) Impression.popup.popupSolde(); Impression.settings.disableForm(false); Impression.settings.update(); - } else { - Impression.popup.popupImpression(AJAXResp.code); + } else { + Impression.popup.popupImpression(AJAXResp.code, AJAXResp.code_bat_j); } Impression.AJAX.updateSolde(); }