Vss2Git

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

@@ -28,7 +28,11 @@ namespace CG67.FicheCollege.Domaine
         /// </summary>
         private string mStatutOP;
 
-	
+        /// opération prévu ou non 
+        /// </summary>
+        private int mPrevuOP;
+
+
         public int Annee
         {
             get { return mAnnee; }
@@ -55,13 +59,20 @@ namespace CG67.FicheCollege.Domaine
             get { return mStatutOP; }
             set { mStatutOP = value; }
         }
-        public ProgTravaux(int annee, string libelle, double montant, string typeOperation, string statutOp)
+
+        public int PrevuOp
+        {
+            get { return mPrevuOP; }
+            set { mPrevuOP = value; }
+        }
+        public ProgTravaux(int annee, string libelle, double montant, string typeOperation, string statutOp, int prevuOp)
         {
             this.mAnnee = annee;
             this.mTypeOperation = typeOperation;
             this.mLibelle = libelle;
             this.mMontant = montant;
             this.mStatutOP = statutOp;
+            this.mPrevuOP = prevuOp;
         }
     }
 }

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

@@ -21,12 +21,12 @@ namespace CG67.FicheCollege.Entrepot
                     connexion.Open();
                     using (OracleCommand command = connexion.CreateCommand())
                     {
-                        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.CommandText = "SELECT ANNEE, LIBELLE_OPERATION, MONTANT_PREV, TYPE_OPERATION, STATUT_OP, IMPREVU FROM T_OPERAT_SERV_BAT INNER JOIN T_COLLEGE ON (T_OPERAT_SERV_BAT.LIEN_T_COLLEGE = T_COLLEGE.REF_COLLEGE) WHERE CODE_COLLEGE = :RNE AND LIBELLE_OPERATION NOT IN (Select LIBELLE_OPERATION FROM T_OPERAT_SERV_BAT WHERE LIBELLE_OPERATION = 'Op') AND ANNEE BETWEEN :AnneeMoins2 AND :Annee ORDER BY ANNEE , TYPE_OPERATION ASC";
+                        //     command.CommandText = "SELECT ANNEE, LIBELLE_OPERATION, MONTANT_PREV, TYPE_OPERATION, STATUT_OP, IMPREVU 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 :AnneeMoins2 AND :Annee ORDER BY ANNEE , TYPE_OPERATION ASC";
                         command.Parameters.AddWithValue (":RNE", codeRNE);
-                        int anneeMoins1 = annee - 1;
-                        command.Parameters.AddWithValue(":AnneeMoins1", anneeMoins1);
-                        int anneePlus1 = annee + 1;
-                        command.Parameters.AddWithValue (":AnneePlus1", anneePlus1);
+                        int anneeMoins2 = annee - 2;
+                        command.Parameters.AddWithValue(":AnneeMoins2", anneeMoins2);
+                        command.Parameters.AddWithValue (":Annee", annee);
                         double montantPrev;
                         using (OracleDataReader reader = command.ExecuteReader())
                         {
@@ -40,7 +40,7 @@ namespace CG67.FicheCollege.Entrepot
                                 {
                                     montantPrev = 0;
                                 }
-                                resultat.Add(new ProgTravaux(Convert.ToInt16(reader["ANNEE"].ToString()), reader["LIBELLE_OPERATION"].ToString(), montantPrev , reader["TYPE_OPERATION"].ToString(), reader["STATUT_OP"].ToString()));
+                                resultat.Add(new ProgTravaux(Convert.ToInt16(reader["ANNEE"].ToString()), reader["LIBELLE_OPERATION"].ToString(), montantPrev, reader["TYPE_OPERATION"].ToString(), reader["STATUT_OP"].ToString(), Convert.ToInt16(reader["IMPREVU"].ToString())));
                             }
                         }
                     }

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

@@ -99,6 +99,10 @@ body
 {
 	width:100px;
 }
+.travimprevu
+{
+	width:80px;
+}
 
 h2
 {

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

@@ -288,7 +288,7 @@
       <tr>
        <table>
          <br></br>
-        <h3>Programmation des travaux Maintenance (année n-1, n, n+1)</h3>
+        <h3>Programmation des travaux Maintenance (année n-2, n-1, n)</h3>
         </table>
         <td>
           <xsl:if test="count(Etablissement/LstTravaux/child::*) >0">
@@ -299,6 +299,7 @@
               <col class="travlibelle"></col>
               <col class="travmontant"></col>
               <col class="travstatus"></col>
+              <col class="travimprevu"></col>
             </colgroup>
             <tr>
               <th class="bordurecentre">Année</th>
@@ -306,6 +307,7 @@
               <th class="bordurecentre">Libelle</th>              
               <th class="bordurecentre">Montant</th>
               <th class="bordurecentre">Statut</th>
+              <th class="bordurecentre">Imprevu</th>
             </tr>
             <xsl:for-each select="Etablissement/LstTravaux/ProgTravaux">              
               <tr>
@@ -325,6 +327,14 @@
                 <td class="bordurecentre">
                   <xsl:value-of select="StatutOp"/>
                 </td>
+                <td class="bordurecentre">
+                  <xsl:if test ="PrevuOp= 0">
+                   Oui
+                  </xsl:if>
+                  <xsl:if test ="PrevuOp != 0">
+                   Non
+                  </xsl:if>
+                </td>
               </tr>
             </xsl:for-each>
           </table>