Vss2Git

CG67.FicheCollege.root/CG67.FicheCollege/Core/CG67.FicheCollege.Entrepot/EntrepotClasseDecouverte.cs

@@ -51,10 +51,10 @@ namespace CG67.FicheCollege.Entrepot
                         connexion.Open();
                         using (OracleCommand command = connexion.CreateCommand())
                         {
-                            command.CommandText = "Select ZONE, ANNEE, Sum(TO_NUMBER(NB_ELEVE)) as NBELEVES, Sum(MT_VOTE) AS SUBVENTION from ASTRE.W67_SIC_FICHE_ELU WHERE ANNEE = '2009' GROUP BY ZONE, ANNEE" ;
-                          //  WHERE CodeRNE = @RNE AND ANNEE = @ANNEE";
+                            command.CommandText = "Select ZONE, ANNEE, Sum(TO_NUMBER(NB_ELEVE)) as NBELEVES, Sum(MT_VOTE) AS SUBVENTION from ASTRE.W67_SIC_FICHE_ELU WHERE ANNEE = @ANNEE GROUP BY ZONE, ANNEE ORDER BY ZONE" ;
+                          //  WHERE COD_TIERS = @RNE AND ANNEE = @ANNEE";
                              // command.Parameters.AddWithValue("@RNE", codeAstre);
-                           //  command.Parameters.AddWithValue("@ANNEE", An);
+                             command.Parameters.AddWithValue("@ANNEE", An);
                             using (OracleDataReader ds = command.ExecuteReader())
                             {
 

CG67.FicheCollege.root/CG67.FicheCollege/Web/CG67.FicheCollege.Web/css/fichecollege.css

@@ -118,14 +118,16 @@ td
 }
 .Zone
 {
-	width:80px;
+	width:200px;
 }
 .Nb_Eleves
 {
-	width:80px;
+	width:150px;
+	text-align: right;
 }
 
 .Montant_Subvention
 {
-	width:50px;
+	width:150px;
+	text-align: right;
 }

CG67.FicheCollege.root/CG67.FicheCollege/Web/CG67.FicheCollege.Web/xslt/FicheCollege.xslt

@@ -548,40 +548,35 @@
             <col class="libelle"></col>
             <col class="information"></col>
           </colgroup>
-        <tr>
         <td>Classes de découvertes</td>
-        </tr>
-        <!--
-        <table id="decouverte">
-        <colgroup>
-          <col class="Zone"></col>
-          <col class="Nb_Eleves"></col>
-          <col class="Montant_Subvention"></col>
-        </colgroup>
-         
-          <th class="bordure">ZONE</th>
-          <th class="bordure">Nombre d'élèves</th>
-          <th class="bordure">Montant subvention</th>
-        
-        <colgroup>
-          <col class="Zone"></col>
-          <col class="Nb_Eleves"></col>
-          <col class="Montant_Subvention"></col>
-        </colgroup>  -->
-      
-         <xsl:for-each select="Etablissement/LstClasseDecouverte/ClasseDecouverte">
-            <td>
-              <xsl:value-of select="Libelle"/>
-            </td>
-            <td>
-              <xsl:value-of select="NbEleves"/>
-            </td> 
-              <td>
-          
-              <xsl:value-of select ="Subvention"/><xsl:text> €</xsl:text>
-            </td>
-        </xsl:for-each>
-     
+        <td>
+          <table id="decouverte">
+            <colgroup>
+              <col class="Zone"></col>
+              <col class="Nb_Eleves"></col>
+              <col class="Montant_Subvention"></col>
+            </colgroup>
+
+            <th class="bordure">ZONE</th>
+            <th class="bordure">Nombre d'élèves</th>
+            <th class="bordure">Montant subvention</th>
+
+              <xsl:for-each select="Etablissement/LstClasseDecouverte/ClasseDecouverte">
+                <tr>
+                  <td class="bordure">
+                    <xsl:value-of select="Libelle"/>
+                  </td>
+                  <td class="bordure">
+                    <xsl:value-of select="NbEleves"/>
+                  </td>
+                  <td class="bordure">
+                    <xsl:value-of select ="Subvention"/>
+                    <xsl:text> €</xsl:text>
+                  </td>
+                </tr>
+              </xsl:for-each>
+          </table>
+        </td>
       </table>
    
      <table>