stubbfel/win8phoneApp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mv exams

Browse Source
This commit is contained in:
stubbfel
2013-10-01 13:49:53 +02:00
parent c26344fc40
commit 5de000ef17
23 changed files with 263 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj
View File

@@ -119,8 +119,8 @@
<Compile Include="Model\Campusmap\HiddenPinPlaceModel.cs" />
<Compile Include="Model\Campusmap\InfoPlacePinModel.cs" />
<Compile Include="Model\Campusmap\SearchPlacePinModel.cs" />
<Compile Include="Model\Exams\ExamListModel.cs" />
<Compile Include="Model\Exams\ExamModel.cs" />
<Compile Include="Model\Exams\ExamListWp8Model.cs" />
<Compile Include="Model\Exams\ExamWp8Model.cs" />
<Compile Include="Model\GeoDb\CampusBuildingLayerModel.cs" />
<Compile Include="Model\GeoDb\CampusBuildingModel.cs" />
<Compile Include="Model\GeoDb\PlaceInformation.cs" />
@@ -188,9 +188,6 @@
<Compile Include="LocalizedStrings.cs" />
<Compile Include="Model\Campusmap\MapModel.cs" />
<Compile Include="Model\Campusmap\MapPinModel.cs" />
<Compile Include="Model\Departments\ChairModel.cs" />
<Compile Include="Model\Departments\DepartmentModel.cs" />
<Compile Include="Model\Departments\FacultyModel.cs" />
<Compile Include="Model\Lecture\LectureActivity.cs" />
<Compile Include="Model\Lecture\LectureCourse.cs" />
<Compile Include="Model\Lecture\LectureDate.cs" />

2
CampusAppWP8/CampusAppWP8/Feed/Departments/DepartmentFeed.cs
View File

@@ -10,10 +10,10 @@ namespace CampusAppWP8.Feed.Departments
using System;
using System.IO;
using CampusAppWP8.Model;
using CampusAppWP8.Model.Departments;
using CampusAppWP8.Resources;
using CampusAppWP8.Utility;
using CampusAppWPortalLib8.Model;
using CampusAppWPortalLib8.Model.Departments;
/// <summary>
/// Feed class for the department information.

6
CampusAppWP8/CampusAppWP8/Feed/Exams/ExamFeed.cs
View File

@@ -16,7 +16,7 @@ namespace CampusAppWP8.Feed.Exams
/// <summary>Exam feed.</summary>
/// <remarks>Stubbfel, 02.09.2013.</remarks>
public class ExamFeed : XmlModel<ExamListModel>
public class ExamFeed : XmlModel<ExamListWp8Model>
{
#region Constructor
@@ -39,7 +39,7 @@ namespace CampusAppWP8.Feed.Exams
/// <remarks>Stubbfel, 02.09.2013.</remarks>
/// <param name="model">The model.</param>
/// <returns>true if it succeeds, false if it fails.</returns>
private bool CheckIsModelUpToDate(ExamListModel model)
private bool CheckIsModelUpToDate(ExamListWp8Model model)
{
if (model == null)
{
@@ -54,7 +54,7 @@ namespace CampusAppWP8.Feed.Exams
/// <param name="model"> The model.</param>
/// <param name="fileInfo">Information describing the file.</param>
/// <returns>true if it succeeds, false if it fails.</returns>
private bool CheckIsFileUpToDate(ExamListModel model, FileInfo fileInfo)
private bool CheckIsFileUpToDate(ExamListWp8Model model, FileInfo fileInfo)
{
if (fileInfo == null || !fileInfo.Exists || fileInfo.Length < 1)
{

2
CampusAppWP8/CampusAppWP8/File/Departments/DepartmentFavoriteFile.cs
View File

@@ -9,9 +9,9 @@ namespace CampusAppWP8.File.Departments
{
using System.IO;
using CampusAppWP8.Model;
using CampusAppWP8.Model.Departments;
using CampusAppWP8.Resources;
using CampusAppWPortalLib8.Model;
using CampusAppWPortalLib8.Model.Departments;
/// <summary>
/// Feed object to handle favorite department feeds.

18
CampusAppWP8/CampusAppWP8/Model/Exams/ExamListWp8Model.cs Normal file
View File

@@ -0,0 +1,18 @@
//-----------------------------------------------------------------------
// <copyright file="ExamListWp8Model.cs" company="BTU/IIT">
// Company copyright tag.
// </copyright>
// <author>stubbfel</author>
// <sience>02.09.2013</sience>
//----------------------------------------------------------------------
namespace CampusAppWP8.Model.Exams
{
using System.Xml.Serialization;
/// <summary>Exam list model.</summary>
/// <remarks>Stubbfel, 02.09.2013.</remarks>
[XmlRoot("links")]
public class ExamListWp8Model : CampusAppWPortalLib8.Model.Exams.ExamListModel<ExamWp8Model>
{
}
}

30
CampusAppWP8/CampusAppWP8/Model/Exams/ExamWp8Model.cs Normal file
View File

@@ -0,0 +1,30 @@
//-----------------------------------------------------------------------
// <copyright file="ExamWp8Model.cs" company="BTU/IIT">
// Company copyright tag.
// </copyright>
// <author>stubbfel</author>
// <sience>02.09.2013</sience>
//----------------------------------------------------------------------
namespace CampusAppWP8.Model.Exams
{
using CampusAppWP8.Utility;
/// <summary>Exam model.</summary>
/// <remarks>Stubbfel, 02.09.2013.</remarks>
public class ExamWp8Model : CampusAppWPortalLib8.Model.Exams.ExamModel
{
#region Property
/// <summary>Gets the caption.</summary>
/// <value>The caption.</value>
public string Caption
{
get
{
return Wp8StringManager.StripAndDecodeHTML(this.CourseText + " (" + this.Type + "/" + this.Version + ")");
}
}
#endregion
}
}

2
CampusAppWP8/CampusAppWP8/Model/StudentCouncil/StudentCouncilModel.cs
View File

@@ -57,7 +57,7 @@ namespace CampusAppWP8.Model.StudentCouncil
int num;
if (int.TryParse(this.faculty, out num))
{
this.faculty = AppResources.Faculty + " " + num;
this.faculty = CampusAppWPortalLib8.Resources.AppResources.Faculty + " " + num;
}
}
}

4
CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentFavoritePage.xaml.cs
View File

@@ -11,9 +11,9 @@ namespace CampusAppWP8.Pages.Departments
using System.Windows;
using System.Windows.Controls;
using System.Windows.Navigation;
using CampusAppWP8.File.Departments;
using CampusAppWP8.Model.Departments;
using CampusAppWP8.File.Departments;
using CampusAppWP8.Resources;
using CampusAppWPortalLib8.Model.Departments;
using Microsoft.Phone.Controls;
/// <summary>

12
CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentIndexPage.xaml.cs
View File

@@ -51,13 +51,13 @@ namespace CampusAppWP8.Pages.Departments
{
DepartmentIndexPage.feed = new DepartmentFeed(false);
}
DepartmentIndexPage.feed.OnLoaded += new DepartmentFeed.OnIO(this.SetupFacultyList);
DepartmentIndexPage.feed.OnFailedWeb += new DepartmentFeed.OnFailed(this.FeedIsFailedWeb);
DepartmentIndexPage.feed.OnFailedFile += new DepartmentFeed.OnFailed(this.FeedIsFailedFile);
DepartmentIndexPage.feed.LoadData(Utilities.GetLoadModus<Model.Departments.DepartmentModel>());
DepartmentIndexPage.feed.LoadData(Utilities.GetLoadModus<CampusAppWPortalLib8.Model.Departments.DepartmentModel>());
if (DepartmentIndexPage.favorite == null)
{
DepartmentIndexPage.favorite = new DepartmentFavoriteFile(false);
@@ -160,7 +160,7 @@ namespace CampusAppWP8.Pages.Departments
{
if (NavigationMode.Back == e.NavigationMode)
{
DepartmentIndexPage.favorite.SaveData();
DepartmentIndexPage.favorite.SaveData();
}
base.OnNavigatedFrom(e);
@@ -195,12 +195,12 @@ namespace CampusAppWP8.Pages.Departments
{
if (DepartmentIndexPage.favorite.Model == null)
{
DepartmentIndexPage.favorite.Model = new Model.Departments.DepartmentModel();
DepartmentIndexPage.favorite.Model = new CampusAppWPortalLib8.Model.Departments.DepartmentModel();
}
if (DepartmentIndexPage.favorite.Model.Faculties.Count == 0)
{
DepartmentIndexPage.favorite.Model.Faculties.Add(new Model.Departments.FacultyModel("favorites"));
DepartmentIndexPage.favorite.Model.Faculties.Add(new CampusAppWPortalLib8.Model.Departments.FacultyModel("favorites"));
}
}

4
CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentPage.xaml
View File

@@ -17,10 +17,6 @@
<!-- LayoutRoot -->
<Grid x:Name="LayoutRoot" Background="Transparent">
<Grid.DataContext>
<viewModel:DepartmentModel />
</Grid.DataContext>
<ProgressBar x:Name="progressBar" VerticalAlignment="Center" HorizontalAlignment="Center" Visibility="Collapsed" IsIndeterminate="True"/>
<!-- Pivot -->
<phone:Pivot x:Name="DepartmentPivot" Title="{Binding Path=LocalizedResources.DepartmentApp_Title, Source={StaticResource LocalizedStrings}}" ItemsSource="{Binding Faculties}">

4
CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentPage.xaml.cs
View File

@@ -12,8 +12,8 @@ namespace CampusAppWP8.Pages.Departments
using System.Windows;
using System.Windows.Controls;
using System.Windows.Navigation;
using CampusAppWP8.Model.Departments;
using CampusAppWP8.Resources;
using CampusAppWPortalLib8.Model.Departments;
using Microsoft.Phone.Controls;
/// <summary>
@@ -186,7 +186,7 @@ namespace CampusAppWP8.Pages.Departments
Button btn = this.lastClickedBtn as Button;
TextBlock btnText = btn.Content as TextBlock;
Model.Departments.ChairModel tempModel = DepartmentIndexPage.GetFeed().Model.Faculties[this.DepartmentPivot.SelectedIndex].GetChairModel(btnText.Text);
CampusAppWPortalLib8.Model.Departments.ChairModel tempModel = DepartmentIndexPage.GetFeed().Model.Faculties[this.DepartmentPivot.SelectedIndex].GetChairModel(btnText.Text);
if (tempModel != null)
{

2
CampusAppWP8/CampusAppWP8/Pages/Exams/Exams.xaml.cs
View File

@@ -59,7 +59,7 @@ namespace CampusAppWP8.Pages.Exams
}
this.ProgressBar.Visibility = System.Windows.Visibility.Visible;
this.feed.LoadData(Utilities.GetLoadModus<Model.Exams.ExamListModel>());
this.feed.LoadData(Utilities.GetLoadModus<Model.Exams.ExamListWp8Model>());
}
/// <summary>

9
CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs generated
View File

@@ -285,15 +285,6 @@ namespace CampusAppWP8.Resources {
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die Fakultät ähnelt.
/// </summary>
public static string Faculty {
get {
return ResourceManager.GetString("Faculty", resourceCulture);
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die Favoriten ähnelt.
/// </summary>

3
CampusAppWP8/CampusAppWP8/Resources/AppResources.resx
View File

@@ -230,9 +230,6 @@
<data name="LectureApp_Type" xml:space="preserve">
<value>Veranstaltungsart</value>
</data>
<data name="Faculty" xml:space="preserve">
<value>Fakultät</value>
</data>
<data name="Professorship_chairs" xml:space="preserve">
<value>Lehrstühle</value>
</data>

2
CampusAppWP8/CampusAppWP8/Model/Departments/ChairModel.cs → CampusAppWP8/CampusAppWPortalLib8/Model/Departments/ChairModel.cs
View File

@@ -5,7 +5,7 @@
// <author>fiedlchr</author>
// <sience>24.06.2013</sience>
//----------------------------------------------------------------------
namespace CampusAppWP8.Model.Departments
namespace CampusAppWPortalLib8.Model.Departments
{
using System.Globalization;
using System.Xml.Serialization;

2
CampusAppWP8/CampusAppWP8/Model/Departments/DepartmentModel.cs → CampusAppWP8/CampusAppWPortalLib8/Model/Departments/DepartmentModel.cs
View File

@@ -5,7 +5,7 @@
// <author>fiedlchr</author>
// <sience>24.06.2013</sience>
//----------------------------------------------------------------------
namespace CampusAppWP8.Model.Departments
namespace CampusAppWPortalLib8.Model.Departments
{
using System;
using System.Collections.ObjectModel;

4
CampusAppWP8/CampusAppWP8/Model/Departments/FacultyModel.cs → CampusAppWP8/CampusAppWPortalLib8/Model/Departments/FacultyModel.cs
View File

@@ -5,11 +5,11 @@
// <author>fiedlchr</author>
// <sience>24.06.2013</sience>
//----------------------------------------------------------------------
namespace CampusAppWP8.Model.Departments
namespace CampusAppWPortalLib8.Model.Departments
{
using System.Collections.ObjectModel;
using System.Xml.Serialization;
using CampusAppWP8.Resources;
using CampusAppWPortalLib8.Resources;
/// <summary>
/// Model for holding the faculty information.

16
CampusAppWP8/CampusAppWP8/Model/Exams/ExamListModel.cs → CampusAppWP8/CampusAppWPortalLib8/Model/Exams/ExamListModel.cs
View File

@@ -5,25 +5,25 @@
// <author>stubbfel</author>
// <sience>02.09.2013</sience>
//----------------------------------------------------------------------
namespace CampusAppWP8.Model.Exams
namespace CampusAppWPortalLib8.Model.Exams
{
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Xml.Serialization;
using CampusAppWP8.Model.Utility;
using CampusAppWPortalLib8.Model.Utility;
/// <summary>Exam list model.</summary>
/// <remarks>Stubbfel, 02.09.2013.</remarks>
[XmlRoot("links")]
public class ExamListModel
public class ExamListModel<T>
{
#region Property
/// <summary>Gets or sets the exams.</summary>
/// <value>The exams.</value>
[XmlElement("link")]
public ObservableCollection<ExamModel> Exams { get; set; }
public ObservableCollection<T> Exams { get; set; }
#endregion
@@ -35,8 +35,14 @@ namespace CampusAppWP8.Model.Exams
public List<CourseModel> CreateCourseList()
{
List<CourseModel> result = new List<CourseModel>();
foreach (ExamModel exam in this.Exams)
foreach (T item in this.Exams)
{
ExamModel exam = item as ExamModel;
if (exam == null)
{
continue;
}
CourseModel tmpModel = new CourseModel(exam.CourseNumber, exam.CourseText);
if (!result.Contains(tmpModel))

14
CampusAppWP8/CampusAppWP8/Model/Exams/ExamModel.cs → CampusAppWP8/CampusAppWPortalLib8/Model/Exams/ExamModel.cs
View File

@@ -5,10 +5,10 @@
// <author>stubbfel</author>
// <sience>02.09.2013</sience>
//----------------------------------------------------------------------
namespace CampusAppWP8.Model.Exams
namespace CampusAppWPortalLib8.Model.Exams
{
using System.Xml.Serialization;
using CampusAppWP8.Utility;
using CampusAppWPortalLib8.Utility;
/// <summary>Exam model.</summary>
/// <remarks>Stubbfel, 02.09.2013.</remarks>
@@ -56,16 +56,6 @@ namespace CampusAppWP8.Model.Exams
[XmlAttribute("link")]
public string Link { get; set; }
/// <summary>Gets the caption.</summary>
/// <value>The caption.</value>
public string Caption
{
get
{
return Wp8StringManager.StripAndDecodeHTML(this.CourseText + " (" + this.Type + "/" + this.Version + ")");
}
}
#endregion
}
}

81
CampusAppWP8/CampusAppWPortalLib8/Model/StudentCouncil/StudentCouncilListModel.cs Normal file
View File

@@ -0,0 +1,81 @@
//-----------------------------------------------------------------------
// <copyright file="StudentCouncilListModel.cs" company="BTU/IIT">
// Company copyright tag.
// </copyright>
// <author>stubbfel</author>
// <sience>02.07.2013</sience>
//----------------------------------------------------------------------
namespace CampusAppWPortalLib8.Model.StudentCouncil
{
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Linq;
using System.Xml.Serialization;
/// <summary>
/// Model for menus in one week
/// </summary>
[XmlRoot("root")]
public class StudentCouncilListModel
{
#region Members
/// <summary>
/// Time when the model was created
/// </summary>
private readonly DateTime createTime;
#endregion
#region Constructor
/// <summary>
/// Initializes a new instance of the <see cref="StudentCouncilListModel" /> class.
/// </summary>
public StudentCouncilListModel()
{
this.createTime = DateTime.Now;
}
#endregion
#region Proberty
/// <summary>
/// Gets or sets the StudentCouncils
/// </summary>
[XmlArray("data")]
[XmlArrayItem("studentcouncil")]
public ObservableCollection<StudentCouncilModel> StudentCouncils { get; set; }
/// <summary>
/// Gets the creation time of the model
/// </summary>
public DateTime CreateTime
{
get
{
return this.createTime;
}
}
#endregion
#region Method
/// <summary>
/// Method group the StudentCouncilList by Faculty
/// </summary>
/// <returns>a Dictionary, where the Key is name of the Faculty und the value is a List of StudentCouncil</returns>
public Dictionary<string, List<StudentCouncilModel>> GetStudentCouncilsGroupByFaculty()
{
List<IGrouping<string, StudentCouncilModel>> tmpList = this.StudentCouncils.GroupBy(p => p.Faculty).ToList();
Dictionary<string, List<StudentCouncilModel>> itemMap = new Dictionary<string, List<StudentCouncilModel>>();
foreach (IGrouping<string, StudentCouncilModel> group in tmpList)
{
Dictionary<string, List<StudentCouncilModel>> tempDic = new Dictionary<string, List<StudentCouncilModel>>();
itemMap.Add(group.Key, group.ToList());
}
return itemMap;
}
#endregion
}
}

86
CampusAppWP8/CampusAppWPortalLib8/Model/StudentCouncil/StudentCouncilModel.cs Normal file
View File

@@ -0,0 +1,86 @@
//-----------------------------------------------------------------------------
// <copyright file="StudentCouncilModel.cs" company="BTU/IIT">
// Company copyright tag.
// </copyright>
// <author>stubbfel</author>
// <sience>02.07.2013</sience>
//-----------------------------------------------------------------------------
namespace CampusAppWPortalLib8.Model.StudentCouncil
{
using CampusAppWPortalLib8.Resources;
using System.Xml.Serialization;
/// <summary>
/// Model for menu
/// </summary>
public class StudentCouncilModel
{
#region Member
/// <summary>
/// name of the faculty.
/// </summary>
private string faculty;
#endregion
#region Constructor
/// <summary>
/// Initializes a new instance of the <see cref="StudentCouncilModel" /> class.
/// </summary>
public StudentCouncilModel()
{
}
#endregion
#region Property
/// <summary>
/// Gets or sets the faculty of the StudentCouncil.
/// </summary>
[XmlAttribute("faculty")]
public string Faculty
{
get
{
return this.faculty;
}
set
{
if (value != this.faculty)
{
this.faculty = value;
int num;
if (int.TryParse(this.faculty, out num))
{
this.faculty = AppResources.Faculty + " " + num;
}
}
}
}
/// <summary>
/// Gets or sets the name of the StudentCouncil.
/// </summary>
[XmlAttribute("name")]
public string Name { get; set; }
/// <summary>
/// Gets or sets the webpage-url of the StudentCouncil.
/// </summary>
[XmlAttribute("url")]
public string Url { get; set; }
/// <summary>
/// Gets or sets the email-address of the StudentCouncil.
/// </summary>
[XmlAttribute("email")]
public string Email { get; set; }
#endregion
}
}

9
CampusAppWP8/CampusAppWPortalLib8/Resources/AppResources.Designer.cs generated
View File

@@ -61,6 +61,15 @@ namespace CampusAppWPortalLib8.Resources {
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die Fakultät ähnelt.
/// </summary>
public static string Faculty {
get {
return ResourceManager.GetString("Faculty", resourceCulture);
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die Aktion ähnelt.
/// </summary>

3
CampusAppWP8/CampusAppWPortalLib8/Resources/AppResources.resx
View File

@@ -117,6 +117,9 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="Faculty" xml:space="preserve">
<value>Fakultät</value>
</data>
<data name="MensaApp_Action" xml:space="preserve">
<value>Aktion</value>
</data>