From 660f5d385590495ae91eac09592832a477a9198c Mon Sep 17 00:00:00 2001
From: adri <reg+git@adriy.be>
Date: Sat, 19 Jan 2019 10:58:20 +0100
Subject: [PATCH] Gros UC avec 3 petit UC Ok (3xPlat=>Repa)

---
 ProjetTheAlone/App.xaml                    |  2 +-
 ProjetTheAlone/Model/EventPasseModel.cs    | 32 -----------------
 ProjetTheAlone/Model/RepaModel.cs          | 32 -----------------
 ProjetTheAlone/ProjetTheAlone.csproj       | 40 ++++++++++++++++++++--
 ProjetTheAlone/UserControlDIY/Plat.xaml    |  1 -
 ProjetTheAlone/UserControlDIY/Repa.xaml    | 12 +++----
 ProjetTheAlone/UserControlDIY/Repa.xaml.cs | 19 ++++++++--
 ProjetTheAlone/View/DashBoard.xaml         | 25 ++++++++------
 ProjetTheAlone/View/DashBoard.xaml.cs      | 14 +++++---
 9 files changed, 83 insertions(+), 94 deletions(-)
 delete mode 100644 ProjetTheAlone/Model/EventPasseModel.cs
 delete mode 100644 ProjetTheAlone/Model/RepaModel.cs

diff --git a/ProjetTheAlone/App.xaml b/ProjetTheAlone/App.xaml
index d66f507..e5efce0 100644
--- a/ProjetTheAlone/App.xaml
+++ b/ProjetTheAlone/App.xaml
@@ -2,7 +2,7 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:ProjetTheAlone"
-             StartupUri="/View/DashBoard.xaml">
+             StartupUri="/View/Accueil.xaml">
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
diff --git a/ProjetTheAlone/Model/EventPasseModel.cs b/ProjetTheAlone/Model/EventPasseModel.cs
deleted file mode 100644
index 18e018e..0000000
--- a/ProjetTheAlone/Model/EventPasseModel.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ProjetTheAlone.Model
-{
-    public class EventPasseModel : INotifyPropertyChanged
-    {
-        public event PropertyChangedEventHandler PropertyChanged;
-        ObservableCollection<string> classement;
-
-        public ObservableCollection<string> Classement { get => classement; set { classement = value; OnPropertyChanged("Classement"); } }
-
-        public EventPasseModel(ObservableCollection<string>  classement)
-        {
-            Classement = classement;
-        }
-
-        protected void OnPropertyChanged(string name)
-        {
-            PropertyChangedEventHandler handler = PropertyChanged;
-            if (handler != null)
-            {
-                handler(this, new PropertyChangedEventArgs(name));
-            }
-        }
-    }
-}
diff --git a/ProjetTheAlone/Model/RepaModel.cs b/ProjetTheAlone/Model/RepaModel.cs
deleted file mode 100644
index cb75244..0000000
--- a/ProjetTheAlone/Model/RepaModel.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.ComponentModel;
-using ProjetTheAlone.Classes;
-using System.Collections.ObjectModel;
-
-namespace ProjetTheAlone.Model
-{
-    public class RepaModel : INotifyPropertyChanged
-    {
-        private ObservableCollection<C_T_plat> listPlat = new ObservableCollection<C_T_plat>();
-
-        public ObservableCollection<C_T_plat> ListPlat { get => listPlat; set { listPlat = value; OnPropertyChanged("ListPlat"); } }
-
-        public event PropertyChangedEventHandler PropertyChanged;
-        protected void OnPropertyChanged(string name)
-        {
-            PropertyChangedEventHandler handler = PropertyChanged;
-            if (handler != null)
-            {
-                handler(this, new PropertyChangedEventArgs(name));
-            }
-        }
-        public RepaModel()
-        {
-
-        }
-    }
-}
diff --git a/ProjetTheAlone/ProjetTheAlone.csproj b/ProjetTheAlone/ProjetTheAlone.csproj
index 68bf636..0dfeb02 100644
--- a/ProjetTheAlone/ProjetTheAlone.csproj
+++ b/ProjetTheAlone/ProjetTheAlone.csproj
@@ -90,7 +90,7 @@
     <Compile Include="Model\C_T_typeEvenement.cs" />
     <Compile Include="Model\C_T_typePlat.cs" />
     <Compile Include="Model\C_T_typeRepa.cs" />
-    <Compile Include="Model\EventPasseModel.cs" />
+    <Compile Include="ViewModel\EventPasseModel.cs" />
     <Compile Include="Model\G_Base.cs" />
     <Compile Include="Model\G_T_beneficiaire.cs" />
     <Compile Include="Model\G_T_equipe.cs" />
@@ -103,7 +103,7 @@
     <Compile Include="Model\G_T_typeEvenement.cs" />
     <Compile Include="Model\G_T_typePlat.cs" />
     <Compile Include="Model\G_T_typeRepa.cs" />
-    <Compile Include="Model\RepaModel.cs" />
+    <Compile Include="ViewModel\RepaModel.cs" />
     <Compile Include="UserControlDIY\EventFutur.xaml.cs">
       <DependentUpon>EventFutur.xaml</DependentUpon>
     </Compile>
@@ -117,9 +117,25 @@
       <DependentUpon>Repa.xaml</DependentUpon>
     </Compile>
     <Compile Include="ViewModel\Base.cs" />
+    <Compile Include="ViewModel\EvenementEncode.cs" />
+    <Compile Include="View\Accueil.xaml.cs">
+      <DependentUpon>Accueil.xaml</DependentUpon>
+    </Compile>
     <Compile Include="View\DashBoard.xaml.cs">
       <DependentUpon>DashBoard.xaml</DependentUpon>
     </Compile>
+    <Compile Include="View\FicBeneficiaireEncode.xaml.cs">
+      <DependentUpon>FicBeneficiaireEncode.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\FicEncodage.xaml.cs">
+      <DependentUpon>FicEncodage.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\FicEvenementEncode.xaml.cs">
+      <DependentUpon>FicEvenementEncode.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\FicRepasEncode.xaml.cs">
+      <DependentUpon>FicRepasEncode.xaml</DependentUpon>
+    </Compile>
     <Page Include="MainWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -148,10 +164,30 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="View\Accueil.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="View\DashBoard.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="View\FicBeneficiaireEncode.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="View\FicEncodage.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="View\FicEvenementEncode.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="View\FicRepasEncode.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/ProjetTheAlone/UserControlDIY/Plat.xaml b/ProjetTheAlone/UserControlDIY/Plat.xaml
index 5478df2..707fcf4 100644
--- a/ProjetTheAlone/UserControlDIY/Plat.xaml
+++ b/ProjetTheAlone/UserControlDIY/Plat.xaml
@@ -28,6 +28,5 @@
         </Grid.ColumnDefinitions>
         <TextBlock x:Name="FoodDesc" Style="{StaticResource MaterialDesignTitleTextBlock}" HorizontalAlignment="Center" Height="Auto" Text="{Binding PlatV.P_nom}" />
         <Image x:Name="FoodPic" Source="{Binding PlatV.P_img, Converter={StaticResource imgConverter}}" Grid.Column="1" Stretch="Uniform"/>
-
     </Grid>
 </UserControl>
diff --git a/ProjetTheAlone/UserControlDIY/Repa.xaml b/ProjetTheAlone/UserControlDIY/Repa.xaml
index 75dca68..e011511 100644
--- a/ProjetTheAlone/UserControlDIY/Repa.xaml
+++ b/ProjetTheAlone/UserControlDIY/Repa.xaml
@@ -21,14 +21,10 @@
             <RowDefinition Height="*"/>
             <RowDefinition Height="*"/>
         </Grid.RowDefinitions>
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="2*" />
-            <ColumnDefinition Width="*" />
-        </Grid.ColumnDefinitions>
-        <TextBlock Style="{StaticResource MaterialDesignTitleTextBlock}" HorizontalAlignment="Center" Height="Auto" Text="Date Jour" Grid.ColumnSpan="2"/>
-        <TextBlock Grid.Row="1" Style="{StaticResource MaterialDesignTitleTextBlock}" HorizontalAlignment="Center" Height="Auto" Text="{Binding ListPlat[0].P_Nom}" />
-        <TextBlock Grid.Row="2" Style="{StaticResource MaterialDesignTitleTextBlock}" HorizontalAlignment="Center" Height="Auto" Text="Date Jour" />
-        <TextBlock Grid.Row="3" Style="{StaticResource MaterialDesignTitleTextBlock}" HorizontalAlignment="Center" Height="Auto" Text="Date Jour" />
+        <TextBlock Text="{Binding Quand}" />
+        <local:Plat x:Name="Plat1XML" Grid.Row="1"></local:Plat>
+        <local:Plat x:Name="Plat2XML" Grid.Row="2"></local:Plat>
+        <local:Plat x:Name="Plat3XML" Grid.Row="3"></local:Plat>
 
     </Grid>
 </UserControl>
diff --git a/ProjetTheAlone/UserControlDIY/Repa.xaml.cs b/ProjetTheAlone/UserControlDIY/Repa.xaml.cs
index 5c8346f..0696acf 100644
--- a/ProjetTheAlone/UserControlDIY/Repa.xaml.cs
+++ b/ProjetTheAlone/UserControlDIY/Repa.xaml.cs
@@ -15,6 +15,7 @@ using System.Windows.Navigation;
 using System.Windows.Shapes;
 using ProjetTheAlone.Classes;
 using ProjetTheAlone.Model;
+using ProjetTheAlone.ViewModel;
 
 namespace ProjetTheAlone.UserControlDIY
 {
@@ -24,17 +25,29 @@ namespace ProjetTheAlone.UserControlDIY
     public partial class Repa : UserControl
     {
         
-        public ObservableCollection<C_T_plat> ListPlat
+        public RepaModel RM
         {
             get
             {
-                return this.DataContext as ObservableCollection<C_T_plat>;
+                return this.DataContext as RepaModel;
             }
         }
-
+        public C_T_plat Plat1 { get => ((RM==null)?new C_T_plat():RM.Plat1 ?? new C_T_plat()); }
+        public C_T_plat Plat2 { get => ((RM == null) ? new C_T_plat() : RM.Plat2 ?? new C_T_plat()); }
+        public C_T_plat Plat3 { get => ((RM == null) ? new C_T_plat() : RM.Plat3 ?? new C_T_plat()); }
         public Repa()
         {
             InitializeComponent();
+            GridPrinc.DataContext = RM;
+            Plat1XML.DataContext = Plat1;
+            this.DataContextChanged += new DependencyPropertyChangedEventHandler(updateDataContext);
+        }
+        public void updateDataContext(object o, DependencyPropertyChangedEventArgs e)
+        {
+            GridPrinc.DataContext = RM;
+            Plat1XML.DataContext = Plat1;
+            Plat2XML.DataContext = Plat2;
+            Plat3XML.DataContext = Plat3;
         }
     }
 }
diff --git a/ProjetTheAlone/View/DashBoard.xaml b/ProjetTheAlone/View/DashBoard.xaml
index dbc1569..38ec60e 100644
--- a/ProjetTheAlone/View/DashBoard.xaml
+++ b/ProjetTheAlone/View/DashBoard.xaml
@@ -16,7 +16,7 @@
         TextOptions.TextRenderingMode="Auto"
         Background="{DynamicResource MaterialDesignPaper}"
         FontFamily="{DynamicResource MaterialDesignFont}"
-        Name="wnd">
+        Name="wnd" Closing="wnd_Closing">
     <Window.Resources>
         <local:DebugDummyConverter x:Key="DebugDummyConverter" />
     </Window.Resources>
@@ -32,11 +32,11 @@
                 <ColumnDefinition />
                 <ColumnDefinition />
             </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
+            <!--<Grid.RowDefinitions>
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="Auto" />
-                µ
             </Grid.RowDefinitions>
+            <TextBlock ></TextBlock>
             <DockPanel>
                 <ListView  x:Name="RepasMatin">
                     <ListView.ItemContainerStyle>
@@ -51,10 +51,11 @@
                         </DataTemplate>
                     </ListView.ItemTemplate>
                 </ListView>
-            </DockPanel>
+            </DockPanel>-->
+            <control:Repa x:Name="RepasMatin"></control:Repa>
 
             <materialDesign:PackIcon Kind="Build" Grid.Column="2" HorizontalAlignment="Right" Cursor="Hand"/>
-            
+
         </Grid>
         <Grid Grid.Row="1" >
             <Grid.ColumnDefinitions>
@@ -63,15 +64,19 @@
                 <ColumnDefinition />
                 <ColumnDefinition />
             </Grid.ColumnDefinitions>
-            <control:EventPasse x:Name="EventPasse1" Classement="{Binding Classement}"></control:EventPasse>
+            <control:EventPasse x:Name="EventPasse1" Classement="{Binding Classement}" ></control:EventPasse>
             <control:EventPasse x:Name="EventPasse2" Classement="{Binding Classement}" Grid.Column="1"></control:EventPasse>
             <control:EventFutur Grid.Column="2"></control:EventFutur>
             <control:EventFutur Grid.Column="3"></control:EventFutur>
         </Grid>
 
-        
+
         <Grid Grid.Row="2" Visibility="Visible">
-            <Border>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="356*"/>
+                <ColumnDefinition Width="147*"/>
+            </Grid.ColumnDefinitions>
+            <Border Grid.ColumnSpan="2">
                 <Border.Background>
                     <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
                         <GradientStop Color="OrangeRed" Offset="0" />
@@ -79,8 +84,8 @@
                     </LinearGradientBrush>
                 </Border.Background>
             </Border>
-            <TextBlock Grid.Column="1" Style="{StaticResource MaterialDesignTitleTextBlock}" VerticalAlignment="Center" Height="Auto" Text="Absentéisme ou alerte" />
+            <TextBlock Style="{StaticResource MaterialDesignTitleTextBlock}" VerticalAlignment="Center" Height="Auto" Text="Absentéisme ou alerte" Grid.ColumnSpan="2" Margin="0,9" />
         </Grid>
-        
+
     </Grid>
 </Window>
diff --git a/ProjetTheAlone/View/DashBoard.xaml.cs b/ProjetTheAlone/View/DashBoard.xaml.cs
index f56cae3..353e5a4 100644
--- a/ProjetTheAlone/View/DashBoard.xaml.cs
+++ b/ProjetTheAlone/View/DashBoard.xaml.cs
@@ -16,6 +16,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Shapes;
 using ProjetTheAlone.Model;
 using ProjetTheAlone.Classes;
+using ProjetTheAlone.ViewModel;
 
 namespace ProjetTheAlone.View
 {
@@ -58,7 +59,7 @@ namespace ProjetTheAlone.View
             EventPasse2.DataContext = EventPasse1.DataContext = Epm;
             Epm.Classement = Cl;
 
-            FileStream fs = new System.IO.FileStream(@"C:\Users\adrie\Nextcloud\ecole\3IS\POO\ProjetTheAlone\ProjetTheAlone\img\desert.jpg", FileMode.Open, FileAccess.Read);
+            FileStream fs = new System.IO.FileStream(@".\desert.jpg", FileMode.Open, FileAccess.Read);
             BinaryReader br = new BinaryReader(fs);
             byte[] result = br.ReadBytes((int)fs.Length);
             br.Close();
@@ -66,15 +67,18 @@ namespace ProjetTheAlone.View
             Rm.ListPlat.Add(new C_T_plat("Entrée", result, null));
             Rm.ListPlat.Add(new C_T_plat("Plat", result, null));
             Rm.ListPlat.Add(new C_T_plat("Desert", result, null));
+            Rm.Quand = "Matin";
             Console.WriteLine($"~~~~~~{Rm.ListPlat[0].P_nom}~~~~~~");
 
-            RepasMatin.ItemsSource = Rm.ListPlat;
-            //Test.DataContext = Rm.ListPlat[0];
-            //Test1.DataContext = Rm.ListPlat[1];
-            //Test2.DataContext = Rm.ListPlat[2];
+            RepasMatin.DataContext = Rm;
 
 
         }
+
+        private void wnd_Closing(object sender, System.ComponentModel.CancelEventArgs e)
+        {
+            Accueil.Openaffichage = false;
+        }
     }
     public class DebugDummyConverter : IValueConverter
     {