tous

src/CalculateurMoyanne/BSN/Bussness.csproj

@@ -1,14 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-    <Platforms>AnyCPU;x64</Platforms>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\ClassCalculateurMoyenne\ClassCalculateurMoyenne.csproj" />
-  </ItemGroup>
-
-</Project>

src/CalculateurMoyanne/BSN/Class1.cs

@@ -1,7 +0,0 @@
-namespace BSN
-{
-    public class Class1
-    {
-
-    }
-}

src/CalculateurMoyanne/BSN/IDataManager.cs

@@ -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<Data>
-    {
-        Task<bool> Add(Data data);
-        Task<bool> Delete(Data data);
-        Task<bool> Update(Data data);
-        Task<Data> GetDataWithName(string name);
-        Task<IEnumerable<Data>> GetAll();
-    }
-}

src/CalculateurMoyanne/BSN/Manager.cs

@@ -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<MaquetteModel> maquette { get; private set; }
-        private readonly List<MaquetteModel> maquettes = new();
-        public ReadOnlyCollection<BlocModel> bloc { get; private set; }
-        private readonly List<BlocModel> blocs = new();
-        public ReadOnlyCollection<UE> ue { get; private set; }
-        private readonly List<UE> ues = new();
-        public ReadOnlyCollection<Matiere> matiere { get; private set; }
-        private readonly List<Matiere> matieres = new();
-
-
-
-        public IDataManager<MaquetteModel> MaquetteDbDataManager => maquetteDbDataManager;
-        private readonly IDataManager<MaquetteModel> maquetteDbDataManager;
-        public IDataManager<BlocModel> BlocDbDataManager => blocDbDataManager;
-        private readonly IDataManager<BlocModel> blocDbDataManager;
-        public IDataManager<UE> UeDbDataManager => ueDbDataManager;
-        private readonly IDataManager<UE> ueDbDataManager;
-        public IDataManager<Matiere> MatiereDbDataManager => matiereDbDataManager;
-        private readonly IDataManager<Matiere> matiereDbDataManager;
-       
-     #endregion
-
-
-     #region Constructeurs
-
-        public Manager(IDataManager<MaquetteModel> maquettemanager)
-        {
-           this.maquetteDbDataManager = maquettemanager;
-            maquette = new ReadOnlyCollection<MaquetteModel>(maquettes);
-        }
-        public Manager(IDataManager<BlocModel>blocmanager)
-        {
-            this.blocDbDataManager = blocmanager;
-              bloc = new ReadOnlyCollection<BlocModel>(blocs);
-        }
-        public Manager(IDataManager<UE> UeManager)
-        {
-            this.ueDbDataManager = UeManager;
-            ue = new ReadOnlyCollection<UE>(ues);
-        }
-        public Manager(IDataManager<Matiere> matiereDbDataManager)
-        {
-            this.matiereDbDataManager = matiereDbDataManager;
-            matiere = new ReadOnlyCollection<Matiere>(matieres);
-        }
-
-        public Manager(IDataManager<Matiere> matiereManager,IDataManager<UE> UeManager, IDataManager<BlocModel> blocmanager, IDataManager<MaquetteModel> maquettemanager)
-        {
-        this.matiereDbDataManager = matiereManager;
-        matiere = new ReadOnlyCollection<Matiere>(matieres);
-        this.maquetteDbDataManager = maquettemanager;
-        maquette = new ReadOnlyCollection<MaquetteModel>(maquettes);
-        this.blocDbDataManager = blocmanager;
-        bloc = new ReadOnlyCollection<BlocModel>(blocs);
-        this.ueDbDataManager = UeManager;
-        ue = new ReadOnlyCollection<UE>(ues);
-        }
-
-     #endregion
-
-     #region Methodes
-    
-       public Task<bool> AddMaquette(MaquetteModel maqt)
-       {
-        if (maquetteDbDataManager == null)
-        {
-               return Task.FromResult(false);
-        }
-         
-            return maquetteDbDataManager.Add(maqt);
-
-       }
-
-        public async Task<bool> Deletemqt(MaquetteModel maqt)
-        {
-          if (maquetteDbDataManager == null)
-          {
-               return false;
-          }
-            return await maquetteDbDataManager.Delete(maqt);
-        }
-
-        public async Task<bool> UpdateMaquette(MaquetteModel maqt)
-        {
-            if (maquetteDbDataManager == null)
-            {
-                return false;
-            }
-            return await maquetteDbDataManager.Update(maqt);
-        }
-        public async Task<IEnumerable<MaquetteModel>> GetAllMaquette()
-        {
-            return await maquetteDbDataManager.GetAll();
-        }
-
-
-    }
-    #endregion
-}

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();
            
         }

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));
         }
     }
 }

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<Start>();
+           
-            builder.Services.AddTransient<BlocViewModel>();
+
-            builder.Services.AddSingleton<UEPage1>();
+           // builder.Services.AddSingleton<UEPage1>();
-            builder.Services.AddSingleton<UeViewModel>();
+           // builder.Services.AddSingleton<UeViewModel>();
+
             builder.Services.AddSingleton<Maquette>();
             builder.Services.AddSingleton<MaquetteViewModel>();
+            builder.Services.AddTransient<Start>();
+            builder.Services.AddTransient<BlocViewModel>();
 
             return builder.Build();
         }

src/CalculateurMoyanne/CalculateurApp/ViewModel/BlocViewModel.cs

@@ -14,7 +14,8 @@ namespace CalculateurApp.ViewModel
     public partial class BlocViewModel:ObservableObject
     {
 
-       
+        [ObservableProperty]
+        string nom;
         public BlocModel blocModel { get; set; }
         public UE ue { get; set; }
         public BlocViewModel()

src/CalculateurMoyanne/CalculateurApp/ViewModel/MaquetteViewModel.cs

@@ -42,6 +42,7 @@ namespace CalculateurApp.ViewModel
         }
          [RelayCommand]
         void Delete(BlocModel bl)
+        
         {
             if (Items.Contains(bl))
             {

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]
+        //[RelayCommand]
-        async Task GoBack()
+        //async Task GoBack()
-        {
+        //{
-            await Shell.Current.GoToAsync("..");
+        //    await Shell.Current.GoToAsync("..");
-        }
+        //}
 
 
     }

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)

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)
         {

src/CalculateurMoyanne/ClassCalculateurMoyenne/Modele/MoyenneGeneral.cs

@@ -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;
-
-        }
-
-       
-        
-    }
-}