commit 12ddf7efcb209e856a7011f06b4efd0d0317a08b
Author: lbihannic <lucas.bihannic@inrae.fr>
Date:   Wed Apr 2 16:01:36 2025 +0200

    add hints for behaviour chambers and refactor navigation page

diff --git a/GES_PAC/Controls/DoubleEntry.cs b/GES_PAC/Controls/DoubleEntry.cs
new file mode 100644
index 0000000..416468a
--- /dev/null
+++ b/GES_PAC/Controls/DoubleEntry.cs
@@ -0,0 +1,16 @@
+﻿using System.Globalization;
+
+namespace GES_PAC.Controls
+{
+    public class DoubleEntry : Entry
+    {
+        public DoubleEntry()
+        {
+            Keyboard = Keyboard.Numeric;
+            PlaceholderColor = Colors.LightGray;
+            TextColor = Colors.Black;
+            Placeholder = "0,0";
+            FontSize = 16;
+        }
+    }
+}
diff --git a/GES_PAC/GES_PAC.csproj b/GES_PAC/GES_PAC.csproj
index efc268b..fe3a976 100644
--- a/GES_PAC/GES_PAC.csproj
+++ b/GES_PAC/GES_PAC.csproj
@@ -96,6 +96,9 @@
 	  <MauiXaml Update="View\ChambersView.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
+	  <MauiXaml Update="View\Controls\ChamberButtonView.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
 	  <MauiXaml Update="View\CreateCalibrationView.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
diff --git a/GES_PAC/Model/Journee.cs b/GES_PAC/Model/Journee.cs
index 61aa442..6d58b78 100644
--- a/GES_PAC/Model/Journee.cs
+++ b/GES_PAC/Model/Journee.cs
@@ -44,7 +44,7 @@ namespace GES_PAC.Model
             return existing.IsComplete();
         }
 
-        public void AddSerie(Serie set)
+        public void AddSet(Serie set)
         {
             Series.Add(set);
         }
diff --git a/GES_PAC/Model/Serie.cs b/GES_PAC/Model/Serie.cs
index bdc957d..0d892bf 100644
--- a/GES_PAC/Model/Serie.cs
+++ b/GES_PAC/Model/Serie.cs
@@ -51,16 +51,12 @@ namespace GES_PAC.Model
                 return false;
             return sa.HasBehaviour();
         }
-
-        public ObservableCollection<bool> GetIsOutDatas()
+        public bool GetIsInByNumeroBoite(int numeroBoite)
         {
-            var isOutDatas = new ObservableCollection<bool>();
-            for (int i = 1; i <= 12; i++)
-            {
-                var serieAnimal = SeriesAnimales.FirstOrDefault(sa => sa.NumeroBoite == i);
-                isOutDatas.Add(!serieAnimal?.IsOut ?? true);
-            }
-            return isOutDatas;
+            var serieAnimal = SeriesAnimales.FirstOrDefault(sa => sa.NumeroBoite == numeroBoite);
+            if (serieAnimal == null || !serieAnimal.Mesures.Any())
+                return true;
+            return !serieAnimal?.IsOut ?? true;
         }
 
         public Mesure? GetLastMeasureByNumeroBoite(int numeroBoite)
@@ -71,9 +67,12 @@ namespace GES_PAC.Model
             return serieAnimal.GetLastMeasure();
         }
 
-        internal void AddMeasure(Mesure newMeasure, int numBoite)
+        internal void AddMeasure(Mesure newMeasure, int numBoite, bool isAnimalOut)
         {
-            SeriesAnimales.Select(sa => sa).Where(sa => sa.NumeroBoite == numBoite).First().AddMeasure(newMeasure);
+            var sa = SeriesAnimales.Select(sa => sa).Where(sa => sa.NumeroBoite == numBoite).First();
+            sa.AddMeasure(newMeasure);
+            if (isAnimalOut)
+                sa.IsOut = true;
         }
 
         internal void AddBehaviour(Comportement newBehaviour, int numBoite, bool isAnimalOut)
diff --git a/GES_PAC/Model/TypeComportement.cs b/GES_PAC/Model/TypeComportement.cs
index 89ae521..0ea040c 100644
--- a/GES_PAC/Model/TypeComportement.cs
+++ b/GES_PAC/Model/TypeComportement.cs
@@ -12,20 +12,26 @@ namespace GES_PAC.Model
             Value = value;
         }
 
-        public static readonly TypeComportement SUFFOCATION = new("SUFFOCATION", 1);
-        public static readonly TypeComportement AGITATION = new("AGITATION", 2);
-        public static readonly TypeComportement PERTE_DE_CONNAISSANCE = new("PERTE DE CONNAISSANCE", 3);
-        public static readonly TypeComportement HYPOTHERMIE = new("HYPOTHERMIE", 4);
-        public static readonly TypeComportement HYPERTHERMIE = new("HYPERTHERMIE", 5);
-        public static readonly TypeComportement AUTRE = new("AUTRE", 6);
+        public static readonly TypeComportement IMMOBILITE = new("Immobilit�", 1);
+        public static readonly TypeComportement DEPLACEMENT_AVANT_ARRIERE = new("D�placement avant/arri�re", 2);
+        public static readonly TypeComportement DEPLACEMENT_EN_ROND = new("D�placement en rond", 3);
+        public static readonly TypeComportement BELEMENT = new("B�lement", 4);
+        public static readonly TypeComportement FLAIRAGE = new("Flairage", 5);
+        public static readonly TypeComportement COUDE_AU_SOL = new("Coudes au sol", 6);
+        public static readonly TypeComportement COUP_DE_PATTE = new("Coup de patte", 7);
+        public static readonly TypeComportement ELIMINATION = new("�limination", 8);
+        public static readonly TypeComportement AUTRE = new("Autre", 9);
 
         public static readonly List<TypeComportement> All = new()
         {
-            SUFFOCATION,
-            AGITATION,
-            PERTE_DE_CONNAISSANCE,
-            HYPOTHERMIE,
-            HYPERTHERMIE,
+            IMMOBILITE,
+            DEPLACEMENT_AVANT_ARRIERE,
+            DEPLACEMENT_EN_ROND,
+            BELEMENT,
+            FLAIRAGE,
+            COUDE_AU_SOL,
+            COUP_DE_PATTE,
+            ELIMINATION,
             AUTRE
         };
 
diff --git a/GES_PAC/Resources/Images/Animaux/sad_sheep.svg b/GES_PAC/Resources/Images/Animaux/sad_sheep.svg
new file mode 100644
index 0000000..2b045c2
--- /dev/null
+++ b/GES_PAC/Resources/Images/Animaux/sad_sheep.svg
@@ -0,0 +1,61 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
+ "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
+ width="512.000000pt" height="512.000000pt" viewBox="0 0 512.000000 512.000000"
+ preserveAspectRatio="xMidYMid meet">
+
+<g transform="translate(0.000000,512.000000) scale(0.100000,-0.100000)"
+fill="#000000" stroke="none">
+<path d="M2138 4597 c-86 -30 -167 -86 -214 -147 l-37 -49 -31 17 c-24 13 -57
+17 -141 17 -101 0 -114 -2 -162 -27 -29 -16 -68 -42 -87 -58 -79 -70 -133
+-203 -123 -304 4 -44 1 -54 -27 -90 -45 -59 -84 -152 -98 -234 -15 -90 0 -209
+37 -290 14 -30 22 -59 18 -63 -5 -4 -91 -44 -193 -89 -472 -208 -723 -378
+-820 -560 -33 -62 -35 -70 -35 -165 0 -98 1 -102 40 -175 46 -86 139 -186 205
+-221 36 -19 60 -24 125 -24 70 0 88 4 145 32 118 58 253 190 386 378 l49 70 6
+-200 c9 -284 45 -490 129 -730 41 -116 136 -314 195 -407 50 -77 166 -227 176
+-228 3 0 9 287 13 639 6 506 5 643 -5 659 -10 16 -10 26 1 51 16 40 56 71 143
+111 107 50 236 42 292 -20 15 -17 16 -90 15 -893 l-1 -875 29 -10 c16 -5 45
+-32 65 -60 77 -104 194 -157 330 -150 123 6 217 53 284 141 22 30 45 46 80 58
+l48 16 2 877 c1 802 3 880 18 896 31 34 84 52 156 52 57 0 81 -6 136 -32 123
+-57 171 -113 143 -165 -10 -18 -11 -155 -4 -669 l9 -646 70 85 c90 109 152
+210 225 360 140 287 207 574 219 933 l6 194 44 -64 c124 -177 264 -314 381
+-371 56 -28 75 -32 145 -32 70 0 87 4 134 30 68 38 149 127 198 218 37 70 38
+75 38 172 0 95 -2 103 -35 165 -46 87 -161 200 -285 282 -157 105 -332 192
+-743 369 l-44 19 31 35 c114 131 117 344 7 476 l-24 28 19 51 c28 74 26 170
+-7 240 -34 73 -76 116 -149 151 -75 36 -175 40 -244 9 -24 -11 -44 -20 -46
+-20 -2 0 -17 23 -35 50 -18 28 -54 70 -82 95 -168 151 -432 154 -609 5 l-33
+-27 -52 42 c-76 62 -149 87 -264 92 -80 3 -105 0 -162 -20z m314 -81 c32 -15
+82 -49 112 -76 l53 -49 43 39 c96 88 196 125 325 118 64 -3 95 -11 141 -33 76
+-37 153 -114 189 -190 16 -33 30 -62 32 -64 2 -3 13 5 26 16 44 41 90 57 157
+57 78 0 129 -23 183 -83 70 -77 82 -182 32 -280 l-22 -45 38 -48 c85 -108 104
+-245 48 -356 -33 -67 -79 -109 -156 -144 -40 -19 -64 -22 -144 -21 l-97 2 -63
+-45 c-80 -56 -155 -84 -244 -91 -126 -10 -264 42 -369 137 l-56 52 -52 -48
+c-29 -26 -82 -61 -118 -78 -59 -28 -74 -31 -165 -31 -93 0 -105 3 -173 34
+l-72 34 -44 -31 c-62 -45 -160 -89 -225 -103 -31 -6 -95 -9 -143 -7 -113 7
+-195 44 -277 125 -167 167 -184 432 -40 619 39 51 39 51 37 136 -1 75 2 92 26
+141 77 159 256 219 421 143 32 -14 59 -25 60 -24 76 118 138 172 238 209 79
+30 222 22 299 -15z m-1226 -1582 c-4 -9 -13 -60 -22 -112 -12 -76 -21 -103
+-43 -131 -59 -74 -279 -278 -354 -328 -116 -78 -174 -81 -217 -11 -28 46 -25
+95 10 165 76 151 275 302 534 404 84 33 101 35 92 13z m2784 -21 c234 -92 451
+-258 515 -394 60 -129 4 -243 -104 -211 -86 26 -249 156 -392 313 l-87 94 -15
+101 c-9 55 -19 109 -23 118 -8 21 1 19 106 -21z m-2026 -119 c34 -33 15 -58
+-52 -68 -65 -10 -118 -41 -184 -107 -32 -32 -61 -59 -64 -59 -18 0 -44 24 -44
+41 0 26 79 110 141 150 84 54 174 73 203 43z m1314 -20 c64 -32 170 -127 179
+-162 6 -24 -15 -52 -39 -52 -4 0 -34 27 -66 59 -66 66 -119 97 -184 107 -68
+10 -86 35 -51 69 22 23 90 14 161 -21z m-841 -848 c70 -13 93 -13 169 -1 164
+27 234 -19 236 -153 1 -66 -15 -102 -64 -149 -62 -60 -201 -101 -296 -87 -97
+13 -241 104 -277 175 -29 54 -16 140 28 188 42 44 76 49 204 27z m177 -634
+c91 -63 136 -160 136 -290 0 -147 -51 -244 -147 -276 -215 -73 -379 127 -305
+371 60 195 195 279 316 195z"/>
+<path d="M2484 1261 c-51 -31 -121 -137 -110 -166 6 -16 91 -35 160 -35 70 0
+167 20 173 36 6 16 -33 92 -66 127 -53 58 -104 70 -157 38z"/>
+<path d="M1900 2401 c-14 -5 -47 -22 -74 -40 -28 -17 -60 -31 -71 -31 -22 0
+-22 0 -28 -392 -4 -215 -7 -514 -7 -663 l0 -272 48 -45 c87 -81 254 -192 320
+-212 l22 -7 0 815 0 816 -23 0 c-12 0 -54 9 -92 20 -38 11 -70 20 -70 19 0 0
+-11 -4 -25 -8z"/>
+<path d="M3120 2389 c-36 -10 -75 -19 -87 -19 l-23 0 0 -816 0 -815 23 6 c65
+20 239 136 325 218 l42 41 0 226 c0 125 -3 423 -7 663 -6 433 -6 437 -27 437
+-11 0 -45 15 -76 34 -73 44 -93 47 -170 25z"/>
+</g>
+</svg>
diff --git a/GES_PAC/Services/ConnexionService.cs b/GES_PAC/Services/ConnexionService.cs
index db0561f..22ab288 100644
--- a/GES_PAC/Services/ConnexionService.cs
+++ b/GES_PAC/Services/ConnexionService.cs
@@ -1,11 +1,6 @@
-using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Linq;
 using System.Net.NetworkInformation;
 using System.Runtime.CompilerServices;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace GES_PAC.Services
 {
@@ -40,7 +35,7 @@ namespace GES_PAC.Services
         public ConnexionService()
         {
             Connectivity.ConnectivityChanged += Connectivity_ConnectivityChanged;
-            Task.Run(() => this.SetIsConnected()).Wait();
+            Task.Run(() => SetIsConnected()).Wait();
             // ou : new Action(async () => await SetIsConnected())();
         }
 
@@ -51,7 +46,7 @@ namespace GES_PAC.Services
 
         public void Connectivity_ConnectivityChanged(object sender, ConnectivityChangedEventArgs e)
         {
-            Task.Run(() => this.SetIsConnected(e)).Wait();
+            Task.Run(() => SetIsConnected(e)).Wait();
         }
 
         #region INPC
diff --git a/GES_PAC/View/ChambersView.xaml b/GES_PAC/View/ChambersView.xaml
index fe7f6fc..90d5a67 100644
--- a/GES_PAC/View/ChambersView.xaml
+++ b/GES_PAC/View/ChambersView.xaml
@@ -2,8 +2,8 @@
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:vm="clr-namespace:GES_PAC.ViewModel"
+             xmlns:controls="clr-namespace:GES_PAC.View.Controls"
              xmlns:tools="clr-namespace:GES_PAC.View.Tools"
-
              x:Class="GES_PAC.View.ChambersView"
              x:DataType="vm:ChambersViewModel">
 
@@ -48,58 +48,20 @@
                                 </Grid.RowDefinitions>
 
                                 <!-- Boutons Gauche -->
-                                <Grid Grid.Row="5" Grid.Column="0">
-                                    <Button Text="1" Style="{StaticResource ChambreButtonStyle}" Command="{Binding OnClickChamberCommand}" CommandParameter="1" BackgroundColor="{Binding ChamberColors[0]}" IsEnabled="{Binding ChamberIsIn[0]}"/>
-                                    <Label Text="{Binding ChamberNumbers[0]}" FontSize="10" Margin="3" HorizontalOptions="Start" VerticalOptions="Start" />
-									<Label Text="{Binding ChamberIsOut[0]}" FontSize="10" Margin="10" HorizontalOptions="Start" VerticalOptions="Start" />
-                                </Grid>
-                                <Grid Grid.Row="4" Grid.Column="0">
-                                    <Button Text="3" Style="{StaticResource ChambreButtonStyle}" Command="{Binding OnClickChamberCommand}" CommandParameter="3" BackgroundColor="{Binding ChamberColors[2]}" IsEnabled="{Binding ChamberIsIn[2]}"/>
-                                    <Label Text="{Binding ChamberNumbers[2]}" FontSize="10" Margin="3" HorizontalOptions="Start" VerticalOptions="Start" />
-                                </Grid>
-                                <Grid Grid.Row="3" Grid.Column="0">
-                                    <Button Text="5" Style="{StaticResource ChambreButtonStyle}" Command="{Binding OnClickChamberCommand}" CommandParameter="5" BackgroundColor="{Binding ChamberColors[4]}" IsEnabled="{Binding ChamberIsIn[4]}"/>
-                                    <Label Text="{Binding ChamberNumbers[4]}" FontSize="10" Margin="3" HorizontalOptions="Start" VerticalOptions="Start" />
-                                </Grid>
-                                <Grid Grid.Row="2" Grid.Column="0">
-                                    
-                                    <Button Text="7" Style="{StaticResource ChambreButtonStyle}" Command="{Binding OnClickChamberCommand}" CommandParameter="7" BackgroundColor="{Binding ChamberColors[6]}" IsEnabled="{Binding ChamberIsIn[6]}"/>
-                                    <Label Text="{Binding ChamberNumbers[6]}" FontSize="10" Margin="3" HorizontalOptions="Start" VerticalOptions="Start" />
-                                </Grid>
-                                <Grid Grid.Row="1" Grid.Column="0">
-                                    <Button Text="9" Style="{StaticResource ChambreButtonStyle}" Command="{Binding OnClickChamberCommand}" CommandParameter="9" BackgroundColor="{Binding ChamberColors[8]}" IsEnabled="{Binding ChamberIsIn[8]}"/>
-                                    <Label Text="{Binding ChamberNumbers[8]}" FontSize="10" Margin="3" HorizontalOptions="Start" VerticalOptions="Start" />
-                                </Grid>
-                                <Grid Grid.Row="0" Grid.Column="0">
-                                    <Button Text="11" Style="{StaticResource ChambreButtonStyle}" Command="{Binding OnClickChamberCommand}" CommandParameter="11" BackgroundColor="{Binding ChamberColors[10]}" IsEnabled="{Binding ChamberIsIn[10]}"/>
-                                    <Label Text="{Binding ChamberNumbers[10]}" FontSize="10" Margin="3" HorizontalOptions="Start" VerticalOptions="Start" />
-                                </Grid>
+                                <controls:ChamberButtonView Grid.Row="5" Grid.Column="0" ChamberId="1" />
+                                <controls:ChamberButtonView Grid.Row="4" Grid.Column="0" ChamberId="3" />
+                                <controls:ChamberButtonView Grid.Row="3" Grid.Column="0" ChamberId="5" />
+                                <controls:ChamberButtonView Grid.Row="2" Grid.Column="0" ChamberId="7" />
+                                <controls:ChamberButtonView Grid.Row="1" Grid.Column="0" ChamberId="9" />
+                                <controls:ChamberButtonView Grid.Row="0" Grid.Column="0" ChamberId="11" />
 
                                 <!-- Boutons Droite -->
-                                <Grid Grid.Row="5" Grid.Column="2">
-                                    <Button Text="2" Style="{StaticResource ChambreButtonStyle}" Command="{Binding OnClickChamberCommand}" CommandParameter="2" BackgroundColor="{Binding ChamberColors[1]}" IsEnabled="{Binding ChamberIsIn[1]}"/>
-                                    <Label Text="{Binding ChamberNumbers[1]}" FontSize="10" Margin="3" HorizontalOptions="Start" VerticalOptions="Start" />
-                                </Grid>
-                                <Grid Grid.Row="4" Grid.Column="2">
-                                    <Button Text="4" Style="{StaticResource ChambreButtonStyle}" Command="{Binding OnClickChamberCommand}" CommandParameter="4" BackgroundColor="{Binding ChamberColors[3]}" IsEnabled="{Binding ChamberIsIn[3]}"/>
-                                    <Label Text="{Binding ChamberNumbers[3]}" FontSize="10" Margin="3" HorizontalOptions="Start" VerticalOptions="Start" />
-                                </Grid>
-                                <Grid Grid.Row="3" Grid.Column="2">
-                                    <Button Text="6" Style="{StaticResource ChambreButtonStyle}" Command="{Binding OnClickChamberCommand}" CommandParameter="6" BackgroundColor="{Binding ChamberColors[5]}" IsEnabled="{Binding ChamberIsIn[5]}"/>
-                                    <Label Text="{Binding ChamberNumbers[5]}" FontSize="10" Margin="3" HorizontalOptions="Start" VerticalOptions="Start" />
-                                </Grid>
-                                <Grid Grid.Row="2" Grid.Column="2">
-                                    <Button Text="8" Style="{StaticResource ChambreButtonStyle}" Command="{Binding OnClickChamberCommand}" CommandParameter="8" BackgroundColor="{Binding ChamberColors[7]}" IsEnabled="{Binding ChamberIsIn[7]}"/>
-                                    <Label Text="{Binding ChamberNumbers[7]}" FontSize="10" Margin="3" HorizontalOptions="Start" VerticalOptions="Start" />
-                                </Grid>
-                                <Grid Grid.Row="1" Grid.Column="2">
-                                    <Button Text="10" Style="{StaticResource ChambreButtonStyle}" Command="{Binding OnClickChamberCommand}" CommandParameter="10" BackgroundColor="{Binding ChamberColors[9]}" IsEnabled="{Binding ChamberIsIn[9]}"/>
-                                    <Label Text="{Binding ChamberNumbers[9]}" FontSize="10" Margin="3" HorizontalOptions="Start" VerticalOptions="Start" />
-                                </Grid>
-                                <Grid Grid.Row="0" Grid.Column="2">
-                                    <Button Text="12" Style="{StaticResource ChambreButtonStyle}" Command="{Binding OnClickChamberCommand}" CommandParameter="12" BackgroundColor="{Binding ChamberColors[11]}" IsEnabled="{Binding ChamberIsIn[11]}"/>
-                                    <Label Text="{Binding ChamberNumbers[11]}" FontSize="10" Margin="3" HorizontalOptions="Start" VerticalOptions="Start" />
-                                </Grid>
+                                <controls:ChamberButtonView Grid.Row="5" Grid.Column="2" ChamberId="2" />
+                                <controls:ChamberButtonView Grid.Row="4" Grid.Column="2" ChamberId="4" />
+                                <controls:ChamberButtonView Grid.Row="3" Grid.Column="2" ChamberId="6" />
+                                <controls:ChamberButtonView Grid.Row="2" Grid.Column="2" ChamberId="8" />
+                                <controls:ChamberButtonView Grid.Row="1" Grid.Column="2" ChamberId="10" />
+                                <controls:ChamberButtonView Grid.Row="0" Grid.Column="2" ChamberId="12" />
 
                                 <!-- Couloir central -->
                                 <BoxView Grid.Column="1" Grid.RowSpan="6" HeightRequest="500" WidthRequest="75" Color="Gray"/>
@@ -130,7 +92,6 @@
                     Text="Terminer les mesures"
                     Command="{Binding TerminateSetCommand}"
                     Style="{StaticResource btnNormal}"
-                    IsEnabled="{Binding IsFormValid}"
                     VerticalOptions="End"/>
             </StackLayout>
         </StackLayout>
diff --git a/GES_PAC/View/Controls/ChamberButtonView.xaml b/GES_PAC/View/Controls/ChamberButtonView.xaml
new file mode 100644
index 0000000..1291a5e
--- /dev/null
+++ b/GES_PAC/View/Controls/ChamberButtonView.xaml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentView xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:vm="clr-namespace:GES_PAC.ViewModel.Controls"
+             x:Class="GES_PAC.View.Controls.ChamberButtonView"
+             x:Name="ChamberButtonControl"
+             x:DataType="vm:ChamberButtonViewModel">
+
+    <Grid>
+        <Button Text="{Binding ButtonText}"
+                Style="{StaticResource ChambreButtonStyle}"
+                Command="{Binding OnClickChamberCommand}"
+                CommandParameter="{Binding ButtonCommandParameter}"
+                BackgroundColor="{Binding ButtonBackgroundColor}"
+                IsEnabled="{Binding ButtonIsEnabled}" />
+        <Label Text="{Binding ButtonLabel}"
+               FontSize="10"
+               Margin="3"
+               HorizontalOptions="Start"
+               VerticalOptions="Start" />
+    </Grid>
+</ContentView>
diff --git a/GES_PAC/View/Controls/ChamberButtonView.xaml.cs b/GES_PAC/View/Controls/ChamberButtonView.xaml.cs
new file mode 100644
index 0000000..d2a86c5
--- /dev/null
+++ b/GES_PAC/View/Controls/ChamberButtonView.xaml.cs
@@ -0,0 +1,32 @@
+﻿using GES_PAC.ViewModel.Controls;
+
+namespace GES_PAC.View.Controls
+{
+    public partial class ChamberButtonView : ContentView
+    {
+        public static readonly BindableProperty ChamberIdProperty =
+            BindableProperty.Create(nameof(ChamberId), typeof(int), typeof(ChamberButtonView), default(int), propertyChanged: OnChamberIdChanged);
+
+        public int ChamberId
+        {
+            get => (int)GetValue(ChamberIdProperty);
+            set => SetValue(ChamberIdProperty, value);
+        }
+
+        public ChamberButtonView()
+        {
+            BindingContext = new ChamberButtonViewModel();
+            InitializeComponent();
+        }
+
+        private static void OnChamberIdChanged(BindableObject bindable, object oldValue, object newValue)
+        {
+            var control = (ChamberButtonView)bindable;
+
+            if (control.BindingContext is ChamberButtonViewModel viewModel)
+            {
+                viewModel.UpdateProperties((int)newValue);
+            }
+        }
+    }
+}
diff --git a/GES_PAC/View/CreateBehaviourView.xaml b/GES_PAC/View/CreateBehaviourView.xaml
index 1733656..ec8f05f 100644
--- a/GES_PAC/View/CreateBehaviourView.xaml
+++ b/GES_PAC/View/CreateBehaviourView.xaml
@@ -26,7 +26,6 @@
 
                             <Picker Title="Sélectionnez un type de comportement"
                                 ItemsSource="{Binding TypeComp}"
-                                ItemDisplayBinding="{Binding Name}"
                                 SelectedItem="{Binding SelectedType}" />
 
 
@@ -45,7 +44,7 @@
                                    Placeholder="(facultatif)"/>
                         </VerticalStackLayout>
 
-                        <!-- sortie de l'animal -->
+                        <!-- Sortie de l'animal -->
                         <HorizontalStackLayout HorizontalOptions="Center" VerticalOptions="Center">
                             <CheckBox IsChecked="{Binding IsAnimalOut}" HorizontalOptions="Center" />
                             <Label Text="Sortie de l'animal" FontSize="14" TextColor="Gray" HorizontalOptions="Center" VerticalOptions="Center" />
diff --git a/GES_PAC/View/CreateCalibrationView.xaml b/GES_PAC/View/CreateCalibrationView.xaml
index c42633f..8c5e2f4 100644
--- a/GES_PAC/View/CreateCalibrationView.xaml
+++ b/GES_PAC/View/CreateCalibrationView.xaml
@@ -3,6 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:vm="clr-namespace:GES_PAC.ViewModel"
              xmlns:tools="clr-namespace:GES_PAC.View.Tools"
+			 xmlns:controls="clr-namespace:GES_PAC.Controls"
              x:Class="GES_PAC.View.CreateCalibrationView"
              x:DataType="vm:CreateCalibrationViewModel">
 
@@ -39,11 +40,7 @@
                         <!-- CH4 -->
                         <VerticalStackLayout>
                             <Label Text="CH4 (ppm)" FontSize="14" TextColor="Gray" FontAttributes="Bold"/>
-                            <Entry Text="{Binding ConcCH4, Mode=TwoWay, TargetNullValue=''}" 
-                                   FontSize="16" 
-                                   TextColor="Black" 
-                                   Placeholder="0,0" 
-                                   Keyboard="Numeric"/>
+							<controls:DoubleEntry Text="{Binding ConcCH4, Mode=OneWayToSource, TargetNullValue=''}" />
                             <Label Text="Entrez une valeur"
                                 FontSize="12"
                                 TextColor="Red"
@@ -53,11 +50,7 @@
                         <!-- O2 -->
                         <VerticalStackLayout>
                             <Label Text="O2 (% vol.)" FontSize="14" TextColor="Gray" FontAttributes="Bold"/>
-                            <Entry Text="{Binding ConcO2 , Mode=TwoWay, TargetNullValue=''}" 
-                                   FontSize="16" 
-                                   TextColor="Black" 
-                                   Placeholder="0,0" 
-                                   Keyboard="Numeric"/>
+							<controls:DoubleEntry Text="{Binding ConcO2, Mode=OneWayToSource, TargetNullValue=''}" />
                             <Label Text="Entrez une valeur"
                                 FontSize="12"
                                 TextColor="Red"
@@ -67,11 +60,7 @@
                         <!-- CO2 -->
                         <VerticalStackLayout>
                             <Label Text="CO2 (% vol.)" FontSize="14" TextColor="Gray" FontAttributes="Bold"/>
-                            <Entry Text="{Binding ConcCO2, Mode=TwoWay, TargetNullValue=''}" 
-                                   FontSize="16" 
-                                   TextColor="Black" 
-                                   Placeholder="0,0" 
-                                   Keyboard="Numeric"/>
+							<controls:DoubleEntry Text="{Binding ConcCO2, Mode=OneWayToSource, TargetNullValue=''}" />
                             <Label Text="Entrez une valeur"
                                 FontSize="12"
                                 TextColor="Red"
diff --git a/GES_PAC/View/CreateMeasureView.xaml b/GES_PAC/View/CreateMeasureView.xaml
index 66bf3cb..af6474f 100644
--- a/GES_PAC/View/CreateMeasureView.xaml
+++ b/GES_PAC/View/CreateMeasureView.xaml
@@ -3,6 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:vm="clr-namespace:GES_PAC.ViewModel"
              xmlns:tools="clr-namespace:GES_PAC.View.Tools"
+			 xmlns:controls="clr-namespace:GES_PAC.Controls"
              x:Class="GES_PAC.View.CreateMeasureView"
              x:DataType="vm:CreateMeasureViewModel">
 
@@ -10,13 +11,37 @@
         <StackLayout BackgroundColor="White" Spacing="50">
             <tools:ConnectionIndicatorView />
             <ScrollView>
-
                 <VerticalStackLayout Grid.Row="1" Spacing="30">
 
-                    <Label Text="{Binding Titre}"
-                       FontSize="20"
-                       FontAttributes="Bold"
-                       HorizontalOptions="Center" />
+                    <Grid ColumnDefinitions="*,Auto,*" Padding="10" VerticalOptions="Start">
+                        <Label Text="{Binding Titre}"
+                           FontSize="20"
+                           FontAttributes="Bold"
+                           VerticalOptions="Center"
+                           HorizontalOptions="Center"
+                           Grid.Column="1" />
+
+                        <Button 
+                            ImageSource="sad_sheep.png" 
+                            MaximumHeightRequest="50"
+                            MaximumWidthRequest="75"
+                            BackgroundColor="Orange"
+                            TextColor="White"
+                            Command="{Binding BehaviourCommand}"
+                            Style="{StaticResource btnNormal}"
+                            IsVisible="{Binding HasLastMeasure}"
+                            VerticalOptions="Center"
+                            Padding="0"
+                            Grid.Column="2">
+                            <Button.Shadow>
+                                <Shadow 
+                                Brush="Black"
+                                Offset="2,2"
+                                Radius="4"
+                                Opacity="0.5" />
+                            </Button.Shadow>
+                        </Button>
+                    </Grid>
 
                     <Label Text="{Binding LastTime}"
                        FontSize="14"
@@ -30,13 +55,7 @@
                         <VerticalStackLayout>
                             <Label Text="CH4 (ppm)" FontSize="14" TextColor="Gray" FontAttributes="Bold"/>
                             <Grid ColumnDefinitions="*,Auto" ColumnSpacing="5">
-                                <Entry Grid.Column="0"
-                                   Text="{Binding ConcCH4, Mode=TwoWay, TargetNullValue=''}"
-                                   FontSize="16"
-                                   TextColor="Black"
-                                   Placeholder="0,0"
-                                   Keyboard="Numeric">
-                                </Entry>
+								<controls:DoubleEntry  Grid.Column="0" Text="{Binding ConcCH4, Mode=OneWayToSource, TargetNullValue=''}"/>
                                 <Label Grid.Column="1"
                                    Text="{Binding LastCH4, StringFormat='[{0} ppm]'}"
                                    FontSize="16"
@@ -57,13 +76,7 @@
                         <VerticalStackLayout>
                             <Label Text="O2 (%)" FontSize="14" TextColor="Gray" FontAttributes="Bold"/>
                             <Grid ColumnDefinitions="*,Auto" ColumnSpacing="5">
-                                <Entry Grid.Column="0"
-                                   Text="{Binding ConcO2, Mode=TwoWay, TargetNullValue=''}"
-                                   FontSize="16"
-                                   TextColor="Black"
-                                   Placeholder="0,0"
-                                   Keyboard="Numeric">
-                                </Entry>
+								<controls:DoubleEntry Grid.Column="0" Text="{Binding ConcO2, Mode=OneWayToSource, TargetNullValue=''}"/>
                                 <Label Grid.Column="1"
                                    Text="{Binding LastO2, StringFormat='[{0} %]'}"
                                    FontSize="16"
@@ -84,13 +97,7 @@
                         <VerticalStackLayout>
                             <Label Text="CO2 (%)" FontSize="14" TextColor="Gray" FontAttributes="Bold"/>
                             <Grid ColumnDefinitions="*,Auto" ColumnSpacing="5">
-                                <Entry Grid.Column="0"
-                                   Text="{Binding ConcCO2, Mode=TwoWay, TargetNullValue=''}"
-                                   FontSize="16"
-                                   TextColor="Black"
-                                   Placeholder="0,0"
-                                   Keyboard="Numeric">
-                                </Entry>
+								<controls:DoubleEntry Grid.Column="0" Text="{Binding ConcCO2, Mode=OneWayToSource, TargetNullValue=''}"/>
                                 <Label Grid.Column="1"
                                    Text="{Binding LastCO2, StringFormat='[{0} %]'}"
                                    FontSize="16"
@@ -106,6 +113,12 @@
                                IsVisible="{Binding ConcCO2Error}"/>
                         </VerticalStackLayout>
 
+						<!-- Sortie de l'animal -->
+						<HorizontalStackLayout HorizontalOptions="Center" VerticalOptions="Center" IsVisible="{Binding HasLastMeasure}">
+							<CheckBox IsChecked="{Binding IsAnimalOut}" HorizontalOptions="Center" />
+							<Label Text="Sortie de l'animal" FontSize="14" TextColor="Gray" HorizontalOptions="Center" VerticalOptions="Center" />
+						</HorizontalStackLayout>
+
 
                     </VerticalStackLayout>
                 </VerticalStackLayout>
@@ -117,15 +130,6 @@
                 VerticalOptions="FillAndExpand">
 
                 <Button 
-                    Text="Comportements"
-                    BackgroundColor="Orange"
-                    TextColor="White"
-                    Command="{Binding BehaviourCommand}"
-                    Style="{StaticResource btnNormal}"
-                    VerticalOptions="End"
-                    Margin="0,0,10,0"/>
-
-                <Button 
                     Text="Enregistrer"
                     Command="{Binding CreateMeasureCommand}"
                     Style="{StaticResource btnNormal}"
diff --git a/GES_PAC/View/CreateSetView.xaml b/GES_PAC/View/CreateSetView.xaml
index 0a5c098..01e7a74 100644
--- a/GES_PAC/View/CreateSetView.xaml
+++ b/GES_PAC/View/CreateSetView.xaml
@@ -3,6 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:vm="clr-namespace:GES_PAC.ViewModel"
              xmlns:tools="clr-namespace:GES_PAC.View.Tools"
+			 xmlns:controls="clr-namespace:GES_PAC.Controls"
              x:Class="GES_PAC.View.CreateSetView"
              x:DataType="vm:CreateSetViewModel">
 
@@ -39,7 +40,7 @@
                         <!-- Température -->
                         <VerticalStackLayout>
                             <Label Text="Température (°C)" FontSize="14" TextColor="Gray" FontAttributes="Bold"/>
-                            <Entry Text="{Binding Temperature}" FontSize="16" TextColor="Black" Placeholder="25" Keyboard="Numeric"/>
+                            <controls:DoubleEntry Text="{Binding Temperature, Mode=OneWayToSource}" Placeholder="25,0"/>
                             <Label Text="Entrez une valeur"
                                 FontSize="12"
                                 TextColor="Red"
@@ -49,7 +50,7 @@
                         <!-- Humidité -->
                         <VerticalStackLayout>
                             <Label Text="Humidité (%)" FontSize="14" TextColor="Gray" FontAttributes="Bold"/>
-                            <Entry Text="{Binding Humidite}" FontSize="16" TextColor="Black" Placeholder="50" Keyboard="Numeric"/>
+                            <controls:DoubleEntry Text="{Binding Humidite, Mode=OneWayToSource}" Placeholder="50,0"/>
                             <Label Text="Entrez une valeur"
                                 FontSize="12"
                                 TextColor="Red"
@@ -59,7 +60,7 @@
                         <!-- Pression -->
                         <VerticalStackLayout>
                             <Label Text="Pression (hPa)" FontSize="14" TextColor="Gray" FontAttributes="Bold"/>
-                            <Entry Text="{Binding Pression}" FontSize="16" TextColor="Black" Placeholder="1,5" Keyboard="Numeric"/>
+                            <controls:DoubleEntry Text="{Binding Pression, Mode=OneWayToSource}" Placeholder="1,5"/>
                             <Label Text="Entrez une valeur"
                                 FontSize="12"
                                 TextColor="Red"
diff --git a/GES_PAC/View/EnterAnimalView.xaml b/GES_PAC/View/EnterAnimalView.xaml
index 47a7fe6..eadec19 100644
--- a/GES_PAC/View/EnterAnimalView.xaml
+++ b/GES_PAC/View/EnterAnimalView.xaml
@@ -3,6 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:vm="clr-namespace:GES_PAC.ViewModel"
              xmlns:tools="clr-namespace:GES_PAC.View.Tools"
+             xmlns:controls="clr-namespace:GES_PAC.Controls"
              x:Class="GES_PAC.View.EnterAnimalView"
              x:DataType="vm:EnterAnimalViewModel">
 
@@ -34,7 +35,7 @@
                         <!-- Poids -->
                         <VerticalStackLayout>
                             <Label Text="Poids (kg)" FontSize="14" TextColor="Gray" FontAttributes="Bold"/>
-                            <Entry Text="{Binding Poids}" FontSize="16" TextColor="Black" Placeholder="75" Keyboard="Numeric"/>
+                            <controls:DoubleEntry Text="{Binding Poids, Mode=OneWayToSource}" Placeholder="75,0"/>
                             <Label Text="Entrez une valeur"
                                 FontSize="12"
                                 TextColor="Red"
diff --git a/GES_PAC/ViewModel/ChambersViewModel.cs b/GES_PAC/ViewModel/ChambersViewModel.cs
index 466ba4f..5545fbe 100644
--- a/GES_PAC/ViewModel/ChambersViewModel.cs
+++ b/GES_PAC/ViewModel/ChambersViewModel.cs
@@ -1,6 +1,4 @@
 using GES_PAC.Model;
-using GES_PAC.View;
-using System.Collections.ObjectModel;
 using System.Windows.Input;
 
 namespace GES_PAC.ViewModel
@@ -13,13 +11,10 @@ namespace GES_PAC.ViewModel
         #endregion
 
         #region Commandes
-        public ICommand OnClickChamberCommand { get; }
+        public ICommand TerminateSetCommand { get; }
         #endregion
 
         #region Propriétés
-        public ObservableCollection<Color> ChamberColors { get; set; } = [];
-        public ObservableCollection<int> ChamberNumbers { get; set; } = [];
-        public ObservableCollection<bool> ChamberIsIn { get; set; } = [];
         public Serie CurrentSet { get; set; }
 
         #endregion
@@ -27,54 +22,12 @@ namespace GES_PAC.ViewModel
         #region Constructeurs
         public ChambersViewModel()
         {
-            //ONLY FOR TESTS
-            var date = DateTime.Now;
-            var newDay = new Journee(date, PersonViewModel.Instance.Persons[0], PlaceViewModel.Instance.Places[0], "");
-            newDay.AddSerie(new Serie(date, date, 25, 25, 25));
-            newDay.GetCurrentSet().AddSerieAnimal(new SerieAnimal(1, 500, date, ""));
-            newDay.GetCurrentSet().AddMeasure(new Mesure(date, 50, 50, 50), 1);
-            JourneeViewModel.Instance.Journees.Add(newDay);
-            //ONLY FOR TESTS
-
             CurrentSet = JourneeViewModel.Instance.GetCurrentSet();
-            UpdateChamberDatas();
-
-            OnClickChamberCommand = new Command<string>(async (idStr) =>
-            {
-                int id = int.Parse(idStr);
-                await GoToEnterAnimal(id);
-            });
         }
         #endregion
 
         #region Méthodes
-        private async Task GoToEnterAnimal(int id)
-        {
-            if (IsBusy) return;
-            IsBusy = true;
-
-            if (CurrentSet.GetMeasureNumberByNumeroBoite(id) == 0)
-                await Shell.Current.GoToAsync($"{nameof(EnterAnimalView)}?chamberId={id}");
-            else
-                await Shell.Current.GoToAsync($"{nameof(CreateMeasureView)}?chamberId={id}");
-
-            IsBusy = false;
-        }
-
-        private void UpdateChamberDatas()
-        {
-            ChamberIsIn = JourneeViewModel.Instance.GetCurrentSet().GetIsOutDatas();
-            for (int i = 1; i <= 12; i++)
-            {
-                bool hasBehaviour = CurrentSet.GetHasBehaviourByNumeroBoite(i);
-                int count = CurrentSet.GetMeasureNumberByNumeroBoite(i);
-                if (hasBehaviour)
-                    ChamberColors.Add(Colors.Yellow);
-                else
-                    ChamberColors.Add(count > 0 ? Colors.LightGreen : Colors.White);
-                ChamberNumbers.Add(count);
-            }
-        }
+        
         #endregion
     }
 }
diff --git a/GES_PAC/ViewModel/Controls/ChamberButtonViewModel.cs b/GES_PAC/ViewModel/Controls/ChamberButtonViewModel.cs
new file mode 100644
index 0000000..ec6084a
--- /dev/null
+++ b/GES_PAC/ViewModel/Controls/ChamberButtonViewModel.cs
@@ -0,0 +1,115 @@
+﻿using GES_PAC.Model;
+using GES_PAC.View;
+using System.Windows.Input;
+
+namespace GES_PAC.ViewModel.Controls
+{
+    public class ChamberButtonViewModel : BaseViewModel
+    {
+        #region Attributs
+        private string _buttonText;
+        private int _buttonCommandParameter;
+        private Color _buttonBackgroundColor;
+        private bool _buttonIsEnabled;
+        private string _buttonLabel;
+        private ICommand _onClickChamberCommand;
+        #endregion
+
+        #region Propriétés
+
+        public string ButtonText {
+            get => _buttonText;
+            set
+            {
+                _buttonText = value;
+                OnPropertyChanged();
+            }
+        }
+        public int ButtonCommandParameter
+        {
+            get => _buttonCommandParameter;
+            set
+            {
+                _buttonCommandParameter = value;
+                OnPropertyChanged();
+            }
+        }
+        public Color ButtonBackgroundColor
+        {
+            get => _buttonBackgroundColor;
+            set
+            {
+                _buttonBackgroundColor = value;
+                OnPropertyChanged();
+            }
+        }
+        public bool ButtonIsEnabled
+        {
+            get => _buttonIsEnabled;
+            set
+            {
+                _buttonIsEnabled = value;
+                OnPropertyChanged();
+            }
+        }
+        public string ButtonLabel
+        {
+            get => _buttonLabel;
+            set
+            {
+                _buttonLabel = value;
+                OnPropertyChanged();
+            }
+        }
+        public Serie CurrentSet { get; set; }
+        #endregion
+
+        #region Commandes
+        public ICommand OnClickChamberCommand
+        {
+            get => _onClickChamberCommand;
+            set
+            {
+                _onClickChamberCommand = value;
+                OnPropertyChanged();
+            }
+        }
+        #endregion
+
+        #region Constructeurs
+        #endregion
+
+        #region Méthodes
+        public void UpdateProperties(int chamberId)
+        {
+            OnClickChamberCommand = new Command(async () => await GoToEnterAnimal());
+
+            CurrentSet = JourneeViewModel.Instance.GetCurrentSet();
+
+            ButtonText = chamberId.ToString();
+            ButtonCommandParameter = chamberId;
+
+            ButtonIsEnabled = JourneeViewModel.Instance.GetCurrentSet().GetIsInByNumeroBoite(chamberId);
+            bool hasBehaviour = CurrentSet.GetHasBehaviourByNumeroBoite(chamberId);
+            int count = CurrentSet.GetMeasureNumberByNumeroBoite(chamberId);
+            if (hasBehaviour)
+                ButtonBackgroundColor = Colors.Yellow;
+            else
+                ButtonBackgroundColor = count > 0 ? Colors.LightGreen : Colors.White;
+            ButtonLabel = count.ToString();
+        }
+        private async Task GoToEnterAnimal()
+        {
+            if (IsBusy) return;
+            IsBusy = true;
+
+            if (CurrentSet.GetMeasureNumberByNumeroBoite(ButtonCommandParameter) == 0)
+                await Shell.Current.GoToAsync($"{nameof(EnterAnimalView)}?chamberId={ButtonCommandParameter}");
+            else
+                await Shell.Current.GoToAsync($"{nameof(CreateMeasureView)}?chamberId={ButtonCommandParameter}");
+
+            IsBusy = false;
+        }
+        #endregion
+    }
+}
diff --git a/GES_PAC/ViewModel/CreateMeasureViewModel.cs b/GES_PAC/ViewModel/CreateMeasureViewModel.cs
index 1aa975c..57fd30f 100644
--- a/GES_PAC/ViewModel/CreateMeasureViewModel.cs
+++ b/GES_PAC/ViewModel/CreateMeasureViewModel.cs
@@ -13,6 +13,7 @@ namespace GES_PAC.ViewModel
         private double? _conc_o2;
         private double? _conc_co2;
         private double? _conc_ch4;
+        private bool _isAnimalOut;
         private bool _isFormValid;
         private bool _hasLastMeasure;
         private double? _lastO2;
@@ -78,6 +79,15 @@ namespace GES_PAC.ViewModel
                 UpdateColors();
             }
         }
+        public bool IsAnimalOut
+        {
+            get => _isAnimalOut;
+            set
+            {
+                _isAnimalOut = value;
+                OnPropertyChanged();
+            }
+        }
         public bool HasLastMeasure
         {
             get => _hasLastMeasure;
@@ -185,8 +195,9 @@ namespace GES_PAC.ViewModel
 
             var date = DateTime.Now;
             var newMeasure = new Mesure(date, ConcO2 ?? 0, ConcCO2 ?? 0, ConcCH4 ?? 0);
+            var currentSet = JourneeViewModel.Instance.GetCurrentDay().GetCurrentSet();
 
-            JourneeViewModel.Instance.AddMeasureToCurrentSet(newMeasure, ChamberId);
+            currentSet.AddMeasure(newMeasure, ChamberId, IsAnimalOut);
 
             await Shell.Current.GoToAsync(nameof(ChambersView));
 
diff --git a/GES_PAC/ViewModel/CreateSetViewModel.cs b/GES_PAC/ViewModel/CreateSetViewModel.cs
index dfa03e3..9aa6909 100644
--- a/GES_PAC/ViewModel/CreateSetViewModel.cs
+++ b/GES_PAC/ViewModel/CreateSetViewModel.cs
@@ -102,7 +102,7 @@ namespace GES_PAC.ViewModel
             var date = DateTime.Now;
             var journeeActuelle = JourneeViewModel.Instance.GetCurrentDay();
             var newSet = new Serie(date, DateTimeMAJ, Temperature ?? 0, Humidite ?? 0, Pression ?? 0);
-            journeeActuelle.AddSerie(newSet);
+            journeeActuelle.AddSet(newSet);
 
             await Shell.Current.GoToAsync(nameof(ChambersView));
             IsBusy = false;
diff --git a/GES_PAC/ViewModel/EnterAnimalViewModel.cs b/GES_PAC/ViewModel/EnterAnimalViewModel.cs
index a018bdd..3748dc3 100644
--- a/GES_PAC/ViewModel/EnterAnimalViewModel.cs
+++ b/GES_PAC/ViewModel/EnterAnimalViewModel.cs
@@ -95,7 +95,7 @@ namespace GES_PAC.ViewModel
 
         private void ValidateForm()
         {
-            NumRFIDError = NumRFID.Length < 5 ;
+            NumRFIDError = NumRFID == null || NumRFID.Length < 5;
             PoidsError = Poids == null;
 
             OnPropertyChanged(nameof(NumRFIDError));
diff --git a/GES_PAC/ViewModel/JourneeViewModel.cs b/GES_PAC/ViewModel/JourneeViewModel.cs
index 9c0d95c..eaa8213 100644
--- a/GES_PAC/ViewModel/JourneeViewModel.cs
+++ b/GES_PAC/ViewModel/JourneeViewModel.cs
@@ -32,11 +32,6 @@ namespace GES_PAC.ViewModel
         {
             return GetCurrentDay().GetCurrentSet();
         }
-
-        public void AddMeasureToCurrentSet(Mesure newMeasure, int numBoite)
-        {
-            GetCurrentDay().GetCurrentSet().AddMeasure(newMeasure, numBoite);
-        }
         #endregion
     }
 }
diff --git a/GES_PAC/ViewModel/MainViewModel.cs b/GES_PAC/ViewModel/MainViewModel.cs
index 63ffc0d..c2256a7 100644
--- a/GES_PAC/ViewModel/MainViewModel.cs
+++ b/GES_PAC/ViewModel/MainViewModel.cs
@@ -1,3 +1,4 @@
+using GES_PAC.Model;
 using GES_PAC.Services;
 using GES_PAC.View;
 
@@ -16,6 +17,15 @@ namespace GES_PAC.ViewModel
         #region Constructeur
         public MainViewModel(ConnexionService connService)
         {
+            //ONLY FOR TESTS
+            var date = DateTime.Now;
+            var newDay = new Journee(date, PersonViewModel.Instance.Persons[0], PlaceViewModel.Instance.Places[0], "");
+            newDay.AddSet(new Serie(date, date, 25, 25, 25));
+            newDay.GetCurrentSet().AddSerieAnimal(new SerieAnimal(1, 500, date, ""));
+            newDay.GetCurrentSet().AddMeasure(new Mesure(date, 50, 50, 50), 1, false);
+            JourneeViewModel.Instance.Journees.Add(newDay);
+            //ONLY FOR TESTS
+
             this.connService = connService;
             GoToCreateDayCommand = new Command(async () => await GoToCreateDayPage());
         }
diff --git a/GES_PAC/ViewModel/PlaceViewModel.cs b/GES_PAC/ViewModel/PlaceViewModel.cs
index 74a060a..e65c51a 100644
--- a/GES_PAC/ViewModel/PlaceViewModel.cs
+++ b/GES_PAC/ViewModel/PlaceViewModel.cs
@@ -17,7 +17,7 @@ namespace GES_PAC.ViewModel
         
         #region Constructeur
         private PlaceViewModel() {
-            Places.Add(new Lieu("Ferme du soleil", "Dupont", "Chèvres")); // Ajout d'un lieu par défaut pour les tests
+            Places.Add(new Lieu("Elevage Langlade", "INRAE", "Mouton")); // Ajout d'un lieu par défaut pour les tests
         }
         #endregion
     }
