Vss2Git

CG67.FicheCollege.root/CG67.FicheCollege/Core/CG67.FicheCollege.Domaine/ProgTravaux.cs

@@ -23,6 +23,10 @@ namespace CG67.FicheCollege.Domaine
         /// type de l'opération (maintenance, rénovation, etc...)
         /// </summary>
         private string mTypeOperation;
+        /// <summary>
+        /// status de l'opération
+        /// </summary>
+        private string mStatutOP;
 
 	
         public int Annee
@@ -46,11 +50,18 @@ namespace CG67.FicheCollege.Domaine
             set { mTypeOperation = value; }
         }
 
-        public ProgTravaux(int annee, string libelle, double montant, string typeOperation)
+        public string StatutOp
+        {
+            get { return mStatutOP; }
+            set { mStatutOP = value; }
+        }
+        public ProgTravaux(int annee, string libelle, double montant, string typeOperation, string statutOp)
         {
             this.mAnnee = annee;
+            this.mTypeOperation = typeOperation;
             this.mLibelle = libelle;
             this.mMontant = montant;
+            this.mStatutOP = statutOp;
         }
     }
 }

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

@@ -21,7 +21,7 @@ namespace CG67.FicheCollege.Entrepot
                     connexion.Open();
                     using (OracleCommand command = connexion.CreateCommand())
                     {
-                        command.CommandText = "SELECT ANNEE, LIBELLE_OPERATION, MONTANT_PREV, TYPE_OPERATION FROM T_OPERAT_SERV_BAT INNER JOIN T_COLLEGE ON (T_OPERAT_SERV_BAT.LIEN_T_COLLEGE = T_COLLEGE.REF_COLLEGE) WHERE TYPE_OPERATION Like 'Restructuration%' AND CODE_COLLEGE = :RNE AND LIBELLE_OPERATION NOT IN (Select LIBELLE_OPERATION FROM T_OPERAT_SERV_BAT WHERE LIBELLE_OPERATION = 'Op') AND ANNEE BETWEEN :AnneeMoins1 AND :AnneePlus1 ORDER BY TYPE_OPERATION, ANNEE ASC";
+                        command.CommandText = "SELECT ANNEE, LIBELLE_OPERATION, MONTANT_PREV, TYPE_OPERATION, STATUT_OP FROM T_OPERAT_SERV_BAT INNER JOIN T_COLLEGE ON (T_OPERAT_SERV_BAT.LIEN_T_COLLEGE = T_COLLEGE.REF_COLLEGE) WHERE (TYPE_OPERATION Like 'Restructuration%' OR TYPE_OPERATION Like 'Maintenance%') AND CODE_COLLEGE = :RNE AND LIBELLE_OPERATION NOT IN (Select LIBELLE_OPERATION FROM T_OPERAT_SERV_BAT WHERE LIBELLE_OPERATION = 'Op') AND ANNEE BETWEEN :AnneeMoins1 AND :AnneePlus1 ORDER BY ANNEE , TYPE_OPERATION ASC";
                         command.Parameters.AddWithValue (":RNE", codeRNE);
                         int anneeMoins1 = annee - 1;
                         command.Parameters.AddWithValue(":AnneeMoins1", anneeMoins1);
@@ -31,7 +31,7 @@ namespace CG67.FicheCollege.Entrepot
                         {
                             while (reader.Read())
                             {
-                                resultat.Add(new ProgTravaux(Convert.ToInt16(reader["ANNEE"].ToString()), reader["LIBELLE_OPERATION"].ToString(), Convert.ToDouble(reader["MONTANT_PREV"].ToString()), reader["TYPE_OPERATION"].ToString()));
+                                resultat.Add(new ProgTravaux(Convert.ToInt16(reader["ANNEE"].ToString()), reader["LIBELLE_OPERATION"].ToString(), Convert.ToDouble(reader["MONTANT_PREV"].ToString()), reader["TYPE_OPERATION"].ToString(), reader["STATUT_OP"].ToString()));
                             }
                         }
                     }

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

@@ -63,16 +63,24 @@ body
 {
  width: 50px; 
 }
+.typetravaux
+{
+	width:80px;
+}
 .travlibelle
 {
- width:350px; 	
+ width:400px; 	
 }
 
 .travmontant
 {
-	 width:80px;
+	 width:120px;
 	 text-align: right;
 }
+.travstatus
+{
+	width:100px;
+}
 
 h2
 {

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

@@ -213,24 +213,35 @@
           <table id="travaux">
             <colgroup>
               <col class="travannee"></col>
+              <col class="typetravaux"></col>
               <col class="travlibelle"></col>
               <col class="travmontant"></col>
+              <col class="travstatus"></col>
             </colgroup>
             <tr>
               <th class="bordure">Année</th>
-              <th class="bordure">Libelle</th>
-              <th class="bordure">Montant</th>
+              <th class="bordure">Type</th>
+              <th class="bordure">Libelle</th>              
+              <th class="bordure">Montant prévisionnel</th>
+              <th class="bordure">Statut</th>
             </tr>
             <xsl:for-each select="Etablissement/LstTravaux/ProgTravaux">              
               <tr>
                 <td class="bordure">
                   <xsl:value-of select="Annee"/>
                 </td>
+                <td class="bordure">
+                  <xsl:value-of select="TypeOperation"/>
+                </td>
                 <td class="bordure">
                   <xsl:value-of select ="Libelle"/>
                 </td>
                 <td class="bordure">
-                  <xsl:value-of select="Montant"/><xsl:text> €</xsl:text> 
+                    <xsl:value-of select="Montant"/>                  
+                  <xsl:text> €</xsl:text> 
+                </td>
+                <td class="bordure">
+                  <xsl:value-of select="StatutOp"/>
                 </td>
               </tr>
             </xsl:for-each>
@@ -402,11 +413,13 @@
                 <tr>
                   <th class="bordure">Nom</th>
                   <th class="bordure">Prénom</th>
-                  <th class="bordure">Grade</th>
-
-
                   <th class="bordure">Fonction</th>
+                  <th class="bordure">Quotité en nbr d'heures<br/>par semaine
+                  </th>
+                  <th class="bordure">Statut</th>
+                 <th class="bordure">Grade</th>
                 </tr>
+                
                 <xsl:for-each select="Etablissement/LstATC/ATC[ContratAide='False']">
                   <tr>
                     <td class="bordure">
@@ -416,12 +429,16 @@
                       <xsl:value-of select="Prenom"/>
                     </td>
                     <td class="bordure">
-                      <xsl:value-of select="Grade"/>
+                      <xsl:value-of select="Fonction"/>
+                    </td>
+                    <td class="bordurecentre">
+                      <xsl:value-of select="ValeurETP"/>
+                    </td>
+                    <td class="bordurecentre">
+                      <xsl:value-of select="Categorie"/>
                     </td>
-
-
                     <td class="bordure">
-                      <xsl:value-of select="Fonction"/>
+                      <xsl:value-of select="Grade"/>
                     </td>
                   </tr>
                 </xsl:for-each>