Vss2Git

CG67.FicheCollege.root/CG67.FicheCollege/Core/CG67.FicheCollege.Domaine/CG67.FicheCollege.Domaine.csproj

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
+    <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{EA9B4153-44A9-46AF-891B-8DFE604CF33F}</ProjectGuid>
     <OutputType>Library</OutputType>

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

@@ -212,6 +212,7 @@ namespace CG67.FicheCollege.Domaine
         /// </summary>
         private string mLienPhoto;
         /// <summary>
+        private string mLienFichier;
         /// nombre total de remplacements d'ATC
         /// </summary>
       //  private int mNbrRemplacementsATC;
@@ -639,6 +640,12 @@ namespace CG67.FicheCollege.Domaine
             get { return mLienPhoto; }
             set { mLienPhoto = value; }
         }
+
+        public string LienFichier
+        {
+            get { return mLienFichier; }
+            set { mLienFichier = value; }
+        }
        // public int NbrRemplacementsATC
        // {
        //     get { return mNbrRemplacementsATC; }
@@ -1122,7 +1129,7 @@ namespace CG67.FicheCollege.Domaine
             this.mNom = nom;
             this.mCommune = commune;
         }
-        public Etablissement(string codeRNE, bool isPrive, int annee, string nom, string commune, string canton, string typeEtablissement, int anneeConstruction, string telephone, string email, string fax, string nomProprietaire, string adresse, string complementAdresse, int codePostal, string ville, string lienPhoto, 
+        public Etablissement(string codeRNE, bool isPrive, int annee, string nom, string commune, string canton, string typeEtablissement, int anneeConstruction, string telephone, string email, string fax, string nomProprietaire, string adresse, string complementAdresse, int codePostal, string ville, string lienPhoto,string lienFichier, 
                                 bool isRestaurant,bool isInternat, bool ascenseur, int effectifTheorique,
                                 dlgLoadActionEducative loaderActionEducative,
                                 dlgLoadClasseDecouverte loaderClasseDecouverte,
@@ -1157,6 +1164,7 @@ namespace CG67.FicheCollege.Domaine
             this.mComplementAdresse = complementAdresse;
             this.mVille = ville;
             this.mCodePostal = codePostal;
+            this.mLienFichier = lienFichier;
             this.mLienPhoto = lienPhoto;
             this.mIsRestautant = isRestaurant;
             this.mIsInternat = isInternat;

CG67.FicheCollege.root/CG67.FicheCollege/Core/CG67.FicheCollege.Entrepot/CG67.FicheCollege.Entrepot.csproj

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
+    <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{799F1203-F76F-4623-B6BD-DBE509478539}</ProjectGuid>
     <OutputType>Library</OutputType>
@@ -37,6 +37,7 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Microsoft.Office.Interop.Excel, Version=12.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c" />
     <Reference Include="System" />
     <Reference Include="System.configuration" />
     <Reference Include="System.Data" />

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

@@ -84,7 +84,7 @@ namespace CG67.FicheCollege.Entrepot
                                  dr["TypeEtablissement"].ToString(), Convert.ToInt16(dr["AnneeConstruction"].ToString()),
                                  dr["Telephone"].ToString(), dr["Email"].ToString(), dr["Fax"].ToString(),
                                  dr["NomPropriétaire"].ToString(), adresse, dr["ComplementAdresse"].ToString(),
-                                 Convert.ToInt32(dr["CodePostal"].ToString()), dr["Ville"].ToString(), dr["LienPhoto"].ToString(),
+                                 Convert.ToInt32(dr["CodePostal"].ToString()), dr["Ville"].ToString(), dr["LienPhoto"].ToString(),dr["fichierPPM"].ToString(),
                                  dr.GetBoolean(dr.GetOrdinal("DemiPension")), dr.GetBoolean(dr.GetOrdinal("Internat")),dr.GetBoolean(dr.GetOrdinal("Ascenseur")), int.Parse(dr["CapaciteTheorique"].ToString()),
                                  EntrepotFactory.GetEntrepotActionEducative().GetByCodeRNEAndAnnee,
                                  EntrepotFactory.GetEntrepotClasseDecouverte().GetByCodeRNEAndAnnee,

CG67.FicheCollege.root/CG67.FicheCollege/Core/CG67.FicheCollege.Interface/CG67.FicheCollege.Interface.csproj

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
+    <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{6F721CCA-8B98-406A-A266-5D7D6264BCE6}</ProjectGuid>
     <OutputType>Library</OutputType>

CG67.FicheCollege.root/CG67.FicheCollege/Web/CG67.FicheCollege.Web/CG67.FicheCollege.Web.csproj

@@ -58,28 +58,17 @@
     <Content Include="photo\Mundolsheim_0672013Z.jpg" />
     <Content Include="photo\Rosheim_0671913R.jpg" />
     <Content Include="photo\Wingen_0671739B.jpg" />
-    <Content Include="photo\Molsheim_0672606U.jpg" />
     <Content Include="photo\Bischheim_0671822S.jpg" />
-    <Content Include="photo\Lauterbourg_0671688W.jpg" />
     <Content Include="photo\SoultzForet_0671827X.jpg" />
     <Content Include="photo\Marmoutier_0671985U.jpg" />
     <Content Include="photo\StrasbourgTruffaut_0671825V.jpg" />
-    <Content Include="photo\Illkirch_0672194W.jpg" />
-    <Content Include="photo\Hochfeden_0671961T.jpg" />
-    <Content Include="photo\Saverne_0671987W.jpg" />
-    <Content Include="photo\StrasbourgErasme_0672459J.jpg" />
     <Content Include="photo\LaWantzenau_0671689X.jpg" />
     <Content Include="photo\Wissembourg_0671984T.jpg" />
-    <Content Include="photo\Hoerdt_0672012Y.jpg" />
     <Content Include="photo\Soufflenheim_0670076U.JPG" />
-    <Content Include="photo\Heiligenstein_0673006D.JPG" />
     <Content Include="photo\StrasbourgHansArp_0671907J.JPG" />
     <Content Include="photo\Woerth_0671596W.JPG" />
-    <Content Include="photo\Bouxwiller_0672076T.jpg" />
     <Content Include="photo\Dettwiller_0672197Z.jpg" />
     <Content Include="photo\StrasbourgStockfeld_0671691Z.JPG" />
-    <Content Include="photo\Diemeringen_0671741D.JPG" />
-    <Content Include="photo\StrasbourgFoch_0671958P.jpg" />
     <Content Include="photo\StrasbourgSophieGermain_0671590P.jpg" />
     <Content Include="photo\untitled.bmp" />
     <Content Include="Web.config" />
@@ -124,45 +113,62 @@
   <ItemGroup>
     <Content Include="css\Print.css" />
     <Content Include="images\logoCG67N.GIF" />
+    <Content Include="photo\Achenheim_0671686U.jpg" />
+    <Content Include="photo\Barr_0672133E.jpg" />
+    <Content Include="photo\Benfeld_0670003P.jpg" />
     <Content Include="photo\BischheimRied_0670004R.jpg" />
-    <Content Include="photo\Bischwiller-Maurois_0672130B.JPG" />
+    <Content Include="photo\Bischwiller-Sautdulièvre_0672237T.jpg" />
+    <Content Include="photo\Bischwiller_Maurois_0672130B.jpg" />
+    <Content Include="photo\Bouxwiller_0672076T.jpg" />
     <Content Include="photo\Brumath_0670009W.jpg" />
+    <Content Include="photo\Chatenois_0671962U.jpg" />
+    <Content Include="photo\Dambach_0670011Y.jpg" />
+    <Content Include="photo\Diemeringen_0671741D.jpg" />
     <Content Include="photo\Drulingen_0670014B.jpg" />
     <Content Include="photo\Drusenheim_0672074R.jpg" />
     <Content Include="photo\Duttlenheim_0672896J.jpg" />
     <Content Include="photo\Erstein_0670017E.jpg" />
     <Content Include="photo\Gerstheim_0672135G.jpg" />
-    <Content Include="photo\Haguenau-Foch_0672136H.JPG" />
-    <Content Include="photo\Haguenau-Kleber_0671734W.JPG" />
+    <Content Include="photo\Haguenau-Foch_0672136H.jpg" />
+    <Content Include="photo\Haguenau-Kleber_0671734W.jpg" />
+    <Content Include="photo\Heiligenstein_0673006D.jpg" />
+    <Content Include="photo\Herrlisheim_0671911N.jpg" />
+    <Content Include="photo\Hochfelden_0671961T.jpg" />
+    <Content Include="photo\Hoerdt_0672012Y.jpg" />
+    <Content Include="photo\Illkirch_Roseaux-0672194W.JPG" />
+    <Content Include="photo\Ingwiller_0670035Z.jpg" />
     <Content Include="photo\La_Broque_0671697F.jpg" />
+    <Content Include="photo\Lauterbourg_0671688W.jpg" />
     <Content Include="photo\La_walck_0671598Y.jpg" />
     <Content Include="photo\Lingolsheim-galilée_0672765S.jpg" />
     <Content Include="photo\Eschau_0671687V.jpg" />
-    <Content Include="photo\Chatenois_0671962U.jpg" />
-    <Content Include="photo\LaWalck_0671598Y.jpg" />
     <Content Include="photo\Lingolsheim_M_Alexandre_0671690Y.jpg" />
     <Content Include="photo\Marckolsheim_0671600A.JPG" />
     <Content Include="photo\Marlenheim_0671989Y.jpg" />
     <Content Include="photo\Mertzwiller_0671912P.JPG" />
-    <Content Include="photo\Molsheim_0672131C.JPG" />
+    <Content Include="photo\Molsheim-Bugatti_0672606U.jpg" />
+    <Content Include="photo\Molsheim-Meck_0672131C.jpg" />
     <Content Include="photo\Mutzig_0671828Y.jpg" />
     <Content Include="photo\Niederbronn_0671738A.JPG" />
+    <Content Include="photo\Obernai-Europe_0672078V.jpg" />
     <Content Include="photo\Obernai-Freppel_0672132D.jpg" />
     <Content Include="photo\Ostwald_0672072N.JPG" />
     <Content Include="photo\Pfulgriesheim_0672193V.jpg" />
     <Content Include="photo\Reichshoffen_0671595V.jpg" />
     <Content Include="photo\Rhinau_0671963V.jpg" />
     <Content Include="photo\Sarre-Union_0670056X.JPG" />
+    <Content Include="photo\Sarrebourg_0570097W.jpg" />
+    <Content Include="photo\Saverne_Les-sources_0671986V.jpg" />
+    <Content Include="photo\Saverne_Poincaré_0671987W.jpg" />
     <Content Include="photo\Schiltigheim-leclerc_0670065G.jpg" />
     <Content Include="photo\Schiltigheim-Rouget de Lisle_0670066H.jpg" />
+    <Content Include="photo\Schweighouse_0671960S.JPG" />
     <Content Include="photo\Seltz_0671597X.JPG" />
     <Content Include="photo\Souffelweyersheim_0672254L.JPG" />
+    <Content Include="photo\Strasbourg-Erasme_0672459J.jpg" />
+    <Content Include="photo\Strasbourg-Foch_0671958P.jpg" />
     <Content Include="photo\Strasbourg-Louise-Weiss_0671593T.jpg" />
     <Content Include="photo\StrasbourgSolignac_0671692A.jpg" />
-    <Content Include="photo\Achenheim_0671686U.jpg" />
-    <Content Include="photo\Barr_0672133E.jpg" />
-    <Content Include="photo\Benfeld_0670003P.jpg" />
-    <Content Include="photo\Bischwiller_0672237T.JPG" />
     <Content Include="photo\Strasbourg_Esplanade_0671915T.JPG" />
     <Content Include="photo\Strasbourg_Kléber_0670133F.JPG" />
     <Content Include="photo\Strasbourg_Lezay Marnésia_ 0670105A.JPG" />
@@ -172,26 +178,24 @@
     <Content Include="photo\Strasbourg_Twinger_ 0671508A.JPG" />
     <Content Include="photo\Sundhouse_0670106B.jpg" />
     <Content Include="photo\Sélestat-Mentel_0671830A.JPG" />
-    <Content Include="photo\Sélestat_0672134F.JPG" />
-    <Content Include="photo\Truchtersheim_ 0670107C.JPG" />
+    <Content Include="photo\Sélestat_Beatus Rhenanus_0672134F.jpg" />
+    <Content Include="photo\Truchtersheim_0670107C.jpg" />
     <Content Include="photo\Vendenheim_0672658A.jpg" />
     <Content Include="photo\Villé_0671601B.JPG" />
     <Content Include="photo\Wasselonne_0671740C.jpg" />
     <Content Include="photo\Illkirch_0671956M.jpg" />
     <Content Include="photo\StrasbourgFustel_0671742E.jpg" />
-    <Content Include="photo\Dambach_0670011Y.JPG" />
     <Content Include="photo\Eckbolsheim_0670016D.JPG" />
     <Content Include="photo\Geispolsheim_0671824U.JPG" />
     <Content Include="photo\Haguenau_0671734W.jpg" />
-    <Content Include="photo\Herrlisheim_0671911N.jpg" />
-    <Content Include="photo\Ingwiller_0670035Z.jpg" />
     <Content Include="photo\Schirmeck_0670068K.jpg" />
-    <Content Include="photo\Obernai_0672078V.JPG" />
-    <Content Include="photo\Saverne_0671986V.jpg" />
-    <Content Include="photo\Selestat_0671830A.jpg" />
     <Content Include="photo\StrasbourgVauban_0671909L.JPG" />
     <Content Include="vide.histo" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="pdf\Pilotes.pdf" />
+    <None Include="xls\Pilotes.xls" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v9.0\WebApplications\Microsoft.WebApplication.targets" Condition="" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

CG67.FicheCollege.root/CG67.FicheCollege/Web/CG67.FicheCollege.Web/Web.config

@@ -3,13 +3,13 @@
 <configuration>
 
   <appSettings>
-      <add key="ConnexionStringSic" value="Data Source=ESNA\SQLSTD2K5_1;Initial Catalog=TSic;User Id=UserTSicRW;password=UserTS!cRW!"/>
+      <add key="ConnexionStringSic" value="Data Source=PAN\SQLSTD2K5_1;Initial Catalog=TSic;User Id=UserTSicRW;password=UserTS!cRW!"/>
       <add key="ConnexionStringOracleCollege" value="Data Source=PCOL;User Id=college;Password=college;"/>
       <add key="ConnexionStringAccess" value="Provider=microsoft.jet.oledb.4.0;Data Source=\\Moder\App_production\College\data\Base\BD Collège_prod.mdb;Persist Security Info=False;"/>
       <add key="ConnexionStringOracleSubvention" value="Data Source=SGFP;User Id=ASTRE;Password=ASTRE;"/>
       <add key="ConnexionStringOracleAstreGF" value="Data Source=SGFP;User Id=SO;Password=SO;"/>
       <add key="ConnexionStringOracleRH" value="Data Source=SRHP;User Id=CG67_ATC;Password=ATC_CG67;"/>
-      <add key="AnneeEnCours" value="2012"/>
+      <add key="AnneeEnCours" value="2013"/>
   </appSettings>
   <connectionStrings/>
   <!-- -->

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

@@ -432,9 +432,19 @@
           </xsl:if>
           <tr>
             <table>
-              <br></br>
+				<br></br>
               <h3>Travaux de maintenance réalisés et prévus</h3>
-            </table>
+			</table>
+			  Données accessibles en Janvier 2014
+			<!--  <br></br>
+			  <xsl:element name="a">
+				  <xsl:attribute name="href">
+					  ..\xls\<xsl:value-of select="Etablissement/LienFichier"/>
+				  </xsl:attribute>
+				  Plan pluriannuel de programmation des travaux de maintenance
+				  <xsl:value-of select="Etablissement/LienFichier"/>
+			  </xsl:element>
+			  <br></br>
             <td>
               <xsl:if test="count(Etablissement/LstTravaux/child::*) >0">
                 <table id="travaux">
@@ -484,15 +494,15 @@
                   </xsl:for-each>
                 </table>
               </xsl:if>
-              <xsl:if test="count(Etablissement/LstTravaux/child::*) =0">
+              <xsl:if test="count(Etablissement/LstTravaux/child::*) =0"> 
                 Néant
               </xsl:if>
-
-            </td>
+				
+            </td> -->
           </tr>
           <tr>
             <br/>
-            <td>
+			 <td>
               <xsl:value-of select="Etablissement/CommentaireProgTravaux"/>
             </td>
           </tr>