From ee637b14a5737b1336a11430161ae57db26fc186 Mon Sep 17 00:00:00 2001
From: etudiant <etudiant@MB-R-110000998.local>
Date: Mon, 12 Dec 2022 20:33:38 +0100
Subject: [PATCH] Maui

---
 .../{MaquettePage.xaml => BlockView.xaml}     |  17 +++--
 .../CalculateurApp/View/BlockView.xaml.cs     |  21 ++++++
 .../CalculateurApp/View/EXE.xaml              |  42 -----------
 .../CalculateurApp/View/MaquettePage.xaml.cs  |  12 ----
 .../CalculateurApp/View/mqt.xaml              |  67 ++++++++++++++++++
 .../View/{EXE.xaml.cs => mqt.xaml.cs}         |   3 +-
 .../CalculateurEF/calcul.db                   | Bin 40960 -> 0 bytes
 .../ClassCalculateurMoyenne/Class1.cs         |   7 --
 8 files changed, 103 insertions(+), 66 deletions(-)
 rename src/CalculateurMoyanne/CalculateurApp/View/{MaquettePage.xaml => BlockView.xaml} (81%)
 create mode 100644 src/CalculateurMoyanne/CalculateurApp/View/BlockView.xaml.cs
 delete mode 100644 src/CalculateurMoyanne/CalculateurApp/View/EXE.xaml
 delete mode 100644 src/CalculateurMoyanne/CalculateurApp/View/MaquettePage.xaml.cs
 create mode 100644 src/CalculateurMoyanne/CalculateurApp/View/mqt.xaml
 rename src/CalculateurMoyanne/CalculateurApp/View/{EXE.xaml.cs => mqt.xaml.cs} (88%)
 delete mode 100644 src/CalculateurMoyanne/CalculateurEF/calcul.db
 delete mode 100644 src/CalculateurMoyanne/ClassCalculateurMoyenne/Class1.cs

diff --git a/src/CalculateurMoyanne/CalculateurApp/View/MaquettePage.xaml b/src/CalculateurMoyanne/CalculateurApp/View/BlockView.xaml
similarity index 81%
rename from src/CalculateurMoyanne/CalculateurApp/View/MaquettePage.xaml
rename to src/CalculateurMoyanne/CalculateurApp/View/BlockView.xaml
index 28f49fe..c11a33c 100644
--- a/src/CalculateurMoyanne/CalculateurApp/View/MaquettePage.xaml
+++ b/src/CalculateurMoyanne/CalculateurApp/View/BlockView.xaml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?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"
              x:Class="CalculateurApp.View.Maquette"
@@ -17,12 +17,19 @@
                Text="{Binding blocModel.Nom }"
                TextColor="Black"
              />
-        <Button
+        <Button x:Name="Afer" Text="Modifier"  Grid.Row="1" Grid.Column="1" HorizontalOptions="End" VerticalOptions="End" WidthRequest="80"></Button>
+         <Button
             Command="{Binding AddCommand}"
-            Text="Add"
+            Text="ajouter"
             Grid.Row="1"
-            Grid.Column="1">
+            Grid.Column="1"
+            HorizontalOptions="Center"
+            VerticalOptions="Center"
+            WidthRequest="100"
+            >
         </Button>
+        
+        
         <Label Text="Liste des blocs" Grid.Row="2" Grid.ColumnSpan="2" FontSize="Header" HorizontalOptions="Center" TextDecorations="Underline" TextColor="Black" FontAttributes="Bold, Italic" ></Label>
         <CollectionView Grid.Row="3" Grid.ColumnSpan="2" ItemsSource="{Binding Items}" SelectionMode="None" >
             <CollectionView.ItemTemplate>
@@ -35,6 +42,8 @@
                                     Command="{Binding Source={RelativeSource AncestorType={x:Type viewmodel:MaquetteViewModel}}, Path=DeleteCommand}"
                                     CommandParameter="{Binding .}"
                                 />
+                                <SwipeItem Text="AFFICHER" BackgroundColor="BlueViolet"></SwipeItem>
+                                <SwipeItem Text="MODIFIER UES" BackgroundColor="Beige"></SwipeItem>
                             </SwipeItems>
                         </SwipeView.RightItems>
                         <Grid Padding="0">
diff --git a/src/CalculateurMoyanne/CalculateurApp/View/BlockView.xaml.cs b/src/CalculateurMoyanne/CalculateurApp/View/BlockView.xaml.cs
new file mode 100644
index 0000000..aaae1c0
--- /dev/null
+++ b/src/CalculateurMoyanne/CalculateurApp/View/BlockView.xaml.cs
@@ -0,0 +1,21 @@
+using CalculateurApp.ViewModel;
+using CalculateurMapping;
+using ClassCalculateurMoyenne;
+using Bussness;
+
+namespace CalculateurApp.View;
+
+
+public partial class BlockView : ContentPage
+{
+    
+	public BlockView()
+	{
+		InitializeComponent();
+        BindingContext = new MaquetteViewModel ();
+    }
+    private async void Aer(object sender, EventArgs e)
+    {
+        //Navigation.PushAsync(new BlockView());
+    }
+}
\ No newline at end of file
diff --git a/src/CalculateurMoyanne/CalculateurApp/View/EXE.xaml b/src/CalculateurMoyanne/CalculateurApp/View/EXE.xaml
deleted file mode 100644
index 346f4dd..0000000
--- a/src/CalculateurMoyanne/CalculateurApp/View/EXE.xaml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?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:tool="https://schemas.microsoft.com/dotnet/2022/maui/toolkit"
-             x:Class="CalculateurApp.View.EXE"
-             Title="EXE">
-  
-    
-    
-    
-    
-<Grid  
-         Padding="10"
-         RowSpacing="60"
-         ColumnSpacing="6">
-        <Grid.RowDefinitions>
-            <RowDefinition  />
-            <RowDefinition />
-        </Grid.RowDefinitions>
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition />
-            <ColumnDefinition/>
-        </Grid.ColumnDefinitions >
-        <Frame Grid.Row="0" BackgroundColor="Black"></Frame>
-        <Frame Grid.Row="1" BackgroundColor="Yellow"></Frame>
-        <Button Text=" afficher UE"></Button>
-        <BoxView Grid.Row="0" BackgroundColor="Red"></BoxView>
-        <BoxView Grid.Row="1"  BackgroundColor="AliceBlue"></BoxView>
-  </Grid>
-    <!--<ScrollView >
-        <VerticalStackLayout Spacing="10" >
-            <Label Text="rouf"></Label>
-            <Frame>
-                
-                
-
-            </Frame>
-        </VerticalStackLayout>
-      
-    </ScrollView>-->
-   
-</ContentPage>
\ No newline at end of file
diff --git a/src/CalculateurMoyanne/CalculateurApp/View/MaquettePage.xaml.cs b/src/CalculateurMoyanne/CalculateurApp/View/MaquettePage.xaml.cs
deleted file mode 100644
index 45899c8..0000000
--- a/src/CalculateurMoyanne/CalculateurApp/View/MaquettePage.xaml.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using CalculateurApp.ViewModel;
-
-namespace CalculateurApp.View;
-
-public partial class Maquette : ContentPage
-{
-	public Maquette()
-	{
-		InitializeComponent();
-        BindingContext = new MaquetteViewModel ();
-    }
-}
\ No newline at end of file
diff --git a/src/CalculateurMoyanne/CalculateurApp/View/mqt.xaml b/src/CalculateurMoyanne/CalculateurApp/View/mqt.xaml
new file mode 100644
index 0000000..dc78154
--- /dev/null
+++ b/src/CalculateurMoyanne/CalculateurApp/View/mqt.xaml
@@ -0,0 +1,67 @@
+<?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:viewmodel="clr-namespace:CalculateurApp.ViewModel"
+             x:DataType="viewmodel:BlocViewModel"             
+             x:Class="CalculateurApp.View.EXE"
+             Title="Maquette">
+<Grid RowDefinitions="100 ,Auto,*"
+         ColumnDefinitions=".75*,.25*"
+         Padding="2"
+         RowSpacing="4"
+         ColumnSpacing="4">
+
+        <Entry Placeholder="Ajout de BLOC DANS LA MAQUETTE"
+               Grid.Row="1" BackgroundColor="AliceBlue"
+               Text="{Binding blocModel.Nom }"
+               TextColor="Black"
+             />
+         <Button
+            
+            Text="Modifier"
+            Grid.Row="1"
+            Grid.Column="1"
+            HorizontalOptions="Center"
+            VerticalOptions="Center"
+            WidthRequest="100"
+            >
+            <!--Command="{Binding AddUEBlocCommand}"-->
+        </Button>
+         <!--<Label Text="Liste des blocs" Grid.Row="2" Grid.ColumnSpan="2" FontSize="Header" HorizontalOptions="Center" TextDecorations="Underline" TextColor="Black" FontAttributes="Bold, Italic" ></Label>
+        <CollectionView Grid.Row="3" Grid.ColumnSpan="2" ItemsSource="{Binding Items}" SelectionMode="None" >
+            <CollectionView.ItemTemplate>
+                <DataTemplate x:DataType="{x:Type  model:BlocModel }">
+                    <SwipeView>
+                        <SwipeView.RightItems>
+                            <SwipeItems>
+                                <SwipeItem Text="Delete" 
+                                    BackgroundColor="Red"
+                                    Command="{Binding Source={RelativeSource AncestorType={x:Type viewmodel:MaquetteViewModel}}, Path=DeleteCommand}"
+                                    CommandParameter="{Binding .}"
+                                />
+                                <SwipeItem  Text="Update" BackgroundColor="AliceBlue">
+                                </SwipeItem>
+                                <SwipeItem Text="Ajout de UE" BackgroundColor="Beige"></SwipeItem>
+                            </SwipeItems>
+                        </SwipeView.RightItems>
+                        <Grid Padding="0">
+                            <Frame Grid.Row="1">
+                                <Frame.GestureRecognizers >
+                                    <TapGestureRecognizer  
+                                           Command="{Binding Source={RelativeSource AncestorType={x:Type  viewmodel:MaquetteViewModel}}, Path=TapCommand}"
+                                           CommandParameter="{Binding .}" />
+                                </Frame.GestureRecognizers>
+                                <Label Text="{Binding Nom}" 
+                                       FontSize="10" TextColor="Black"
+                                />
+                            </Frame>
+                        </Grid>
+                    </SwipeView>
+                </DataTemplate>
+            </CollectionView.ItemTemplate>
+        </CollectionView >-->
+    </Grid>
+</ContentPage>
+
+
+
diff --git a/src/CalculateurMoyanne/CalculateurApp/View/EXE.xaml.cs b/src/CalculateurMoyanne/CalculateurApp/View/mqt.xaml.cs
similarity index 88%
rename from src/CalculateurMoyanne/CalculateurApp/View/EXE.xaml.cs
rename to src/CalculateurMoyanne/CalculateurApp/View/mqt.xaml.cs
index 742547e..f98bae5 100644
--- a/src/CalculateurMoyanne/CalculateurApp/View/EXE.xaml.cs
+++ b/src/CalculateurMoyanne/CalculateurApp/View/mqt.xaml.cs
@@ -5,5 +5,6 @@ public partial class EXE : ContentPage
 	public EXE()
 	{
 		InitializeComponent();
-	}
+       
+    }
 }
\ No newline at end of file
diff --git a/src/CalculateurMoyanne/CalculateurEF/calcul.db b/src/CalculateurMoyanne/CalculateurEF/calcul.db
deleted file mode 100644
index 7e4a0ecd7c96d92472e66f84edde1f46bc71b90d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 40960
zcmeI)&u-#I9Kdm#WaB`^rhAAiR;n`cDQMFuAzh_aRH-a=wrCTR5?CdN%Azn?St3{q
zj?_JZ+H2pVhhF;veSxYk&{Hpcf*w0IHvdtx$0gqpCT2YT&CF-UCKDnqzdiE;DQ^7k
zZ6gpz+Q(WdrF|uYrfDg)Wz?1=L+z|5FVs(cVt?6gO51mzX1D&;(&^u{$A519`q;|;
zk<ESdPv+;$Cn}4C00IagfB*srAaE}MnKsPlIlZ6uIxYD_`N~zlym_+g)@|7dyx?8A
zHO$DAs&=tvi?Z{zeI=|#1uao=gf%Q~iCt?P!pi%bhWX{T-p?h~ylDGP_q_4;P6mOr
z<Ep~U^jt*?iw-Lb4~13D2D0*lYr`;eIsK<>(D=SBhpieuZ^kv$iZ9OWi3VpgLM6*<
zS*n*c`=wnKPNgQC`q`N%Rh-LOwW#uib@3`jvcyHTd|s?xi&yrwDAsG0vZG?3+fHpS
z4(9l`!%C$kYW9_i7DpTx2-Kn3`jVq1U*0S~IsrV6pjsQBJ=x~dq|I(!PK>Q3PAgTr
z{L+bfFg;|VYM<Iw+bP+X!m6uA?po!RmCt7KgS`#I+}_rIJc(?>K?pZv+BF`V7($&o
zZsQWw;TiWaU4l6`4aQY2WeF=CO~l@4FPW0FLUUE*r<{_*y$P=VXO9f?$rF8W8FAHR
zU2aTMMY`_+6_)>Brf}}ucuh}T$Mf{b1oOfx@2>s(FEgTQlrPpd%xBN^>!{Jaw{5k!
zb9+)<u$`uydHHCnJ2MA&JB?epr_RjxKV37-ogICUk7ACjMmy_MaYk2li1{8mqj2{?
zQrBlvd|se`r5on)u|B9o?R8!I^xS*XRX0e#)BDEj1%CJ4!pzikKNgl5_h}R}yhf&O
z60^6RC4nZULNcxwUB7kL3|`A_Pc?QXtQy>MYQy~QSl6Q4aXes+yTFfLy9?`a4;N;y
zskfQU@U14RHht?aO+82mAb<b@2q1s}0tg_000Iag@L>w<=xZlt;h<1BEF2siesT2q
zVZp7*UQlYZo5%YH`v>6%{QB14ntG5BKmY**5I_I{1Q0*~0R#|0;6oO8x^|LY@<)L1
z^MCbE|0DzuKmY**5I_I{1Q0*~0R#|OVFA|vD?GS#4FLoYKmY**5I_I{1Q0*~fmnd`
zKT`n#1Q0*~0R#|0009ILKmdW&7hwIr`eRHF5kLR|1Q0*~0R#|0009ILVExY=KmY**
z5I_I{1Q0*~0R#|0VD$yU@Biof|5ksT=^+9LAb<b@2q1s}0tg_0z{3_`{r|AXpWY*Y
V00IagfB*srAb<b@2s{jd{{R7W`c41<

diff --git a/src/CalculateurMoyanne/ClassCalculateurMoyenne/Class1.cs b/src/CalculateurMoyanne/ClassCalculateurMoyenne/Class1.cs
deleted file mode 100644
index baece1a..0000000
--- a/src/CalculateurMoyanne/ClassCalculateurMoyenne/Class1.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace ClassCalculateurMoyenne
-{
-    public class Class1
-    {
-
-    }
-}
\ No newline at end of file