Vss2Git

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

@@ -39,9 +39,10 @@ namespace CG67.FicheCollege.Entrepot
                             connexion1.Open();
                             using (OracleCommand command1 = connexion1.CreateCommand())
                             {
-                                command1.CommandText = "Select * from V_ATC WHERE COD_STRUC = @C_STRUC ";
-                               // command1.CommandText = "Select * from V_ATC WHERE COD_STRUC = '38401024'";
-                                command1.Parameters.AddWithValue("@C_STRUC", codeAstre);
+                               command1.CommandText = "Select * from V_ATC WHERE COD_STRUC = '" + codeAstre + "'";
+                               // command1.CommandText = "Select * from V_ATC WHERE COD_STRUC = '38401024'" 
+                                //command1.Parameters.AddWithValue("@C_STRUC", codeAstre);
+                               
                                 using (OracleDataReader dr1 = command1.ExecuteReader())
                                 {
 

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

@@ -51,7 +51,7 @@ namespace CG67.FicheCollege.Entrepot
                         connexion.Open();
                         using (OracleCommand command = connexion.CreateCommand())
                         {
-                            command.CommandText = "Select ANNEE, ZONE, 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 ORDER BY ZONE ";
+                            command.CommandText = "Select ANNEE, ZONE, Sum(TO_NUMBER(NB_ELEVE)) as NBELEVES, Sum(MT_VOTE) AS SUBVENTION from ASTRE.W67_SIC_FICHE_ELU WHERE ANNEE = '" + annee + "' AND COD_TIERS = '" + codeAstre + "' GROUP BY ZONE, ANNEE ORDER BY ZONE ";
                           //  WHERE COD_TIERS = @RNE AND ANNEE = @ANNEE";
                              // command.Parameters.AddWithValue("@RNE", codeAstre);
                           //  command.Parameters.AddWithValue("@ANNEE", annee.ToString());

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

@@ -131,3 +131,34 @@ td
 	width:150px;
 	text-align: right;
 }
+
+.atcnom
+{
+	width:80px;
+	text-align:left;
+}
+.atcprenom
+{
+	width:80px;
+	text-align:  left;
+}
+.atcfonction
+{
+	width:150px;
+	text-align: left;
+}
+.atcqtew
+{
+	width:100px;
+	text-align: right;
+}
+.atcstatut
+{
+	width:80px;
+	text-align:  center;
+}
+.atcgrade
+{
+	width:150px;
+	text-align:  left;
+}

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

@@ -417,13 +417,21 @@
         
             <xsl:if test ="count(Etablissement/LstATC/ATC)>0">
               <table id="listeagentscg">
+                <colgroup>
+                  <col class="atcnom"></col>
+                  <col class="atcprenom"></col>
+                  <col class="atcfonction"></col>
+                  <col class="atcqtew"></col>
+                  <col class="atcstatut"></col>
+                  <col class="atcgrade"></col>
+                </colgroup>
                 <tr>
-                  <th class="bordure">Nom</th>
-                  <th class="bordure">Prénom</th>
-                  <th class="bordure">Fonction</th>
-                  <th class="bordure">Quotité de travail</th>
-                  <th class="bordure">Statut</th>
-                 <th class="bordure">Grade</th>
+                  <th class="bordurecentre">Nom</th>
+                  <th class="bordurecentre">Prénom</th>
+                  <th class="bordurecentre">Fonction</th>
+                  <th class="bordurecentre">Quotité de travail</th>
+                  <th class="bordurecentre">Statut</th>
+                 <th class="bordurecentre">Grade</th>
                 </tr>
                 
                 <xsl:for-each select="Etablissement/LstATC/ATC">
@@ -561,7 +569,7 @@
         -->
     
     <h2>6. Actions éducatives territoriales</h2>
-      <!--
+  
       <table>
           <colgroup>
             <col class="libelle"></col>
@@ -597,7 +605,7 @@
           </table>
         </td>
       </table>
-   -->
+  
      <table>
       <colgroup>
         <col class="libelle"></col>