/ - Diff - GES_PAC - Forge DGA

             public App()
+            {
                 InitializeComponent();
                 //var dbPath = Path.Combine(FileSystem.AppDataDirectory, "GES_PAC.db3");
                 //if (File.Exists(dbPath))
                 //    File.Delete(dbPath);
                 Db = new AppDbContext();
                 Db.Database.EnsureCreated();
                 _ = InitSmartEnumsAsync();
                 //_ = InitDb();
+            }
             protected override Window CreateWindow(IActivationState? activationState)
-...
                     if (!await Db.TypeComportement.AnyAsync(c => c.Value == comportement.Value))
                         Db.TypeComportement.Add(comportement);
+                }
                 await Db.SaveChangesAsync();
+            }
             private async Task InitDb()
+            {
                 //ONLY FOR TESTS
                 var place = new Lieu("Elevage Langlade", "INRAE", "Mouton");
                 var person = new Personne("Bond", "James", "jamesbond@inrae.fr");
                 await Db.Personne.AddAsync(person);
                 await Db.Lieu.AddAsync(place);
                 await Db.SaveChangesAsync();
                 //ONLY FOR TESTS
+            }
+        }
+    }

+    {
         public class DoubleEntry : Entry
+        {
             public static readonly BindableProperty DoubleValueProperty =
                 BindableProperty.Create(
                     nameof(DoubleValue),
                     typeof(double?),
                     typeof(DoubleEntry),
                     default(double?),
                     BindingMode.TwoWay,
                     propertyChanged: OnDoubleValueChanged);
             public double? DoubleValue
+            {
                 get => (double?)GetValue(DoubleValueProperty);
                 set => SetValue(DoubleValueProperty, value);
+            }
             public DoubleEntry()
+            {
                 Keyboard = Keyboard.Numeric;
-...
                 TextColor = Colors.Black;
                 Placeholder = "0,0";
                 FontSize = 16;
                 TextChanged += OnTextChanged;
+            }
             private static void OnDoubleValueChanged(BindableObject bindable, object oldValue, object newValue)
+            {
                 if (bindable is DoubleEntry entry && newValue is double val)
+                {
                     var str = val.ToString(CultureInfo.CurrentCulture);
                     if (entry.Text != str)
                         entry.Text = str;
+                }
+            }
             private void OnTextChanged(object sender, TextChangedEventArgs e)
+            {
                 var input = e.NewTextValue;
                 if (string.IsNullOrWhiteSpace(input))
                     return;
                 if (input.StartsWith(","))
+                {
                     MainThread.BeginInvokeOnMainThread(() =>
+                    {
                         TextChanged -= OnTextChanged;
                         Text = "0" + input;
                         TextChanged += OnTextChanged;
                     });
                     return;
+                }
                 if (double.TryParse(input, NumberStyles.Float, CultureInfo.CurrentCulture, out double value))
+                {
                     SetValue(DoubleValueProperty, value);
+                }
                 else
+                {
                     SetValue(DoubleValueProperty, null);
+                }
+            }
+        }
+    }

GES_PAC/Model/SerieAnimal.cs
83	83
84	84	return $"{timeInChamber.Hours:00}:{timeInChamber.Minutes:00}" + (IsTimeWarning() ? "⚠" : "");
85	85	}
	86	public int GetMinInChamber()
	87	{
	88	if (Mesures.Count == 0)
	89	return 0;
	90	return (DateTime.Now - GetFirstMeasure().Time).Minutes;
	91	}
86	92
87	93	}
88	94	}

                             <VerticalStackLayout>
                                 <Label Text="CH4 (ppm)" FontSize="14" TextColor="Gray" FontAttributes="Bold"/>
                                 <Grid ColumnDefinitions="*,Auto" ColumnSpacing="5">
     								<controls:DoubleEntry  Grid.Column="0" Text="{Binding ConcCH4, Mode=OneWayToSource, TargetNullValue=''}"/>
                                     <controls:DoubleEntry DoubleValue="{Binding ConcCH4}"/>
                                     <Label Grid.Column="1"
                                        Text="{Binding LastCH4, StringFormat='[{0} ppm]'}"
                                        FontSize="16"
-...
                             <VerticalStackLayout>
                                 <Label Text="O2 (%)" FontSize="14" TextColor="Gray" FontAttributes="Bold"/>
                                 <Grid ColumnDefinitions="*,Auto" ColumnSpacing="5">
     								<controls:DoubleEntry Grid.Column="0" Text="{Binding ConcO2, Mode=OneWayToSource, TargetNullValue=''}"/>
                                     <controls:DoubleEntry DoubleValue="{Binding ConcO2}"/>
                                     <Label Grid.Column="1"
                                        Text="{Binding LastO2, StringFormat='[{0} %]'}"
                                        FontSize="16"
-...
                             <VerticalStackLayout>
                                 <Label Text="CO2 (%)" FontSize="14" TextColor="Gray" FontAttributes="Bold"/>
                                 <Grid ColumnDefinitions="*,Auto" ColumnSpacing="5">
     								<controls:DoubleEntry Grid.Column="0" Text="{Binding ConcCO2, Mode=OneWayToSource, TargetNullValue=''}"/>
                                     <controls:DoubleEntry DoubleValue="{Binding ConcCO2}" />
                                     <Label Grid.Column="1"
                                        Text="{Binding LastCO2, StringFormat='[{0} %]'}"
                                        FontSize="16"

                 <ScrollView>
                     <StackLayout Spacing="100">
                         <Label Text="Exporter les données"
                             FontSize="22"
                             FontAttributes="Bold"
                             HorizontalOptions="Center"/>
     					<Grid ColumnDefinitions="*,Auto,*" Padding="10">
                         <Label Text="{Binding DataFoundText}"
     						<Label Text="Exporter"
                                 FontSize="22"
     						    Grid.Column="1"
                                 FontAttributes="Bold"
                                 HorizontalOptions="Center"
     						    VerticalOptions="Center"/>
     						<Button Text="Vider DB"
     	                        Command="{Binding ClearDataCommand}"
     	                        Grid.Column="2"
     	                        HorizontalOptions="End"
     	                        VerticalOptions="Center" />
     					</Grid>
     					<Label Text="{Binding DataFoundText}"
                            FontSize="18"
                            HorizontalOptions="Center"/>

     using GES_PAC.Model;
     using GES_PAC.View;
     using System.ComponentModel.Design;
     using System.Windows.Input;
     namespace GES_PAC.ViewModel.Controls
-...
                 ButtonIsEnabled = true;
                 ButtonLabel = "0";
                 TimeIn = "";
                 TimeColor = Colors.Black;
+            }
             public void UpdateProperties()
+            {
-...
                     _isSubscribed = false;
+                }
                 UpdateTimerColor();
                 ButtonIsEnabled = !AnimalSet.IsOut;
                 ButtonBackgroundColor = AnimalSet.HasBehaviour() ? Colors.Yellow : Colors.LightGreen;
                 ButtonLabel = measureCount.ToString();
                 TimeIn = AnimalSet.GetFormatedTimeInChamber();
                 TimeColor = AnimalSet.IsTimeWarning() ? Colors.Red : Colors.Black;
+            }
-...
             public void OnTimerTick(object? sender, EventArgs e)
+            {
                 TimeIn = AnimalSet?.GetFormatedTimeInChamber() ?? "";
                 TimeColor = AnimalSet?.IsTimeWarning() ?? false ? Colors.Red : Colors.Black;
                 UpdateTimerColor();
+            }
             public void UpdateTimerColor()
+            {
                 var nbMesure = AnimalSet?.GetMeasureCount() ?? 0;
                 var min = AnimalSet?.GetMinInChamber() ?? 0;
                 if (nbMesure == 1 && min >= 25 ||
                     nbMesure == 2 && (min >= 50 || (AnimalSet.GetLastMeasure().Conc_CO2 > 2 && min >= 40)) ||
                     AnimalSet?.IsTimeWarning() == true)
                         TimeColor = Colors.Red;
+            }
             #endregion

GES_PAC/ViewModel/CreateMeasureViewModel.cs
241	241	LastTime = "Dernière mesure : " + (int)(DateTime.Now - LastMeasure.Time).TotalMinutes + " min";
242	242	UpdateColors();
243	243	}
	244	else
	245	{
	246	ConcCH4 = 0.0;
	247	ConcO2 = 20.9;
	248	ConcCO2 = 0.0;
	249	}
244	250	}
245	251	private void UpdateColors()
246	252	{

GES_PAC/ViewModel/CreateSetViewModel.cs
30	30	get => _dateTimeMAJ.TimeOfDay;
31	31	set
32	32	{
33		_dateTimeMAJ = _dateTimeMAJ.Date + value;
	33	var today = DateTime.Today;
	34	var now = DateTime.Now;
	35	var proposedTime = today + value;
	36
	37	if (proposedTime > now.AddHours(6))
	38	_dateTimeMAJ = today.AddDays(-1) + value;
	39	else
	40	_dateTimeMAJ = today + value;
	41
34	42	OnPropertyChanged();
35	43	ValidateForm();
36	44	}
37	45	}
38	46
	47
39	48	public double? Temperature
40	49	{
41	50	get => _temperature;

             #region Commandes
             public ICommand ExportJSONCommand { get; }
             public ICommand ExportCSVCommand { get; }
             public ICommand ClearDataCommand { get; }
             #endregion
             #region Constructeur
-...
+            {
                 ExportJSONCommand = new Command(ExportJSON);
                 ExportCSVCommand = new Command(ExportCSV);
                 ClearDataCommand = new Command(ClearData);
                 DayList = JourneeViewModel.Instance?.Journees ?? null;
                 HasData = DayList != null && DayList.Count > 0;
-...
     #endif
+            }
             private async void ClearData()
+            {
                 if (IsBusy) return;
                 IsBusy = true;
                 App.Db.MesureCalibration.RemoveRange(App.Db.MesureCalibration);
                 App.Db.Calibration.RemoveRange(App.Db.Calibration);
                 App.Db.Mesure.RemoveRange(App.Db.Mesure);
                 App.Db.Comportement.RemoveRange(App.Db.Comportement);
                 App.Db.SerieAnimal.RemoveRange(App.Db.SerieAnimal);
                 App.Db.Serie.RemoveRange(App.Db.Serie);
                 App.Db.Journee.RemoveRange(App.Db.Journee);
                 App.Db.Personne.RemoveRange(App.Db.Personne);
                 App.Db.Lieu.RemoveRange(App.Db.Lieu);
                 var place = new Lieu("Elevage Langlade", "INRAE", "Mouton");
                 var person = new Personne("Bond", "James", "jamesbond@inrae.fr");
                 App.Db.Personne.Add(person);
                 App.Db.Lieu.Add(place);
                 await App.Db.SaveChangesAsync();
                 IsBusy = false;
+            }
             #endregion
+        }
+    }

             public async Task InitAsync()
+            {
                 var journees = await App.Db.Journee
                     .Include(j => j.Responsable)
                     .Include(j => j.Lieu)
                     .Include(j => j.Calibrations)
                         .ThenInclude(c => c.Mesures)
                             .ThenInclude(m => m.Type)
-...
                             .ThenInclude(sa => sa.Comportements)
                     .ToListAsync();
                 foreach (var j in journees)
+                {
                     foreach (var c in j.Calibrations)

GES_PAC

Révision 3fef487c