diff --git a/Planungsboard.Presentation/App.xaml b/Planungsboard.Presentation/App.xaml index d7053de..2422edd 100644 --- a/Planungsboard.Presentation/App.xaml +++ b/Planungsboard.Presentation/App.xaml @@ -6,7 +6,12 @@ StartupUri="Views/MainWindow.xaml"> - + + + + + + diff --git a/Planungsboard.Presentation/DesignData/ResourceDictionary.xaml b/Planungsboard.Presentation/DesignData/ResourceDictionary.xaml new file mode 100644 index 0000000..46c8183 --- /dev/null +++ b/Planungsboard.Presentation/DesignData/ResourceDictionary.xaml @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/Planungsboard.Presentation/UserControls/Card.xaml b/Planungsboard.Presentation/UserControls/Card.xaml index 6b520da..2a69a0c 100644 --- a/Planungsboard.Presentation/UserControls/Card.xaml +++ b/Planungsboard.Presentation/UserControls/Card.xaml @@ -5,10 +5,14 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:local="clr-namespace:Planungsboard.Presentation.UserControls" mc:Ignorable="d" - d:DataContext="{d:DesignInstance local:Card}" - d:DesignHeight="100" d:DesignWidth="200"> + + d:DesignWidth="200"> - + @@ -19,27 +23,10 @@ - - + + - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/Planungsboard.Presentation/UserControls/MenuUserControl.xaml b/Planungsboard.Presentation/UserControls/MenuUserControl.xaml index 8633df6..52b9054 100644 --- a/Planungsboard.Presentation/UserControls/MenuUserControl.xaml +++ b/Planungsboard.Presentation/UserControls/MenuUserControl.xaml @@ -12,7 +12,7 @@ diff --git a/Planungsboard.Presentation/ViewModels/MainViewModel.cs b/Planungsboard.Presentation/ViewModels/MainViewModel.cs index 84b7969..0320d07 100644 --- a/Planungsboard.Presentation/ViewModels/MainViewModel.cs +++ b/Planungsboard.Presentation/ViewModels/MainViewModel.cs @@ -48,8 +48,33 @@ public MainViewModel() }; teams.ForEach(team => team.SetColor()); this.Teams = new ObservableCollection(teams); + + var backlogCards = Enumerable.Range(0, 12).Select(_ => new Card()).ToList(); + var rnd = new Random(); + var alpha = "qwertzuioplkjhgfdsayxcvbnm"; + foreach (var c in backlogCards) + { + c.Effort = rnd.Next(1, 10) ^ 2; + c.Id = rnd.Next(10000, 99999).ToString(); + c.Title = alpha.OrderBy(c => Guid.NewGuid()).Take(rnd.Next(3, 5)).Select(c => c.ToString()).Aggregate((s, s1) => s + s1).ToUpper(); + } + + this.BacklogCards = backlogCards; + + var futureCards = Enumerable.Range(0, 21).Select(_ => new Card()).ToList(); + foreach (var c in futureCards) + { + c.Id = rnd.Next(10000, 99999).ToString(); + c.Title = alpha.OrderBy(c => Guid.NewGuid()).Take(rnd.Next(3, 5)).Select(c => c.ToString()).Aggregate((s, s1) => s + s1).ToUpper(); + } + + this.FutureCards = futureCards; } + public List FutureCards { get; set; } + + public List BacklogCards { get; set; } + private (int quarter, int year) ConvertFromQuater(string input) { var quarter = int.Parse(input[1].ToString()); @@ -254,7 +279,7 @@ public class Card public string Title { get; set; } public int Effort { get; set; } public List AssignedQuarter { get; set; } - public string Color { get; set; } + public string Color { get; set; } = "#FA58F4"; } public class Team diff --git a/Planungsboard.Presentation/Views/MainWindow.xaml b/Planungsboard.Presentation/Views/MainWindow.xaml index aca448e..7792de7 100644 --- a/Planungsboard.Presentation/Views/MainWindow.xaml +++ b/Planungsboard.Presentation/Views/MainWindow.xaml @@ -9,6 +9,7 @@ xmlns:userControls="clr-namespace:Planungsboard.Presentation.UserControls" mc:Ignorable="d" Title="Planungsboard" Height="990" Width="1566" + Background="#0F2E45" DataContext="{Binding MainViewModel, Source={StaticResource Locator}}"> @@ -30,18 +31,19 @@ + - + - + - + @@ -64,7 +66,7 @@ - + @@ -153,6 +155,63 @@ + + + + + + + + + + + + + + + + + + + + + + +