commencement de correction pour le bug du login (qui fait qu'on doit redmarer l'intranet)

darcs-hash:20061117133434-f46e9-00a13be3e62303cb7820708db3d41309c22f78b1.gz

intranet/Root.py

@@ -162,6 +162,8 @@ def verifLogin(login = '', password = ''):
                 cherrypy.session['uid'] = login
                 cherrypy.session['session_key'] = True
                 cherrypy.session['droits'] = adh.droits()
+                cherrypy.session['LDAP'] = crans_ldap()
+
                 cherrypy.log("User logged in : %s" % cherrypy.session['uid'], "LOGIN")
                 return
             else:

intranet/pages/impression.py

@@ -130,7 +130,7 @@ class root:
     lancerImpression.exposed = True
     
     # 
-    # methode pour récupérer l'état de l'imprimante
+    # methode pour recuperer l'etat de l'imprimante
     #
     def etatImprimante(self):
         try:
@@ -139,6 +139,17 @@ class root:
             return {"printer_state"  : 'Imprimante hors ligne'}
     etatImprimante.exposed = True
 
+    # 
+    # methode pour le solde
+    #
+    def AJAXGetSolde(self):
+        try:
+            adh = cherrypy.session['LDAP'].search('uid=' + cherrypy.session['uid'])['adherent'][0]
+            return {"solde"  : adh.solde() }
+        except Exception, e:
+            return {"erreur"  : str(e)}
+    AJAXGetSolde.exposed = True
+
 
 
 

intranet/static/css/impression.css

@@ -22,20 +22,22 @@ ul#actionMenu li {
  *   <!-- file name, menu de gauche -->
  * ****************************************** */
 #fileName {
+   display: block;
    width:150px;
    text-align:center;
    padding:50px 5px 5px 5px;
    background: url(../images/pdf-icon.png) center top no-repeat;
-   margin-bottom:10px;
+   margin:0 0 10px 0;
    overflow:auto;
 }
-#actionNouvelleImpression {
+
-   margin:1em 0;
+#actionMenu li {
+   margin: .8em 0;
 }
+
 #actionEtatImprimante {
    padding:0.4em;
    border: thin black solid;
-   margin:1em 0;
 }
 
 /* ******************************************* *

intranet/static/scripts/impression.js

@@ -365,6 +365,8 @@ Impression.AJAX.finImpression = function(AJAXResp)
    } else  {
       Impression.popup.popupImpression(AJAXResp.code);
    }
+   Impression.AJAX.updateSolde();
+
 }
 
 Impression.AJAX.getPrinterState = function()
@@ -383,4 +385,21 @@ Impression.AJAX.displayPrinterState = function(AJAXResp)
    }
 }
 
+Impression.AJAX.updateSolde = function()
+{
+   var url = "AJAXGetSolde";
+   Impression.AJAX.call(url, Impression.AJAX.displaySolde);
+}
+
+Impression.AJAX.displaySolde = function(AJAXResp)
+{
+   logDebug('AJAX terminated (updateSolde)');
+   if (AJAXResp.erreur) {
+      logWarning('Erreur distante (etatImprimante) : ' + AJAXResp.erreur);
+   } else  {
+      replaceChildNodes("soldePlaceHolder", AJAXResp.solde )
+   }
+}
+
 setInterval(Impression.AJAX.getPrinterState, 30000);
+setInterval(Impression.AJAX.updateSolde, 60000);

intranet/static/scripts/machines.js

@@ -58,7 +58,7 @@ Machines.listeMachines.display = function(result)
    if (result.machines) {
       replaceChildNodes('listeMachines',map(Machines.listeMachines.newMachineNodeFromDict ,result.machines));
       Machines.actions.updateMenu(Machines.actions.actionForMachineList);
-      aMachines.currentMid = '';
+      Machines.currentMid = '';
    }
    else if (result.erreur)
      logError("Erreur distante : " + result.erreur);

intranet/templates/impression.tmpl

@@ -62,15 +62,26 @@
 
 
 <ul id="actionMenu">
-
    #if $getVar('fileName',False)
-    	    <li><div id="fileName"><span>$fileName</span></div></li>
+    	    <li id="fileName"><span>$fileName</span></li>
 	    <li><span style="font-weight:bold;">pages: </span><span id="fileNbPages"></span></li>
             <hr />
     #end if
 	    <li id="actionNouvelleImpression"><a href="index">Nouvelle impression</a></li>
 	    <li id="actionMesCodes"><a href="#" onclick="Impression.mesCodes.getCodes(); return false;">Mes codes</a></li>
-	    <li id="actionEtatImprimante" onclick="Impression.AJAX.getPrinterState();"><span style="font-weight:bold;">&Eacute;tat imprimante:</span><br /><span id="etatImprimanteIci"> $etatImprimante </span></li>
+	    <li id="actionMesCodes" onclick="Impression.AJAX.updateSolde(); return false;">
+	       <span style="font-weight:bold;">Solde: </span>
+	       <span id="soldePlaceHolder">-</span> &euro;
+	    </li>
+	    <script type="text/javascript">
+	       <!--
+	       Impression.AJAX.updateSolde();
+	       //-->
+	    </script>
+	    <li id="actionEtatImprimante" onclick="Impression.AJAX.getPrinterState();">
+	       <span style="font-weight:bold;">&Eacute;tat imprimante:</span><br />
+	       <span id="etatImprimanteIci"> $etatImprimante </span>
+	    </li>
 </ul>
 
 #if not $getVar('Erreur_imprimante',False) 
@@ -117,16 +128,19 @@ nounous</span> </p>
       #if $getVar('fileName',False)
       	  <script type="text/javascript">
     	  <!--
+
               Impression.settings.init();
-              Impression.AJAX.usefile('$fileName');
+	      //Impression..AJAX.updateSolde();
+	      Impression.AJAX.usefile('$fileName');
               Impression.settings.preloadAllImages();        
     	      //-->
     	  </script>
       #else
       	   <script type="text/javascript">
     	   <!--
-               Impression.settings.init();
+	      Impression.settings.init();
-               Impression.settings.disableForm(true);
+	      //Impression..AJAX.updateSolde();
+	      Impression.settings.disableForm(true);
     	   //-->
     	   </script>
       #end if
@@ -135,7 +149,8 @@ nounous</span> </p>
     <script type="text/javascript">
     <!--
         Impression.settings.init();
-        Impression.settings.disableForm(true);
+	//Impression.AJAX.updateSolde();
+	Impression.settings.disableForm(true);
 	logError("$Erreur_imprimante");
     //-->
     </script>