From 3b16c5feaf6a8c6683d4b556fd75bda2f7189693 Mon Sep 17 00:00:00 2001
From: Darkstack <1835601+darkstack@users.noreply.github.com>
Date: Tue, 12 Mar 2019 21:41:30 +0100
Subject: [PATCH] Player now resolve in UI

---
 .../Controllers/WordPressController.cs        |  10 +-
 LaDOSE.Src/LaDOSE.DTO/WPEvent.cs              |  14 -
 LaDOSE.Src/LaDOSE.DTO/WPUser.cs               |   8 +
 LaDOSE.Src/LaDOSE.DTO/WpBooking.cs            |  11 +
 LaDOSE.Src/LaDOSE.DesktopApp/App.xaml         |   2 +-
 .../Behaviors/MultiSelectorBehaviours.cs      | 418 ++++++++++++++++++
 .../LaDOSE.DesktopApp.csproj                  |  25 +-
 .../Properties/Resources.Designer.cs          |  44 +-
 .../Properties/Settings.Designer.cs           |  22 +-
 .../LaDOSE.DesktopApp/Resources/64x64.png     | Bin 0 -> 8296 bytes
 .../LaDOSE.DesktopApp/Services/RestService.cs |  38 +-
 .../ViewModels/GameViewModel.cs               |   7 +
 .../ViewModels/ShellViewModel.cs              |  18 +-
 .../ViewModels/WebNavigationViewModel.cs      |  15 +
 .../ViewModels/WordPressViewModel.cs          | 255 +++++++----
 .../LaDOSE.DesktopApp/Views/ShellView.xaml    |  16 +-
 .../Views/WebNavigationView.xaml              |  17 +
 .../Views/WebNavigationView.xaml.cs           |  34 ++
 .../LaDOSE.DesktopApp/Views/WebView.xaml.cs   |  29 ++
 .../Views/{WpView.xaml => WordPressView.xaml} |  14 +-
 .../{WpView.xaml.cs => WordPressView.xaml.cs} |   1 +
 .../Interface/IWordPressService.cs            |   2 +-
 .../Service/WordPressService.cs               |  24 +-
 23 files changed, 850 insertions(+), 174 deletions(-)
 create mode 100644 LaDOSE.Src/LaDOSE.DTO/WPUser.cs
 create mode 100644 LaDOSE.Src/LaDOSE.DTO/WpBooking.cs
 create mode 100644 LaDOSE.Src/LaDOSE.DesktopApp/Behaviors/MultiSelectorBehaviours.cs
 create mode 100644 LaDOSE.Src/LaDOSE.DesktopApp/Resources/64x64.png
 create mode 100644 LaDOSE.Src/LaDOSE.DesktopApp/ViewModels/WebNavigationViewModel.cs
 create mode 100644 LaDOSE.Src/LaDOSE.DesktopApp/Views/WebNavigationView.xaml
 create mode 100644 LaDOSE.Src/LaDOSE.DesktopApp/Views/WebNavigationView.xaml.cs
 create mode 100644 LaDOSE.Src/LaDOSE.DesktopApp/Views/WebView.xaml.cs
 rename LaDOSE.Src/LaDOSE.DesktopApp/Views/{WpView.xaml => WordPressView.xaml} (90%)
 rename LaDOSE.Src/LaDOSE.DesktopApp/Views/{WpView.xaml.cs => WordPressView.xaml.cs} (98%)

diff --git a/LaDOSE.Src/LaDOSE.Api/Controllers/WordPressController.cs b/LaDOSE.Src/LaDOSE.Api/Controllers/WordPressController.cs
index 7fa07c4..b5be32b 100644
--- a/LaDOSE.Src/LaDOSE.Api/Controllers/WordPressController.cs
+++ b/LaDOSE.Src/LaDOSE.Api/Controllers/WordPressController.cs
@@ -64,9 +64,15 @@ namespace LaDOSE.Api.Controllers
         }
 
         [HttpGet("CreateChallonge/{gameId:int}/{wpEventId:int}")]
-        public bool CreateChallonge(int gameId, int wpEventId)
+        public string CreateChallonge(int gameId, int wpEventId)
         {
-            return _service.CreateChallonge(gameId, wpEventId);
+            return _service.CreateChallonge(gameId, wpEventId,null);
+        }
+
+        [HttpPost("CreateChallonge/{gameId:int}/{wpEventId:int}")]
+        public string CreateChallonge(int gameId, int wpEventId, [FromBody]List<WPUser> additionalPlayer)
+        {
+            return _service.CreateChallonge(gameId, wpEventId, additionalPlayer);
         }
     }
 }
\ No newline at end of file
diff --git a/LaDOSE.Src/LaDOSE.DTO/WPEvent.cs b/LaDOSE.Src/LaDOSE.DTO/WPEvent.cs
index f5f547e..5b08cfe 100644
--- a/LaDOSE.Src/LaDOSE.DTO/WPEvent.cs
+++ b/LaDOSE.Src/LaDOSE.DTO/WPEvent.cs
@@ -14,18 +14,4 @@ namespace LaDOSE.DTO
         public DateTime? Date { get; set; }
         public List<WPBooking> WpBookings { get; set; }
     }
-
-    public class WPBooking
-    {
-        public WPUser WpUser { get; set; }
-        public string Message { get; set; }
-
-        public string Meta { get; set; }
-    }
-
-    public class WPUser
-    {
-        public string Name { get; set; }
-    }
-
 }
\ No newline at end of file
diff --git a/LaDOSE.Src/LaDOSE.DTO/WPUser.cs b/LaDOSE.Src/LaDOSE.DTO/WPUser.cs
new file mode 100644
index 0000000..85b305f
--- /dev/null
+++ b/LaDOSE.Src/LaDOSE.DTO/WPUser.cs
@@ -0,0 +1,8 @@
+namespace LaDOSE.DTO
+{
+    public  class WPUser
+    {
+        public string Id { get; set; }
+        public string Name { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/LaDOSE.Src/LaDOSE.DTO/WpBooking.cs b/LaDOSE.Src/LaDOSE.DTO/WpBooking.cs
new file mode 100644
index 0000000..c2ced85
--- /dev/null
+++ b/LaDOSE.Src/LaDOSE.DTO/WpBooking.cs
@@ -0,0 +1,11 @@
+namespace LaDOSE.DTO
+{
+    public class WPBooking
+    {
+        public WPUser WpUser { get; set; }
+        public string Message { get; set; }
+
+        public string Meta { get; set; }
+    }
+
+}
\ No newline at end of file
diff --git a/LaDOSE.Src/LaDOSE.DesktopApp/App.xaml b/LaDOSE.Src/LaDOSE.DesktopApp/App.xaml
index 09ab519..5b6efc4 100644
--- a/LaDOSE.Src/LaDOSE.DesktopApp/App.xaml
+++ b/LaDOSE.Src/LaDOSE.DesktopApp/App.xaml
@@ -8,7 +8,7 @@
         <ResourceDictionary>
                 <ResourceDictionary.MergedDictionaries>
                     <ResourceDictionary>
-                        <local:Bootstrapper x:Key="Bootstrapper" />
+                    <local:Bootstrapper x:Key="Bootstrapper" />
                     </ResourceDictionary>
                 </ResourceDictionary.MergedDictionaries>
             </ResourceDictionary>
diff --git a/LaDOSE.Src/LaDOSE.DesktopApp/Behaviors/MultiSelectorBehaviours.cs b/LaDOSE.Src/LaDOSE.DesktopApp/Behaviors/MultiSelectorBehaviours.cs
new file mode 100644
index 0000000..fe81b4d
--- /dev/null
+++ b/LaDOSE.Src/LaDOSE.DesktopApp/Behaviors/MultiSelectorBehaviours.cs
@@ -0,0 +1,418 @@
+using System;
+using System.Collections;
+using System.Collections.Specialized;
+using System.Linq;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+
+namespace LaDOSE.DesktopApp.Behaviors
+{
+    /// <summary>
+    /// A sync behaviour for a multiselector.
+    /// </summary>
+    public static class MultiSelectorBehaviours
+    {
+        public static readonly DependencyProperty SynchronizedSelectedItems = DependencyProperty.RegisterAttached(
+            "SynchronizedSelectedItems", typeof(IList), typeof(MultiSelectorBehaviours), new PropertyMetadata(null, OnSynchronizedSelectedItemsChanged));
+
+        private static readonly DependencyProperty SynchronizationManagerProperty = DependencyProperty.RegisterAttached(
+            "SynchronizationManager", typeof(SynchronizationManager), typeof(MultiSelectorBehaviours), new PropertyMetadata(null));
+
+        /// <summary>
+        /// Gets the synchronized selected items.
+        /// </summary>
+        /// <param name="dependencyObject">The dependency object.</param>
+        /// <returns>The list that is acting as the sync list.</returns>
+        public static IList GetSynchronizedSelectedItems(DependencyObject dependencyObject)
+        {
+            return (IList)dependencyObject.GetValue(SynchronizedSelectedItems);
+        }
+
+        /// <summary>
+        /// Sets the synchronized selected items.
+        /// </summary>
+        /// <param name="dependencyObject">The dependency object.</param>
+        /// <param name="value">The value to be set as synchronized items.</param>
+        public static void SetSynchronizedSelectedItems(DependencyObject dependencyObject, IList value)
+        {
+            dependencyObject.SetValue(SynchronizedSelectedItems, value);
+        }
+
+        private static SynchronizationManager GetSynchronizationManager(DependencyObject dependencyObject)
+        {
+            return (SynchronizationManager)dependencyObject.GetValue(SynchronizationManagerProperty);
+        }
+
+        private static void SetSynchronizationManager(DependencyObject dependencyObject, SynchronizationManager value)
+        {
+            dependencyObject.SetValue(SynchronizationManagerProperty, value);
+        }
+
+        private static void OnSynchronizedSelectedItemsChanged(DependencyObject dependencyObject, DependencyPropertyChangedEventArgs e)
+        {
+            if (e.OldValue != null)
+            {
+                SynchronizationManager synchronizer = GetSynchronizationManager(dependencyObject);
+                synchronizer.StopSynchronizing();
+
+                SetSynchronizationManager(dependencyObject, null);
+            }
+
+            IList list = e.NewValue as IList;
+            Selector selector = dependencyObject as Selector;
+
+            // check that this property is an IList, and that it is being set on a ListBox
+            if (list != null && selector != null)
+            {
+                SynchronizationManager synchronizer = GetSynchronizationManager(dependencyObject);
+                if (synchronizer == null)
+                {
+                    synchronizer = new SynchronizationManager(selector);
+                    SetSynchronizationManager(dependencyObject, synchronizer);
+                }
+
+                synchronizer.StartSynchronizingList();
+            }
+        }
+
+        /// <summary>
+        /// A synchronization manager.
+        /// </summary>
+        private class SynchronizationManager
+        {
+            private readonly Selector _multiSelector;
+            private TwoListSynchronizer _synchronizer;
+
+            /// <summary>
+            /// Initializes a new instance of the <see cref="SynchronizationManager"/> class.
+            /// </summary>
+            /// <param name="selector">The selector.</param>
+            internal SynchronizationManager(Selector selector)
+            {
+                _multiSelector = selector;
+            }
+
+            /// <summary>
+            /// Starts synchronizing the list.
+            /// </summary>
+            public void StartSynchronizingList()
+            {
+                IList list = GetSynchronizedSelectedItems(_multiSelector);
+
+                if (list != null)
+                {
+                    _synchronizer = new TwoListSynchronizer(GetSelectedItemsCollection(_multiSelector), list);
+                    _synchronizer.StartSynchronizing();
+                }
+            }
+
+            /// <summary>
+            /// Stops synchronizing the list.
+            /// </summary>
+            public void StopSynchronizing()
+            {
+                _synchronizer.StopSynchronizing();
+            }
+
+            public static IList GetSelectedItemsCollection(Selector selector)
+            {
+                if (selector is MultiSelector)
+                {
+                    return (selector as MultiSelector).SelectedItems;
+                }
+                else if (selector is ListBox)
+                {
+                    return (selector as ListBox).SelectedItems;
+                }
+                else
+                {
+                    throw new InvalidOperationException("Target object has no SelectedItems property to bind.");
+                }
+            }
+
+        }
+    }
+
+
+    public class TwoListSynchronizer : IWeakEventListener
+    {
+        private static readonly IListItemConverter DefaultConverter = new DoNothingListItemConverter();
+        private readonly IList _masterList;
+        private readonly IListItemConverter _masterTargetConverter;
+        private readonly IList _targetList;
+
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TwoListSynchronizer"/> class.
+        /// </summary>
+        /// <param name="masterList">The master list.</param>
+        /// <param name="targetList">The target list.</param>
+        /// <param name="masterTargetConverter">The master-target converter.</param>
+        public TwoListSynchronizer(IList masterList, IList targetList, IListItemConverter masterTargetConverter)
+        {
+            _masterList = masterList;
+            _targetList = targetList;
+            _masterTargetConverter = masterTargetConverter;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TwoListSynchronizer"/> class.
+        /// </summary>
+        /// <param name="masterList">The master list.</param>
+        /// <param name="targetList">The target list.</param>
+        public TwoListSynchronizer(IList masterList, IList targetList)
+            : this(masterList, targetList, DefaultConverter)
+        {
+        }
+
+        private delegate void ChangeListAction(IList list, NotifyCollectionChangedEventArgs e, Converter<object, object> converter);
+
+        /// <summary>
+        /// Starts synchronizing the lists.
+        /// </summary>
+        public void StartSynchronizing()
+        {
+            ListenForChangeEvents(_masterList);
+            ListenForChangeEvents(_targetList);
+
+            // Update the Target list from the Master list
+            SetListValuesFromSource(_masterList, _targetList, ConvertFromMasterToTarget);
+
+            // In some cases the target list might have its own view on which items should included:
+            // so update the master list from the target list
+            // (This is the case with a ListBox SelectedItems collection: only items from the ItemsSource can be included in SelectedItems)
+            if (!TargetAndMasterCollectionsAreEqual())
+            {
+                SetListValuesFromSource(_targetList, _masterList, ConvertFromTargetToMaster);
+            }
+        }
+
+        /// <summary>
+        /// Stop synchronizing the lists.
+        /// </summary>
+        public void StopSynchronizing()
+        {
+            StopListeningForChangeEvents(_masterList);
+            StopListeningForChangeEvents(_targetList);
+        }
+
+        /// <summary>
+        /// Receives events from the centralized event manager.
+        /// </summary>
+        /// <param name="managerType">The type of the <see cref="T:System.Windows.WeakEventManager"/> calling this method.</param>
+        /// <param name="sender">Object that originated the event.</param>
+        /// <param name="e">Event data.</param>
+        /// <returns>
+        /// true if the listener handled the event. It is considered an error by the <see cref="T:System.Windows.WeakEventManager"/> handling in WPF to register a listener for an event that the listener does not handle. Regardless, the method should return false if it receives an event that it does not recognize or handle.
+        /// </returns>
+        public bool ReceiveWeakEvent(Type managerType, object sender, EventArgs e)
+        {
+            HandleCollectionChanged(sender as IList, e as NotifyCollectionChangedEventArgs);
+
+            return true;
+        }
+
+        /// <summary>
+        /// Listens for change events on a list.
+        /// </summary>
+        /// <param name="list">The list to listen to.</param>
+        protected void ListenForChangeEvents(IList list)
+        {
+            if (list is INotifyCollectionChanged)
+            {
+                CollectionChangedEventManager.AddListener(list as INotifyCollectionChanged, this);
+            }
+        }
+
+        /// <summary>
+        /// Stops listening for change events.
+        /// </summary>
+        /// <param name="list">The list to stop listening to.</param>
+        protected void StopListeningForChangeEvents(IList list)
+        {
+            if (list is INotifyCollectionChanged)
+            {
+                CollectionChangedEventManager.RemoveListener(list as INotifyCollectionChanged, this);
+            }
+        }
+
+        private void AddItems(IList list, NotifyCollectionChangedEventArgs e, Converter<object, object> converter)
+        {
+            int itemCount = e.NewItems.Count;
+
+            for (int i = 0; i < itemCount; i++)
+            {
+                int insertionPoint = e.NewStartingIndex + i;
+
+                if (insertionPoint > list.Count)
+                {
+                    list.Add(converter(e.NewItems[i]));
+                }
+                else
+                {
+                    list.Insert(insertionPoint, converter(e.NewItems[i]));
+                }
+            }
+        }
+
+        private object ConvertFromMasterToTarget(object masterListItem)
+        {
+            return _masterTargetConverter == null ? masterListItem : _masterTargetConverter.Convert(masterListItem);
+        }
+
+        private object ConvertFromTargetToMaster(object targetListItem)
+        {
+            return _masterTargetConverter == null ? targetListItem : _masterTargetConverter.ConvertBack(targetListItem);
+        }
+
+        private void HandleCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            IList sourceList = sender as IList;
+
+            switch (e.Action)
+            {
+                case NotifyCollectionChangedAction.Add:
+                    PerformActionOnAllLists(AddItems, sourceList, e);
+                    break;
+                case NotifyCollectionChangedAction.Move:
+                    PerformActionOnAllLists(MoveItems, sourceList, e);
+                    break;
+                case NotifyCollectionChangedAction.Remove:
+                    PerformActionOnAllLists(RemoveItems, sourceList, e);
+                    break;
+                case NotifyCollectionChangedAction.Replace:
+                    PerformActionOnAllLists(ReplaceItems, sourceList, e);
+                    break;
+                case NotifyCollectionChangedAction.Reset:
+                    UpdateListsFromSource(sender as IList);
+                    break;
+                default:
+                    break;
+            }
+        }
+
+        private void MoveItems(IList list, NotifyCollectionChangedEventArgs e, Converter<object, object> converter)
+        {
+            RemoveItems(list, e, converter);
+            AddItems(list, e, converter);
+        }
+
+        private void PerformActionOnAllLists(ChangeListAction action, IList sourceList, NotifyCollectionChangedEventArgs collectionChangedArgs)
+        {
+            if (sourceList == _masterList)
+            {
+                PerformActionOnList(_targetList, action, collectionChangedArgs, ConvertFromMasterToTarget);
+            }
+            else
+            {
+                PerformActionOnList(_masterList, action, collectionChangedArgs, ConvertFromTargetToMaster);
+            }
+        }
+
+        private void PerformActionOnList(IList list, ChangeListAction action, NotifyCollectionChangedEventArgs collectionChangedArgs, Converter<object, object> converter)
+        {
+            StopListeningForChangeEvents(list);
+            action(list, collectionChangedArgs, converter);
+            ListenForChangeEvents(list);
+        }
+
+        private void RemoveItems(IList list, NotifyCollectionChangedEventArgs e, Converter<object, object> converter)
+        {
+            int itemCount = e.OldItems.Count;
+
+            // for the number of items being removed, remove the item from the Old Starting Index
+            // (this will cause following items to be shifted down to fill the hole).
+            for (int i = 0; i < itemCount; i++)
+            {
+                list.RemoveAt(e.OldStartingIndex);
+            }
+        }
+
+        private void ReplaceItems(IList list, NotifyCollectionChangedEventArgs e, Converter<object, object> converter)
+        {
+            RemoveItems(list, e, converter);
+            AddItems(list, e, converter);
+        }
+
+        private void SetListValuesFromSource(IList sourceList, IList targetList, Converter<object, object> converter)
+        {
+            StopListeningForChangeEvents(targetList);
+
+            targetList.Clear();
+
+            foreach (object o in sourceList)
+            {
+                targetList.Add(converter(o));
+            }
+
+            ListenForChangeEvents(targetList);
+        }
+
+        private bool TargetAndMasterCollectionsAreEqual()
+        {
+            return _masterList.Cast<object>().SequenceEqual(_targetList.Cast<object>().Select(item => ConvertFromTargetToMaster(item)));
+        }
+
+        /// <summary>
+        /// Makes sure that all synchronized lists have the same values as the source list.
+        /// </summary>
+        /// <param name="sourceList">The source list.</param>
+        private void UpdateListsFromSource(IList sourceList)
+        {
+            if (sourceList == _masterList)
+            {
+                SetListValuesFromSource(_masterList, _targetList, ConvertFromMasterToTarget);
+            }
+            else
+            {
+                SetListValuesFromSource(_targetList, _masterList, ConvertFromTargetToMaster);
+            }
+        }
+
+
+
+
+        /// <summary>
+        /// An implementation that does nothing in the conversions.
+        /// </summary>
+        internal class DoNothingListItemConverter : IListItemConverter
+        {
+            /// <summary>
+            /// Converts the specified master list item.
+            /// </summary>
+            /// <param name="masterListItem">The master list item.</param>
+            /// <returns>The result of the conversion.</returns>
+            public object Convert(object masterListItem)
+            {
+                return masterListItem;
+            }
+
+            /// <summary>
+            /// Converts the specified target list item.
+            /// </summary>
+            /// <param name="targetListItem">The target list item.</param>
+            /// <returns>The result of the conversion.</returns>
+            public object ConvertBack(object targetListItem)
+            {
+                return targetListItem;
+            }
+        }
+        public interface IListItemConverter
+        {
+            /// <summary>
+            /// Converts the specified master list item.
+            /// </summary>
+            /// <param name="masterListItem">The master list item.</param>
+            /// <returns>The result of the conversion.</returns>
+            object Convert(object masterListItem);
+
+            /// <summary>
+            /// Converts the specified target list item.
+            /// </summary>
+            /// <param name="targetListItem">The target list item.</param>
+            /// <returns>The result of the conversion.</returns>
+            object ConvertBack(object targetListItem);
+        }
+    }
+}
diff --git a/LaDOSE.Src/LaDOSE.DesktopApp/LaDOSE.DesktopApp.csproj b/LaDOSE.Src/LaDOSE.DesktopApp/LaDOSE.DesktopApp.csproj
index d72efd6..0c7e86a 100644
--- a/LaDOSE.Src/LaDOSE.DesktopApp/LaDOSE.DesktopApp.csproj
+++ b/LaDOSE.Src/LaDOSE.DesktopApp/LaDOSE.DesktopApp.csproj
@@ -8,12 +8,13 @@
     <OutputType>WinExe</OutputType>
     <RootNamespace>LaDOSE.DesktopApp</RootNamespace>
     <AssemblyName>LaDOSE.DesktopApp</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Deterministic>true</Deterministic>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -50,7 +51,11 @@
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Data" />
+    <Reference Include="System.Design" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Net" />
     <Reference Include="System.Web" />
+    <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Caliburn.Micro.3.2.0\lib\net45\System.Windows.Interactivity.dll</HintPath>
     </Reference>
@@ -72,6 +77,7 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
+    <Compile Include="Behaviors\MultiSelectorBehaviours.cs" />
     <Compile Include="Bootstrapper.cs" />
     <Compile Include="Utils\PhpSerialize.cs" />
     <Compile Include="Services\RestService.cs" />
@@ -82,15 +88,19 @@
     <Compile Include="Utils\WpfUtil.cs" />
     <Compile Include="ViewModels\ShellViewModel.cs" />
     <Compile Include="ViewModels\GameViewModel.cs" />
+    <Compile Include="ViewModels\WebNavigationViewModel.cs" />
     <Compile Include="ViewModels\WordPressViewModel.cs" />
+    <Compile Include="Views\WebNavigationView.xaml.cs">
+      <DependentUpon>WebNavigationView.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\ShellView.xaml.cs">
       <DependentUpon>ShellView.xaml</DependentUpon>
     </Compile>
     <Compile Include="Views\GameView.xaml.cs">
       <DependentUpon>GameView.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Views\WpView.xaml.cs">
-      <DependentUpon>WpView.xaml</DependentUpon>
+    <Compile Include="Views\WordPressView.xaml.cs">
+      <DependentUpon>WordPressView.xaml</DependentUpon>
     </Compile>
     <Compile Include="App.xaml.cs">
       <DependentUpon>App.xaml</DependentUpon>
@@ -100,6 +110,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Views\WebNavigationView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="Views\ShellView.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -108,7 +122,7 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Views\WpView.xaml">
+    <Page Include="Views\WordPressView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
@@ -148,8 +162,9 @@
       <Name>LaDOSE.DTO</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup />
   <ItemGroup>
-    <Folder Include="Resources\" />
+    <Resource Include="Resources\64x64.png" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/LaDOSE.Src/LaDOSE.DesktopApp/Properties/Resources.Designer.cs b/LaDOSE.Src/LaDOSE.DesktopApp/Properties/Resources.Designer.cs
index 5e8e560..62258ed 100644
--- a/LaDOSE.Src/LaDOSE.DesktopApp/Properties/Resources.Designer.cs
+++ b/LaDOSE.Src/LaDOSE.DesktopApp/Properties/Resources.Designer.cs
@@ -8,10 +8,10 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace LaDOSE.DesktopApp.Properties
-{
-
-
+namespace LaDOSE.DesktopApp.Properties {
+    using System;
+    
+    
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>
@@ -19,51 +19,43 @@ namespace LaDOSE.DesktopApp.Properties
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources
-    {
-
+    internal class Resources {
+        
         private static global::System.Resources.ResourceManager resourceMan;
-
+        
         private static global::System.Globalization.CultureInfo resourceCulture;
-
+        
         [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources()
-        {
+        internal Resources() {
         }
-
+        
         /// <summary>
         ///   Returns the cached ResourceManager instance used by this class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager
-        {
-            get
-            {
-                if ((resourceMan == null))
-                {
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
                     global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("LaDOSE.DesktopApp.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
             }
         }
-
+        
         /// <summary>
         ///   Overrides the current thread's CurrentUICulture property for all
         ///   resource lookups using this strongly typed resource class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture
-        {
-            get
-            {
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
                 return resourceCulture;
             }
-            set
-            {
+            set {
                 resourceCulture = value;
             }
         }
diff --git a/LaDOSE.Src/LaDOSE.DesktopApp/Properties/Settings.Designer.cs b/LaDOSE.Src/LaDOSE.DesktopApp/Properties/Settings.Designer.cs
index ba88adf..e05364f 100644
--- a/LaDOSE.Src/LaDOSE.DesktopApp/Properties/Settings.Designer.cs
+++ b/LaDOSE.Src/LaDOSE.DesktopApp/Properties/Settings.Designer.cs
@@ -8,21 +8,17 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace LaDOSE.DesktopApp.Properties
-{
-
-
+namespace LaDOSE.DesktopApp.Properties {
+    
+    
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
-    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
-    {
-
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.0.0")]
+    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
+        
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-
-        public static Settings Default
-        {
-            get
-            {
+        
+        public static Settings Default {
+            get {
                 return defaultInstance;
             }
         }
diff --git a/LaDOSE.Src/LaDOSE.DesktopApp/Resources/64x64.png b/LaDOSE.Src/LaDOSE.DesktopApp/Resources/64x64.png
new file mode 100644
index 0000000000000000000000000000000000000000..e4e114cd52328448a3e3ed00075af088e9fb8f7d
GIT binary patch
literal 8296
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
aD#4KCC&R+I_oXUm?%&hZ&t;ucLK6T%kau<f

literal 0
HcmV?d00001

diff --git a/LaDOSE.Src/LaDOSE.DesktopApp/Services/RestService.cs b/LaDOSE.Src/LaDOSE.DesktopApp/Services/RestService.cs
index d858414..f2f810f 100644
--- a/LaDOSE.Src/LaDOSE.DesktopApp/Services/RestService.cs
+++ b/LaDOSE.Src/LaDOSE.DesktopApp/Services/RestService.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Configuration;
 using System.Windows;
 using LaDOSE.DTO;
@@ -64,6 +65,31 @@ namespace LaDOSE.DesktopApp.Services
             }
 
 
+        }
+        private R Post<P,R>(string resource, P entity)
+        {
+            var json = new RestSharp.Serialization.Json.JsonSerializer();
+            var jsonD = new RestSharp.Serialization.Json.JsonDeserializer();
+            var request = new RestRequest();
+            request.Method = Method.POST;
+            request.Resource = resource;
+            request.AddHeader("Accept", "application/json");
+            request.AddHeader("Content-type", "application/json");
+            request.Parameters.Clear();
+            request.AddParameter("application/json; charset=utf-8", json.Serialize(entity), ParameterType.RequestBody);
+            //request.AddObject(entity);
+            var response = Client.Execute(request);
+            //var content = response.Content; // raw content as string  
+            try
+            {
+                return jsonD.Deserialize<R>(response);
+            }
+            catch (Exception)
+            {
+                return default(R);
+            }
+
+
         }
 
         #endregion
@@ -77,11 +103,17 @@ namespace LaDOSE.DesktopApp.Services
         }
 
 
-        public bool CreateChallonge(int gameId, int eventId)
+        public string CreateChallonge(int gameId, int eventId)
         {
             var restRequest = new RestRequest($"/api/wordpress/CreateChallonge/{gameId}/{eventId}", Method.GET);
-            var restResponse = Client.Get<bool>(restRequest);
-            return restResponse.Data;
+            var restResponse = Client.Get(restRequest);
+            return restResponse.Content;
+        }
+        public string CreateChallonge2(int gameId, int eventId, List<WPUser> optionalPlayers)
+        {
+ 
+            var restResponse = Post<List<WPUser>,string>($"/api/wordpress/CreateChallonge/{gameId}/{eventId}",optionalPlayers);
+            return restResponse;
         }
         public bool RefreshDb()
         {
diff --git a/LaDOSE.Src/LaDOSE.DesktopApp/ViewModels/GameViewModel.cs b/LaDOSE.Src/LaDOSE.DesktopApp/ViewModels/GameViewModel.cs
index 7cfdfc9..75ac9d6 100644
--- a/LaDOSE.Src/LaDOSE.DesktopApp/ViewModels/GameViewModel.cs
+++ b/LaDOSE.Src/LaDOSE.DesktopApp/ViewModels/GameViewModel.cs
@@ -16,6 +16,13 @@ namespace LaDOSE.DesktopApp.ViewModels
         {
             this.RestService = restService;
             this.Games=new List<Game>();
+
+        }
+
+        protected override void OnInitialize()
+        {
+            LoadGames();
+            base.OnInitialize();
         }
 
         public void LoadGames()
diff --git a/LaDOSE.Src/LaDOSE.DesktopApp/ViewModels/ShellViewModel.cs b/LaDOSE.Src/LaDOSE.DesktopApp/ViewModels/ShellViewModel.cs
index ae1f107..4b020cc 100644
--- a/LaDOSE.Src/LaDOSE.DesktopApp/ViewModels/ShellViewModel.cs
+++ b/LaDOSE.Src/LaDOSE.DesktopApp/ViewModels/ShellViewModel.cs
@@ -1,19 +1,29 @@
-using Caliburn.Micro;
+using System;
+using System.Windows;
+using System.Windows.Media.Imaging;
+using Caliburn.Micro;
 using LaDOSE.DesktopApp.Services;
 
 namespace LaDOSE.DesktopApp.ViewModels
 {
     public class ShellViewModel : Conductor<IScreen>.Collection.AllActive
     {
+     
+        
         protected override void OnInitialize()
         {
+            this.DisplayName = "LaDOSE";
+            this.AppIcon = BitmapFrame.Create(Application.GetResourceStream(new Uri("/LaDOSE.DesktopApp;component/Resources/64x64.png",
+                UriKind.RelativeOrAbsolute)).Stream);
             var wordPressViewModel = new WordPressViewModel(IoC.Get<RestService>());
             ActivateItem(wordPressViewModel);
             base.OnInitialize();
-       
+            
             
         }
 
+        public BitmapFrame AppIcon { get; set; }
+
         public void LoadEvent()
         {
          ActivateItem(new WordPressViewModel(IoC.Get<RestService>()));
@@ -23,5 +33,9 @@ namespace LaDOSE.DesktopApp.ViewModels
             ActivateItem(new GameViewModel(IoC.Get<RestService>()));
         }
 
+        public void OpenWeb()
+        {
+            ActivateItem(new WebNavigationViewModel("www.google.com"));
+        }
     }
 }
\ No newline at end of file
diff --git a/LaDOSE.Src/LaDOSE.DesktopApp/ViewModels/WebNavigationViewModel.cs b/LaDOSE.Src/LaDOSE.DesktopApp/ViewModels/WebNavigationViewModel.cs
new file mode 100644
index 0000000..bc5767c
--- /dev/null
+++ b/LaDOSE.Src/LaDOSE.DesktopApp/ViewModels/WebNavigationViewModel.cs
@@ -0,0 +1,15 @@
+using Caliburn.Micro;
+
+namespace LaDOSE.DesktopApp.ViewModels
+{
+    public class WebNavigationViewModel : Screen
+    {
+        public WebNavigationViewModel(string uri)
+        {
+            Uri = uri;
+            this.DisplayName = Uri;
+        }
+
+        public string Uri { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/LaDOSE.Src/LaDOSE.DesktopApp/ViewModels/WordPressViewModel.cs b/LaDOSE.Src/LaDOSE.DesktopApp/ViewModels/WordPressViewModel.cs
index b75491e..3137fc6 100644
--- a/LaDOSE.Src/LaDOSE.DesktopApp/ViewModels/WordPressViewModel.cs
+++ b/LaDOSE.Src/LaDOSE.DesktopApp/ViewModels/WordPressViewModel.cs
@@ -22,7 +22,8 @@ namespace LaDOSE.DesktopApp.ViewModels
         private Game _selectedGame;
         private ObservableCollection<WPUser> _players;
         private ObservableCollection<WPUser> _playersOptions;
-        
+        private ObservableCollection<WPUser> _optionalPlayers;
+
         private RestService RestService { get; set; }
 
         public WordPressViewModel(RestService restService)
@@ -30,6 +31,121 @@ namespace LaDOSE.DesktopApp.ViewModels
             this.RestService = restService;
             Players = new ObservableCollection<WPUser>();
             PlayersOptions = new ObservableCollection<WPUser>();
+            OptionalPlayers = new ObservableCollection<WPUser>();
+        }
+
+        #region Auto Property
+
+        protected override void OnInitialize()
+        {
+            base.OnInitialize();
+            Task.Factory.StartNew(new Action(this.Load), TaskCreationOptions.LongRunning).ContinueWith(t => { },
+                CancellationToken.None, TaskContinuationOptions.OnlyOnFaulted,
+                TaskScheduler.FromCurrentSynchronizationContext());
+        }
+
+        public bool CanGenerate
+        {
+            get { return SelectedWpEvent != null && SelectedGame != null && Players?.Count() > 0; }
+        }
+
+        public List<WPEvent> Events { get; set; }
+
+        public WPEvent SelectedWpEvent
+        {
+            get => _selectedWpEvent;
+            set
+            {
+                _selectedWpEvent = value;
+                SelectedGame = null;
+                ParseGame(_selectedWpEvent);
+            }
+        }
+
+        public Game SelectedGame
+        {
+            get => _selectedGame;
+            set
+            {
+                _selectedGame = value;
+
+                Players.Clear();
+                PlayersOptions.Clear();
+
+                Task.Factory.StartNew(LoadPlayers, TaskCreationOptions.LongRunning).ContinueWith(t => { },
+                    CancellationToken.None, TaskContinuationOptions.OnlyOnFaulted,
+                    TaskScheduler.FromCurrentSynchronizationContext());
+                NotifyOfPropertyChange(() => SelectedGame);
+                NotifyOfPropertyChange(() => this.CanGenerate);
+                NotifyOfPropertyChange(() => Players);
+                NotifyOfPropertyChange(() => PlayersOptions);
+            }
+        }
+
+        public ObservableCollection<WPUser> Players
+        {
+            get => _players;
+            set
+            {
+                _players = value;
+                NotifyOfPropertyChange(() => Players);
+            }
+        }
+
+        public ObservableCollection<WPUser> PlayersOptions
+        {
+            get => _playersOptions;
+            set
+            {
+                _playersOptions = value;
+                NotifyOfPropertyChange(() => PlayersOptions);
+            }
+        }
+
+        public ObservableCollection<WPUser> OptionalPlayers
+        {
+            get => _optionalPlayers;
+            set
+            {
+                _optionalPlayers = value;
+                NotifyOfPropertyChange(() => OptionalPlayers);
+            }
+        }
+
+        public ObservableCollection<Game> GamesFound { get; set; }
+        public List<Game> Games { get; set; }
+
+        #endregion
+
+        #region Commands
+
+        public void UpdateDb()
+        {
+            Mouse.OverrideCursor = System.Windows.Input.Cursors.Wait;
+            var tsk = Task.Factory.StartNew(new Action(()=>this.RestService.RefreshDb()));
+            tsk.ContinueWith(t =>
+                {
+                    MessageBox.Show(t.Exception.InnerException.Message);
+                },
+                CancellationToken.None, TaskContinuationOptions.OnlyOnFaulted,
+                TaskScheduler.FromCurrentSynchronizationContext());
+            
+               MessageBox.Show("Database updated");
+            
+        }
+
+        public void Generate()
+        {
+            List<WPUser> test = new List<WPUser>();
+            test = OptionalPlayers.ToList();
+            var messageBoxText = this.RestService.CreateChallonge2(SelectedGame.Id, SelectedWpEvent.Id, test);
+
+            if (messageBoxText != null && messageBoxText.Length > 0 && !messageBoxText.Contains("error"))
+            {
+                System.Diagnostics.Process.Start($"https://challonge.com/{messageBoxText}");
+            }
+            else
+                MessageBox.Show("Didn't work :(");
         }
 
         public void LoadEvents()
@@ -45,86 +161,7 @@ namespace LaDOSE.DesktopApp.ViewModels
                 TaskScheduler.FromCurrentSynchronizationContext());
         }
 
-        private void Load()
-        {
-            GamesFound = new ObservableCollection<Game>();
-            this.Games = this.RestService.GetGames();
-            this.Events = this.RestService.GetEvents();
-
-            NotifyOfPropertyChange("Events");
-            Application.Current.Dispatcher.Invoke(() =>
-                System.Windows.Input.Mouse.OverrideCursor = null);
-        }
-
-
-        public bool CanGenerate
-        {
-            get { return SelectedWpEvent != null && SelectedGame != null; }
-        }
-
-
-        public List<WPEvent> Events { get; set; }
-
-        public WPEvent SelectedWpEvent
-        {
-            get => _selectedWpEvent;
-            set
-            {
-                _selectedWpEvent = value;
-                SelectedGame = null;
-                ParseGame(_selectedWpEvent);
-              
-            }
-        }
-
-        public Game SelectedGame
-        {
-            get => _selectedGame;
-            set
-            {
-                _selectedGame = value;
-             
-                Players.Clear();
-                PlayersOptions.Clear();
-
-                Task.Factory.StartNew(LoadPlayers,TaskCreationOptions.LongRunning).ContinueWith(t =>
-                    {
-
-                    },
-                    CancellationToken.None, TaskContinuationOptions.OnlyOnFaulted,
-                    TaskScheduler.FromCurrentSynchronizationContext());
-                NotifyOfPropertyChange(() => SelectedGame);
-                NotifyOfPropertyChange(() => this.CanGenerate);
-                NotifyOfPropertyChange(() => Players);
-                NotifyOfPropertyChange(() => PlayersOptions);
-            }
-        }
-
-
-
-        public ObservableCollection<WPUser> Players
-        {
-            get => _players;
-            set
-            {
-                _players = value;
-                NotifyOfPropertyChange(()=>Players);
-            }
-        }
-
-        public ObservableCollection<WPUser> PlayersOptions
-        {
-            get => _playersOptions;
-            set
-            {
-                _playersOptions = value;
-                NotifyOfPropertyChange(() => PlayersOptions);
-            }
-        }
-
-
-        public ObservableCollection<Game> GamesFound { get; set; }
-        public List<Game> Games { get; set; }
+        #endregion
 
         private void ParseGame(WPEvent selectedWpEvent)
         {
@@ -153,32 +190,58 @@ namespace LaDOSE.DesktopApp.ViewModels
 
         private void LoadPlayers()
         {
-     
             if (SelectedWpEvent != null)
                 if (SelectedGame != null)
                 {
-                  this.RestService.GetUsers(SelectedWpEvent.Id, SelectedGame.Id).ForEach((e) => this.Players.AddUI(e));
-                  this.RestService.GetUsersOptions(SelectedWpEvent.Id, SelectedGame.Id).ForEach((e) => this.PlayersOptions.AddUI(e));
+                    var findUser = FindUser(SelectedWpEvent.Id, SelectedGame);
+                    var findUser2 = FindUser(SelectedWpEvent.Id, SelectedGame,true);
 
+                    findUser.ForEach((e) => this.Players.AddUI(e));
+                    findUser2.ForEach((e) => this.PlayersOptions.AddUI(e));
+                    //this.RestService.GetUsers(SelectedWpEvent.Id, SelectedGame.Id)
+                    //    .ForEach((e) => this.Players.AddUI(e));
+                    //this.RestService.GetUsersOptions(SelectedWpEvent.Id, SelectedGame.Id)
+                    //    .ForEach((e) => this.PlayersOptions.AddUI(e));
+                    NotifyOfPropertyChange(() => this.CanGenerate);
                 }
-                    
         }
 
-        public void UpdateDb()
+        private void Load()
         {
-            if (this.RestService.RefreshDb())
-                MessageBox.Show("DataBaseUpdated");
-            else
-                MessageBox.Show("Update Failed");
+            Application.Current.Dispatcher.Invoke(() =>
+                System.Windows.Input.Mouse.OverrideCursor = Cursors.Wait);
+            GamesFound = new ObservableCollection<Game>();
+            this.Games = this.RestService.GetGames();
+            this.Events = this.RestService.GetEvents();
+
+            NotifyOfPropertyChange("Events");
+            Application.Current.Dispatcher.Invoke(() =>
+                System.Windows.Input.Mouse.OverrideCursor = null);
         }
 
-        public void Generate()
+        public List<WPUser> FindUser(int wpEventId, Game game,bool optional = false)
         {
-            if (this.RestService.CreateChallonge(SelectedGame.Id, SelectedWpEvent.Id))
-                MessageBox.Show("Challonge Created");
-            else
-                MessageBox.Show("Didn't worl :(");
-        }
 
+            string[] selectedGameWpId;
+            selectedGameWpId = !optional ? game.WordPressTag.Split(';') : game.WordPressTagOs.Split(';');
+
+            var currentWpEvent = this.Events.Where(e => e.Id == wpEventId).ToList();
+            List<WPBooking> bookings = currentWpEvent.SelectMany(e => e.WpBookings).ToList();
+            List<WPUser> users = new List<WPUser>();
+            foreach (var booking in bookings)
+            {
+                var reservations = WpEventDeserialize.Parse(booking.Meta);
+                if (reservations != null)
+                {
+                    var gamesReservation = reservations.Where(e => e.Valid).Select(e => e.Name);
+                    if (selectedGameWpId.Any(e => gamesReservation.Contains(e)))
+                    {
+                        users.Add(booking.WpUser);
+                    }
+                }
+            }
+
+            return users;
+        }
     }
 }
\ No newline at end of file
diff --git a/LaDOSE.Src/LaDOSE.DesktopApp/Views/ShellView.xaml b/LaDOSE.Src/LaDOSE.DesktopApp/Views/ShellView.xaml
index 47290be..b24e19e 100644
--- a/LaDOSE.Src/LaDOSE.DesktopApp/Views/ShellView.xaml
+++ b/LaDOSE.Src/LaDOSE.DesktopApp/Views/ShellView.xaml
@@ -4,10 +4,16 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:LaDOSE.DesktopApp.Views"
+
              xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
              xmlns:cal="http://www.caliburnproject.org"
+             Icon="{Binding Path=AppIcon}"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
+    <Window.Resources>
+     
+    </Window.Resources>
+    
     <Grid Row="4" Column="1">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto"></RowDefinition>
@@ -32,10 +38,18 @@
                         </i:EventTrigger>
                     </i:Interaction.Triggers>
                 </MenuItem>
+                <MenuItem Header="_Web">
+                    <i:Interaction.Triggers>
+                        <i:EventTrigger EventName="Click">
+                            <cal:ActionMessage MethodName="OpenWeb">
+                            </cal:ActionMessage>
+                        </i:EventTrigger>
+                    </i:Interaction.Triggers>
+                </MenuItem>
                 <MenuItem Header="_Close" />
             </MenuItem>
         </Menu>
-      
+     
         <TabControl Grid.Row="1"  x:Name="Items">
             <TabControl.ItemTemplate>
                 <DataTemplate>
diff --git a/LaDOSE.Src/LaDOSE.DesktopApp/Views/WebNavigationView.xaml b/LaDOSE.Src/LaDOSE.DesktopApp/Views/WebNavigationView.xaml
new file mode 100644
index 0000000..61fd2b3
--- /dev/null
+++ b/LaDOSE.Src/LaDOSE.DesktopApp/Views/WebNavigationView.xaml
@@ -0,0 +1,17 @@
+<UserControl x:Class="LaDOSE.DesktopApp.Views.WebNavigationView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:LaDOSE.DesktopApp.Views"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <Grid Row="4" Column="1">
+        <Grid.RowDefinitions>
+
+            <RowDefinition Height="*"></RowDefinition>
+
+        </Grid.RowDefinitions>
+
+    </Grid>
+</UserControl>
diff --git a/LaDOSE.Src/LaDOSE.DesktopApp/Views/WebNavigationView.xaml.cs b/LaDOSE.Src/LaDOSE.DesktopApp/Views/WebNavigationView.xaml.cs
new file mode 100644
index 0000000..e107967
--- /dev/null
+++ b/LaDOSE.Src/LaDOSE.DesktopApp/Views/WebNavigationView.xaml.cs
@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+using LaDOSE.DesktopApp.ViewModels;
+
+namespace LaDOSE.DesktopApp.Views
+{
+    /// <summary>
+    /// Interaction logic for ShellView.xaml
+    /// </summary>
+    public partial class WebNavigationView : UserControl
+    {
+        public WebNavigationView()
+        {
+      
+            InitializeComponent();
+
+
+        }
+
+   
+    }
+}
diff --git a/LaDOSE.Src/LaDOSE.DesktopApp/Views/WebView.xaml.cs b/LaDOSE.Src/LaDOSE.DesktopApp/Views/WebView.xaml.cs
new file mode 100644
index 0000000..267a933
--- /dev/null
+++ b/LaDOSE.Src/LaDOSE.DesktopApp/Views/WebView.xaml.cs
@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace LaDOSE.DesktopApp.Views
+{
+    /// <summary>
+    /// Interaction logic for ShellView.xaml
+    /// </summary>
+    public partial class WebNavigationView : UserControl
+    {
+        public WebNavigationView()
+        {
+      
+            InitializeComponent();
+        }
+    }
+}
diff --git a/LaDOSE.Src/LaDOSE.DesktopApp/Views/WpView.xaml b/LaDOSE.Src/LaDOSE.DesktopApp/Views/WordPressView.xaml
similarity index 90%
rename from LaDOSE.Src/LaDOSE.DesktopApp/Views/WpView.xaml
rename to LaDOSE.Src/LaDOSE.DesktopApp/Views/WordPressView.xaml
index 0cab5f7..8a3dbba 100644
--- a/LaDOSE.Src/LaDOSE.DesktopApp/Views/WpView.xaml
+++ b/LaDOSE.Src/LaDOSE.DesktopApp/Views/WordPressView.xaml
@@ -6,13 +6,16 @@
              xmlns:local="clr-namespace:LaDOSE.DesktopApp.Views"
              xmlns:userControls="clr-namespace:LaDOSE.DesktopApp.UserControls"
              xmlns:cal="http://www.caliburnproject.org"
+             xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
+             xmlns:behaviors="clr-namespace:LaDOSE.DesktopApp.Behaviors"
              mc:Ignorable="d"
+             
              d:DesignHeight="450" d:DesignWidth="800">
     <Grid Row="4" Column="2">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
-            <RowDefinition Height="*" />
+            <RowDefinition Height="2*" />
             <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
@@ -43,7 +46,7 @@
                 <ColumnDefinition Width="2*"></ColumnDefinition>
             </Grid.ColumnDefinitions>
             <ListView Grid.Column="0" ItemsSource="{Binding ElementName=EventsList,Path=SelectedItem.WpBookings}"
-                      x:Name="BookingList">
+                      x:Name="BookingList" IsTextSearchEnabled="True" TextSearch.TextPath="WpUser.Name"> 
                 <ListView.ItemTemplate>
                     <DataTemplate>
                         <StackPanel Orientation="Horizontal">
@@ -76,7 +79,7 @@
             </Grid.RowDefinitions>
             <Button Grid.Row="0" cal:Message.Attach="Generate">Generate</Button>
             <ListView Grid.Row="1" x:Name="GameFoundListView" ItemsSource="{Binding GamesFound}"
-                      SelectedItem="{Binding SelectedGame,UpdateSourceTrigger=PropertyChanged}">
+                      SelectedItem="{Binding SelectedGame,UpdateSourceTrigger=PropertyChanged}"  IsTextSearchEnabled="True" TextSearch.TextPath="Name">
                 <ListView.ItemTemplate>
                     <DataTemplate>
                         <StackPanel Orientation="Horizontal">
@@ -99,7 +102,7 @@
                         <Label Content="{Binding Players.Count,UpdateSourceTrigger=PropertyChanged}"></Label>
                         <Label>)</Label>
                     </StackPanel>
-                    <ListView Grid.Row="1" Grid.Column="0" x:Name="PlayersList" ItemsSource="{Binding Players,UpdateSourceTrigger=PropertyChanged}">
+                    <ListView Grid.Row="1" Grid.Column="0" x:Name="PlayersList" ItemsSource="{Binding Players,UpdateSourceTrigger=PropertyChanged}" IsTextSearchEnabled="True" TextSearch.TextPath="Name">
                         <ListView.ItemTemplate>
                             <DataTemplate>
                                 <StackPanel Orientation="Horizontal">
@@ -113,7 +116,8 @@
                         <Label Content="{Binding PlayersOptions.Count,UpdateSourceTrigger=PropertyChanged}"></Label>
                         <Label>)</Label>
                     </StackPanel>
-                    <ListView Grid.Row="1"  Grid.Column="1" x:Name="PlayersOptionsList" ItemsSource="{Binding PlayersOptions,UpdateSourceTrigger=PropertyChanged}">
+                    <ListView Grid.Row="1"  Grid.Column="1" x:Name="PlayersOptionsList" ItemsSource="{Binding PlayersOptions,UpdateSourceTrigger=PropertyChanged}" IsTextSearchEnabled="True" TextSearch.TextPath="Name" behaviors:MultiSelectorBehaviours.SynchronizedSelectedItems="{Binding OptionalPlayers}">
+                        
                         <ListView.ItemTemplate>
                             <DataTemplate>
                                 <StackPanel Orientation="Horizontal">
diff --git a/LaDOSE.Src/LaDOSE.DesktopApp/Views/WpView.xaml.cs b/LaDOSE.Src/LaDOSE.DesktopApp/Views/WordPressView.xaml.cs
similarity index 98%
rename from LaDOSE.Src/LaDOSE.DesktopApp/Views/WpView.xaml.cs
rename to LaDOSE.Src/LaDOSE.DesktopApp/Views/WordPressView.xaml.cs
index 31063f6..d775dbf 100644
--- a/LaDOSE.Src/LaDOSE.DesktopApp/Views/WpView.xaml.cs
+++ b/LaDOSE.Src/LaDOSE.DesktopApp/Views/WordPressView.xaml.cs
@@ -22,6 +22,7 @@ namespace LaDOSE.DesktopApp.Views
     {
         public WordPressView()
         {
+       
             InitializeComponent();
         }
 
diff --git a/LaDOSE.Src/LaDOSE.Service/Interface/IWordPressService.cs b/LaDOSE.Src/LaDOSE.Service/Interface/IWordPressService.cs
index e5af5eb..252fee3 100644
--- a/LaDOSE.Src/LaDOSE.Service/Interface/IWordPressService.cs
+++ b/LaDOSE.Src/LaDOSE.Service/Interface/IWordPressService.cs
@@ -10,6 +10,6 @@ namespace LaDOSE.Business.Interface
         List<WPUser> GetBooking(int wpEventId, Game game);
         List<WPUser> GetBookingOptions(int wpEventId, Game game);
         bool UpdateBooking();
-        bool CreateChallonge(int gameId, int wpEventId);
+        string CreateChallonge(int gameId, int wpEventId, IList<WPUser> additionPlayers);
     }
 }
\ No newline at end of file
diff --git a/LaDOSE.Src/LaDOSE.Service/Service/WordPressService.cs b/LaDOSE.Src/LaDOSE.Service/Service/WordPressService.cs
index 8537326..b743485 100644
--- a/LaDOSE.Src/LaDOSE.Service/Service/WordPressService.cs
+++ b/LaDOSE.Src/LaDOSE.Service/Service/WordPressService.cs
@@ -9,6 +9,7 @@ using LaDOSE.Entity.Context;
 using LaDOSE.Entity.Wordpress;
 using Microsoft.EntityFrameworkCore;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Serialization;
 
 namespace LaDOSE.Business.Service
 {
@@ -78,14 +79,14 @@ namespace LaDOSE.Business.Service
             }
             return users;
         }
-        public bool CreateChallonge(int gameId, int wpEventId)
+        public string CreateChallonge(int gameId, int wpEventId, IList<WPUser> additionalPlayers)
         {
             var selectedGame = _context.Game.FirstOrDefault(e => e.Id == gameId);
             var selectedGameWpId = selectedGame.WordPressTag.Split(';');
             var currentWpEvent = _context.WPEvent.Include(e => e.WPBookings).ThenInclude(e => e.WPUser)
                 .Where(e => e.Id == wpEventId);
             var users = currentWpEvent.SelectMany(e => e.WPBookings.Select(u => u.WPUser));
-
+            var useradded = new List<WPUser>();
        
           
             if (selectedGame != null)
@@ -110,6 +111,7 @@ namespace LaDOSE.Business.Service
                         { 
                             try
                             {
+                                useradded.Add(booking.WPUser);
                                 _challongeProvider.AddPlayer(tournament.id, booking.WPUser.Name);
                             }
                             catch
@@ -124,13 +126,25 @@ namespace LaDOSE.Business.Service
                  
                     
                 }
-      
 
-                return true;
+                if (additionalPlayers != null && additionalPlayers.Count > 0)
+                {
+                    foreach (var additionalPlayer in additionalPlayers)
+                    {
+                        if (useradded.All(e => e.Name != additionalPlayer.Name))
+                        {
+                            _challongeProvider.AddPlayer(tournament.id, additionalPlayer.Name);
+                        }
+                    }
+
+                }
+
+
+                 return tournament.url;
             }
 
 
-            return false;
+            return "error while creating challonge";
         }
     }
 }
\ No newline at end of file