diff --git a/src/CalculateurMoyanne/BSN/Bussness.csproj b/src/CalculateurMoyanne/BSN/Bussness.csproj deleted file mode 100644 index ef6377b..0000000 --- a/src/CalculateurMoyanne/BSN/Bussness.csproj +++ /dev/null @@ -1,14 +0,0 @@ - - - - net6.0 - enable - enable - AnyCPU;x64 - - - - - - - diff --git a/src/CalculateurMoyanne/BSN/Class1.cs b/src/CalculateurMoyanne/BSN/Class1.cs deleted file mode 100644 index b49d4d1..0000000 --- a/src/CalculateurMoyanne/BSN/Class1.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace BSN -{ - public class Class1 - { - - } -} \ No newline at end of file diff --git a/src/CalculateurMoyanne/BSN/IDataManager.cs b/src/CalculateurMoyanne/BSN/IDataManager.cs deleted file mode 100644 index 757c9c0..0000000 --- a/src/CalculateurMoyanne/BSN/IDataManager.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace BSN -{ - public interface IDataManager - { - Task Add(Data data); - Task Delete(Data data); - Task Update(Data data); - Task GetDataWithName(string name); - Task> GetAll(); - } -} diff --git a/src/CalculateurMoyanne/BSN/Manager.cs b/src/CalculateurMoyanne/BSN/Manager.cs deleted file mode 100644 index 5008a0e..0000000 --- a/src/CalculateurMoyanne/BSN/Manager.cs +++ /dev/null @@ -1,112 +0,0 @@ -using ClassCalculateurMoyenne; -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace BSN -{ - public class Manager - { - #region propriétés - public ReadOnlyCollection maquette { get; private set; } - private readonly List maquettes = new(); - public ReadOnlyCollection bloc { get; private set; } - private readonly List blocs = new(); - public ReadOnlyCollection ue { get; private set; } - private readonly List ues = new(); - public ReadOnlyCollection matiere { get; private set; } - private readonly List matieres = new(); - - - - public IDataManager MaquetteDbDataManager => maquetteDbDataManager; - private readonly IDataManager maquetteDbDataManager; - public IDataManager BlocDbDataManager => blocDbDataManager; - private readonly IDataManager blocDbDataManager; - public IDataManager UeDbDataManager => ueDbDataManager; - private readonly IDataManager ueDbDataManager; - public IDataManager MatiereDbDataManager => matiereDbDataManager; - private readonly IDataManager matiereDbDataManager; - - #endregion - - - #region Constructeurs - - public Manager(IDataManager maquettemanager) - { - this.maquetteDbDataManager = maquettemanager; - maquette = new ReadOnlyCollection(maquettes); - } - public Manager(IDataManagerblocmanager) - { - this.blocDbDataManager = blocmanager; - bloc = new ReadOnlyCollection(blocs); - } - public Manager(IDataManager UeManager) - { - this.ueDbDataManager = UeManager; - ue = new ReadOnlyCollection(ues); - } - public Manager(IDataManager matiereDbDataManager) - { - this.matiereDbDataManager = matiereDbDataManager; - matiere = new ReadOnlyCollection(matieres); - } - - public Manager(IDataManager matiereManager,IDataManager UeManager, IDataManager blocmanager, IDataManager maquettemanager) - { - this.matiereDbDataManager = matiereManager; - matiere = new ReadOnlyCollection(matieres); - this.maquetteDbDataManager = maquettemanager; - maquette = new ReadOnlyCollection(maquettes); - this.blocDbDataManager = blocmanager; - bloc = new ReadOnlyCollection(blocs); - this.ueDbDataManager = UeManager; - ue = new ReadOnlyCollection(ues); - } - - #endregion - - #region Methodes - - public Task AddMaquette(MaquetteModel maqt) - { - if (maquetteDbDataManager == null) - { - return Task.FromResult(false); - } - - return maquetteDbDataManager.Add(maqt); - - } - - public async Task Deletemqt(MaquetteModel maqt) - { - if (maquetteDbDataManager == null) - { - return false; - } - return await maquetteDbDataManager.Delete(maqt); - } - - public async Task UpdateMaquette(MaquetteModel maqt) - { - if (maquetteDbDataManager == null) - { - return false; - } - return await maquetteDbDataManager.Update(maqt); - } - public async Task> GetAllMaquette() - { - return await maquetteDbDataManager.GetAll(); - } - - - } - #endregion -} diff --git a/src/CalculateurMoyanne/CalculateurApp/App.xaml.cs b/src/CalculateurMoyanne/CalculateurApp/App.xaml.cs index 5ec182c..957a8bd 100644 --- a/src/CalculateurMoyanne/CalculateurApp/App.xaml.cs +++ b/src/CalculateurMoyanne/CalculateurApp/App.xaml.cs @@ -10,9 +10,9 @@ namespace CalculateurApp { InitializeComponent(); - MainPage = new NavigationPage(new HomePage()); + // MainPage = new NavigationPage(new HomePage()); //MainPage = new AppShell(BlocViewModel c); - // MainPage = new Maquette (); + MainPage = new Maquette (); // MainPage = new Start(); } diff --git a/src/CalculateurMoyanne/CalculateurApp/AppShell.xaml.cs b/src/CalculateurMoyanne/CalculateurApp/AppShell.xaml.cs index 73c7126..5f5bfca 100644 --- a/src/CalculateurMoyanne/CalculateurApp/AppShell.xaml.cs +++ b/src/CalculateurMoyanne/CalculateurApp/AppShell.xaml.cs @@ -7,7 +7,7 @@ namespace CalculateurApp public AppShell() { InitializeComponent(); - Routing.RegisterRoute(nameof(Maquette), typeof(Maquette)); + Routing.RegisterRoute(nameof(Start), typeof(Start)); } } } \ No newline at end of file diff --git a/src/CalculateurMoyanne/CalculateurApp/MauiProgram.cs b/src/CalculateurMoyanne/CalculateurApp/MauiProgram.cs index 8c333a9..abf0835 100644 --- a/src/CalculateurMoyanne/CalculateurApp/MauiProgram.cs +++ b/src/CalculateurMoyanne/CalculateurApp/MauiProgram.cs @@ -15,12 +15,15 @@ namespace CalculateurApp fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular"); fonts.AddFont("OpenSans-Semibold.ttf", "OpenSansSemibold"); }); - builder.Services.AddTransient(); - builder.Services.AddTransient(); - builder.Services.AddSingleton(); - builder.Services.AddSingleton(); + + + // builder.Services.AddSingleton(); + // builder.Services.AddSingleton(); + builder.Services.AddSingleton(); builder.Services.AddSingleton(); + builder.Services.AddTransient(); + builder.Services.AddTransient(); return builder.Build(); } diff --git a/src/CalculateurMoyanne/CalculateurApp/ViewModel/BlocViewModel.cs b/src/CalculateurMoyanne/CalculateurApp/ViewModel/BlocViewModel.cs index 641564d..bfd2d2d 100644 --- a/src/CalculateurMoyanne/CalculateurApp/ViewModel/BlocViewModel.cs +++ b/src/CalculateurMoyanne/CalculateurApp/ViewModel/BlocViewModel.cs @@ -13,8 +13,9 @@ namespace CalculateurApp.ViewModel [QueryProperty("Nom", "Nom")] public partial class BlocViewModel:ObservableObject { - - + + [ObservableProperty] + string nom; public BlocModel blocModel { get; set; } public UE ue { get; set; } public BlocViewModel() @@ -28,7 +29,7 @@ namespace CalculateurApp.ViewModel ObservableCollection items; [ObservableProperty] string intitulé; - + [RelayCommand] void Add() diff --git a/src/CalculateurMoyanne/CalculateurApp/ViewModel/MaquetteViewModel.cs b/src/CalculateurMoyanne/CalculateurApp/ViewModel/MaquetteViewModel.cs index 108324f..8466994 100644 --- a/src/CalculateurMoyanne/CalculateurApp/ViewModel/MaquetteViewModel.cs +++ b/src/CalculateurMoyanne/CalculateurApp/ViewModel/MaquetteViewModel.cs @@ -42,6 +42,7 @@ namespace CalculateurApp.ViewModel } [RelayCommand] void Delete(BlocModel bl) + { if (Items.Contains(bl)) { diff --git a/src/CalculateurMoyanne/CalculateurApp/ViewModel/UeViewModel.cs b/src/CalculateurMoyanne/CalculateurApp/ViewModel/UeViewModel.cs index 0190ca9..115e13f 100644 --- a/src/CalculateurMoyanne/CalculateurApp/ViewModel/UeViewModel.cs +++ b/src/CalculateurMoyanne/CalculateurApp/ViewModel/UeViewModel.cs @@ -10,7 +10,7 @@ using System.Threading.Tasks; namespace CalculateurApp.ViewModel { - [QueryProperty("Nom", "Nom")] + //[QueryProperty("Nom", "Nom")] public partial class UeViewModel:ObservableObject { //[ObservableProperty] @@ -63,11 +63,11 @@ namespace CalculateurApp.ViewModel Items.Remove(bl); } } - [RelayCommand] - async Task GoBack() - { - await Shell.Current.GoToAsync(".."); - } + //[RelayCommand] + //async Task GoBack() + //{ + // await Shell.Current.GoToAsync(".."); + //} } diff --git a/src/CalculateurMoyanne/CalculateurEF/calcul.db-shm b/src/CalculateurMoyanne/CalculateurEF/calcul.db-shm deleted file mode 100644 index fe9ac28..0000000 Binary files a/src/CalculateurMoyanne/CalculateurEF/calcul.db-shm and /dev/null differ diff --git a/src/CalculateurMoyanne/CalculateurEF/calcul.db-wal b/src/CalculateurMoyanne/CalculateurEF/calcul.db-wal deleted file mode 100644 index e69de29..0000000 diff --git a/src/CalculateurMoyanne/ClassCalculateurMoyenne/Modele/BlocModel.cs b/src/CalculateurMoyanne/ClassCalculateurMoyenne/Modele/BlocModel.cs index e6fbd2a..37dbbae 100644 --- a/src/CalculateurMoyanne/ClassCalculateurMoyenne/Modele/BlocModel.cs +++ b/src/CalculateurMoyanne/ClassCalculateurMoyenne/Modele/BlocModel.cs @@ -97,7 +97,7 @@ namespace ClassCalculateurMoyenne } public bool Equals(BlocModel other) { - return Equals(other.Nom); + return Nom. Equals(other.Nom); } public override bool Equals(object obj) diff --git a/src/CalculateurMoyanne/ClassCalculateurMoyenne/Modele/MaquetteModel.cs b/src/CalculateurMoyanne/ClassCalculateurMoyenne/Modele/MaquetteModel.cs index 76b0296..175bf64 100644 --- a/src/CalculateurMoyanne/ClassCalculateurMoyenne/Modele/MaquetteModel.cs +++ b/src/CalculateurMoyanne/ClassCalculateurMoyenne/Modele/MaquetteModel.cs @@ -118,7 +118,7 @@ namespace ClassCalculateurMoyenne public bool Equals(MaquetteModel other) { - return Equals(other.GetNomMaquette()); + return NomMaquette. Equals(other.GetNomMaquette()); } public override bool Equals(object obj) { diff --git a/src/CalculateurMoyanne/ClassCalculateurMoyenne/Modele/MoyenneGeneral.cs b/src/CalculateurMoyanne/ClassCalculateurMoyenne/Modele/MoyenneGeneral.cs deleted file mode 100644 index 9919cc7..0000000 --- a/src/CalculateurMoyanne/ClassCalculateurMoyenne/Modele/MoyenneGeneral.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace ClassCalculateurMoyenne -{ - public class MoyenneGeneral - { public long Id { get; set; } - public int Resultat { get; set; } - public MoyenneGeneral( long id,int resultat) - - { - Id = id; - Resultat = resultat; - - } - - - - } -}