/ - Diff - GES_PAC - Forge DGA

GES_PAC/AppShell.xaml.cs
22	22	Routing.RegisterRoute(nameof(CreateMeasureView), typeof(CreateMeasureView));
23	23	Routing.RegisterRoute(nameof(CreateBehaviourView), typeof(CreateBehaviourView));
24	24	Routing.RegisterRoute(nameof(EndSetView), typeof(EndSetView));
	25	Routing.RegisterRoute(nameof(EndDayView), typeof(EndDayView));
25	26	}
26	27	}
27	28	}

     	  <MauiXaml Update="View\CreateSetView.xaml">
     	    <Generator>MSBuild:Compile</Generator>
     	  </MauiXaml>
     	  <MauiXaml Update="View\EndDayView.xaml">
     	    <Generator>MSBuild:Compile</Generator>
     	  </MauiXaml>
     	  <MauiXaml Update="View\EndSetView.xaml">
     	    <Generator>MSBuild:Compile</Generator>
     	  </MauiXaml>

GES_PAC/Model/Calibration.cs
1	1
	2
2	3	namespace GES_PAC.Model
3	4	{
4	5	public class Calibration
...	...
34	35	{
35	36	return Mesures.Select(m => m.Type).Distinct().ToList();
36	37	}
	38
	39	internal MesureCalibration? getMesureCalibrationByType(TypeCalibration typeCalibration)
	40	{
	41	return Mesures.FirstOrDefault(mc => mc.Type == typeCalibration);
	42	}
37	43	}
38	44	}

     using System.Diagnostics;
     using System.Linq;
     namespace GES_PAC.Model
+    {
         public class Journee
-...
+            {
                 return Series.Count > 0;
+            }
             internal int GetSetCount()
+            {
                 return Series.Count;
+            }
             internal int GetDayAnimalCount()
+            {
                 return Series.Sum(s => s.GetAnimalCount());
+            }
             internal int GetDayMeasureCount()
+            {
                 return Series.Sum(s => s.GetMeasureCount());
+            }
             internal int GetDayBehaviourCount()
+            {
                 return Series.Sum(s => s.GetBehaviourCount());
+            }
             internal Calibration GetLastCalibration()
+            {
                 return Calibrations.Last();
+            }
             internal Calibration GetDebutCalibration()
+            {
                 return Calibrations.First(c => c.Phase == PhaseCalibration.Debut);
+            }
             #endregion
+        }
+    }

                             <!-- CH4 -->
                             <VerticalStackLayout>
                                 <Label Text="CH4 (ppm)" FontSize="14" TextColor="Gray" FontAttributes="Bold"/>
     							<controls:DoubleEntry Text="{Binding ConcCH4, Mode=OneWayToSource, TargetNullValue=''}" />
                                 <Grid ColumnDefinitions="*,Auto" ColumnSpacing="5">
                                     <controls:DoubleEntry Text="{Binding ConcCH4, Mode=OneWayToSource, TargetNullValue=''}" />
                                     <Label Grid.Column="1"
                                        Text="{Binding LastCH4, StringFormat='[{0} ppm]'}"
                                        FontSize="16"
                                        TextColor="{Binding LastCH4Color}"
                                        VerticalOptions="Center"
                                        HorizontalOptions="End"
                                        IsVisible="{Binding HasLastMeasure}" />
                                 </Grid>
                                 <Label Text="Entrez une valeur"
                                     FontSize="12"
                                     TextColor="Red"
-...
                             <!-- O2 -->
                             <VerticalStackLayout>
                                 <Label Text="O2 (% vol.)" FontSize="14" TextColor="Gray" FontAttributes="Bold"/>
     							<controls:DoubleEntry Text="{Binding ConcO2, Mode=OneWayToSource, TargetNullValue=''}" />
                                 <Grid ColumnDefinitions="*,Auto" ColumnSpacing="5">
                                     <controls:DoubleEntry Text="{Binding ConcO2, Mode=OneWayToSource, TargetNullValue=''}" />
                                     <Label Grid.Column="1"
                                        Text="{Binding LastO2, StringFormat='[{0} %]'}"
                                        FontSize="16"
                                        TextColor="{Binding LastO2Color}"
                                        VerticalOptions="Center"
                                        HorizontalOptions="End"
                                        IsVisible="{Binding HasLastMeasure}" />
                                 </Grid>
                                 <Label Text="Entrez une valeur"
                                     FontSize="12"
                                     TextColor="Red"
-...
                             <!-- CO2 -->
                             <VerticalStackLayout>
                                 <Label Text="CO2 (% vol.)" FontSize="14" TextColor="Gray" FontAttributes="Bold"/>
     							<controls:DoubleEntry Text="{Binding ConcCO2, Mode=OneWayToSource, TargetNullValue=''}" />
                                 <Grid ColumnDefinitions="*,Auto" ColumnSpacing="5">
                                     <controls:DoubleEntry Text="{Binding ConcCO2, Mode=OneWayToSource, TargetNullValue=''}" />
                                     <Label Grid.Column="1"
                                        Text="{Binding LastCO2, StringFormat='[{0} %]'}"
                                        FontSize="16"
                                        TextColor="{Binding LastCO2Color}"
                                        VerticalOptions="Center"
                                        HorizontalOptions="End"
                                        IsVisible="{Binding HasLastMeasure}" />
                                 </Grid>
                                 <Label Text="Entrez une valeur"
                                     FontSize="12"
                                     TextColor="Red"

     <?xml version="1.0" encoding="utf-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:tools="clr-namespace:GES_PAC.View.Tools"
                  x:Class="GES_PAC.View.EndDayView"
                  x:DataType="vm:EndDayViewModel">
         <Grid>
             <StackLayout BackgroundColor="White" Spacing="50">
                 <tools:ConnectionIndicatorView />
                 <ScrollView>
                     <StackLayout Spacing="50">
                         <Label Text="Terminer la journée ?"
                            FontSize="22"
                            FontAttributes="Bold"
                            HorizontalOptions="Center"/>
                         <Label
                             Text="{Binding NumberSet, StringFormat='Nombre de séries : {0}'}"
                             FontSize="16"
                             HorizontalOptions="Center" />
                         <Label
                             Text="{Binding NumberAnimal, StringFormat='Nombre d animaux étudiés : {0}'}"
                             FontSize="16"
                             HorizontalOptions="Center" />
                         <Label
                             Text="{Binding NumberMeasure, StringFormat='Nombre de mesures : {0}'}"
                             FontSize="16"
                             HorizontalOptions="Center" />
                         <Label
                             Text="{Binding NumberBehaviour, StringFormat='Nombre de comportements : {0}'}"
                             FontSize="16"
                             HorizontalOptions="Center" />
                     </StackLayout>
                 </ScrollView>
                 <StackLayout
                     Margin="10"
                     HorizontalOptions="CenterAndExpand"
                     Orientation="Horizontal"
                     VerticalOptions="FillAndExpand">
                     <Button
                         Text="Confirmer"
                         Command="{Binding GoToCalibrationCommand}"
                         Style="{StaticResource btnNormal}"
                         VerticalOptions="End"/>
                 </StackLayout>
             </StackLayout>
             <Grid Grid.RowSpan="1" IsVisible="{Binding IsBusy}">
                 <Border StrokeThickness="0"
                     Background="Black"
                     Opacity="0.5"
                     Padding="20"
                     WidthRequest="160"
                     HeightRequest="160"
                     HorizontalOptions="Center"
                     VerticalOptions="Center"
                     StrokeShape="RoundRectangle 20">
                     <VerticalStackLayout HorizontalOptions="Center" VerticalOptions="Center">
                         <ActivityIndicator IsRunning="True" Color="White" />
                         <Label Text="Chargement..."
                             FontSize="14"
                             TextColor="white"
                             HorizontalOptions="Center"/>
                     </VerticalStackLayout>
                 </Border>
             </Grid>
         </Grid>
     </ContentPage>

     using GES_PAC.ViewModel;
     namespace GES_PAC.View
+    {
         public partial class EndDayView
+        {
             public EndDayView()
+            {
                 InitializeComponent();
                 BindingContext = new EndDayViewModel();
+            }
+        }
+    }

                     <Button
                         Text="Confirmer"
                         Command="{Binding GoToCreateDayCommand}"
                         Command="{Binding GoToSetListCommand}"
                         Style="{StaticResource btnNormal}"
                         VerticalOptions="End"/>
                 </StackLayout>

     <?xml version="1.0" encoding="utf-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:tools="clr-namespace:GES_PAC.View.Tools"
                  x:Class="GES_PAC.View.SetListView"
                  x:DataType="vm:SetListViewModel">
         <Grid>
             <StackLayout BackgroundColor="White" Spacing="50">
                 <tools:ConnectionIndicatorView />
                 <ScrollView>
                     <StackLayout Spacing="100">
                         <Label Text="{Binding LastSetText}"
                             FontSize="18"
                             HorizontalOptions="Center"/>
                     </StackLayout>
                 </ScrollView>
                 <Grid ColumnDefinitions="*,Auto,*,Auto,*"
                       HorizontalOptions="Center"
                       VerticalOptions="FillAndExpand">
                     <Button
                         Grid.Column="1"
                         Text="Reprendre la série"
                         Command="{Binding GoToLastSetCommand}"
                         Style="{StaticResource btnNormal}"
                         VerticalOptions="End"
                         HorizontalOptions="Start"
                         IsVisible="{Binding HasLastSet}"
                         Margin="0,0,20,20"/>
                     <Button
                         Grid.Column="3"
                         Text="Créer une série"
                         Command="{Binding GoToCreateSetCommand}"
                         Style="{StaticResource btnNormal}"
                         VerticalOptions="End"
                         HorizontalOptions="End"
                         Margin="20,0,0,20"/>
                 </Grid>
             </StackLayout>
             <Grid Grid.RowSpan="1" IsVisible="{Binding IsBusy}">
                 <Border StrokeThickness="0"
                     Background="Black"
                     Opacity="0.5"
                     Padding="20"
                     WidthRequest="160"
                     HeightRequest="160"
                     HorizontalOptions="Center"
                     VerticalOptions="Center"
                     StrokeShape="RoundRectangle 20">
                     <VerticalStackLayout HorizontalOptions="Center" VerticalOptions="Center">
                         <ActivityIndicator IsRunning="True" Color="White" />
                         <Label Text="Chargement..."
                             FontSize="14"
                             TextColor="white"
                             HorizontalOptions="Center"/>
                     </VerticalStackLayout>
                 </Border>
             </Grid>
         </Grid>
     <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:tools="clr-namespace:GES_PAC.View.Tools"
                 x:Class="GES_PAC.View.SetListView"
                 x:DataType="vm:SetListViewModel">
        <Grid>
            <StackLayout BackgroundColor="White" Spacing="50">
                <tools:ConnectionIndicatorView />
                <ScrollView>
                    <StackLayout Spacing="100">
                        <Label Text="{Binding LastSetText}"
                            FontSize="18"
                            HorizontalOptions="Center"/>
                    </StackLayout>
                </ScrollView>
                <StackLayout HorizontalOptions="Center" VerticalOptions="EndAndExpand" Spacing="75" Margin="0, 0, 0, 50">
                    <Button
                        Text="Créer une série"
                        Command="{Binding GoToCreateSetCommand}"
                        Style="{StaticResource btnNormal}"
                        VerticalOptions="End"
                        HorizontalOptions="Center"/>
                    <Button
                        Text="Reprendre la série"
                        Command="{Binding GoToLastSetCommand}"
                        Style="{StaticResource btnNormal}"
                        VerticalOptions="End"
                        HorizontalOptions="Center"
                        IsVisible="{Binding HasLastSet}"/>
                    <Button
                        Text="Terminer la journée"
                        Command="{Binding GoToEndDayCommand}"
                        Style="{StaticResource btnNormal}"
                        VerticalOptions="End"
                        HorizontalOptions="Center"/>
                </StackLayout>
            </StackLayout>
            <Grid Grid.RowSpan="1" IsVisible="{Binding IsBusy}">
                <Border StrokeThickness="0"
                    Background="Black"
                    Opacity="0.5"
                    Padding="20"
                    WidthRequest="160"
                    HeightRequest="160"
                    HorizontalOptions="Center"
                    VerticalOptions="Center"
                    StrokeShape="RoundRectangle 20">
                    <VerticalStackLayout HorizontalOptions="Center" VerticalOptions="Center">
                        <ActivityIndicator IsRunning="True" Color="White" />
                        <Label Text="Chargement..."
                            FontSize="14"
                            TextColor="white"
                            HorizontalOptions="Center"/>
                    </VerticalStackLayout>
                </Border>
            </Grid>
        </Grid>
     </ContentPage>

+        {
             #region Attributs
             private string _buttonText;
             private int _buttonCommandParameter;
             private int _chamberId;
             private Color _buttonBackgroundColor;
             private bool _buttonIsEnabled;
             private string _buttonLabel;
-...
                     OnPropertyChanged();
+                }
+            }
             public int ButtonCommandParameter
             public int ChamberId
+            {
                 get => _buttonCommandParameter;
                 get => _chamberId;
                 set
+                {
                     _buttonCommandParameter = value;
                     _chamberId = value;
                     OnPropertyChanged();
+                }
+            }
-...
                 CurrentSet = JourneeViewModel.Instance.GetCurrentSet();
                 ButtonText = chamberId.ToString();
                 ButtonCommandParameter = chamberId;
                 ChamberId = chamberId;
                 ButtonIsEnabled = JourneeViewModel.Instance.GetCurrentSet().GetIsInByNumeroBoite(chamberId);
                 bool hasBehaviour = CurrentSet.GetHasBehaviourByNumeroBoite(chamberId);
-...
                 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}");
                 var targetView = (CurrentSet.GetMeasureNumberByNumeroBoite(ChamberId) == 0) ? nameof(EnterAnimalView) : nameof(CreateMeasureView);
                 await Shell.Current.GoToAsync($"{targetView}?chamberId={ChamberId}");
                 IsBusy = false;
+            }

     using CommunityToolkit.Maui.Core.Extensions;
     using GES_PAC.Model;
     using GES_PAC.View;
     using System.Collections.ObjectModel;
     using System.Diagnostics;
     using System.Windows.Input;
     namespace GES_PAC.ViewModel
-...
             private double? _conc_ch4;
             private string _refBouteille;
             private bool _isRefBouteilleVisible;
             private Calibration _lastCalibration;
             private bool _hasLastMeasure;
             private double? _lastO2;
             private double? _lastCO2;
             private double? _lastCH4;
             private bool _isFormValid;
             #endregion
-...
                     _selectedType = value;
                     IsRefBouteilleVisible = _selectedType.Name != "Air";
                     OnPropertyChanged();
                     OnTypeChanged();
                     ValidateForm();
+                }
+            }
-...
                     OnPropertyChanged();
+                }
+            }
             public Calibration LastCalibration
+            {
                 get => _lastCalibration;
                 set
+                {
                     _lastCalibration = value;
                     OnPropertyChanged();
+                }
+            }
             public bool HasLastMeasure
+            {
                 get => _hasLastMeasure;
                 set
+                {
                     _hasLastMeasure = value;
                     OnPropertyChanged();
+                }
+            }
             public double? LastO2
+            {
                 get => _lastO2;
                 set
+                {
                     _lastO2 = value;
                     OnPropertyChanged();
+                }
+            }
             public double? LastCO2
+            {
                 get => _lastCO2;
                 set
+                {
                     _lastCO2 = value;
                     OnPropertyChanged();
+                }
+            }
             public double? LastCH4
+            {
                 get => _lastCH4;
                 set
+                {
                     _lastCH4 = value;
                     OnPropertyChanged();
+                }
+            }
             public bool IsFormValid
+            {
-...
             #region Constructeurs
             public CreateCalibrationViewModel()
+            {
                 CreateCalibrationCommand = new Command(async () => await CreateCalibration());
                 var journeeActuelle = JourneeViewModel.Instance.GetCurrentDay();
                 var typesManquants = journeeActuelle.GetCurrentMissingCalibration();
                 TypeCalibrations = new ObservableCollection<TypeCalibration>(typesManquants);
                 SelectedType = TypeCalibrations[0];
                 CreateCalibrationCommand = new Command(async () => await CreateCalibration());
                 if (journeeActuelle.GetCurrentPhase() == PhaseCalibration.Fin)
+                {
                     LastCalibration = journeeActuelle.GetDebutCalibration();
                     HasLastMeasure = true;
+                }
+            }
             #endregion
-...
                 var phaseCalibration = JourneeViewModel.Instance.GetCurrentPhase();
                 var isComplete = JourneeViewModel.Instance.GetCurrentDay().AddCalibration(newCalib, phaseCalibration);
                 if (isComplete)
+                {
                     await Shell.Current.GoToAsync(nameof(SetListView));
+                }
                 else
+                {
                     await Shell.Current.GoToAsync(nameof(CreateCalibrationView));
                 var targetView = nameof(CreateCalibrationView);
                 if (isComplete) {
                     targetView = phaseCalibration == PhaseCalibration.Debut ? nameof(SetListView) : nameof(MainView);
+                }
                 await Shell.Current.GoToAsync(targetView);
                 IsBusy = false;
+            }
-...
                 (CreateCalibrationCommand as Command)?.ChangeCanExecute();
+            }
             private void OnTypeChanged()
+            {
                 if (!HasLastMeasure)
                     return;
                 var mesureCalibration = LastCalibration.getMesureCalibrationByType(SelectedType);
                 LastCH4 = mesureCalibration.Conc_CH4;
                 LastO2 = mesureCalibration.Conc_O2;
                 LastCO2 = mesureCalibration.Conc_CO2;
+            }
             #endregion
+        }
+    }

     using GES_PAC.View;
     namespace GES_PAC.ViewModel
+    {
         public class EndDayViewModel : BaseViewModel
+        {
             #region Attributs
             private int _numberSet;
             private int _numberAnimal;
             private int _numberMeasure;
             private int _numberBehaviour;
             #endregion
             #region Commandes
             public Command GoToCalibrationCommand { get; }
             #endregion
             #region Propriétés
             public int NumberSet
+            {
                 get => _numberSet;
                 set
+                {
                     SetProperty(ref _numberSet, value);
                     OnPropertyChanged();
+                }
+            }
             public int NumberAnimal
+            {
                 get => _numberAnimal;
                 set
+                {
                     SetProperty(ref _numberAnimal, value);
                     OnPropertyChanged();
+                }
+            }
             public int NumberMeasure
+            {
                 get => _numberMeasure;
                 set
+                {
                     SetProperty(ref _numberMeasure, value);
                     OnPropertyChanged();
+                }
+            }
             public int NumberBehaviour
+            {
                 get => _numberBehaviour;
                 set
+                {
                     SetProperty(ref _numberBehaviour, value);
                     OnPropertyChanged();
+                }
+            }
             #endregion
             #region Constructeur
             public EndDayViewModel()
+            {
                 var journeeActuelle = JourneeViewModel.Instance.GetCurrentDay();
                 NumberSet = journeeActuelle.GetSetCount();
                 NumberAnimal = journeeActuelle.GetDayAnimalCount();
                 NumberMeasure = journeeActuelle.GetDayMeasureCount();
                 NumberBehaviour = journeeActuelle.GetDayBehaviourCount();
                 GoToCalibrationCommand = new Command(async () => await GoToCalibrationPage());
+            }
             #endregion
             #region Méthodes
             private async Task GoToCalibrationPage()
+            {
                 if (IsBusy) return;
                 IsBusy = true;
                 await Shell.Current.GoToAsync(nameof(CreateCalibrationView));
                 IsBusy = false;
+            }
             #endregion
+        }
+    }

     using GES_PAC.Model;
     using GES_PAC.Services;
     using GES_PAC.View;
     using GES_PAC.View;
     namespace GES_PAC.ViewModel
+    {
-...
             #endregion
             #region Commandes
             public Command GoToCreateDayCommand { get; }
             public Command GoToSetListCommand { get; }
             #endregion
             #region Propriétés
-...
                 NumberAnimal = serieActuelle.GetAnimalCount();
                 NumberMeasure = serieActuelle.GetMeasureCount();
                 NumberBehaviour = serieActuelle.GetBehaviourCount();
                 GoToCreateDayCommand = new Command(async () => await GoToCreateDayPage());
                 GoToSetListCommand = new Command(async () => await GoToSetListPage());
+            }
             #endregion
             #region Méthodes
             private async Task GoToCreateDayPage()
             private async Task GoToSetListPage()
+            {
                 if (IsBusy) return;
                 IsBusy = true;

             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);
                 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.AddCalibration(new MesureCalibration(date, 50, 40, 500, TypeCalibration.Air, ""), PhaseCalibration.Debut);
                 newDay.AddCalibration(new MesureCalibration(date, 0, 0, 1000000, TypeCalibration.Methane, "dazdazd"), PhaseCalibration.Debut);
                 newDay.AddCalibration(new MesureCalibration(date, 30, 30, 3000, TypeCalibration.Melange, "deqsfsdf"), PhaseCalibration.Debut);
                 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;

             #region Commandes
             public ICommand GoToCreateSetCommand { get; }
             public ICommand GoToLastSetCommand { get; }
             public ICommand GoToEndDayCommand { get; }
             #endregion
             #region Constructeur
-...
+            {
                 GoToCreateSetCommand = new Command(async () => await GoToCreateSetPage());
                 GoToLastSetCommand = new Command(async () => await GoToLastSetPage());
                 GoToEndDayCommand = new Command(async () => await GoToEndDayPage());
                 HasLastSet = JourneeViewModel.Instance.GetCurrentDay().HasAnySet();
+            }
-...
                 await Shell.Current.GoToAsync(nameof(ChambersView));
                 IsBusy = false;
+            }
             private async Task GoToEndDayPage()
+            {
                 if (IsBusy) return;
                 IsBusy = true;
                 await Shell.Current.GoToAsync(nameof(EndDayView));
                 IsBusy = false;
+            }
             #endregion
+        }
+    }

GES_PAC

Révision 957b1f34