select logo

Apollon.Domain/Models/Tournament.cs

@@ -8,9 +8,10 @@ namespace Apollon.Domain.Models
 {
     public class Tournament
     {
-        public Tournament(Guid id, string organisation, string tournamentName, string competition, string competitionImage, DateTime startDate, DateTime endDate, string location, int rounds)
+        public Tournament(Guid id, string logo, string organisation, string tournamentName, string competition, string competitionImage, DateTime startDate, DateTime endDate, string location, int rounds)
         {
             Id = id;
+            Logo = logo;
             Organisation = organisation;
             TournamentName = tournamentName;
             Competition = competition;
@@ -22,6 +23,7 @@ namespace Apollon.Domain.Models
         }
 
         public Guid Id { get; }
+        public string Logo { get; }
         public string Organisation { get; }
         public string TournamentName { get; }
         public string Competition { get; }

Apollon.EntityFramework/Commands/CreateTournamentCommand.cs

@@ -26,6 +26,7 @@ namespace Apollon.EntityFramework.Commands
                 TournamentDto tournamentDto = new TournamentDto()
                 {
                     Id = tournament.Id,
+                    Logo = tournament.Logo,
                     Organisation = tournament.Organisation,
                     TournamentName = tournament.TournamentName,
                     Competition = tournament.Competition,  

Apollon.EntityFramework/Commands/UpdateTournamentCommand.cs

@@ -25,6 +25,7 @@ namespace Apollon.EntityFramework.Commands
                 TournamentDto tournamentDto = new TournamentDto()
                 {
                     Id = tournament.Id,
+                    Logo = tournament.Logo,
                     Organisation = tournament.Organisation,
                     TournamentName = tournament.TournamentName,
                     Competition = tournament.Competition,

Apollon.EntityFramework/DTOs/TournamentDto.cs

@@ -9,6 +9,7 @@ namespace Apollon.EntityFramework.DTOs
     public class TournamentDto
     {
         public Guid Id { get; set; }
+        public string Logo { get; set; }
         public string Organisation { get; set; }
         public string TournamentName { get; set; }
         public string Competition { get; set; }

Apollon.EntityFramework/Migrations/20221110003817_logo.Designer.cs

@@ -0,0 +1,67 @@
+// <auto-generated />
+using System;
+using Apollon.EntityFramework;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace Apollon.EntityFramework.Migrations
+{
+    [DbContext(typeof(TournamentsDbContext))]
+    [Migration("20221110003817_logo")]
+    partial class logo
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "6.0.8")
+                .HasAnnotation("Relational:MaxIdentifierLength", 128);
+
+            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder, 1L, 1);
+
+            modelBuilder.Entity("Apollon.EntityFramework.DTOs.TournamentDto", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("Competition")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("CompetitionImage")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<DateTime>("EndDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("Location")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Logo")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Organisation")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<int>("Rounds")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("StartDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("TournamentName")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Tournaments");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

Apollon.EntityFramework/Migrations/20221110003817_logo.cs

@@ -0,0 +1,25 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Apollon.EntityFramework.Migrations
+{
+    public partial class logo : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "Logo",
+                table: "Tournaments",
+                type: "nvarchar(max)",
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "Logo",
+                table: "Tournaments");
+        }
+    }
+}

Apollon.EntityFramework/Migrations/TournamentsDbContextModelSnapshot.cs

@@ -40,6 +40,9 @@ namespace Apollon.EntityFramework.Migrations
                     b.Property<string>("Location")
                         .HasColumnType("nvarchar(max)");
 
+                    b.Property<string>("Logo")
+                        .HasColumnType("nvarchar(max)");
+
                     b.Property<string>("Organisation")
                         .HasColumnType("nvarchar(max)");
 

Apollon.EntityFramework/Queries/GetAllTournamentsQuery.cs

@@ -27,6 +27,7 @@ namespace Apollon.EntityFramework.Queries
 
                 return tournamentsDtos.Select(y => new Tournament(
                     y.Id,
+                    y.Logo,
                     y.Organisation,
                     y.TournamentName,
                     y.Competition,

Apollon.WPF/Commands/AddTournamentCommand.cs

@@ -36,6 +36,7 @@ namespace Apollon.WPF.Commands
 
             Tournament tournament = new Tournament(
                 Guid.NewGuid(),
+                detailsViewModel.Logo,
                 detailsViewModel.Organisation,
                 detailsViewModel.TournamentName,
                 detailsViewModel.Competition,

Apollon.WPF/Commands/ChooseLogoCommand.cs

@@ -0,0 +1,40 @@
+using Apollon.WPF.ViewModels;
+using Microsoft.Win32;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Web;
+using System.Windows;
+
+namespace Apollon.WPF.Commands
+{
+    public class ChooseLogoCommand : CommandBase
+    {
+
+        private readonly AddEditDetailsViewModel _addEditDetailsViewModel;
+
+        public ChooseLogoCommand(AddEditDetailsViewModel addEditDetailsViewModel)
+        {
+            _addEditDetailsViewModel = addEditDetailsViewModel;
+        }
+
+        public override void Execute(object parameter)
+        {
+            OpenFileDialog openFileDialog = new OpenFileDialog()
+            {
+                Title = "Logo wählen",
+                Filter = "Picture (.jpg) | *.jpg",
+                
+            };
+
+            bool? result = openFileDialog.ShowDialog();
+
+            if (result == true)
+            {      
+                _addEditDetailsViewModel.Logo = openFileDialog.FileName;
+            }
+        }
+    }
+}

Apollon.WPF/Commands/EditTournamentCommand.cs

@@ -31,6 +31,7 @@ namespace Apollon.WPF.Commands
 
             Tournament tournament = new Tournament(
                 _editTournamentViewModel.TournamentId,
+                detailsViewModel.Logo,
                 detailsViewModel.Organisation,
                 detailsViewModel.TournamentName,
                 detailsViewModel.Competition,

Apollon.WPF/ViewModels/AddEditDetailsViewModel.cs

@@ -1,4 +1,5 @@
 using Apollon.Domain.Models;
+using Apollon.WPF.Commands;
 using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
@@ -15,6 +16,19 @@ namespace Apollon.WPF.ViewModels
 {
     public class AddEditDetailsViewModel : ViewModelBase
     {
+		private string logo;
+		public string Logo
+		{
+			get
+			{
+				return logo;
+			}
+			set
+			{
+				logo = value;
+				OnPropertyChanged(nameof(Logo));
+			}
+		}	
 
 		private string _organisation;
 		public string Organisation
@@ -183,13 +197,16 @@ namespace Apollon.WPF.ViewModels
 
         public ICommand SubmitCommand { get; }
         public ICommand CancelCommand { get; }
+		public ICommand ChooseLogoCommand { get; }
 
-        public ObservableCollection<Competition> CompetitionList { get; set; }
+        public ObservableCollection<Competition> CompetitionList { get; }
 		
-        public AddEditDetailsViewModel(ICommand submitCommand, ICommand cancelCommand)
+		
+		public AddEditDetailsViewModel(ICommand submitCommand, ICommand cancelCommand)
 		{
 			SubmitCommand = submitCommand;
 			CancelCommand = cancelCommand;
+			ChooseLogoCommand = new ChooseLogoCommand(this);	
 
             CompetitionList = new ObservableCollection<Competition>
             {
@@ -214,9 +231,7 @@ namespace Apollon.WPF.ViewModels
                     CompetitionName = "3D",
                     CompetitionImage = @"\Images\3d.png"
                 }
-
             };            
         }
 	}	
-	
 }

Apollon.WPF/ViewModels/OverviewDetailsViewModel.cs

@@ -16,6 +16,7 @@ namespace Apollon.WPF.ViewModels
         private Tournament SelectedTournament => _selectedTournamentStore.SelectedTournament; 
 
         public bool HasSelectedTournament => SelectedTournament != null;
+        public string Logo => SelectedTournament?.Logo ?? "D:\\Projekte\\Apollon\\Apollon\\Apollon.WPF\\Images\\Archery.png";
         public string Organisation => SelectedTournament?.Organisation ?? "keine Organisation";
         public string TournamentName => SelectedTournament?.TournamentName ?? "kein Name";
         public string Competition => SelectedTournament?.Competition ?? "keine Kategorie";
@@ -47,6 +48,7 @@ namespace Apollon.WPF.ViewModels
         private void SelectedTournamentStore_SelectedTournamentChanged()
         {
             OnPropertyChanged(nameof(HasSelectedTournament));
+            OnPropertyChanged(nameof(Logo));
             OnPropertyChanged(nameof(Organisation));
             OnPropertyChanged(nameof(TournamentName));
             OnPropertyChanged(nameof(Competition));

Apollon.WPF/ViewModels/TournamentDetailsViewModel.cs

@@ -18,6 +18,7 @@ namespace Apollon.WPF.ViewModels
         private Tournament SelectedTournament => _selectedTournamentsStore.SelectedTournament;
 
         public bool HasSelectedTournament => SelectedTournament != null;
+        public string Logo => SelectedTournament?.Logo ?? "D:\\Projekte\\Apollon\\Apollon\\Apollon.WPF\\Images\\Archery.png";
         public string Organisation => SelectedTournament?.Organisation ?? "keine Organisation";
         public string TournamentName => SelectedTournament?.TournamentName ?? "kein Name";
         public string Competition => SelectedTournament?.Competition ?? "keine Kategorie";

Apollon.WPF/Views/Components/AddEditDetails.xaml

@@ -58,8 +58,10 @@
                  FontFamily="Arial"
                  FontSize="16"
                  Height="30"
+                 Width="300"
                  Background="LightGray"
-                 VerticalContentAlignment="Center"/>
+                 VerticalContentAlignment="Center"
+                 HorizontalAlignment="Left"/>
 
         <TextBox Grid.Row="1"
                  Grid.Column="1"
@@ -67,9 +69,28 @@
                  FontFamily="Arial"                     
                  FontSize="16"
                  Height="30"
+                 Width="300"
+                 HorizontalAlignment="Left"
                  VerticalContentAlignment="Center"                     
                  Background="LightGray"/>
 
+        <StackPanel Grid.Column="1"
+               Grid.RowSpan="2">
+            <Image 
+               Height="80"
+               Width="80"
+               HorizontalAlignment="Right"
+               Source="{Binding Logo, TargetNullValue={x:Null}}"/>
+            <Button Style="{StaticResource ModernButton}"
+                    Content="Logo wählen"
+                    Height="20"
+                    Width="80"
+                    HorizontalAlignment="Right"
+                    FontSize="10"
+                    Command="{Binding ChooseLogoCommand}"/>                  
+        </StackPanel>
+        
+
         <ComboBox Grid.Row="2"                                     
                   Text="{Binding Competition}"
                   IsReadOnly="False"
@@ -90,11 +111,11 @@
         <Image x:Name="CompetitionImage"                 
                Grid.Row="2"
                Grid.Column="1"
-               Grid.RowSpan="2"
+               Grid.RowSpan="3"
                Height="80"
                Width="80"
                HorizontalAlignment="Right"
-               Margin="0 0 80 0"
+               Margin="0 0 60 0"
                Source="{Binding CompetitionImage, TargetNullValue={x:Null}}" />
 
         <DatePicker SelectedDateFormat="Long"
@@ -119,6 +140,8 @@
                  FontFamily="Arial"                     
                  FontSize="16"
                  Height="30"
+                 Width="300"
+                 HorizontalAlignment="Left"
                  VerticalContentAlignment="Center"
                  Background="LightGray"/>
         <TextBox Grid.Row="6"

Apollon.WPF/Views/Components/OverviewDetails.xaml

@@ -8,12 +8,13 @@
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">     
     <Grid>
+        
         <Border BorderBrush="#0000a0"
                 BorderThickness="1"
                 CornerRadius="10">
         </Border>
 
-        <TextBlock 
+        <TextBlock Grid.RowSpan="6" 
                        TextAlignment="Center"
                        VerticalAlignment="Center"
                        FontFamily="Arial"
@@ -34,44 +35,69 @@
             </TextBlock.Style>
             klicke auf <LineBreak/> Neues Turnier vorbereiten <LineBreak/><LineBreak/> oder wähle ein vorhandenes Turnier aus um es zu bearbeiten!
         </TextBlock>             
-            <StackPanel>
-                <TextBlock Text="{Binding TournamentName}"
-                       TextAlignment="Center"
+            <StackPanel Margin="10">
+            <WrapPanel HorizontalAlignment="Center">
+                <StackPanel>
+                    <TextBlock Text="{Binding TournamentName}"
+                       TextAlignment="Left"
+                               Width="200"
                        FontFamily="Arial"
                        FontWeight="Bold"
                        FontSize="14"
                        Foreground="#0000a0"
-                       Margin="10">
-                    <TextBlock.Style>
-                        <Style TargetType="TextBlock">
-                            <Setter Property="Visibility" Value="Hidden"/>
-                            <Style.Triggers>
-                            <DataTrigger Binding="{Binding HasSelectedTournament}" Value="True">
-                                    <Setter Property="Visibility" Value="Visible"/>
-                                </DataTrigger>
-                            </Style.Triggers>
-                        </Style>
-                    </TextBlock.Style>
-                </TextBlock>
+                       TextWrapping="WrapWithOverflow">
+                        <TextBlock.Style>
+                            <Style TargetType="TextBlock">
+                                <Setter Property="Visibility" Value="Hidden"/>
+                                <Style.Triggers>
+                                    <DataTrigger Binding="{Binding HasSelectedTournament}" Value="True">
+                                        <Setter Property="Visibility" Value="Visible"/>
+                                    </DataTrigger>
+                                </Style.Triggers>
+                            </Style>
+                        </TextBlock.Style>
+                    </TextBlock>
 
-                <TextBlock Text="{Binding Organisation}"
-                       TextAlignment="Center"
+                    <TextBlock Text="{Binding Organisation}"
+                       TextAlignment="Left"
                        FontFamily="Arial"
                        FontWeight="Bold"
                        FontSize="14"
                        Foreground="#0000a0"
+                               Width="200"
+                               TextWrapping="WrapWithOverflow"
                        Margin="10">
-                    <TextBlock.Style>
-                        <Style TargetType="TextBlock">
+                        <TextBlock.Style>
+                            <Style TargetType="TextBlock">
+                                <Setter Property="Visibility" Value="Hidden"/>
+                                <Style.Triggers>
+                                    <DataTrigger Binding="{Binding HasSelectedTournament}" Value="True">
+                                        <Setter Property="Visibility" Value="Visible"/>
+                                    </DataTrigger>
+                                </Style.Triggers>
+                            </Style>
+                        </TextBlock.Style>
+                    </TextBlock>
+                </StackPanel>
+                <Image Grid.Column="2"
+               Grid.Row="2"
+               Source="{Binding Logo}"               
+               Width="50"
+               Height="50">
+                    <Image.Style>
+                        <Style TargetType="Image">
                             <Setter Property="Visibility" Value="Hidden"/>
                             <Style.Triggers>
                                 <DataTrigger Binding="{Binding HasSelectedTournament}" Value="True">
                                     <Setter Property="Visibility" Value="Visible"/>
                                 </DataTrigger>
-                        </Style.Triggers>
+                            </Style.Triggers>
                         </Style>
-                    </TextBlock.Style>
-                </TextBlock>
+                    </Image.Style>
+
+                </Image>
+            </WrapPanel>
+               
             <WrapPanel HorizontalAlignment="Center">
                 <TextBlock Text="{Binding Competition}"
                        TextAlignment="Center"
@@ -224,8 +250,8 @@
                     Content="Turnier öffnen"
                     FontSize="16"
                     Height="40"
-                    Width="210"
-                    Margin="40"
+                    Width="150"
+                    Margin="20"
                     Cursor="Hand"
                     Command="{Binding NavigateNavBarCommand}">
                  <Button.Style>                     

Apollon.WPF/Views/Components/TournamentDetails.xaml

@@ -13,7 +13,7 @@
             <ColumnDefinition Width="auto"/>
         </Grid.ColumnDefinitions>
         <Image Grid.Column="0"
-               Source="D:\Projekte\Apollon\Apollon\Apollon.WPF\Images\Logos\logo_klein_DSB.jpg"
+               Source="{Binding Logo}"
                Width="80"
                VerticalAlignment="Center"/>
         <StackPanel Grid.Column="1">