ajout du statut de l'imprimante

darcs-hash:20061013102845-f46e9-f7214edb3cef8b6e0b22f8d48edd3e64c6c71020.gz

intranet/pages/impression.py

@@ -2,6 +2,7 @@
 import cherrypy, tempfile, shutil, os
 import crans.impression
 import crans.impression.digicode
+import crans.impression.etat_imprimante
 
 FILE_UPLOAD_BASE_FOLDER = cherrypy.config.get('fileUpload.folder', "/var/impression/fichiers/")
 
@@ -34,6 +35,11 @@ class root:
                 data['openError'] = "Choisissez un fichier"
         
         data['fileList'] = self.getUploadedFileListFor(cherrypy.session['uid'])
+        try:
+            data['etatImprimante'] = "<br />".join(crans.impression.etat_imprimante.etat())
+        except Exception, e:
+            data['etatImprimante'] = 'Imprimante hors ligne'
+            data['Erreur_imprimante'] = str(e)
         return {'template':'impression', 
                 'values':data,
                 'stylesheets':['impression.css'],

intranet/templates/impression.tmpl

@@ -1,7 +1,6 @@
 #import crans.impression
 
 <div id="globalDiv">
-
 <form id="form_impression" name="form_impression"  onsubmit="Impression.popup();return false;">
     <fieldset><legend>Options d'impression</legend>
         <div id="leftColumn">              
@@ -23,16 +22,13 @@
 		    <option value="$type_papier">$crans.impression.LABELS[type_papier]</option>
 		#end for
 		</select>
-            
 		<br />
-
 		<label for="agrafes" class="labelInput">Agrafes:</label>
 		<select name="agrafes" id="agrafes" class="selectOne" onChange="Impression.settings.update(this);">
                 #for type_agrafes in $crans.impression.AGRAPHES_VALEURS_POSSIBLES
 		     <option value="$type_agrafes">$crans.impression.LABELS[type_agrafes]</option>
 		#end for
 		</select>
-
 		<br />
 		
 		<label for="nb_copies" class="labelInput">Copies:</label>
@@ -60,11 +56,14 @@
 	    <li><span style="font-weight:bold;">pages: </span><span id="fileNbPages"></span></li>
 	    <li><a href="index">Nouvelle impression</a></li>
     #end if
+	    <li><span style="font-weight:bold;">&Eacute;tat
+imprimante:</span><br /><span> $etatImprimante </span></li>
 
 
 <!--	<li><a href="historique">Historique</a></li> -->
 </ul>
 
+#if not $getVar('Erreur_imprimante',False) 
     #if not $getVar('fileName',False)
 	<div id="popupFichiers">
 	    <h1>Impression - Choix fichier</h1>
@@ -96,9 +95,9 @@
     roundElement("popupFichiers");
     roundElement("insideDiv");
     </script>
-
     #end if
 
+
 </div>
 
       #if $getVar('fileName',False)
@@ -117,3 +116,13 @@
     	   //-->
     	   </script>
       #end if
+#else 
+    ## desactivation de l'interface si l'imprimant a un probleme
+    <script type="text/javascript">
+    <!--
+        Impression.settings.init();
+        Impression.settings.disableForm(true);
+	logError("$Erreur_imprimante");
+    //-->
+    </script>
+#end if

intranet/templates/login.tmpl

@@ -10,7 +10,7 @@
         padding:20px;
         background:#eee;
         border:3px solid #ddd;
-        margin:auto auto;
+        margin:0 auto;
         }
     .liens {
         text-align:right;