From 0f6c23ec4299528adc588b1d028aa0db057f19f4 Mon Sep 17 00:00:00 2001
From: cldupland <clement.dupland@etu.uca.fr>
Date: Fri, 25 Oct 2019 09:18:58 +0200
Subject: [PATCH] Avancement sur le test en vue

---
 TheGameExtreme/model/manager/GameManager.cs | 4 ++++
 TheGameExtreme/view/MainPage.xaml           | 8 ++++----
 TheGameExtreme/view/MainPage.xaml.cs        | 7 +++++++
 TheGameExtreme/viewmodel/Main.cs            | 4 +++-
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/TheGameExtreme/model/manager/GameManager.cs b/TheGameExtreme/model/manager/GameManager.cs
index 204c286..e3a233a 100644
--- a/TheGameExtreme/model/manager/GameManager.cs
+++ b/TheGameExtreme/model/manager/GameManager.cs
@@ -126,6 +126,10 @@ namespace TheGameExtreme.model.manager
 
         public void joue(int valueCard, int orderedStackSelected)
         {
+            if (EndMessage != null)
+            {
+                throw new Exception("Le jeu est fini! Veuillez lancer une nouvelle partie!");
+            }
             foreach(Card card in CurrentHand)
             {
                 if (valueCard == card.Value)
diff --git a/TheGameExtreme/view/MainPage.xaml b/TheGameExtreme/view/MainPage.xaml
index cac5c5b..8923746 100644
--- a/TheGameExtreme/view/MainPage.xaml
+++ b/TheGameExtreme/view/MainPage.xaml
@@ -16,7 +16,7 @@
                 Margin="0,0,0,40">
                 <StackLayout
                     Orientation="Vertical">
-                    <Label HorizontalTextAlignment="Center" x:Name="pile0" />
+                    <Label HorizontalTextAlignment="Center" x:Name="pile0" Text="1" />
                     <StackLayout
                         Orientation="Horizontal">
                         <CheckBox x:Name="checkbox0" CheckedChanged="radioButton" />
@@ -25,7 +25,7 @@
                 </StackLayout>
                 <StackLayout
                     Orientation="Vertical">
-                    <Label HorizontalTextAlignment="Center" x:Name="pile1" />
+                    <Label HorizontalTextAlignment="Center" x:Name="pile1" Text="1" />
                     <StackLayout
                         Orientation="Horizontal">
                         <CheckBox x:Name="checkbox1" CheckedChanged="radioButton" />
@@ -34,7 +34,7 @@
                 </StackLayout>
                 <StackLayout
                     Orientation="Vertical">
-                    <Label HorizontalTextAlignment="Center" x:Name="pile2" />
+                    <Label HorizontalTextAlignment="Center" x:Name="pile2" Text="100" />
                     <StackLayout
                         Orientation="Horizontal">
                         <CheckBox x:Name="checkbox2" CheckedChanged="radioButton" />
@@ -43,7 +43,7 @@
                 </StackLayout>
                 <StackLayout
                     Orientation="Vertical">
-                    <Label HorizontalTextAlignment="Center" x:Name="pile3" />
+                    <Label HorizontalTextAlignment="Center" x:Name="pile3" Text="100" />
                     <StackLayout
                         Orientation="Horizontal">
                         <CheckBox x:Name="checkbox3" CheckedChanged="radioButton" />
diff --git a/TheGameExtreme/view/MainPage.xaml.cs b/TheGameExtreme/view/MainPage.xaml.cs
index 968e749..ef48ee4 100644
--- a/TheGameExtreme/view/MainPage.xaml.cs
+++ b/TheGameExtreme/view/MainPage.xaml.cs
@@ -150,6 +150,13 @@ namespace TheGameExtreme
             Alert.SetBinding(Label.TextProperty, new Binding("Alert", source: viewmodel));
 
             inflateHand();
+
+            pile0.Text = "1";
+            pile1.Text = "1";
+            pile2.Text = "100";
+            pile3.Text = "100";
+
+            botPanel.Children.Remove(button);
         }
 
         private void endTurn(object sender, EventArgs args)
diff --git a/TheGameExtreme/viewmodel/Main.cs b/TheGameExtreme/viewmodel/Main.cs
index 928731a..9b01ded 100644
--- a/TheGameExtreme/viewmodel/Main.cs
+++ b/TheGameExtreme/viewmodel/Main.cs
@@ -103,7 +103,9 @@ namespace TheGameExtreme.viewmodel
         {
             try
             {
-                return gameManager.endTurn();
+                bool isEnd = gameManager.endTurn();
+                Alert = gameManager.EndMessage;
+                return isEnd;
             }
             catch(Exception e)
             {