Merge branch 'Modele' of https://codefirst.iut.uca.fr/git/SAE2.01/ParionsCuites into Modele

ParionsCuite/ParionsCuite/MainPage.xaml

@@ -43,8 +43,8 @@
                 <Grid Grid.Column="1">
                         <!-- Création de 2 lignes -->
                     <Grid.RowDefinitions>
-                        <RowDefinition Height="1*"/>
+                        <RowDefinition Height="100"/>
-                        <RowDefinition Height="8*"/>
+                        <RowDefinition Height="800"/>
                     </Grid.RowDefinitions>
                     
                     <!-- 1er ligne -->
@@ -61,7 +61,7 @@
                     <!-- 2e ligne -->
                     <Grid Grid.Row="1">
                         <ContentView>
-                            <ajout:Ajouts_Pari/>
+                            <pari:Parier/>
                         </ContentView>
                     </Grid>
                 </Grid>

ParionsCuite/ParionsCuite/ParionsCuite.csproj

@@ -1,5 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
   <PropertyGroup>
     <TargetFrameworks>net7.0-android;net7.0-ios;net7.0-maccatalyst</TargetFrameworks>
     <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net7.0-windows10.0.19041.0</TargetFrameworks>
@@ -11,18 +10,14 @@
     <UseMaui>true</UseMaui>
     <SingleProject>true</SingleProject>
     <ImplicitUsings>enable</ImplicitUsings>
-
     <!-- Display name -->
     <ApplicationTitle>ParionsCuite</ApplicationTitle>
-
     <!-- App Identifier -->
     <ApplicationId>com.companyname.parionscuite</ApplicationId>
     <ApplicationIdGuid>be941c7a-90b1-469a-aa20-94c786120159</ApplicationIdGuid>
-
     <!-- Versions -->
     <ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
     <ApplicationVersion>1</ApplicationVersion>
-
     <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">11.0</SupportedOSPlatformVersion>
     <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">13.1</SupportedOSPlatformVersion>
     <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
@@ -30,7 +25,6 @@
     <TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
     <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
   </PropertyGroup>
-
   <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net7.0-ios|AnyCPU'">
     <CreatePackage>false</CreatePackage>
   </PropertyGroup>
@@ -40,32 +34,19 @@
   <ItemGroup>
     <!-- App Icon -->
     <MauiIcon Include="Resources\AppIcon\appicon.svg" ForegroundFile="Resources\AppIcon\appiconfg.svg" Color="#512BD4" />
-
     <!-- Splash Screen -->
     <MauiSplashScreen Include="Resources\Splash\splash.svg" Color="#512BD4" BaseSize="128,128" />
-
     <!-- Images -->
     <MauiImage Include="Resources\Images\*" />
     <MauiImage Update="Resources\Images\dotnet_bot.svg" BaseSize="168,208" />
-
     <!-- Custom Fonts -->
     <MauiFont Include="Resources\Fonts\*" />
-
     <!-- Raw Assets (also remove the "Resources\Raw" prefix) -->
     <MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)" />
   </ItemGroup>
-	<ItemGroup>
-	  <Compile Remove="Test\**" />
-	  <EmbeddedResource Remove="Test\**" />
-	  <MauiCss Remove="Test\**" />
-	  <MauiXaml Remove="Test\**" />
-	  <None Remove="Test\**" />
-	</ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" />
   </ItemGroup>
-
   <ItemGroup>
     <MauiXaml Update="Views\Accueil.xaml">
       <Generator>MSBuild:Compile</Generator>
@@ -83,7 +64,6 @@
       <Generator>MSBuild:Compile</Generator>
     </MauiXaml>
   </ItemGroup>
-
   <ItemGroup>
     <None Remove="Resources\Images\fleches.png" />
     <None Remove="Views\Ajout_Paris\" />
@@ -108,4 +88,22 @@
     <Folder Include="Modeles\" />
     <Folder Include="Stub\" />
   </ItemGroup>
+  <ItemGroup />
+  <ItemGroup Condition="$(VisualStudioVersion) == '17.0'">
+    <Reference Include="Microsoft.Data.Tools.Schema.Sql, Version=16.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>$(SSDTPath)\Microsoft.Data.Tools.Schema.Sql.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.Data.Tools.Schema.Sql.UnitTesting, Version=17.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>$(SSDTUnitTestPath)\Microsoft.Data.Tools.Schema.Sql.UnitTesting.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.Data.Tools.Schema.Sql.UnitTestingAdapter, Version=17.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>$(SSDTUnitTestPath)\Microsoft.Data.Tools.Schema.Sql.UnitTestingAdapter.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+  </ItemGroup>
+  <PropertyGroup>
+    <SsdtUnitTestVersion>3.1</SsdtUnitTestVersion>
+  </PropertyGroup>
 </Project>

ParionsCuite/ParionsCuite/Views/Ajout_Paris/Ajouts_Pari.xaml

@@ -5,7 +5,7 @@
     <VerticalStackLayout>
 
         <!--Ajout Parieur-->
-        <Grid Margin="20" ColumnDefinitions="5*,*,5*,*" RowDefinitions="*,*">
+        <Grid Margin="5" ColumnDefinitions="5*,*,5*,*" RowDefinitions="*,*">
 
             <Label Text="Parieur(s) 1 :" FontSize="Title" HorizontalOptions="Center"/>
             <Label Grid.Column="2" Text="Parieur(s) 2 :" FontSize="Title" HorizontalOptions="End"/>