From 2f7ca919ccdea88a6d899476c1724f6fd790c69d Mon Sep 17 00:00:00 2001 From: Christian Fiedler Date: Tue, 15 Oct 2013 12:57:20 +0200 Subject: [PATCH] in between --- CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj | 14 + .../Pages/TimeTable/TimeTableWeek.xaml | 13 +- .../Pages/TimeTable/TimeTableWeek.xaml.cs | 87 +++--- .../Resources/AppResources.Designer.cs | 261 ++++++++++++++++++ .../CampusAppWP8/Resources/AppResources.resx | 1 + .../CampusAppWP8/Resources/Constants.resx | 15 + .../Resources/Constants1.Designer.cs | 63 ++++- .../Utility/Lui/Templates/WeekView.xaml | 73 +++++ .../Utility/Lui/Templates/WeekView.xaml.cs | 59 ++++ .../Utility/Lui/Templates/WeekViewDay.xaml | 18 ++ .../Utility/Lui/Templates/WeekViewDay.xaml.cs | 90 ++++++ 11 files changed, 646 insertions(+), 48 deletions(-) create mode 100644 CampusAppWP8/CampusAppWP8/Utility/Lui/Templates/WeekView.xaml create mode 100644 CampusAppWP8/CampusAppWP8/Utility/Lui/Templates/WeekView.xaml.cs create mode 100644 CampusAppWP8/CampusAppWP8/Utility/Lui/Templates/WeekViewDay.xaml create mode 100644 CampusAppWP8/CampusAppWP8/Utility/Lui/Templates/WeekViewDay.xaml.cs diff --git a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj index 11336ba6..af7772a4 100644 --- a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj +++ b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj @@ -243,6 +243,12 @@ DefaultHeader.xaml + + WeekView.xaml + + + WeekViewDay.xaml + @@ -515,6 +521,14 @@ Designer MSBuild:Compile + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + diff --git a/CampusAppWP8/CampusAppWP8/Pages/TimeTable/TimeTableWeek.xaml b/CampusAppWP8/CampusAppWP8/Pages/TimeTable/TimeTableWeek.xaml index bcdac4e7..9193b1c1 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/TimeTable/TimeTableWeek.xaml +++ b/CampusAppWP8/CampusAppWP8/Pages/TimeTable/TimeTableWeek.xaml @@ -4,6 +4,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:phone="clr-namespace:Microsoft.Phone.Controls;assembly=Microsoft.Phone" xmlns:shell="clr-namespace:Microsoft.Phone.Shell;assembly=Microsoft.Phone" + xmlns:templ="clr-namespace:CampusAppWP8.Utility.Lui.Templates" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" FontFamily="{StaticResource PhoneFontFamilyNormal}" @@ -15,12 +16,18 @@ - + + + + + + + + - - + \ No newline at end of file diff --git a/CampusAppWP8/CampusAppWP8/Pages/TimeTable/TimeTableWeek.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/TimeTable/TimeTableWeek.xaml.cs index 403b8392..c67b102f 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/TimeTable/TimeTableWeek.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/TimeTable/TimeTableWeek.xaml.cs @@ -35,7 +35,7 @@ namespace CampusAppWP8.Pages.TimeTable private struct PageItem { - public Canvas Content { get; set; } + public Canvas[] Content { get; set; } public DateTime DateFrom { get; set; } public DateTime DateTo { get; set; } public char WeekChar { get; set; } @@ -46,18 +46,21 @@ namespace CampusAppWP8.Pages.TimeTable private static readonly int PIVOT_PAGES = 3; private static readonly int PIVOT_PAGES_HALF_DOWN = 1; - + private static readonly int PIVOT_PAGES_COLUMNS = 5; // days in week private PageItem[] itemPages = new PageItem[PIVOT_PAGES]; private int lastSelectedIndex = 0; //private double APP_BAR_SPACE = 0; + private string[] testPiIt = new string[3] { "bla_1", "bla_2", "bla_3" }; public TimeTableWeek() { this.InitializeComponent(); DateTime firstDay = this.GetFirstDayOfWeek(DateTime.Now).AddDays(-7 * PIVOT_PAGES_HALF_DOWN); - + + this.ThePivot.ItemsSource = this.testPiIt; +/* for (int i = 0; i < PIVOT_PAGES; i++) { /* @@ -70,13 +73,12 @@ namespace CampusAppWP8.Pages.TimeTable new List>() }; */ +/* this.itemPages[i].Stacks = new List>(); this.CreatePage(i, firstDay); firstDay = firstDay.AddDays(7); } - - this.ThePivot.SelectionChanged += new SelectionChangedEventHandler(this.OnPivotSelectionChanged); - +*/ ApplicationBarIconButton dayViewBtn = new ApplicationBarIconButton(); dayViewBtn.Text = AppResources.DayView; dayViewBtn.IconUri = new Uri(Icons.Info, UriKind.Relative); @@ -151,7 +153,7 @@ namespace CampusAppWP8.Pages.TimeTable private void OnClickDayView(object sender, EventArgs e) { - Uri url = new Uri("/Pages/TimeTable/TimeTableDay.xaml", UriKind.Relative); + Uri url = new Uri(Constants.PathTimeTable_Day, UriKind.Relative); Page page = App.RootFrame.Content as Page; page.NavigationService.Navigate(url); } @@ -179,7 +181,7 @@ namespace CampusAppWP8.Pages.TimeTable private void OnClickProperties(object sender, EventArgs e) { - Uri url = new Uri("/Pages/TimeTable/TimeTableProperties.xaml", UriKind.Relative); + Uri url = new Uri(Constants.PathTimeTable_Properties, UriKind.Relative); Page page = App.RootFrame.Content as Page; page.NavigationService.Navigate(url); } @@ -188,7 +190,7 @@ namespace CampusAppWP8.Pages.TimeTable { TimeTable.AppointmentsModel.Appointments.CollectionChanged += new NotifyCollectionChangedEventHandler(this.OnListChanged); - Uri url = new Uri("/Pages/TimeTable/AppointmentEdit.xaml", UriKind.Relative); + Uri url = new Uri(Constants.PathTimeTable_AppointmentEdit, UriKind.Relative); Page page = App.RootFrame.Content as Page; page.NavigationService.Navigate(url); } @@ -240,7 +242,7 @@ namespace CampusAppWP8.Pages.TimeTable { TimeTable.AppointmentsModel.Appointments.CollectionChanged += new NotifyCollectionChangedEventHandler(this.OnListChanged); - string urlString = "/Pages/TimeTable/Appointment.xaml?" + Constants.Param_Appointment_Index + "=" + index; + string urlString = Constants.PathTimeTable_Appointment + "?" + Constants.Param_Appointment_Index + "=" + index; Uri url = new Uri(urlString, UriKind.Relative); Page page = App.RootFrame.Content as Page; @@ -290,23 +292,13 @@ namespace CampusAppWP8.Pages.TimeTable this.RemoveContentUIElement(index, sender as Canvas); - /* - Canvas[] tempCan = this.GetModelCanvasFromContent(index, this.itemPages[index].Stacks[dayIndex][listIndex][0]); - -// FIXME: tempCan[0] -> to correct tempCan - this.DrawMultiBubble( - index, - dayIndex, - listIndex, - this.itemPages[index].Stacks[dayIndex][listIndex].Count(), - tempCan[0].Width + tempCan[0].Margin.Left, - tempCan[0].Margin.Top); - */ + bool bubbleDrawn = false; for (int day = 0; day < 5; day++) { - if (this.itemPages[index].Stacks[listIndex][0].IsDate(this.itemPages[index].DateFrom.Date.AddDays(day)) > -1) + if (this.itemPages[index].Stacks[listIndex][0].IsDate(this.itemPages[index].DateFrom.Date.AddDays(day)) > -1 && bubbleDrawn == false) { + bubbleDrawn = true; Canvas[] tempCan = this.GetModelCanvasFromContent(index, this.itemPages[index].Stacks[listIndex][0]); this.DrawMultiBubble( index, @@ -389,7 +381,7 @@ namespace CampusAppWP8.Pages.TimeTable /**/ this.itemPages[index].Stacks.Clear(); - this.itemPages[index].Content.Children.Clear(); +// this.itemPages[index].Content.Children.Clear(); /* for(int i = 0; i < 5; i++) { @@ -636,8 +628,8 @@ namespace CampusAppWP8.Pages.TimeTable private void CreatePage(int itemIndex, DateTime weekStart) { - this.itemPages[itemIndex].Content = new Canvas(); - this.itemPages[itemIndex].Content.Height = WEEK_TABLE_CELL_HEIGHT * 24; +// this.itemPages[itemIndex].Content = new Canvas(); +// this.itemPages[itemIndex].Content.Height = WEEK_TABLE_CELL_HEIGHT * 24; this.itemPages[itemIndex].DateFrom = weekStart; this.itemPages[itemIndex].DateTo = weekStart.AddDays(6); this.itemPages[itemIndex].WeekNumber = System.Globalization.DateTimeFormatInfo.CurrentInfo.Calendar.GetWeekOfYear( @@ -656,10 +648,28 @@ namespace CampusAppWP8.Pages.TimeTable //this.DrawBackground(canBG); - container.Children.Add(canBG); - container.Children.Add(this.itemPages[itemIndex].Content); + //container.Children.Add(canBG); + //container.Children.Add(this.itemPages[itemIndex].Content); container.SizeChanged += new SizeChangedEventHandler(this.OnCanvasSizeChanged); - sv.Content = container; + + Grid mainItGrid = new Grid(); + mainItGrid.Height = WEEK_TABLE_CELL_HEIGHT * 24; + RowDefinition row_0 = new RowDefinition(); + row_0.Height = new GridLength(WEEK_TABLE_CELL_HEIGHT * 24, GridUnitType.Pixel); + ColumnDefinition col_0 = new ColumnDefinition(); + col_0.Width = new GridLength(WEEK_TABLE_HEAD_WIDTH, GridUnitType.Pixel); + ColumnDefinition col_day = new ColumnDefinition(); + col_day.Width = new GridLength(1, GridUnitType.Star); + mainItGrid.RowDefinitions.Add(row_0); + mainItGrid.ColumnDefinitions.Add(col_0); // left + + // day columns + for (int i = 0; i < PIVOT_PAGES_COLUMNS; i++) + { + mainItGrid.ColumnDefinitions.Add(col_day); + } + + sv.Content = mainItGrid; pvItem.Content = sv; Grid headGrid = new Grid(); @@ -672,7 +682,10 @@ namespace CampusAppWP8.Pages.TimeTable private void RemoveContentUIElement(int index, UIElement elem) { - this.itemPages[index].Content.Children.Remove(elem); +// if (this.itemPages[index].Content.Children.Remove(elem) == false) + { + throw new ArgumentException(); + } } private void RemoveContentUIElement(int index, AppointmentModel model) @@ -683,7 +696,7 @@ namespace CampusAppWP8.Pages.TimeTable { foreach (Canvas can in list) { - this.itemPages[index].Content.Children.Remove(can); +// this.itemPages[index].Content.Children.Remove(can); } } } @@ -692,13 +705,13 @@ namespace CampusAppWP8.Pages.TimeTable { List retValue = new List(); - foreach (FrameworkElement elem in this.itemPages[index].Content.Children) +// foreach (FrameworkElement elem in this.itemPages[index].Content.Children) { - if (elem.Tag.GetType().Equals(typeof(AppointmentModel))) +// if (elem.Tag.GetType().Equals(typeof(AppointmentModel))) { - if ((elem.Tag as AppointmentModel).Equals(model)) +// if ((elem.Tag as AppointmentModel).Equals(model)) { - retValue.Add(elem as Canvas); +// retValue.Add(elem as Canvas); } } } @@ -709,6 +722,7 @@ namespace CampusAppWP8.Pages.TimeTable private void DrawAppointment(AppointmentModel model, int index, int xIndex, double opacity = 1.0, int zIndex = 0, int modelCount = 0) { +/* Canvas modelCan = model.GetCanvas( ((this.itemPages[index].Content.Width - WEEK_TABLE_HEAD_WIDTH) / 5) - 2 - 2 - (modelCount * WEEK_TABLE_ZINDEX_SHIFT), WEEK_TABLE_CELL_HEIGHT, @@ -724,6 +738,7 @@ namespace CampusAppWP8.Pages.TimeTable 0); this.itemPages[index].Content.Children.Add(modelCan); +*/ } private void DrawMultiBubble(int index, int dayIndex, int listIndex, int number, double xOffset, double yOffset) @@ -766,7 +781,7 @@ namespace CampusAppWP8.Pages.TimeTable can.SetValue(Canvas.TopProperty, yOffset - (WEEK_TABLE_CELL_HEIGHT / 2)); can.SetValue(Canvas.ZIndexProperty, WEEK_TABLE_ZINDEX_MAX + 1); - this.itemPages[index].Content.Children.Add(can); +// this.itemPages[index].Content.Children.Add(can); } private void DrawHeader(int index) diff --git a/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs b/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs index 5f37747a..4dccb0e9 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs +++ b/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs @@ -69,6 +69,15 @@ namespace CampusAppWP8.Resources { } } + /// + /// Sucht eine lokalisierte Zeichenfolge, die Ganztägig ähnelt. + /// + public static string AllDay { + get { + return ResourceManager.GetString("AllDay", resourceCulture); + } + } + /// /// Sucht eine lokalisierte Zeichenfolge, die BTU-Tag via NFC ähnelt. /// @@ -114,6 +123,33 @@ namespace CampusAppWP8.Resources { } } + /// + /// Sucht eine lokalisierte Zeichenfolge, die Termin ähnelt. + /// + public static string Appointment { + get { + return ResourceManager.GetString("Appointment", resourceCulture); + } + } + + /// + /// Sucht eine lokalisierte Zeichenfolge, die Teilnehmer ähnelt. + /// + public static string Attendees { + get { + return ResourceManager.GetString("Attendees", resourceCulture); + } + } + + /// + /// Sucht eine lokalisierte Zeichenfolge, die Automatisch scrollen zur Stunde ähnelt. + /// + public static string AutoScrollToHour { + get { + return ResourceManager.GetString("AutoScrollToHour", resourceCulture); + } + } + /// /// Sucht eine lokalisierte Zeichenfolge, die Sie haben einen BTU-Tag eingescannt ähnelt. /// @@ -195,6 +231,24 @@ namespace CampusAppWP8.Resources { } } + /// + /// Sucht eine lokalisierte Zeichenfolge, die Abbrechen ähnelt. + /// + public static string Cancel { + get { + return ResourceManager.GetString("Cancel", resourceCulture); + } + } + + /// + /// Sucht eine lokalisierte Zeichenfolge, die Kategorie ähnelt. + /// + public static string Categories { + get { + return ResourceManager.GetString("Categories", resourceCulture); + } + } + /// /// Sucht eine lokalisierte Zeichenfolge, die Essenbeschreibung kopieren ähnelt. /// @@ -213,6 +267,24 @@ namespace CampusAppWP8.Resources { } } + /// + /// Sucht eine lokalisierte Zeichenfolge, die Erstellen ähnelt. + /// + public static string Creating { + get { + return ResourceManager.GetString("Creating", resourceCulture); + } + } + + /// + /// Sucht eine lokalisierte Zeichenfolge, die Tagesansicht ähnelt. + /// + public static string DayView { + get { + return ResourceManager.GetString("DayView", resourceCulture); + } + } + /// /// Sucht eine lokalisierte Zeichenfolge, die Löschen ähnelt. /// @@ -267,6 +339,33 @@ namespace CampusAppWP8.Resources { } } + /// + /// Sucht eine lokalisierte Zeichenfolge, die Beschreibung ähnelt. + /// + public static string Description { + get { + return ResourceManager.GetString("Description", resourceCulture); + } + } + + /// + /// Sucht eine lokalisierte Zeichenfolge, die Dauer ähnelt. + /// + public static string Duration { + get { + return ResourceManager.GetString("Duration", resourceCulture); + } + } + + /// + /// Sucht eine lokalisierte Zeichenfolge, die Bearbeiten ähnelt. + /// + public static string Edit { + get { + return ResourceManager.GetString("Edit", resourceCulture); + } + } + /// /// Sucht eine lokalisierte Zeichenfolge, die Events ähnelt. /// @@ -294,6 +393,15 @@ namespace CampusAppWP8.Resources { } } + /// + /// Sucht eine lokalisierte Zeichenfolge, die Erweiterte Einstellungen ähnelt. + /// + public static string ExtendedProperties { + get { + return ResourceManager.GetString("ExtendedProperties", resourceCulture); + } + } + /// /// Sucht eine lokalisierte Zeichenfolge, die Favoriten ähnelt. /// @@ -339,6 +447,15 @@ namespace CampusAppWP8.Resources { } } + /// + /// Sucht eine lokalisierte Zeichenfolge, die groß ähnelt. + /// + public static string Large { + get { + return ResourceManager.GetString("Large", resourceCulture); + } + } + /// /// Sucht eine lokalisierte Zeichenfolge, die Ebene ähnelt. /// @@ -492,6 +609,15 @@ namespace CampusAppWP8.Resources { } } + /// + /// Sucht eine lokalisierte Zeichenfolge, die Autoscrollauswahl ähnelt. + /// + public static string ListPickerHeaderAutoScroll { + get { + return ResourceManager.GetString("ListPickerHeaderAutoScroll", resourceCulture); + } + } + /// /// Sucht eine lokalisierte Zeichenfolge, die Campusauswahl ähnelt. /// @@ -546,6 +672,24 @@ namespace CampusAppWP8.Resources { } } + /// + /// Sucht eine lokalisierte Zeichenfolge, die Anzeigegrößenauswahl ähnelt. + /// + public static string ListPickerHeaderVisualScale { + get { + return ResourceManager.GetString("ListPickerHeaderVisualScale", resourceCulture); + } + } + + /// + /// Sucht eine lokalisierte Zeichenfolge, die Ort ähnelt. + /// + public static string Location { + get { + return ResourceManager.GetString("Location", resourceCulture); + } + } + /// /// Sucht eine lokalisierte Zeichenfolge, die Webmail ähnelt. /// @@ -555,6 +699,15 @@ namespace CampusAppWP8.Resources { } } + /// + /// Sucht eine lokalisierte Zeichenfolge, die mittel ähnelt. + /// + public static string Medium { + get { + return ResourceManager.GetString("Medium", resourceCulture); + } + } + /// /// Sucht eine lokalisierte Zeichenfolge, die Die Mensa ist heute geschlossen ähnelt. /// @@ -861,6 +1014,15 @@ namespace CampusAppWP8.Resources { } } + /// + /// Sucht eine lokalisierte Zeichenfolge, die Priorität ähnelt. + /// + public static string Priority { + get { + return ResourceManager.GetString("Priority", resourceCulture); + } + } + /// /// Sucht eine lokalisierte Zeichenfolge, die Lehrstühle ähnelt. /// @@ -870,6 +1032,15 @@ namespace CampusAppWP8.Resources { } } + /// + /// Sucht eine lokalisierte Zeichenfolge, die Einstellungen ähnelt. + /// + public static string Properties { + get { + return ResourceManager.GetString("Properties", resourceCulture); + } + } + /// /// Sucht eine lokalisierte Zeichenfolge, die ... suche ähnelt. /// @@ -879,6 +1050,15 @@ namespace CampusAppWP8.Resources { } } + /// + /// Sucht eine lokalisierte Zeichenfolge, die Wiederholung ähnelt. + /// + public static string Repeat { + get { + return ResourceManager.GetString("Repeat", resourceCulture); + } + } + /// /// Sucht eine lokalisierte Zeichenfolge, die LeftToRight ähnelt. /// @@ -915,6 +1095,15 @@ namespace CampusAppWP8.Resources { } } + /// + /// Sucht eine lokalisierte Zeichenfolge, die Speichern ähnelt. + /// + public static string Save { + get { + return ResourceManager.GetString("Save", resourceCulture); + } + } + /// /// Sucht eine lokalisierte Zeichenfolge, die Kein gültigen NFC-Tag gefunden ähnelt. /// @@ -1059,6 +1248,15 @@ namespace CampusAppWP8.Resources { } } + /// + /// Sucht eine lokalisierte Zeichenfolge, die klein ähnelt. + /// + public static string Small { + get { + return ResourceManager.GetString("Small", resourceCulture); + } + } + /// /// Sucht eine lokalisierte Zeichenfolge, die vorlesen ähnelt. /// @@ -1140,6 +1338,33 @@ namespace CampusAppWP8.Resources { } } + /// + /// Sucht eine lokalisierte Zeichenfolge, die Titel ähnelt. + /// + public static string Title { + get { + return ResourceManager.GetString("Title", resourceCulture); + } + } + + /// + /// Sucht eine lokalisierte Zeichenfolge, die bis ähnelt. + /// + public static string To { + get { + return ResourceManager.GetString("To", resourceCulture); + } + } + + /// + /// Sucht eine lokalisierte Zeichenfolge, die Heute ähnelt. + /// + public static string ToDay { + get { + return ResourceManager.GetString("ToDay", resourceCulture); + } + } + /// /// Sucht eine lokalisierte Zeichenfolge, die Aktualisieren ähnelt. /// @@ -1149,6 +1374,33 @@ namespace CampusAppWP8.Resources { } } + /// + /// Sucht eine lokalisierte Zeichenfolge, die Sichtbarkeit ähnelt. + /// + public static string Visibility { + get { + return ResourceManager.GetString("Visibility", resourceCulture); + } + } + + /// + /// Sucht eine lokalisierte Zeichenfolge, die Anzeige Größe ähnelt. + /// + public static string VisualScale { + get { + return ResourceManager.GetString("VisualScale", resourceCulture); + } + } + + /// + /// Sucht eine lokalisierte Zeichenfolge, die Wochenansicht ähnelt. + /// + public static string WeekView { + get { + return ResourceManager.GetString("WeekView", resourceCulture); + } + } + /// /// Sucht eine lokalisierte Zeichenfolge, die Willkommen zur BTU-CampusApp WP8 ähnelt. /// @@ -1157,5 +1409,14 @@ namespace CampusAppWP8.Resources { return ResourceManager.GetString("WelcomeString", resourceCulture); } } + + /// + /// Sucht eine lokalisierte Zeichenfolge, die Wann ähnelt. + /// + public static string When { + get { + return ResourceManager.GetString("When", resourceCulture); + } + } } } diff --git a/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx b/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx index ce6d22a1..bb5a4246 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx +++ b/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx @@ -523,6 +523,7 @@ Wochenansicht + Die Mensa ist heute geschlossen diff --git a/CampusAppWP8/CampusAppWP8/Resources/Constants.resx b/CampusAppWP8/CampusAppWP8/Resources/Constants.resx index 718c4b4f..5521c59d 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/Constants.resx +++ b/CampusAppWP8/CampusAppWP8/Resources/Constants.resx @@ -588,4 +588,19 @@ removeBack + + /Pages/TimeTable/Appointment.xaml + + + /Pages/TimeTable/AppointmentEdit.xaml + + + /Pages/TimeTable/TimeTableDay.xaml + + + /Pages/TimeTable/TimeTableWeek.xaml + + + /Pages/TimeTable/TimeTableProperties.xaml + \ No newline at end of file diff --git a/CampusAppWP8/CampusAppWP8/Resources/Constants1.Designer.cs b/CampusAppWP8/CampusAppWP8/Resources/Constants1.Designer.cs index c47a7ebf..2db8203c 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/Constants1.Designer.cs +++ b/CampusAppWP8/CampusAppWP8/Resources/Constants1.Designer.cs @@ -600,15 +600,6 @@ namespace CampusAppWP8.Resources { } } - /// - /// Sucht eine lokalisierte Zeichenfolge, die AppointmentIndex ähnelt. - /// - public static string Param_Appointment_Index { - get { - return ResourceManager.GetString("Param_Appointment_Index", resourceCulture); - } - } - /// /// Sucht eine lokalisierte Zeichenfolge, die NDEF ähnelt. /// @@ -618,6 +609,15 @@ namespace CampusAppWP8.Resources { } } + /// + /// Sucht eine lokalisierte Zeichenfolge, die AppointmentIndex ähnelt. + /// + public static string Param_Appointment_Index { + get { + return ResourceManager.GetString("Param_Appointment_Index", resourceCulture); + } + } + /// /// Sucht eine lokalisierte Zeichenfolge, die BuildingId ähnelt. /// @@ -1023,6 +1023,51 @@ namespace CampusAppWP8.Resources { } } + /// + /// Sucht eine lokalisierte Zeichenfolge, die /Pages/TimeTable/Appointment.xaml ähnelt. + /// + public static string PathTimeTable_Appointment { + get { + return ResourceManager.GetString("PathTimeTable_Appointment", resourceCulture); + } + } + + /// + /// Sucht eine lokalisierte Zeichenfolge, die /Pages/TimeTable/AppointmentEdit.xaml ähnelt. + /// + public static string PathTimeTable_AppointmentEdit { + get { + return ResourceManager.GetString("PathTimeTable_AppointmentEdit", resourceCulture); + } + } + + /// + /// Sucht eine lokalisierte Zeichenfolge, die /Pages/TimeTable/TimeTableDay.xaml ähnelt. + /// + public static string PathTimeTable_Day { + get { + return ResourceManager.GetString("PathTimeTable_Day", resourceCulture); + } + } + + /// + /// Sucht eine lokalisierte Zeichenfolge, die /Pages/TimeTable/TimeTableProperties.xaml ähnelt. + /// + public static string PathTimeTable_Properties { + get { + return ResourceManager.GetString("PathTimeTable_Properties", resourceCulture); + } + } + + /// + /// Sucht eine lokalisierte Zeichenfolge, die /Pages/TimeTable/TimeTableWeek.xaml ähnelt. + /// + public static string PathTimeTable_Week { + get { + return ResourceManager.GetString("PathTimeTable_Week", resourceCulture); + } + } + /// /// Sucht eine lokalisierte Zeichenfolge, die Uebersicht ähnelt. /// diff --git a/CampusAppWP8/CampusAppWP8/Utility/Lui/Templates/WeekView.xaml b/CampusAppWP8/CampusAppWP8/Utility/Lui/Templates/WeekView.xaml new file mode 100644 index 00000000..142c0dcd --- /dev/null +++ b/CampusAppWP8/CampusAppWP8/Utility/Lui/Templates/WeekView.xaml @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/CampusAppWP8/CampusAppWP8/Utility/Lui/Templates/WeekView.xaml.cs b/CampusAppWP8/CampusAppWP8/Utility/Lui/Templates/WeekView.xaml.cs new file mode 100644 index 00000000..de94c9b5 --- /dev/null +++ b/CampusAppWP8/CampusAppWP8/Utility/Lui/Templates/WeekView.xaml.cs @@ -0,0 +1,59 @@ +//----------------------------------------------------------------------------- +// +// Company copyright tag. +// +// fiedlchr +// 14.10.2013 +//----------------------------------------------------------------------------- +namespace CampusAppWP8.Utility.Lui.Templates +{ + using System; + using System.Collections.Generic; + using System.Linq; + using System.Net; + using System.Windows; + using System.Windows.Controls; + using System.Windows.Navigation; + using Microsoft.Phone.Controls; + using Microsoft.Phone.Shell; + + public partial class WeekView : UserControl + { + private string[] timeStrings = new string[24]; + private string[] monStrings = new string[24]; + + public WeekView() + { + this.InitializeComponent(); + + this.InitLayout(); + } + + private void InitLayout() + { + for (int i = 0; i < 24; i++) + { + this.timeStrings[i] = string.Format("{0:00}:00", i); + this.monStrings[i] = i.ToString(); + } + + this.TimeList.ItemsSource = this.timeStrings; + + //this.MonList.ItemsSource = this.monStrings; + //this.TueList.ItemsSource = this.monStrings; + //this.WedList.ItemsSource = this.monStrings; + //this.ThuList.ItemsSource = this.monStrings; + //this.FriList.ItemsSource = this.monStrings; + } + + private void ListBoxSelectionChanged(object sender, SelectionChangedEventArgs e) + { + ListBox obj = sender as ListBox; + + if (obj.SelectedIndex >= 0) + { + obj.SelectedIndex = -1; + } + } + } +} diff --git a/CampusAppWP8/CampusAppWP8/Utility/Lui/Templates/WeekViewDay.xaml b/CampusAppWP8/CampusAppWP8/Utility/Lui/Templates/WeekViewDay.xaml new file mode 100644 index 00000000..5b643154 --- /dev/null +++ b/CampusAppWP8/CampusAppWP8/Utility/Lui/Templates/WeekViewDay.xaml @@ -0,0 +1,18 @@ + + + + + + + + + \ No newline at end of file diff --git a/CampusAppWP8/CampusAppWP8/Utility/Lui/Templates/WeekViewDay.xaml.cs b/CampusAppWP8/CampusAppWP8/Utility/Lui/Templates/WeekViewDay.xaml.cs new file mode 100644 index 00000000..d0d10838 --- /dev/null +++ b/CampusAppWP8/CampusAppWP8/Utility/Lui/Templates/WeekViewDay.xaml.cs @@ -0,0 +1,90 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Net; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Navigation; +using Microsoft.Phone.Controls; +using Microsoft.Phone.Shell; +using System.Windows.Shapes; +using System.Windows.Media; + +namespace CampusAppWP8.Utility.Lui.Templates +{ + public partial class WeekViewDay : UserControl + { + public static readonly DependencyProperty BgListElementsProperty = DependencyProperty.Register("BgListElements", typeof(int), typeof(WeekViewDay), new PropertyMetadata(null)); + public static readonly DependencyProperty BgListElementHeightProperty = DependencyProperty.Register("BgListElementHeight", typeof(double), typeof(WeekViewDay), new PropertyMetadata(null)); + + public WeekViewDay() + { + this.InitializeComponent(); + } + + public int BgListElements + { + get + { + return (int)this.GetValue(BgListElementsProperty); + } + + set + { + if (value > 0) + { + this.SetValue(BgListElementsProperty, value); + + this.DrawLines(); + } + } + } + + public double BgListElementHeight + { + get + { + return (double)this.GetValue(BgListElementHeightProperty); + } + + set + { + if (value > 0) + { + this.SetValue(BgListElementHeightProperty, value); + + this.DrawLines(); + } + } + } + + private void DrawLines() + { + if (this.BgListElementHeight > 0 + && this.BgListElements > 1) + { + this.BGCanvas.Children.Clear(); + + for (int i = 1; i < this.BgListElements; i++) + { + Line hLineInn = new Line(); + hLineInn.X1 = 0; + hLineInn.Y1 = 0; + hLineInn.X2 = 1; + hLineInn.Y2 = 0; + hLineInn.Stroke = new SolidColorBrush(Colors.DarkGray); + hLineInn.Stretch = Stretch.Fill; + hLineInn.HorizontalAlignment = HorizontalAlignment.Left; + hLineInn.SetValue(Canvas.TopProperty, (this.BgListElementHeight * i)); + hLineInn.StrokeDashArray = new DoubleCollection(); + hLineInn.StrokeDashArray.Add(2); + hLineInn.StrokeDashArray.Add(4); + hLineInn.StrokeThickness = 1; + hLineInn.SetValue(Canvas.ZIndexProperty, 0); + + this.BGCanvas.Children.Add(hLineInn); + } + } + } + } +}