diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/departments_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/departments_159.png deleted file mode 100644 index 917436d2..00000000 Binary files a/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/departments_159.png and /dev/null differ diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/events_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/events_159.png new file mode 100644 index 00000000..85178e99 Binary files /dev/null and b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/events_159.png differ diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/lehrstuehle_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/lehrstuehle_159.png new file mode 100644 index 00000000..02d15bff Binary files /dev/null and b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/lehrstuehle_159.png differ diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/mensa_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/mensa_159.png deleted file mode 100644 index 3a6abae2..00000000 Binary files a/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/mensa_159.png and /dev/null differ diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/mensaplan_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/mensaplan_159.png new file mode 100644 index 00000000..fe25b542 Binary files /dev/null and b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/mensaplan_159.png differ diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/news_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/news_159.png index 2d11f51b..37bfd04b 100644 Binary files a/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/news_159.png and b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/news_159.png differ diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/placeinfoacces_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/placeinfoacces_159.png index e7154a5e..9abdc9ae 100644 Binary files a/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/placeinfoacces_159.png and b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/placeinfoacces_159.png differ diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/pos_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/pos_159.png new file mode 100644 index 00000000..7c9b56cc Binary files /dev/null and b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/pos_159.png differ diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/student_council_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/student_council_159.png index 26ab3658..998d470e 100644 Binary files a/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/student_council_159.png and b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/student_council_159.png differ diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/events_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/events_159.png new file mode 100644 index 00000000..811253df Binary files /dev/null and b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/events_159.png differ diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/departments_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/lehrstuehle_159.png similarity index 100% rename from CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/departments_159.png rename to CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/lehrstuehle_159.png diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/mensa_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/mensa_159.png deleted file mode 100644 index e1f15575..00000000 Binary files a/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/mensa_159.png and /dev/null differ diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/mensaplan_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/mensaplan_159.png new file mode 100644 index 00000000..2327a52d Binary files /dev/null and b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/mensaplan_159.png differ diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/news_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/news_159.png index 9d7650bd..75e64a3f 100644 Binary files a/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/news_159.png and b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/news_159.png differ diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/placeinfoacces_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/placeinfoacces_159.png index e7154a5e..a29a38f1 100644 Binary files a/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/placeinfoacces_159.png and b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/placeinfoacces_159.png differ diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/pos_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/pos_159.png new file mode 100644 index 00000000..757bb58f Binary files /dev/null and b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/pos_159.png differ diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/student_council_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/student_council_159.png index 47ed68d2..29fc275b 100644 Binary files a/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/student_council_159.png and b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/student_council_159.png differ diff --git a/CampusAppWP8/CampusAppWP8/Assets/Maps/MZG.png b/CampusAppWP8/CampusAppWP8/Assets/Maps/MZG.png index 8e6f1d4f..30e6ba8d 100644 Binary files a/CampusAppWP8/CampusAppWP8/Assets/Maps/MZG.png and b/CampusAppWP8/CampusAppWP8/Assets/Maps/MZG.png differ diff --git a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj index e9db4ecf..c5a0e57c 100644 --- a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj +++ b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj @@ -138,8 +138,12 @@ + + + BTUTagInfo.xaml + RoomListPage.xaml @@ -290,6 +294,10 @@ Designer MSBuild:Compile + + Designer + MSBuild:Compile + Designer MSBuild:Compile @@ -433,6 +441,16 @@ PreserveNewest + + + + + + + + + + @@ -468,12 +486,10 @@ - - @@ -486,10 +502,6 @@ - - - - diff --git a/CampusAppWP8/CampusAppWP8/File/Campusmap/BuildingsMaps.xml b/CampusAppWP8/CampusAppWP8/File/Campusmap/BuildingsMaps.xml index 9b8421a7..b8ab9ab9 100644 --- a/CampusAppWP8/CampusAppWP8/File/Campusmap/BuildingsMaps.xml +++ b/CampusAppWP8/CampusAppWP8/File/Campusmap/BuildingsMaps.xml @@ -6,13 +6,13 @@ Mehrzweckgebäude Mehrzweck /Assets/Maps/MZG.png - 730 + 756 800 -288 -390 - Point(430 526) - 735864 - 1401188 + Point(430 500) + 650000 + 1200000 Das IKMZ ist die zentrale Einrichtung der BTU, in der die Strukturbereiche der Informations-, Kommunikations- und Medienversorgung zusammengefasst sind. diff --git a/CampusAppWP8/CampusAppWP8/Model/Campusmap/MapModel.cs b/CampusAppWP8/CampusAppWP8/Model/Campusmap/MapModel.cs index c238c0fa..f97360ae 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Campusmap/MapModel.cs +++ b/CampusAppWP8/CampusAppWP8/Model/Campusmap/MapModel.cs @@ -6,7 +6,7 @@ // 24.06.2013 //---------------------------------------------------------------------- namespace CampusAppWP8.Model.Campusmap -{ +{ using System; using System.Collections.Generic; using System.Windows; @@ -43,7 +43,7 @@ namespace CampusAppWP8.Model.Campusmap #endregion - #region Events + #region Events /// /// Delegate for MapInfo @@ -145,6 +145,7 @@ namespace CampusAppWP8.Model.Campusmap { x = this.RefPoint.X + this.MapImageOffsetX + x; y = this.RefPoint.Y + this.MapImageOffsetY - y; + return new Point(x, y); } diff --git a/CampusAppWP8/CampusAppWP8/Model/Setting/AppSettings.cs b/CampusAppWP8/CampusAppWP8/Model/Setting/AppSettings.cs index 235a0508..af3dd11e 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Setting/AppSettings.cs +++ b/CampusAppWP8/CampusAppWP8/Model/Setting/AppSettings.cs @@ -15,6 +15,16 @@ namespace CampusAppWP8.Model.Setting /// public class AppSettings { + + #region Enum + + public enum BTUTagDefaultHandler + { + InfoPage = 0, + CampusMap = 1 + } + + #endregion #region Property /// @@ -124,6 +134,19 @@ namespace CampusAppWP8.Model.Setting } } + + public BTUTagDefaultHandler TagDefaultHandler + { + get + { + return App.LoadFromAppState(Constants.AppSetting_BTUTagDefaultHandler); + } + set + { + App.SaveToAppState(Constants.AppSetting_BTUTagDefaultHandler, value); + } + } + #endregion } } \ No newline at end of file diff --git a/CampusAppWP8/CampusAppWP8/Model/Setting/TagHandlerListPickerItemListModel.cs b/CampusAppWP8/CampusAppWP8/Model/Setting/TagHandlerListPickerItemListModel.cs new file mode 100644 index 00000000..96eec5f6 --- /dev/null +++ b/CampusAppWP8/CampusAppWP8/Model/Setting/TagHandlerListPickerItemListModel.cs @@ -0,0 +1,44 @@ +// +// Company copyright tag.List +// +// stubbfel +// 25.07.2013 +//---------------------------------------------------------------------- +namespace CampusApp8.Model.Setting +{ + using CampusAppWPortalLib8.Model.Utility; + using CampusAppWP8.Model.Setting; + using CampusAppWP8.Resources; + + /// + /// Class for the RoleList + /// + public class TagHandlerListPickerItemListModel : ListPickerItemListModel + { + #region Constructor + + /// + /// Initializes a new instance of the class. + /// + public TagHandlerListPickerItemListModel() + : base() + { + this.LoadList(); + } + + #endregion + + #region Method + + /// + /// Overrides the LoadList-Method + /// + protected override void LoadList() + { + this.AddItem(new ListPickerItemModel(AppSettings.BTUTagDefaultHandler.InfoPage.ToString(), AppResources.Setting_TagHandlerInfo)); + this.AddItem(new ListPickerItemModel(AppSettings.BTUTagDefaultHandler.CampusMap.ToString(), AppResources.Setting_TagHandlerMap)); + } + + #endregion + } +} diff --git a/CampusAppWP8/CampusAppWP8/Pages/BTUTag/BTUTagInfo.xaml b/CampusAppWP8/CampusAppWP8/Pages/BTUTag/BTUTagInfo.xaml new file mode 100644 index 00000000..079dc40c --- /dev/null +++ b/CampusAppWP8/CampusAppWP8/Pages/BTUTag/BTUTagInfo.xaml @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/CampusAppWP8/CampusAppWP8/Pages/BTUTag/BTUTagInfo.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/BTUTag/BTUTagInfo.xaml.cs new file mode 100644 index 00000000..954a455e --- /dev/null +++ b/CampusAppWP8/CampusAppWP8/Pages/BTUTag/BTUTagInfo.xaml.cs @@ -0,0 +1,45 @@ + +namespace CampusAppWP8.Pages.BTTTag +{ + using System; + using System.Windows.Navigation; + using CampusApp8.Model.Setting; + using Microsoft.Phone.Controls; + + public partial class BTUTagInfo : PhoneApplicationPage + { + + #region Member + private TagHandlerListPickerItemListModel taghandlerModel; + #endregion + + #region Constructor + + public BTUTagInfo() + { + InitializeComponent(); + this.taghandlerModel = new TagHandlerListPickerItemListModel(); + this.TagHandler.ItemsSource = this.taghandlerModel.List; + int tagselIndex = this.taghandlerModel.GetIndexOrDefault(Settings.AppSetting.TagDefaultHandler.ToString()); + this.TagHandler.SelectedIndex = tagselIndex; + } + + #endregion + + #region Method + + /// + /// Override the OnNavigatedFrom method + /// + /// Arguments of navigation + protected override void OnNavigatedFrom(NavigationEventArgs e) + { + if (NavigationMode.Back == e.NavigationMode) + { + Settings.AppSetting.TagDefaultHandler = (CampusAppWP8.Model.Setting.AppSettings.BTUTagDefaultHandler)Enum.Parse(typeof(CampusAppWP8.Model.Setting.AppSettings.BTUTagDefaultHandler), ((CampusAppWPortalLib8.Model.Utility.ListPickerItemModel)this.TagHandler.SelectedItem).Value); + } + } + + #endregion + } +} \ No newline at end of file diff --git a/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml index e52a35e5..4dc52a98 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml +++ b/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml @@ -24,8 +24,7 @@ - - + diff --git a/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml.cs index 3f8e5308..6e076da1 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml.cs @@ -16,7 +16,9 @@ namespace CampusAppWP8.Pages.Campusmap using System.Threading; using System.Windows; using System.Windows.Controls; + using System.Windows.Input; using System.Windows.Navigation; + using Windows.Networking.Proximity; using CampusAppWP8.File.Places; using CampusAppWP8.Model.Campusmap; using CampusAppWP8.Model.GeoDb; @@ -26,8 +28,6 @@ namespace CampusAppWP8.Pages.Campusmap using CampusAppWP8.Utility.NDEF; using Microsoft.Phone.Controls; using Microsoft.Phone.Shell; - using Windows.Networking.Proximity; - using System.Windows.Input; /// Class for the campusMap page. /// Stubbfel, 19.08.2013. @@ -66,6 +66,8 @@ namespace CampusAppWP8.Pages.Campusmap /// private bool buildInfoEnable; + private long ndefId; + #endregion #region Constructor @@ -82,12 +84,12 @@ namespace CampusAppWP8.Pages.Campusmap if (menuItem1 != null) { - menuItem1.Text = AppResources.CampusMapApp_ScanQR; + menuItem1.Text = AppResources.App_ScanQR; } if (menuItem2 != null) { - menuItem2.Text = AppResources.CampusMapApp_ScanNfc; + menuItem2.Text = AppResources.App_ScanNfc; } if (menuItem3 != null) @@ -118,7 +120,6 @@ namespace CampusAppWP8.Pages.Campusmap /// Event for loading places /// public event LoadingPlace OnLoadingPlace; - private long ndefId; #endregion @@ -484,7 +485,7 @@ namespace CampusAppWP8.Pages.Campusmap private void SearchPlaceByNFC_Click(object sender, EventArgs e) { MessageBoxes.ShowMainModelInfoMessageBox(AppResources.ScarNfc_Search); - this.ProgressBar.Visibility = Visibility.Visible; + this.DefHeader.ProgressVisibility = Visibility.Visible; this.device.StopSubscribingForMessage(this.ndefId); this.ndefId = this.device.SubscribeForMessage(Constants.NCFMessageType_NDEF, this.NDEFHandler); } @@ -563,11 +564,11 @@ namespace CampusAppWP8.Pages.Campusmap if (this.Dispatcher != null) { - this.Dispatcher.BeginInvoke(new Action(() => this.ProgressBar.Visibility = Visibility.Collapsed)); + this.Dispatcher.BeginInvoke(new Action(() => this.DefHeader.ProgressVisibility = Visibility.Collapsed)); } else { - this.ProgressBar.Visibility = Visibility.Collapsed; + this.DefHeader.ProgressVisibility = Visibility.Collapsed; } ndefId = this.device.SubscribeForMessage(Constants.NCFMessageType_NDEF, this.NDEFHandler); @@ -647,6 +648,23 @@ namespace CampusAppWP8.Pages.Campusmap MapScroller.UpdateLayout(); if (scroll) { + if (scrollPoint.X > this.campusMap.ImageWidth) + { + scrollPoint.X = this.campusMap.ImageWidth; + } + else if (scrollPoint.X < 0) + { + scrollPoint.X = 0; + } + + if (scrollPoint.Y > this.campusMap.ImageHeight) + { + scrollPoint.Y = this.campusMap.ImageHeight; + } + else if (scrollPoint.Y < 0) + { + scrollPoint.Y = 0; + } MapScroller.ScrollToVerticalOffset(scrollPoint.Y); MapScroller.ScrollToHorizontalOffset(scrollPoint.X); } @@ -666,7 +684,7 @@ namespace CampusAppWP8.Pages.Campusmap /// (Optional) the scroll. private void ShowCurrentPositionDispatcher(bool scroll = true) { - ProgressBar.Visibility = Visibility.Visible; + this.DefHeader.ProgressVisibility = Visibility.Visible; Thread thread = new Thread(delegate() { this.ShowCurrentPosition(scroll); }); thread.Start(); @@ -693,11 +711,11 @@ namespace CampusAppWP8.Pages.Campusmap { if (this.Dispatcher != null) { - this.Dispatcher.BeginInvoke(new Action(() => this.ProgressBar.Visibility = Visibility.Collapsed)); + this.Dispatcher.BeginInvoke(new Action(() => this.DefHeader.ProgressVisibility = Visibility.Collapsed)); } else { - this.ProgressBar.Visibility = Visibility.Collapsed; + this.DefHeader.ProgressVisibility = Visibility.Collapsed; } } } @@ -716,7 +734,7 @@ namespace CampusAppWP8.Pages.Campusmap MessageBoxes.ShowMainModelInfoMessageBox(AppResources.MsgBox_NoLocation); } - this.ProgressBar.Visibility = Visibility.Collapsed; + this.DefHeader.ProgressVisibility = Visibility.Collapsed; } else { @@ -741,7 +759,7 @@ namespace CampusAppWP8.Pages.Campusmap } this.AddPin(x, y, type, scroll); - ProgressBar.Visibility = Visibility.Collapsed; + this.DefHeader.ProgressVisibility = Visibility.Collapsed; } /// diff --git a/CampusAppWP8/CampusAppWP8/Pages/Campusmap/RoomListPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/Campusmap/RoomListPage.xaml index ca48717b..12d47a20 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Campusmap/RoomListPage.xaml +++ b/CampusAppWP8/CampusAppWP8/Pages/Campusmap/RoomListPage.xaml @@ -24,8 +24,7 @@ - - + diff --git a/CampusAppWP8/CampusAppWP8/Pages/Campusmap/RoomListPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Campusmap/RoomListPage.xaml.cs index 9e77af84..7205a010 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Campusmap/RoomListPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Campusmap/RoomListPage.xaml.cs @@ -317,7 +317,7 @@ namespace CampusAppWP8.Pages.Campusmap this.buildingMap = new BuildingMapModel(this.building.Building.PlaceId); this.buildingMap.ShowMapInfos += new CBMainMapModel.MapInfos(this.ShowMapInfo); - this.Header.HeaderName = AppResources.CampusMapApp_RoomListTitle + " (" + this.building.Building.GetInformationsValue(Constants.PisInformationName_ShortName) + ")"; + this.DefHeader.HeaderName = AppResources.CampusMapApp_RoomListTitle + " (" + this.building.Building.GetInformationsValue(Constants.PisInformationName_ShortName) + ")"; double y = this.building.Building.GeoRefPoint.Latitude; double x = this.building.Building.GeoRefPoint.Longitude; diff --git a/CampusAppWP8/CampusAppWP8/Pages/Dev/QRScanner.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Dev/QRScanner.xaml.cs index 9126ab91..15003e4f 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Dev/QRScanner.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Dev/QRScanner.xaml.cs @@ -23,6 +23,8 @@ namespace CampusAppWP8.Pages.Dev using Microsoft.Devices; using Microsoft.Phone.Controls; using ZXing; + using CampusAppWP8.Utility.Lui.MessageBoxes; + using CampusAppWP8.Model.Setting; /// /// QR Code scanner. @@ -228,16 +230,25 @@ namespace CampusAppWP8.Pages.Dev } else { - string pid = Wp8StringManager.FilterPlaceIdinQRResultString(result.Text); - string urlString = Constants.PathCampusmap_Campusmap; - urlString += "?" + Constants.ParamModelMap_SearchTermAlias + "=" + pid; - Uri url = new Uri(urlString as string, UriKind.Relative); - NavigationService.Navigate(url); + this.GoToCampusMappage(result.Text); } } else { - MessageBox.Show(result.Text); + if (AppSettings.BTUTagDefaultHandler.CampusMap == Settings.AppSetting.TagDefaultHandler) + { + this.GoToCampusMappage(result.Text); + } + else + { + MessageBoxResult msgResult = MessageBoxes.ShowBtuTagInfoOkCancelMessageBox(result.Text); + if (msgResult.Equals(MessageBoxResult.OK)) + { + string urlString = Constants.PathBTUTag_Info; + Uri url = new Uri(urlString as string, UriKind.Relative); + this.NavigationService.Navigate(url); + } + } } }); } @@ -247,6 +258,15 @@ namespace CampusAppWP8.Pages.Dev } } + private void GoToCampusMappage(string tagContent) + { + string pid = Wp8StringManager.FilterPlaceIdinQRResultString(tagContent); + string urlString = Constants.PathCampusmap_Campusmap; + urlString += "?" + Constants.ParamModelMap_SearchTermAlias + "=" + pid; + Uri url = new Uri(urlString as string, UriKind.Relative); + NavigationService.Navigate(url); + } + /// /// Capture thread function. /// @@ -259,10 +279,10 @@ namespace CampusAppWP8.Pages.Dev { //if (this.isInAutofocus == false) //{ - this.cam.GetPreviewBufferArgb32(buffer); + this.cam.GetPreviewBufferArgb32(buffer); - this.OnCaptureImage(buffer, (int)resolution.Width, (int)resolution.Height); - this.isInAutofocus = true; + this.OnCaptureImage(buffer, (int)resolution.Width, (int)resolution.Height); + this.isInAutofocus = true; //} System.Threading.Thread.Sleep(1000); diff --git a/CampusAppWP8/CampusAppWP8/Pages/Events/EventIndexPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Events/EventIndexPage.xaml.cs index 3b9c9b3e..2a3626f3 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Events/EventIndexPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Events/EventIndexPage.xaml.cs @@ -108,6 +108,11 @@ namespace CampusAppWP8.Pages.Events protected override void OnNavigatedTo(NavigationEventArgs e) { base.OnNavigatedTo(e); + + if (this.Orientation.Equals(PageOrientation.Landscape) || this.Orientation.Equals(PageOrientation.LandscapeLeft) || this.Orientation.Equals(PageOrientation.LandscapeRight)) + { + ApplicationBar.Mode = Microsoft.Phone.Shell.ApplicationBarMode.Default; + } } /// diff --git a/CampusAppWP8/CampusAppWP8/Pages/Events/EventPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Events/EventPage.xaml.cs index ec6c2600..033b6549 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Events/EventPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Events/EventPage.xaml.cs @@ -25,7 +25,7 @@ namespace CampusAppWP8.Pages.Events /// public partial class EventPage : PhoneApplicationPage { - #region Method + #region Memeber /// /// To checking if the feed source is already set or not. @@ -92,6 +92,12 @@ namespace CampusAppWP8.Pages.Events protected override void OnNavigatedTo(NavigationEventArgs e) { base.OnNavigatedTo(e); + + if (this.Orientation.Equals(PageOrientation.Landscape) || this.Orientation.Equals(PageOrientation.LandscapeLeft) || this.Orientation.Equals(PageOrientation.LandscapeRight)) + { + ApplicationBar.Mode = Microsoft.Phone.Shell.ApplicationBarMode.Default; + } + this.DefHeader.ProgressVisibility = Visibility.Visible; if (this.isNewInstance) diff --git a/CampusAppWP8/CampusAppWP8/Pages/Exams/Exams.xaml b/CampusAppWP8/CampusAppWP8/Pages/Exams/Exams.xaml index cdc12571..5536c1d4 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Exams/Exams.xaml +++ b/CampusAppWP8/CampusAppWP8/Pages/Exams/Exams.xaml @@ -22,8 +22,7 @@ - - + diff --git a/CampusAppWP8/CampusAppWP8/Pages/Exams/Exams.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Exams/Exams.xaml.cs index f0a6a0e6..337b65d8 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Exams/Exams.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Exams/Exams.xaml.cs @@ -41,6 +41,7 @@ namespace CampusAppWP8.Pages.Exams this.BachelorItem.Header = CampusAppWPortalLib8.Resources.AppResources.Degree_Bachelor; this.MasterItem.Header = CampusAppWPortalLib8.Resources.AppResources.Degree_Master; this.DiplomItem.Header = CampusAppWPortalLib8.Resources.AppResources.Degree_Diploma; + this.DefHeader.ProgressVisibility = Visibility.Visible; this.InitializeFeed(); } @@ -56,12 +57,12 @@ namespace CampusAppWP8.Pages.Exams protected override void OnNavigatedTo(NavigationEventArgs e) { base.OnNavigatedTo(e); + if (this.feed == null) { this.InitializeFeed(); } - this.ProgressBar.Visibility = System.Windows.Visibility.Visible; this.feed.LoadData(Utilities.GetLoadModus()); } @@ -102,14 +103,14 @@ namespace CampusAppWP8.Pages.Exams private void FeedIsReady() { this.SetupExamList(); - this.ProgressBar.Visibility = System.Windows.Visibility.Collapsed; + this.DefHeader.ProgressVisibility = Visibility.Collapsed; } /// Executes the PDF reader operation. /// Stubbfel, 03.09.2013. private void LaunchPDFReader() { - this.ProgressBar.Visibility = System.Windows.Visibility.Collapsed; + this.DefHeader.ProgressVisibility = Visibility.Collapsed; this.file.SaveAndLaunchFile(); } @@ -181,7 +182,7 @@ namespace CampusAppWP8.Pages.Exams private void FeedIsFailFile() { MessageBoxResult result = MessageBoxes.ShowMainModelErrorMessageBox(AppResources.MsgBox_ErrorMainModelLoadFile); - this.ProgressBar.Visibility = System.Windows.Visibility.Collapsed; + this.DefHeader.ProgressVisibility = Visibility.Collapsed; } /// Event handler. Called by Button for click events. @@ -216,7 +217,7 @@ namespace CampusAppWP8.Pages.Exams this.file.OnFailedWeb += new ExamFile.OnFailed(this.FeedIsFailWeb); this.file.OnFailedFile += new ExamFile.OnFailed(this.FeedIsFailFile); this.file.LoadData(); - this.ProgressBar.Visibility = System.Windows.Visibility.Visible; + this.DefHeader.ProgressVisibility = Visibility.Visible; } #endregion diff --git a/CampusAppWP8/CampusAppWP8/Pages/Links/LinkPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Links/LinkPage.xaml.cs index 06fb6f77..b4962976 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Links/LinkPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Links/LinkPage.xaml.cs @@ -64,8 +64,13 @@ namespace CampusAppWP8.Pages.Links { base.OnNavigatedTo(e); + if (this.Orientation.Equals(PageOrientation.Landscape) || this.Orientation.Equals(PageOrientation.LandscapeLeft) || this.Orientation.Equals(PageOrientation.LandscapeRight)) + { + ApplicationBar.Mode = Microsoft.Phone.Shell.ApplicationBarMode.Default; + } + this.InitializeFeeds(); - //this.ProgressBar.Visibility = System.Windows.Visibility.Visible; + this.DefHeader.ProgressVisibility = Visibility.Visible; this.loadingFeeds = 2; this.commonLinkFeed.LoadData(Utilities.GetLoadModus()); @@ -207,7 +212,6 @@ namespace CampusAppWP8.Pages.Links this.loadingFeeds--; if (this.loadingFeeds < 1) { - //this.ProgressBar.Visibility = System.Windows.Visibility.Collapsed; this.DefHeader.ProgressVisibility = Visibility.Collapsed; } } diff --git a/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml index 3472e14e..07850aa1 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml +++ b/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml @@ -8,6 +8,7 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:lui="clr-namespace:CampusAppWP8.Utility.Lui.Button" xmlns:header="clr-namespace:CampusAppWP8.Utility.Lui.Header" + xmlns:toolkit="clr-namespace:Microsoft.Phone.Controls;assembly=Microsoft.Phone.Controls.Toolkit" mc:Ignorable="d" FontFamily="{StaticResource PhoneFontFamilyNormal}" FontSize="{StaticResource PhoneFontSizeNormal}" @@ -22,8 +23,7 @@ - - + @@ -57,6 +57,12 @@ + + + + + + diff --git a/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml.cs index 4a97aaf3..2f0ddf64 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml.cs @@ -85,6 +85,8 @@ namespace CampusAppWP8.Pages.Mensa { menuItem3.Text = CampusAppWPortalLib8.Resources.AppResources.Campus_SFBMain; } + + this.DefHeader.ProgressVisibility = Visibility.Visible; } #endregion @@ -100,7 +102,11 @@ namespace CampusAppWP8.Pages.Mensa protected override void OnNavigatedTo(NavigationEventArgs e) { base.OnNavigatedTo(e); - this.ProgressBar.Visibility = System.Windows.Visibility.Visible; + + if (this.Orientation.Equals(PageOrientation.Landscape) || this.Orientation.Equals(PageOrientation.LandscapeLeft) || this.Orientation.Equals(PageOrientation.LandscapeRight)) + { + ApplicationBar.Mode = Microsoft.Phone.Shell.ApplicationBarMode.Default; + } this.InitializeFeed(); } @@ -204,7 +210,7 @@ namespace CampusAppWP8.Pages.Mensa private void FeedIsReady() { this.SetupMensaPivot(); - this.ProgressBar.Visibility = System.Windows.Visibility.Collapsed; + this.DefHeader.ProgressVisibility = Visibility.Collapsed; } /// @@ -222,7 +228,7 @@ namespace CampusAppWP8.Pages.Mensa private void FeedIsFailFile() { MessageBoxResult result = MessageBoxes.ShowMainModelErrorMessageBox(AppResources.MsgBox_ErrorMainModelLoadFile); - this.ProgressBar.Visibility = System.Windows.Visibility.Collapsed; + this.DefHeader.ProgressVisibility = Visibility.Collapsed; } /// @@ -230,7 +236,7 @@ namespace CampusAppWP8.Pages.Mensa /// private void SetupMensaPivot() { - this.Header.HeaderName = AppResources.MensaApp_Title + ": " + this.feed.Title; + this.DefHeader.HeaderName = AppResources.MensaApp_Title + ": " + this.feed.Title; this.CreatesMealIcons(); this.feed.Model.SetHolidayCaption(AppResources.MensaApp_CloseMensa); this.MensaPivot.ItemsSource = this.feed.Model.Menus; @@ -323,7 +329,7 @@ namespace CampusAppWP8.Pages.Mensa /// event args private void MensaForceUpdate_Click(object sender, EventArgs e) { - this.ProgressBar.Visibility = System.Windows.Visibility.Visible; + this.DefHeader.ProgressVisibility = Visibility.Visible; this.forceLoad = true; this.InitializeFeed(); this.refreshed = true; @@ -335,7 +341,7 @@ namespace CampusAppWP8.Pages.Mensa /// Event information. private void ApplicationBarMenuItem_Click(object sender, EventArgs e) { - this.ProgressBar.Visibility = System.Windows.Visibility.Visible; + this.DefHeader.ProgressVisibility = Visibility.Visible; this.InitializeFeed(CampusAppWPortalLib8.Model.Settings.Campus.CB_MAIN); } @@ -345,7 +351,7 @@ namespace CampusAppWP8.Pages.Mensa /// Event information. private void ApplicationBarMenuItem2_Click(object sender, EventArgs e) { - this.ProgressBar.Visibility = System.Windows.Visibility.Visible; + this.DefHeader.ProgressVisibility = Visibility.Visible; this.InitializeFeed(CampusAppWPortalLib8.Model.Settings.Campus.CB_SOUTH); } @@ -355,7 +361,7 @@ namespace CampusAppWP8.Pages.Mensa /// Event information. private void ApplicationBarMenuItem3_Click(object sender, EventArgs e) { - this.ProgressBar.Visibility = System.Windows.Visibility.Visible; + this.DefHeader.ProgressVisibility = Visibility.Visible; this.InitializeFeed(CampusAppWPortalLib8.Model.Settings.Campus.SFB_MAIN); } @@ -378,6 +384,17 @@ namespace CampusAppWP8.Pages.Mensa #endregion + private void MenuItem_Click(object sender, RoutedEventArgs e) + { + FrameworkElement frameelement = sender as FrameworkElement; + if (frameelement == null) + { + + } + string copyText = frameelement.Tag.ToString() + " (" + AppResources.Setting_UserCampus + " " + this.feed.Title + ")"; + Clipboard.SetText(copyText); + } + #endregion } } \ No newline at end of file diff --git a/CampusAppWP8/CampusAppWP8/Pages/News/NewsIndexPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/News/NewsIndexPage.xaml.cs index 30f12bb0..9939d43f 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/News/NewsIndexPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/News/NewsIndexPage.xaml.cs @@ -104,6 +104,11 @@ namespace CampusAppWP8.Pages.News protected override void OnNavigatedTo(NavigationEventArgs e) { base.OnNavigatedTo(e); + + if (this.Orientation.Equals(PageOrientation.Landscape) || this.Orientation.Equals(PageOrientation.LandscapeLeft) || this.Orientation.Equals(PageOrientation.LandscapeRight)) + { + ApplicationBar.Mode = Microsoft.Phone.Shell.ApplicationBarMode.Default; + } } /// diff --git a/CampusAppWP8/CampusAppWP8/Pages/News/NewsPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/News/NewsPage.xaml.cs index 7739fd17..e51eda33 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/News/NewsPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/News/NewsPage.xaml.cs @@ -80,6 +80,12 @@ namespace CampusAppWP8.Pages.News protected override void OnNavigatedTo(NavigationEventArgs e) { base.OnNavigatedTo(e); + + if (this.Orientation.Equals(PageOrientation.Landscape) || this.Orientation.Equals(PageOrientation.LandscapeLeft) || this.Orientation.Equals(PageOrientation.LandscapeRight)) + { + ApplicationBar.Mode = Microsoft.Phone.Shell.ApplicationBarMode.Default; + } + this.DefHeader.ProgressVisibility = Visibility.Visible; if (this.isNewInstance) diff --git a/CampusAppWP8/CampusAppWP8/Pages/Openinghours/OpeninghoursPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Openinghours/OpeninghoursPage.xaml.cs index e1978021..57561fe5 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Openinghours/OpeninghoursPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Openinghours/OpeninghoursPage.xaml.cs @@ -71,12 +71,12 @@ namespace CampusAppWP8.Pages.Openinghours protected override void OnNavigatedTo(NavigationEventArgs e) { base.OnNavigatedTo(e); - /* - if (e.NavigationMode != System.Windows.Navigation.NavigationMode.Back) - { - this.ProgressBar.Visibility = System.Windows.Visibility.Visible; - } - */ + + if (this.Orientation.Equals(PageOrientation.Landscape) || this.Orientation.Equals(PageOrientation.LandscapeLeft) || this.Orientation.Equals(PageOrientation.LandscapeRight)) + { + ApplicationBar.Mode = Microsoft.Phone.Shell.ApplicationBarMode.Default; + } + if (this.isNewInstance) { if ((this.feed == null) || (this.feed.Model == null)) diff --git a/CampusAppWP8/CampusAppWP8/Pages/Person/PersonPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/Person/PersonPage.xaml index 9f99be66..74ae667d 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Person/PersonPage.xaml +++ b/CampusAppWP8/CampusAppWP8/Pages/Person/PersonPage.xaml @@ -24,8 +24,7 @@ - - + @@ -35,7 +34,7 @@ - + diff --git a/CampusAppWP8/CampusAppWP8/Pages/Person/PersonPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Person/PersonPage.xaml.cs index 2eb35a0c..3f4837d3 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Person/PersonPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Person/PersonPage.xaml.cs @@ -59,7 +59,7 @@ namespace CampusAppWP8.Pages.Person this.api = new PersonSearchApi(); this.api.OnLoaded += new PersonSearchApi.OnIO(this.ApiIsReady); this.api.OnFailedLoad += new PersonSearchApi.OnFailed(this.ApiIsFail); - this.ProgressBar.Visibility = System.Windows.Visibility.Visible; + this.DefHeader.ProgressVisibility = Visibility.Visible; List parameterList = this.CreateUrlParameter(query); this.api.SetUriParams(parameterList); this.api.LoadData(); @@ -81,7 +81,7 @@ namespace CampusAppWP8.Pages.Person private void ApiIsFail() { MessageBoxResult result = MessageBoxes.ShowMainModelErrorMessageBox(AppResources.MsgBox_ErrorMainModelLoad); - this.ProgressBar.Visibility = Visibility.Collapsed; + this.DefHeader.ProgressVisibility = Visibility.Collapsed; } /// API is ready. @@ -89,7 +89,7 @@ namespace CampusAppWP8.Pages.Person private void ApiIsReady() { this.SetupResultBox(); - this.ProgressBar.Visibility = Visibility.Collapsed; + this.DefHeader.ProgressVisibility = Visibility.Collapsed; } /// Sets up the result box. diff --git a/CampusAppWP8/CampusAppWP8/Pages/Setting/AppSettingPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/Setting/AppSettingPage.xaml index 82e30fd7..20e6192b 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Setting/AppSettingPage.xaml +++ b/CampusAppWP8/CampusAppWP8/Pages/Setting/AppSettingPage.xaml @@ -7,6 +7,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:toolkit="clr-namespace:Microsoft.Phone.Controls;assembly=Microsoft.Phone.Controls.Toolkit" + xmlns:header="clr-namespace:CampusAppWP8.Utility.Lui.Header" FontFamily="{StaticResource PhoneFontFamilyNormal}" FontSize="{StaticResource PhoneFontSizeNormal}" Foreground="{StaticResource PhoneForegroundBrush}" @@ -22,14 +23,14 @@ - - - + + + @@ -40,6 +41,25 @@ + + + + + + + + + + + + + + + + + + + diff --git a/CampusAppWP8/CampusAppWP8/Pages/Setting/AppSettingPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Setting/AppSettingPage.xaml.cs index 905422f7..9239915d 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Setting/AppSettingPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Setting/AppSettingPage.xaml.cs @@ -8,13 +8,18 @@ namespace CampusAppWP8.Pages.Setting { using System.Windows.Navigation; - using Microsoft.Phone.Controls; + using Microsoft.Phone.Controls; + using CampusApp8.Model.Setting; + using System; /// /// Class for the AppSettingPage /// public partial class AppSettingPage : PhoneApplicationPage { + #region Member + private TagHandlerListPickerItemListModel taghandlerModel; + #endregion #region Constructor /// @@ -23,8 +28,12 @@ namespace CampusAppWP8.Pages.Setting public AppSettingPage() { this.InitializeComponent(); - GeoWatchToggle.IsChecked = Settings.AppSetting.GeoWatchEnable; - OnlyWiFiToggle.IsChecked = Settings.AppSetting.OnlyWifi; + this.GeoWatchToggle.IsChecked = Settings.AppSetting.GeoWatchEnable; + this.OnlyWiFiToggle.IsChecked = Settings.AppSetting.OnlyWifi; + this.taghandlerModel = new TagHandlerListPickerItemListModel(); + this.TagHandler.ItemsSource = this.taghandlerModel.List; + int tagselIndex = this.taghandlerModel.GetIndexOrDefault(Settings.AppSetting.TagDefaultHandler.ToString()); + this.TagHandler.SelectedIndex = tagselIndex; } #endregion @@ -41,6 +50,7 @@ namespace CampusAppWP8.Pages.Setting { Settings.AppSetting.GeoWatchEnable = GeoWatchToggle.IsChecked.Value; Settings.AppSetting.OnlyWifi = OnlyWiFiToggle.IsChecked.Value; + Settings.AppSetting.TagDefaultHandler = (CampusAppWP8.Model.Setting.AppSettings.BTUTagDefaultHandler)Enum.Parse(typeof(CampusAppWP8.Model.Setting.AppSettings.BTUTagDefaultHandler), ((CampusAppWPortalLib8.Model.Utility.ListPickerItemModel)this.TagHandler.SelectedItem).Value); } } diff --git a/CampusAppWP8/CampusAppWP8/Pages/Setting/UserProfil.xaml b/CampusAppWP8/CampusAppWP8/Pages/Setting/UserProfil.xaml index 2a392a27..f92c9a07 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Setting/UserProfil.xaml +++ b/CampusAppWP8/CampusAppWP8/Pages/Setting/UserProfil.xaml @@ -24,8 +24,7 @@ - - + diff --git a/CampusAppWP8/CampusAppWP8/Pages/Setting/UserProfil.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Setting/UserProfil.xaml.cs index 6455d003..6436902b 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Setting/UserProfil.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Setting/UserProfil.xaml.cs @@ -71,7 +71,7 @@ namespace CampusAppWP8.Pages.Setting /// Stubbfel, 10.09.2013. private void LoadListPicker() { - this.ProgressBar.Visibility = Visibility.Visible; + this.DefHeader.ProgressVisibility = Visibility.Visible; this.courseList = new CourseListPickerItemListWp8Model(); this.courseList.OnLoaded += new CourseListPickerItemListWp8Model.OnIO(this.SetupListPickers); this.courseList.LoadCourseList(); @@ -98,7 +98,7 @@ namespace CampusAppWP8.Pages.Setting this.Semster.SelectedIndex = semesterList.GetIndexOrDefault(this.userProfil.Semester.ToString()); this.Role.SelectedIndex = roleList.GetIndexOrDefault(this.userProfil.Role.ToString()); this.Campus.SelectedIndex = campusList.GetIndexOrDefault(((int)this.userProfil.DefaultCampus).ToString()); - this.ProgressBar.Visibility = Visibility.Collapsed; + this.DefHeader.ProgressVisibility = Visibility.Collapsed; } /// diff --git a/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml index 7a3c07a2..d7048791 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml +++ b/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml @@ -25,7 +25,7 @@ - + @@ -39,11 +39,23 @@ - + + + + + + + + + + + + @@ -83,16 +95,32 @@ - + + + + + + + + + + + + + + + + - + @@ -126,14 +154,15 @@ - - - - + + + + + - + @@ -152,14 +181,15 @@ - + - - + + - + + @@ -174,8 +204,19 @@ - - + + + + + + + + + + + + + @@ -187,8 +228,7 @@ - - + @@ -200,25 +240,9 @@ - - - - - - - - - - - - - - - - - + - - diff --git a/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml.cs index fb4dfb53..d351d030 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml.cs @@ -9,18 +9,22 @@ namespace CampusAppWP8.Pages { using System; using System.Linq; + using System.Runtime.InteropServices.WindowsRuntime; using System.Threading; using System.Windows; using System.Windows.Controls; using System.Windows.Navigation; + using Windows.Networking.Proximity; using CampusAppWP8.Feed.Utility; + using CampusAppWP8.File.Places; using CampusAppWP8.Resources; using CampusAppWP8.Utility; using CampusAppWP8.Utility.Lui.MessageBoxes; + using CampusAppWP8.Utility.Lui.Tiles; + using CampusAppWP8.Utility.NDEF; using Microsoft.Phone.Controls; using Microsoft.Phone.Shell; - using CampusAppWP8.File.Places; - using CampusAppWP8.Utility.Lui.Tiles; + using CampusAppWP8.Model.Setting; /// /// Class for the StartPage @@ -29,9 +33,14 @@ namespace CampusAppWP8.Pages { #region Member + /// The device. + private readonly ProximityDevice device = ProximityDevice.GetDefault(); + /// List of initialise courses. private CourseFeed initCourseList; + private PageOrientation prevOrientation; + #endregion #region Constructor @@ -42,6 +51,7 @@ namespace CampusAppWP8.Pages public StartPage() { this.InitializeComponent(); + ApplicationBarMenuItem menuItem1 = ApplicationBar.MenuItems[0] as ApplicationBarMenuItem; ApplicationBarMenuItem menuItem2 = ApplicationBar.MenuItems[1] as ApplicationBarMenuItem; ApplicationBarMenuItem menuItem3 = ApplicationBar.MenuItems[2] as ApplicationBarMenuItem; @@ -57,18 +67,16 @@ namespace CampusAppWP8.Pages menuItem2.Text = AppResources.Setting_ApplAppBarTitle; } - if (Settings.AppSetting.DevMode) + if (menuItem3 != null) { - if (menuItem3 != null) - { - menuItem3.Text = "Nfc"; - } - - if (menuItem4 != null) - { - menuItem4.Text = "QR-Reader"; - } + menuItem3.Text = AppResources.App_ScanQR; } + + if (menuItem4 != null) + { + menuItem4.Text = AppResources.App_ScanNfc; + } + else { ApplicationBar.MenuItems.RemoveAt(ApplicationBar.MenuItems.Count - 1); @@ -99,6 +107,8 @@ namespace CampusAppWP8.Pages file.LoadData(); } + private long ndefId; + #endregion #region Method @@ -112,6 +122,27 @@ namespace CampusAppWP8.Pages protected override void OnNavigatedTo(NavigationEventArgs e) { base.OnNavigatedTo(e); + if (this.Orientation.Equals(PageOrientation.PortraitUp) || this.Orientation.Equals(PageOrientation.PortraitDown) || this.Orientation.Equals(PageOrientation.Portrait)) + { + this.prevOrientation = PageOrientation.Portrait; + } + else + { + this.prevOrientation = PageOrientation.Landscape; + } + + ndefId = this.device.SubscribeForMessage(Constants.NCFMessageType_NDEF, this.NDEFHandler); + } + + /// + /// Methods overrides the OnNavigatedFrom-Method + /// + /// some NavigationEventArgs + protected override void OnNavigatedFrom(NavigationEventArgs e) + { + this.device.StopSubscribingForMessage(ndefId); + + base.OnNavigatedFrom(e); } #endregion @@ -133,23 +164,36 @@ namespace CampusAppWP8.Pages private void PhoneApplicationPage_OrientationChanged(object sender, OrientationChangedEventArgs e) { // Switch the placement of the buttons based on an orientation change. - if (this.Orientation == PageOrientation.LandscapeLeft) + if (this.Orientation.Equals(PageOrientation.LandscapeLeft)) { this.ContentPanel.Margin = new Thickness(24, -24, 76, 0); this.AppTitle.Margin = new Thickness(12, 17, 0, 28); - this.MoveGridToLandscape(); + if (!this.prevOrientation.Equals(PageOrientation.Landscape)) + { + this.MoveGridToLandscape(); + this.prevOrientation = PageOrientation.Landscape; + } } - else if (this.Orientation == PageOrientation.LandscapeRight) + else if (this.Orientation.Equals(PageOrientation.LandscapeRight)) { this.ContentPanel.Margin = new Thickness(76, -24, 24, 0); this.AppTitle.Margin = new Thickness(64, 17, 0, 28); - this.MoveGridToLandscape(); + if (!this.prevOrientation.Equals(PageOrientation.Landscape)) + { + this.MoveGridToLandscape(); + this.prevOrientation = PageOrientation.Landscape; + } } else { this.ContentPanel.Margin = new Thickness(12, 0, 12, 12); this.AppTitle.Margin = new Thickness(12, 17, 0, 28); - this.MoveToPortrait(); + + if (!this.prevOrientation.Equals(PageOrientation.Portrait)) + { + this.MoveToPortrait(); + this.prevOrientation = PageOrientation.Portrait; + } } } @@ -157,18 +201,19 @@ namespace CampusAppWP8.Pages /// Stubbfel, 27.08.2013. private void MoveToPortrait() { - bool test = this.Row0.Children.Remove(this.OpenHoursAppButton); - if (!test) + if (!this.Row0.Children.Contains(this.MailAppButton) + && !this.Row1.Children.Contains(this.OpenHoursAppButton) + && !this.Row2.Children.Contains(this.LinkAppButton)) { return; } + this.Row0.Children.Remove(this.MailAppButton); + this.Row3.Children.Add(this.MailAppButton); + this.MailAppButton.SetValue(Grid.ColumnProperty, 0); + this.Row1.Children.Remove(this.OpenHoursAppButton); this.Row3.Children.Add(this.OpenHoursAppButton); - this.OpenHoursAppButton.SetValue(Grid.ColumnProperty, 0); - - this.Row1.Children.Remove(this.OSAAppButton); - this.Row3.Children.Add(this.OSAAppButton); - this.OSAAppButton.SetValue(Grid.ColumnProperty, 1); + this.OpenHoursAppButton.SetValue(Grid.ColumnProperty, 1); this.Row2.Children.Remove(this.LinkAppButton); this.Row3.Children.Add(this.LinkAppButton); @@ -179,18 +224,20 @@ namespace CampusAppWP8.Pages /// Stubbfel, 27.08.2013. private void MoveGridToLandscape() { - bool test = this.Row3.Children.Remove(this.OpenHoursAppButton); - if (!test) + if (!this.Row3.Children.Contains(this.MailAppButton) + && !this.Row3.Children.Contains(this.OpenHoursAppButton) + && !this.Row3.Children.Contains(this.LinkAppButton)) { return; } - this.Row0.Children.Add(this.OpenHoursAppButton); - this.OpenHoursAppButton.SetValue(Grid.ColumnProperty, 3); + this.Row3.Children.Remove(this.MailAppButton); + this.Row0.Children.Add(this.MailAppButton); ; + this.MailAppButton.SetValue(Grid.ColumnProperty, 3); - this.Row3.Children.Remove(this.OSAAppButton); - this.Row1.Children.Add(this.OSAAppButton); - this.OSAAppButton.SetValue(Grid.ColumnProperty, 3); + this.Row3.Children.Remove(this.OpenHoursAppButton); + this.Row1.Children.Add(this.OpenHoursAppButton); + this.OpenHoursAppButton.SetValue(Grid.ColumnProperty, 3); this.Row3.Children.Remove(this.LinkAppButton); this.Row2.Children.Add(this.LinkAppButton); @@ -224,10 +271,10 @@ namespace CampusAppWP8.Pages /// /// Caller of the function /// some EventArgs - private void ApplicationBarMenuItem3_Click(object sender, EventArgs e) + private void ApplicationBarMenuItem4_Click(object sender, EventArgs e) { - Uri url = new Uri("/Pages/Dev/NFC.xaml", UriKind.Relative); - NavigationService.Navigate(url); + /* Uri url = new Uri("/Pages/Dev/NFC.xaml", UriKind.Relative); + NavigationService.Navigate(url);*/ } /// @@ -235,7 +282,7 @@ namespace CampusAppWP8.Pages /// /// Caller of the function. /// Event information. - private void ApplicationBarMenuItem4_Click(object sender, EventArgs e) + private void ApplicationBarMenuItem3_Click(object sender, EventArgs e) { Uri url = new Uri("/Pages/Dev/QRScanner.xaml", UriKind.Relative); NavigationService.Navigate(url); @@ -285,8 +332,6 @@ namespace CampusAppWP8.Pages } } - #endregion - private void PintoStart_Click(object sender, RoutedEventArgs e) { FrameworkElement elment = sender as FrameworkElement; @@ -346,28 +391,68 @@ namespace CampusAppWP8.Pages } - private void PintoStart_Click2(object sender, RoutedEventArgs e) + private void NDEFHandler(ProximityDevice sender, ProximityMessage message) { - IconicTileData oIcontile = new IconicTileData(); - oIcontile.Title = "WebmailPage"; + // create ndefMessage + this.device.StopSubscribingForMessage(message.SubscriptionId); - oIcontile.IconImage = new Uri(Icons.Mensa, UriKind.Relative); - oIcontile.SmallIconImage = new Uri(Icons.Mensa, UriKind.Relative); - - // find the tile object for the application tile that using "Iconic" contains string in it. - ShellTile TileToFind = ShellTile.ActiveTiles.FirstOrDefault(x => x.NavigationUri.ToString().Contains("WebmailPage".ToString())); - - if (TileToFind != null && TileToFind.NavigationUri.ToString().Contains("WebmailPage")) + if (AppSettings.BTUTagDefaultHandler.CampusMap == Settings.AppSetting.TagDefaultHandler) { - TileToFind.Delete(); - ShellTile.Create(new Uri(Constants.PathMail_WebMailPage, UriKind.Relative), oIcontile, true); + var ndefMessage = message.Data; + byte[] data = ndefMessage.ToArray(); + NDEFMessage ndef = new NDEFMessage(data); + + // search for placeId + string nfcContent = ndef.GetContent(); + this.GoToCampusMappage(nfcContent); } else { - ShellTile.Create(new Uri(Constants.PathMail_WebMailPage, UriKind.Relative), oIcontile, true); + if (this.Dispatcher != null) + { + this.Dispatcher.BeginInvoke(new Action(() => this.ShowBtuTagMessageBox())); + } + else + { + this.ShowBtuTagMessageBox(); + } + } + + ndefId = this.device.SubscribeForMessage(Constants.NCFMessageType_NDEF, this.NDEFHandler); + } + + private void GoToCampusMappage(string tagContent) + { + string pid = Wp8StringManager.FilterPlaceIdinNFCResultString(tagContent); + string urlString = Constants.PathCampusmap_Campusmap; + urlString += "?" + Constants.ParamModelMap_SearchTermAlias + "=" + pid; + Uri url = new Uri(urlString as string, UriKind.Relative); + + if (this.Dispatcher != null) + { + this.Dispatcher.BeginInvoke(new Action(() => NavigationService.Navigate(url))); + } + else + { + NavigationService.Navigate(url); + } + + } + + private void ShowBtuTagMessageBox() + { + MessageBoxResult msgResult = MessageBoxes.ShowBtuTagInfoOkCancelMessageBox(); + if (msgResult.Equals(MessageBoxResult.OK)) + { + string urlString = Constants.PathBTUTag_Info; + Uri url = new Uri(urlString as string, UriKind.Relative); + this.NavigationService.Navigate(url); + return; } } #endregion + + #endregion } } \ No newline at end of file diff --git a/CampusAppWP8/CampusAppWP8/Pages/StudentCouncil/StudentCouncilPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/StudentCouncil/StudentCouncilPage.xaml.cs index 836f5852..a1ea39e0 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/StudentCouncil/StudentCouncilPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/StudentCouncil/StudentCouncilPage.xaml.cs @@ -54,6 +54,12 @@ namespace CampusAppWP8.Pages.StudentCouncil protected override void OnNavigatedTo(NavigationEventArgs e) { base.OnNavigatedTo(e); + + if (this.Orientation.Equals(PageOrientation.Landscape) || this.Orientation.Equals(PageOrientation.LandscapeLeft) || this.Orientation.Equals(PageOrientation.LandscapeRight)) + { + ApplicationBar.Mode = Microsoft.Phone.Shell.ApplicationBarMode.Default; + } + if (this.feed == null) { this.InitializeFeed(); diff --git a/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs b/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs index fca0e004..5f37747a 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs +++ b/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs @@ -69,6 +69,24 @@ namespace CampusAppWP8.Resources { } } + /// + /// Sucht eine lokalisierte Zeichenfolge, die BTU-Tag via NFC ähnelt. + /// + public static string App_ScanNfc { + get { + return ResourceManager.GetString("App_ScanNfc", resourceCulture); + } + } + + /// + /// Sucht eine lokalisierte Zeichenfolge, die BTU-Tag via QR-Code ähnelt. + /// + public static string App_ScanQR { + get { + return ResourceManager.GetString("App_ScanQR", resourceCulture); + } + } + /// /// Sucht eine lokalisierte Zeichenfolge, die Hinzufügen ähnelt. /// @@ -88,7 +106,7 @@ namespace CampusAppWP8.Resources { } /// - /// Sucht eine lokalisierte Zeichenfolge, die BTU CampusApp ähnelt. + /// Sucht eine lokalisierte Zeichenfolge, die BTU Campus-App ähnelt. /// public static string ApplicationTitle { get { @@ -96,6 +114,42 @@ namespace CampusAppWP8.Resources { } } + /// + /// Sucht eine lokalisierte Zeichenfolge, die Sie haben einen BTU-Tag eingescannt ähnelt. + /// + public static string BTUTag_Prefix { + get { + return ResourceManager.GetString("BTUTag_Prefix", resourceCulture); + } + } + + /// + /// Sucht eine lokalisierte Zeichenfolge, die Mit einem BTU-Tag können Sie ortsgebundenen Informationen anzeigen lassen und in der App nutzen. Möchten Sie weitere Informationen über die BTU-Tags? ähnelt. + /// + public static string BTUTag_Suffix { + get { + return ResourceManager.GetString("BTUTag_Suffix", resourceCulture); + } + } + + /// + /// Sucht eine lokalisierte Zeichenfolge, die Die BTU-Tags (QR-Codes bzw. NFC-Tags) dienen der schnellen Orientierung auf dem Campus der BTU indem sie eine genaue Standortbestimmung ermöglichen. In einer weiteren Entwicklungsphase werden u.a. Funktionen wie die Terminplanung und Evaluation der Lehrveranstaltungen ergänzt. Dabei werden von der CampusApp weder personenbezogene Daten erhoben, noch gespeichert. ähnelt. + /// + public static string BTUTag_Text { + get { + return ResourceManager.GetString("BTUTag_Text", resourceCulture); + } + } + + /// + /// Sucht eine lokalisierte Zeichenfolge, die BTU-Tag-Info ähnelt. + /// + public static string BTUTag_Title { + get { + return ResourceManager.GetString("BTUTag_Title", resourceCulture); + } + } + /// /// Sucht eine lokalisierte Zeichenfolge, die Gebäude ähnelt. /// @@ -132,24 +186,6 @@ namespace CampusAppWP8.Resources { } } - /// - /// Sucht eine lokalisierte Zeichenfolge, die Info via NFC ähnelt. - /// - public static string CampusMapApp_ScanNfc { - get { - return ResourceManager.GetString("CampusMapApp_ScanNfc", resourceCulture); - } - } - - /// - /// Sucht eine lokalisierte Zeichenfolge, die Info via QR-Code ähnelt. - /// - public static string CampusMapApp_ScanQR { - get { - return ResourceManager.GetString("CampusMapApp_ScanQR", resourceCulture); - } - } - /// /// Sucht eine lokalisierte Zeichenfolge, die Campusplan ähnelt. /// @@ -159,6 +195,15 @@ namespace CampusAppWP8.Resources { } } + /// + /// Sucht eine lokalisierte Zeichenfolge, die Essenbeschreibung kopieren ähnelt. + /// + public static string ContextMenu_MealCopy { + get { + return ResourceManager.GetString("ContextMenu_MealCopy", resourceCulture); + } + } + /// /// Sucht eine lokalisierte Zeichenfolge, die Auf Startseite ähnelt. /// @@ -492,6 +537,15 @@ namespace CampusAppWP8.Resources { } } + /// + /// Sucht eine lokalisierte Zeichenfolge, die BTU-Tag-StandardFunktionauswahl ähnelt. + /// + public static string ListPickerHeaderTag { + get { + return ResourceManager.GetString("ListPickerHeaderTag", resourceCulture); + } + } + /// /// Sucht eine lokalisierte Zeichenfolge, die Webmail ähnelt. /// @@ -528,6 +582,15 @@ namespace CampusAppWP8.Resources { } } + /// + /// Sucht eine lokalisierte Zeichenfolge, die BTU-Tag ähnelt. + /// + public static string MsgBox_BtuInfoHeader { + get { + return ResourceManager.GetString("MsgBox_BtuInfoHeader", resourceCulture); + } + } + /// /// Sucht eine lokalisierte Zeichenfolge, die Der aktuelle Campus konnte nicht ermittelt werden. Es wird der im Profil festgelegten Campus verwendet. ähnelt. /// @@ -871,7 +934,7 @@ namespace CampusAppWP8.Resources { } /// - /// Sucht eine lokalisierte Zeichenfolge, die Appeinstellungen ähnelt. + /// Sucht eine lokalisierte Zeichenfolge, die App-Einstellungen ähnelt. /// public static string Setting_App { get { @@ -906,6 +969,33 @@ namespace CampusAppWP8.Resources { } } + /// + /// Sucht eine lokalisierte Zeichenfolge, die BTU-Tag-StandardFunktion ähnelt. + /// + public static string Setting_TagHandler { + get { + return ResourceManager.GetString("Setting_TagHandler", resourceCulture); + } + } + + /// + /// Sucht eine lokalisierte Zeichenfolge, die BTU-Tag-Informationsseite anzeigen ähnelt. + /// + public static string Setting_TagHandlerInfo { + get { + return ResourceManager.GetString("Setting_TagHandlerInfo", resourceCulture); + } + } + + /// + /// Sucht eine lokalisierte Zeichenfolge, die Raumplan anzeigen ähnelt. + /// + public static string Setting_TagHandlerMap { + get { + return ResourceManager.GetString("Setting_TagHandlerMap", resourceCulture); + } + } + /// /// Sucht eine lokalisierte Zeichenfolge, die Profileinstellungen ähnelt. /// diff --git a/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx b/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx index 59e53447..319fbe43 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx +++ b/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx @@ -126,7 +126,7 @@ Controls the Language and ensures that the font for all elements in the RootFrame aligns with the app's language. Set to the language code of this resource file's language. - BTU CampusApp + BTU Campus-App Beispielwert für die Laufzeiteigenschaft @@ -327,7 +327,7 @@ Campus - Appeinstellungen + App-Einstellungen Ortung @@ -410,11 +410,11 @@ Auf Startseite - - Info via NFC + + BTU-Tag via NFC - - Info via QR-Code + + BTU-Tag via QR-Code Kein gültigen NFC-Tag gefunden @@ -455,4 +455,34 @@ Ebeneauswahl + + Essenbeschreibung kopieren + + + Sie haben einen BTU-Tag eingescannt + + + Mit einem BTU-Tag können Sie ortsgebundenen Informationen anzeigen lassen und in der App nutzen. Möchten Sie weitere Informationen über die BTU-Tags? + + + Die BTU-Tags (QR-Codes bzw. NFC-Tags) dienen der schnellen Orientierung auf dem Campus der BTU indem sie eine genaue Standortbestimmung ermöglichen. In einer weiteren Entwicklungsphase werden u.a. Funktionen wie die Terminplanung und Evaluation der Lehrveranstaltungen ergänzt. Dabei werden von der CampusApp weder personenbezogene Daten erhoben, noch gespeichert. + + + BTU-Tag-Info + + + BTU-Tag + + + BTU-Tag-Informationsseite anzeigen + + + Raumplan anzeigen + + + BTU-Tag-StandardFunktionauswahl + + + BTU-Tag-StandardFunktion + \ No newline at end of file diff --git a/CampusAppWP8/CampusAppWP8/Resources/Constants.resx b/CampusAppWP8/CampusAppWP8/Resources/Constants.resx index 4d8c6e79..49ddf27f 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/Constants.resx +++ b/CampusAppWP8/CampusAppWP8/Resources/Constants.resx @@ -576,4 +576,10 @@ InfoWCPin + + /Pages/BTUTag/BTUTagInfo.xaml + + + BTUTagDefaultHandler + \ No newline at end of file diff --git a/CampusAppWP8/CampusAppWP8/Resources/Constants1.Designer.cs b/CampusAppWP8/CampusAppWP8/Resources/Constants1.Designer.cs index 9a1a71e1..aa9eed79 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/Constants1.Designer.cs +++ b/CampusAppWP8/CampusAppWP8/Resources/Constants1.Designer.cs @@ -105,6 +105,15 @@ namespace CampusAppWP8.Resources { } } + /// + /// Sucht eine lokalisierte Zeichenfolge, die BTUTagDefaultHandler ähnelt. + /// + public static string AppSetting_BTUTagDefaultHandler { + get { + return ResourceManager.GetString("AppSetting_BTUTagDefaultHandler", resourceCulture); + } + } + /// /// Sucht eine lokalisierte Zeichenfolge, die DeploymentNumber ähnelt. /// @@ -753,6 +762,15 @@ namespace CampusAppWP8.Resources { } } + /// + /// Sucht eine lokalisierte Zeichenfolge, die /Pages/BTUTag/BTUTagInfo.xaml ähnelt. + /// + public static string PathBTUTag_Info { + get { + return ResourceManager.GetString("PathBTUTag_Info", resourceCulture); + } + } + /// /// Sucht eine lokalisierte Zeichenfolge, die /Pages/Campusmap/CampusMapPage.xaml ähnelt. /// diff --git a/CampusAppWP8/CampusAppWP8/Resources/Icons.cs b/CampusAppWP8/CampusAppWP8/Resources/Icons.cs index 3519ed79..28ab337b 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/Icons.cs +++ b/CampusAppWP8/CampusAppWP8/Resources/Icons.cs @@ -106,7 +106,29 @@ namespace CampusAppWP8.Resources { get { - return Themerize("departments_159.png"); + return Themerize("lehrstuehle_159.png"); + } + } + + /// + /// Gets the uri string of the Events icon. + /// + public static string Events + { + get + { + return Themerize("events_159.png"); + } + } + + /// + /// Gets the uri string of the ExamApp icon. + /// + public static string ExamApp + { + get + { + return Themerize("pos_159.png"); } } @@ -249,7 +271,7 @@ namespace CampusAppWP8.Resources { get { - return Themerize("mensa_159.png"); + return Themerize("mensaplan_159.png"); } } diff --git a/CampusAppWP8/CampusAppWP8/Resources/Icons.resx b/CampusAppWP8/CampusAppWP8/Resources/Icons.resx index 439fa92c..d465f0d5 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/Icons.resx +++ b/CampusAppWP8/CampusAppWP8/Resources/Icons.resx @@ -139,7 +139,13 @@ delete_159.png - departments_159.png + lehrstuehle_159.png + + + events_159.png + + + pos_159.png exams_159.png @@ -178,7 +184,7 @@ link_159.png - mensa_159.png + mensaplan_159.png news_159.png diff --git a/CampusAppWP8/CampusAppWP8/Utility/AppUriMapper.cs b/CampusAppWP8/CampusAppWP8/Utility/AppUriMapper.cs index a25d83e2..a6f71040 100644 --- a/CampusAppWP8/CampusAppWP8/Utility/AppUriMapper.cs +++ b/CampusAppWP8/CampusAppWP8/Utility/AppUriMapper.cs @@ -31,7 +31,6 @@ namespace CampusAppWP8.Utility { // Launch as a lens, launch viewfinder screen. tempUri = Constants.PathQR_QRPage; - tempUri += "?" + Constants.ParamQRResultKey + "=" + Constants.CampusMapApp_QRCodeSearchResultStorageKey; Uri url = new Uri(tempUri as string, UriKind.Relative); return new Uri(tempUri, UriKind.Relative); } diff --git a/CampusAppWP8/CampusAppWP8/Utility/Lui/MessageBoxes/MessageBoxes.cs b/CampusAppWP8/CampusAppWP8/Utility/Lui/MessageBoxes/MessageBoxes.cs index af439b41..21fcefc1 100644 --- a/CampusAppWP8/CampusAppWP8/Utility/Lui/MessageBoxes/MessageBoxes.cs +++ b/CampusAppWP8/CampusAppWP8/Utility/Lui/MessageBoxes/MessageBoxes.cs @@ -63,6 +63,22 @@ namespace CampusAppWP8.Utility.Lui.MessageBoxes return MessageBox.Show(text, AppResources.MsgBox_PlaceInfoHeader, MessageBoxButton.OKCancel); } + public static MessageBoxResult ShowBtuTagInfoOkCancelMessageBox(string text = null) + { + + string tagString; + if (text != null) + { + tagString = ":\n" + Wp8StringManager.ToShortString(text, 160, "..."); + } + else + { + tagString = "!"; + } + string btuString = AppResources.BTUTag_Prefix + tagString + "\n" + AppResources.BTUTag_Suffix; + return MessageBox.Show(btuString, AppResources.MsgBox_BtuInfoHeader, MessageBoxButton.OKCancel); + } + #endregion } } diff --git a/CampusAppWP8/CampusAppWP8/Utility/Lui/Tiles/TileCreator.cs b/CampusAppWP8/CampusAppWP8/Utility/Lui/Tiles/TileCreator.cs index 9bc7c76a..3745abfa 100644 --- a/CampusAppWP8/CampusAppWP8/Utility/Lui/Tiles/TileCreator.cs +++ b/CampusAppWP8/CampusAppWP8/Utility/Lui/Tiles/TileCreator.cs @@ -93,7 +93,7 @@ namespace CampusAppWP8.Utility.Lui.Tiles /// public static void CreateEventTile() { - TileCreator.CreateIconicTile(AppResources.EventApp_Title, Constants.PathEvents_EventsIndexPage, Icons.News, Icons.News); + TileCreator.CreateIconicTile(AppResources.EventApp_Title, Constants.PathEvents_EventsIndexPage, Icons.Events, Icons.Events); // create a new taskk BackgroundTasks.StartBTUCampusAppTask(); diff --git a/CampusAppWP8/CampusAppWP8/Utility/Utilities.cs b/CampusAppWP8/CampusAppWP8/Utility/Utilities.cs index 306dcf2b..1bf54a22 100644 --- a/CampusAppWP8/CampusAppWP8/Utility/Utilities.cs +++ b/CampusAppWP8/CampusAppWP8/Utility/Utilities.cs @@ -19,6 +19,7 @@ namespace CampusAppWP8.Utility using Microsoft.Phone.Net.NetworkInformation; using CampusAppWPortalLib8.Utility; using CampusAppWPortalLib8.Model; + using Microsoft.Phone.Shell; /// /// Collection of utility functions. diff --git a/CampusAppWP8/CampusAppWPortalLib8/Resources/AppResources.Designer.cs b/CampusAppWP8/CampusAppWPortalLib8/Resources/AppResources.Designer.cs index 0da18b19..c607563d 100644 --- a/CampusAppWP8/CampusAppWPortalLib8/Resources/AppResources.Designer.cs +++ b/CampusAppWP8/CampusAppWPortalLib8/Resources/AppResources.Designer.cs @@ -62,7 +62,7 @@ namespace CampusAppWPortalLib8.Resources { } /// - /// Sucht eine lokalisierte Zeichenfolge, die Cottbus Campus ähnelt. + /// Sucht eine lokalisierte Zeichenfolge, die Cottbus ähnelt. /// public static string Campus_CBMain { get { @@ -71,7 +71,7 @@ namespace CampusAppWPortalLib8.Resources { } /// - /// Sucht eine lokalisierte Zeichenfolge, die Cottbus Nordcampus ähnelt. + /// Sucht eine lokalisierte Zeichenfolge, die Cottbus Nord ähnelt. /// public static string Campus_CBNorth { get { @@ -80,7 +80,7 @@ namespace CampusAppWPortalLib8.Resources { } /// - /// Sucht eine lokalisierte Zeichenfolge, die Cottbus Südcampus ähnelt. + /// Sucht eine lokalisierte Zeichenfolge, die Cottbus Süd ähnelt. /// public static string Campus_CBSouth { get { @@ -89,7 +89,7 @@ namespace CampusAppWPortalLib8.Resources { } /// - /// Sucht eine lokalisierte Zeichenfolge, die Senftenberg Campus ähnelt. + /// Sucht eine lokalisierte Zeichenfolge, die Senftenberg ähnelt. /// public static string Campus_SFBMain { get { diff --git a/CampusAppWP8/CampusAppWPortalLib8/Resources/AppResources.resx b/CampusAppWP8/CampusAppWPortalLib8/Resources/AppResources.resx index cf4cd79d..475cb1d9 100644 --- a/CampusAppWP8/CampusAppWPortalLib8/Resources/AppResources.resx +++ b/CampusAppWP8/CampusAppWPortalLib8/Resources/AppResources.resx @@ -118,16 +118,16 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - Cottbus Campus + Cottbus - Cottbus Nordcampus + Cottbus Nord - Cottbus Südcampus + Cottbus Süd - Senftenberg Campus + Senftenberg Bachelor diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/btu_services_159.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/btu_services_159.png new file mode 100644 index 00000000..c1a1e595 Binary files /dev/null and b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/btu_services_159.png differ diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/mensaplan_159.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/mensaplan_159.png new file mode 100644 index 00000000..fe25b542 Binary files /dev/null and b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/mensaplan_159.png differ diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/pos_159.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/pos_159.png new file mode 100644 index 00000000..7c9b56cc Binary files /dev/null and b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/pos_159.png differ diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/btu_services_159.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/btu_services_159.png new file mode 100644 index 00000000..c989db57 Binary files /dev/null and b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/btu_services_159.png differ diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/mensaplan_159.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/mensaplan_159.png new file mode 100644 index 00000000..2327a52d Binary files /dev/null and b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/mensaplan_159.png differ diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/pos_159.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/pos_159.png new file mode 100644 index 00000000..757bb58f Binary files /dev/null and b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/pos_159.png differ diff --git a/CampusAppWP8/IconCreator/srcImages/functions/btu_services.svg b/CampusAppWP8/IconCreator/srcImages/functions/btu_services.svg new file mode 100644 index 00000000..321c1a4a --- /dev/null +++ b/CampusAppWP8/IconCreator/srcImages/functions/btu_services.svg @@ -0,0 +1,114 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/CampusAppWP8/IconCreator/srcImages/functions/mensaplan.svg b/CampusAppWP8/IconCreator/srcImages/functions/mensaplan.svg new file mode 100644 index 00000000..c2a95c4c --- /dev/null +++ b/CampusAppWP8/IconCreator/srcImages/functions/mensaplan.svg @@ -0,0 +1,114 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/CampusAppWP8/IconCreator/srcImages/functions/pos.svg b/CampusAppWP8/IconCreator/srcImages/functions/pos.svg new file mode 100644 index 00000000..3f91d0ad --- /dev/null +++ b/CampusAppWP8/IconCreator/srcImages/functions/pos.svg @@ -0,0 +1,114 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/work/geoApi/Offlinemap.xml b/work/geoApi/Offlinemap.xml index 2bfc667b..9fdfdded 100644 --- a/work/geoApi/Offlinemap.xml +++ b/work/geoApi/Offlinemap.xml @@ -384,12 +384,12 @@ Labor - Lehrgebäude der Biotechnologie. + Die Biotechnologie befindet sich seit dem 21. Juni 2007 in einem eigenen Lehrgebäude. Biotechnologie Lehrgebäude - Lehrgebäude der Elektrotechnik, Chemie und Verfahrenstechnik in Senftenberg. + Bereits seit 1998 befinden sich in diesem Lehrgebäude die Fachbereiche Chemie und Verfahrentechnik. Elektrotechnik/Chemie/Verfahrenstechnik Lehrgebäude @@ -399,7 +399,7 @@ Lehrgebäude - Die Sporthalle bietet Möglichkeiten der sportlichen Ertüchtigung. + Die Sporthalle bietet Möglichkeiten der sportlichen Ertüchtigung und ist Veranstaltungsort der Campus-X-Change Messe. Sporthalle Sport @@ -504,549 +504,1187 @@ Lehrgebäude + Limitierter Zugang Erdgeschoss - Eingang - Eingang - Eingang + Haupteingang + MZG Eingang + Zugangsbereich + Kein Zugang Erdgeschoss - Eingang - Eingang - Eingang + Nebeneingang + MZG Eingang + Zugangsbereich + Kein Zugang Erdgeschoss - Eingang - Eingang - Eingang + Nebeneingang + MZG Eingang + Zugangsbereich + Kein Zugang Erdgeschoss - Eingang - Eingang - Eingang + Nebeneingang + MZG Eingang + Zugangsbereich + Voller Zugang Erdgeschoss Aufzug - Aufzug - Aufzug + MZG Aufzug + Zugangsbereich + Kein Zugang Erdgeschoss Treppe - Treppe - Treppe + MZG Treppe + Zugangsbereich + Kein Zugang Erdgeschoss Treppe - Treppe - Treppe + MZG Treppe + Zugangsbereich + Voller Zugang Erdgeschoss - 101 - 101 + MZG R.101 + MZG R.101 Büro + Voller Zugang Erdgeschoss - 102 - 102 + MZG R.102 + MZG R.102 Büro + Voller Zugang Erdgeschoss - 103 - 103 + MZG R.103 + MZG R.103 Büro + Voller Zugang Erdgeschoss - 104 - 104 + MZG R.104 + MZG R.104 Büro + Voller Zugang Erdgeschoss - 105 - 105 + Sekretariat + MZG R.105 Büro + Voller Zugang Erdgeschoss - 106 - 106 + MZG R.106 + MZG R.106 Büro + Voller Zugang Erdgeschoss - 107 - 107 - Labor SDB + Labor SDB + MZG R.107 + Labor + Voller Zugang Erdgeschoss - 108 - 108 - Labor SDB + Labor SDB + MZG R.108 + Labor + Voller Zugang Erdgeschoss - 109 - 109 - Labor SDB + Labor SDB + MZG R.109 + Labor + Voller Zugang Erdgeschoss - 110 - 110 - Labor SDB + Labor SDB + MZG R.110 + Labor + Voller Zugang Erdgeschoss - 111 - 111 - Labor SDB + Labor SDB + MZG R.111 + Labor + Voller Zugang Erdgeschoss - 112 - 112 - Labor SDB + Labor SDB + MZG R.112 + Labor + Voller Zugang Erdgeschoss - 113 - 113 + MZG R.113 + MZG R.113 Büro + Voller Zugang Erdgeschoss - 114 - 114 + MZG R.114 + MZG R.114 Büro + Voller Zugang Erdgeschoss - 115 - 115 + MZG R.115 + MZG R.115 Büro + Voller Zugang Erdgeschoss - 116 - 116 + MZG R.116 + MZG R.116 Büro + Voller Zugang Erdgeschoss - 117 - 117 + MZG R.117 + MZG R.117 Büro + Voller Zugang Erdgeschoss - 118 - 118 + MZG R.118 + MZG R.118 Büro + Voller Zugang Erdgeschoss - 120 - 120 + MZG R.120 + MZG R.120 Büro + Voller Zugang Erdgeschoss - 121 - 121 + MZG R.121 + MZG R.121 Büro + Voller Zugang Erdgeschoss - 122 - 122 + MZG R.122 + MZG R.122 Büro + Voller Zugang Erdgeschoss - 123 - 123 + MZG R.123 + MZG R.123 Büro + Voller Zugang Erdgeschoss - 125 - 125 - PC - Labor + PC - Labor + MZG R.125 + Labor + Voller Zugang Erdgeschoss - 126 - 126 - PC - Labor + PC - Labor + MZG R.126 + Labor + Voller Zugang Erdgeschoss - 128 - 128 - PC - Labor + PC - Labor + MZG R.128 + Labor + Voller Zugang Erdgeschoss - 130 - 130 - PC - Labor + PC - Labor + MZG R.130 + Labor + Voller Zugang Erdgeschoss - 133 - 133 + Herrentoilette + MZG R.133 WC + Voller Zugang Erdgeschoss - 134 - 134 - CO2 - Labor + CO2 - Labor + MZG R.134 + Labor + Voller Zugang Erdgeschoss - 135 - 135 - CO2 - Labor + Schulungsraum + MZG R.135 + Büro - + + Limitierter Zugang Erdgeschoss - 137 - 137 + Herrentoilette + MZG R.137 WC + Voller Zugang Erdgeschoss - 138 - 138 + Aufenthaltsraum + MZG R.138 Mehrzweck + Limitierter Zugang Erdgeschoss - 139 - 139 + Damentoilette + MZG R.139 WC + Voller Zugang Erdgeschoss - 140 - 140 - PC - Labor + PC - Labor + MZG R.140 + Labor + Voller Zugang Erdgeschoss - 149 - 149 + MZG R.149 + MZG R.149 Büro + Voller Zugang Obergeschoss Aufzug - Aufzug - Aufzug + MZG Aufzug + Zugangsbereich + Kein Zugang Obergeschoss Treppe - Treppe - Treppe + MZG Treppe + Zugangsbereich + Kein Zugang Obergeschoss Treppe - Treppe - Treppe + MZG Treppe + Zugangsbereich + Voller Zugang Obergeschoss - 201 - 201 + MZG R.201 + MZG R.201 Labor + Voller Zugang Obergeschoss - 202 - 202 + MZG R.202 + MZG R.202 Labor + Voller Zugang Obergeschoss - 203 - 203 + MZG R.203 + MZG R.203 Labor + Voller Zugang Obergeschoss - 204 - 204 + MZG R.204 + MZG R.204 Büro + Voller Zugang Obergeschoss - 205 - 205 + MZG R.205 + MZG R.205 Büro + Voller Zugang Obergeschoss - 206 - 206 + MZG R.206 + MZG R.206 Büro + Voller Zugang Obergeschoss - 207 - 207 + MZG R.207 + MZG R.207 Büro + Voller Zugang Obergeschoss - 208 - 208 + MZG R.208 + MZG R.208 Büro + Voller Zugang Obergeschoss - 209 - 209 + MZG R.209 + MZG R.209 Büro + Voller Zugang Obergeschoss - 210 - 210 + MZG R.210 + MZG R.210 Büro + Voller Zugang Obergeschoss - 211 - 211 + MZG R.211 + MZG R.211 Büro + Voller Zugang Obergeschoss - 213 - 213 + MZG R.213 + MZG R.213 Büro + Voller Zugang Obergeschoss - 214 - 214 + MZG R.214 + MZG R.214 Büro + Voller Zugang Obergeschoss - 215 - 215 + MZG R.215 + MZG R.215 Büro + Voller Zugang Obergeschoss - 216 - 216 + MZG R.216 + MZG R.216 Büro + Voller Zugang Obergeschoss - 217 - 217 + MZG R.217 + MZG R.217 Büro + Voller Zugang Obergeschoss - 218 - 218 + MZG R.218 + MZG R.218 Büro + Voller Zugang Obergeschoss - 219 - 219 + MZG R.219 + MZG R.219 Büro + Voller Zugang Obergeschoss - 220 - 220 + MZG R.220 + MZG R.220 Büro + Voller Zugang Obergeschoss - 222 - 222 - Seminarraum + Seminarraum + MZG R.222 + Büro + Voller Zugang Obergeschoss - 223 - 223 + MZG R.223 + MZG R.223 Büro + Voller Zugang Obergeschoss - 224 - 224 + Sekretariat + MZG R.224 Büro + Voller Zugang Obergeschoss - 225 - 225 + MZG R.225 + MZG R.225 Büro + Voller Zugang Obergeschoss - 226 - 226 + MZG R.226 + MZG R.226 Büro + Voller Zugang Obergeschoss - 227 - 227 - PC - Labor + PC - Labor + MZG R.227 + Labor + Voller Zugang Obergeschoss - 228 - 228 - PC - Labor + PC - Labor + MZG R.228 + Labor + Voller Zugang Obergeschoss - 231 - 231 - Archiv + Archiv + MZG R.231 + Mehrzweck + Voller Zugang Obergeschoss - 233 - 233 - Drohnenlabor + Drohnenlabor + MZG R.233 + Labor + Limitierter Zugang Obergeschoss - 235 - 235 + Herrentoilette + MZG R.235 WC + Voller Zugang Obergeschoss - 236 - 236 + Aufenthaltsraum + MZG R.236 Mehrzweck + Voller Zugang Obergeschoss - 237 - 237 + Aufenthaltsraum + MZG R.237 Mehrzweck + Voller Zugang Obergeschoss - 238 - 238 + MZG R.238 Mehrzweck + Voller Zugang Obergeschoss - 239 - 239 + MZG R.239 Mehrzweck + Voller Zugang Obergeschoss - 240 - 240 + MZG R.240 Mehrzweck - + + Limitierter Zugang Obergeschoss - 241 - 241 + Herrentoilette + MZG R.241 WC + Limitierter Zugang Obergeschoss - 243 - 243 + Damentoilette + MZG R.243 WC - + + Voller Zugang + 1. Untergeschoss + Damen- und Herrentoiletten + WC + + + Voller Zugang + 1. Untergeschoss + Aufzug + Zugangsbereich + + + Kein Zugang + 1. Untergeschoss + Treppe + Zugangsbereich + + + Voller Zugang + 1. Untergeschoss + Präsentationsraum + Präsentationsraum + Arbeitsplatz + + + Voller Zugang + 1. Untergeschoss + Archiv + Ulrich-Conrad-Archiv + Mehrzweck + + + Limitierter Zugang + 1. Untergeschoss + Bücherregal + Geschichte + Regal + + + Limitierter Zugang + 1. Untergeschoss + Bücherregal + Bildende Kunst, Fotografie + Regal + + + Limitierter Zugang + 1. Untergeschoss + Bücherregal + Sprache + Regal + + + Limitierter Zugang + 1. Untergeschoss + Helpdesk + Helpdesk + Information + + + Limitierter Zugang + 1. Untergeschoss + Bücherregal + Lehrbuchsammlung + Regal + + + Limitierter Zugang + 1. Untergeschoss + Bücherregal + Kultur, Erziehung, Bildung, Wissenschaft + Regal + + + Limitierter Zugang + 1. Untergeschoss + Zeitschriftenregal + Zeitschriften + Regal + + + Limitierter Zugang + 1. Untergeschoss + Bücherregal + Gesellschaft, Arbeit, Sozialwissenschaften + Regal + + + Voller Zugang + 1. Untergeschoss + Lernpool + Lernpool + Arbeitsplatz + + + Limitierter Zugang + 1. Untergeschoss + Bücherregal + Philosophie + Regal + + + Limitierter Zugang + 1. Untergeschoss + Bücherregal + Allgemeines + Regal + + + Limitierter Zugang + 1. Untergeschoss + Bücherregal + Medien- und Kommunikationswissenschaften + Regal + + + Limitierter Zugang + 1. Untergeschoss + Bücherregal + Religion + Regal + + + Voller Zugang + 1. Untergeschoss + Lesesaal + Lesesaal + Arbeitsplatz + + + Voller Zugang Erdgeschoss - 103a - 103a + Damen- und Herrentoiletten + WC + + + Voller Zugang + Erdgeschoss + Aufzug + Zugangsbereich + + + Kein Zugang + Erdgeschoss + Treppe + Zugangsbereich + + + Voller Zugang + Erdgeschoss + Galeriearbeitsplätze + Galeriearbeitsplätze + Arbeitsplatz + + + Voller Zugang + Erdgeschoss + Leseecke + Leseecke + Arbeitsplatz + + + Voller Zugang + Erdgeschoss + Arbeitsplätze + Arbeitsplätze + Arbeitsplatz + + + Voller Zugang + Erdgeschoss + Servicepunkt + Servicepunkt + Information + + + Voller Zugang + Erdgeschoss + Ausleihe und Rückgabe + Ausleihe und Rückgabe + Information + + + Voller Zugang + Erdgeschoss + Garderobe + Garderobenschränke + Mehrzweck + + + Voller Zugang + Erdgeschoss + Haupteingang + Zugangsbereich + + + Voller Zugang + Erdgeschoss + Gruppenarbeitsraum + Gruppenarbeitsraum + Arbeitsplatz + + + Voller Zugang + 2. Obergeschoss + Damen- und Herrentoiletten + WC + + + Voller Zugang + 2. Obergeschoss + Aufzug + Zugangsbereich + + + Kein Zugang + 2. Obergeschoss + Treppe + Zugangsbereich + + + Voller Zugang + 2. Obergeschoss + Lesesaal + Lesesaal + Arbeitsplatz + + + Limitierter Zugang + 2. Obergeschoss + Helpdesk + Helpdesk + Information + + + Limitierter Zugang + 2. Obergeschoss + Lehrbuchsammlung + Lehrbuchsammlung + Regal + + + Limitierter Zugang + 2. Obergeschoss + Bücherregal + Wirtschaft, Verkehr + Regal + + + Voller Zugang + 2. Obergeschoss + Galeriearbeitsplätze + Galeriearbeitsplätze + Arbeitsplatz + + + Limitierter Zugang + 2. Obergeschoss + Zeitschriftenregal + Zeitschriften + Regal + + + Limitierter Zugang + 2. Obergeschoss + Bücherregal + Recht, Verwaltung + Regal + + + Limitierter Zugang + 2. Obergeschoss + Zeitschriftenregal + Zeitschriften + Regal + + + Voller Zugang + 2. Obergeschoss + Ruhiger Lesesaal + Ruhiger Lesesaal + Arbeitsplatz + + + Kein Zugang + 2. Obergeschoss + Treppe ins 3. OG + Zugangsbereich + + + Voller Zugang + 3. Obergeschoss + Damen- und Herrentoiletten + WC + + + Voller Zugang + 3. Obergeschoss + Aufzug + Zugangsbereich + + + Kein Zugang + 3. Obergeschoss + Treppe + Zugangsbereich + + + Limitierter Zugang + 3. Obergeschoss + Bücherregal + Bauwesen und Baurecht + Regal + + + Voller Zugang + 3. Obergeschoss + Ruhiger Lesesaal + Ruhiger Lesesaal + Arbeitsplatz + + + Limitierter Zugang + 3. Obergeschoss + Helpdesk + Helpdesk + Information + + + Limitierter Zugang + 3. Obergeschoss + Lehrbuchsammlung + Lehrbuchsammlung + Regal + + + Limitierter Zugang + 3. Obergeschoss + Bücherregal + Architektur, Städtebau und Raumordnung + Regal + + + Voller Zugang + 3. Obergeschoss + Galeriearbeitsplätze + Galeriearbeitsplätze + Arbeitsplatz + + + Kein Zugang + 3. Obergeschoss + Treppe ins 2. OG + Zugangsbereich + + + Limitierter Zugang + 3. Obergeschoss + Zeitschriftenregal + Zeitschriften + Regal + + + Voller Zugang + 3. Obergeschoss + Lesesaal + Lesesaal + Arbeitsplatz + + + Voller Zugang + 4. Obergeschoss + Damen- und Herrentoiletten + WC + + + Voller Zugang + 4. Obergeschoss + Aufzug + Zugangsbereich + + + Kein Zugang + 4. Obergeschoss + Treppe + Zugangsbereich + + + Limitierter Zugang + 4. Obergeschoss + Bücherregal + Spezielle Technik + Regal + + + Voller Zugang + 4. Obergeschoss + Galeriearbeitsplätze + Galeriearbeitsplätze + Arbeitsplatz + + + Limitierter Zugang + 4. Obergeschoss + Helpdesk + Helpdesk + Information + + + Limitierter Zugang + 4. Obergeschoss + Lehrbuchsammlung + Lehrbuchsammlung + Regal + + + Limitierter Zugang + 4. Obergeschoss + Bücherregal + Technik - Allgemeine Grundlagen + Regal + + + Limitierter Zugang + 4. Obergeschoss + Zeitschriftenregal + Zeitschriften + Regal + + + Voller Zugang + 4. Obergeschoss + Einzelplätze Datenbanken + Einzelplätze Datenbanken + Arbeitsplatz + + + Voller Zugang + 4. Obergeschoss + Gruppenarbeitsraum + Gruppenarbeitsraum + Arbeitsplatz + + + Voller Zugang + 5. Obergeschoss + Damen- und Herrentoiletten + WC + + + Voller Zugang + 5. Obergeschoss + Aufzug + Zugangsbereich + + + Kein Zugang + 5. Obergeschoss + Treppe + Zugangsbereich + + + Voller Zugang + 5. Obergeschoss + Ruhiger Lesesaal + Ruhiger Lesesaal + Arbeitsplatz + + + Limitierter Zugang + 5. Obergeschoss + Bücherregal + Biologie und Chemie + Regal + + + Limitierter Zugang + 5. Obergeschoss + Bücherregal + Geowissenschaften + Regal + + + Limitierter Zugang + 5. Obergeschoss + Helpdesk + Helpdesk + Information + + + Limitierter Zugang + 5. Obergeschoss + Lehrbuchsammlung + Lehrbuchsammlung + Regal + + + Limitierter Zugang + 5. Obergeschoss + Bücherregal + Medizin, Anthropologie + Regal + + + Limitierter Zugang + 5. Obergeschoss + Bücherregal + Verfahrenstechnik + Regal + + + Voller Zugang + 5. Obergeschoss + Ruhiger Lesesaal + Ruhiger Lesesaal + Arbeitsplatz + + + Limitierter Zugang + 5. Obergeschoss + Bücherregal + Umweltwissenschaften + Regal + + + Limitierter Zugang + 5. Obergeschoss + Zeitschriftenregal + Zeitschriften + Regal + + + Voller Zugang + 5. Obergeschoss + Fachreferent, Informationsvermittlungsstelle + Fachreferent, Informationsvermittlungsstelle + Information + + + Voller Zugang + 5. Obergeschoss + Galeriearbeitsplätze + Galeriearbeitsplätze + Arbeitsplatz + + + Limitierter Zugang + 5. Obergeschoss + Zeitschriftenregal + Zeitschriften + Regal + + + Voller Zugang + 6. Obergeschoss + Damen- und Herrentoiletten + WC + + + Voller Zugang + 6. Obergeschoss + Aufzug + Aufzug + + + Kein Zugang + 6. Obergeschoss + Treppe + Treppe + + + Voller Zugang + Erdgeschoss + MZG R.103a + MZG R.103a Büro + Voller Zugang Erdgeschoss - 103b - 103b + MZG R.103b + MZG R.103b Büro + Voller Zugang Erdgeschoss - 108a - 108a - Labor SDB + Labor SDB + MZG R.108a + Labor + Voller Zugang Erdgeschoss - 125a - 125a - PC - Labor + PC - Labor + MZG R.125a + Labor + Voller Zugang Erdgeschoss - 134a - 134a - CO2 - Labor + CO2 - Labor + MZG R.134a + Labor + Voller Zugang Erdgeschoss - 135a - 135a - Technik/ Lager - - - Erdgeschoss - 137a - 137a - WC - - - Erdgeschoss - 137b - 137b - WC - - - Obergeschoss - 241a - 241a - WC + Technik/ Lager + MZG R.135a + Mehrzweck + Voller Zugang Obergeschoss - 242a - 242a + MZG R.242a + MZG R.242a Büro + Voller Zugang Obergeschoss - 242e - 242e + Aufenthaltsraum + MZG R.242e Mehrzweck diff --git a/work/images/functions/btu_services.svg b/work/images/functions/btu_services.svg new file mode 100644 index 00000000..321c1a4a --- /dev/null +++ b/work/images/functions/btu_services.svg @@ -0,0 +1,114 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/work/images/functions/mensaplan.svg b/work/images/functions/mensaplan.svg new file mode 100644 index 00000000..c2a95c4c --- /dev/null +++ b/work/images/functions/mensaplan.svg @@ -0,0 +1,114 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/work/images/functions/pos.svg b/work/images/functions/pos.svg new file mode 100644 index 00000000..3f91d0ad --- /dev/null +++ b/work/images/functions/pos.svg @@ -0,0 +1,114 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + +