From d414e4df47220874a0ad03ae9c76b73c99f60c68 Mon Sep 17 00:00:00 2001 From: stubbfel Date: Tue, 6 Aug 2013 09:46:50 +0200 Subject: [PATCH 1/4] add fullheaders --- .../Pages/Lecture/LecturePage.xaml | 10 ++--- .../Pages/Setting/UserProfil.xaml | 8 ++-- .../Resources/AppResources.Designer.cs | 45 +++++++++++++++---- .../CampusAppWP8/Resources/AppResources.resx | 15 +++++-- 4 files changed, 57 insertions(+), 21 deletions(-) diff --git a/CampusAppWP8/CampusAppWP8/Pages/Lecture/LecturePage.xaml b/CampusAppWP8/CampusAppWP8/Pages/Lecture/LecturePage.xaml index 26787ad5..c8dbc61b 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Lecture/LecturePage.xaml +++ b/CampusAppWP8/CampusAppWP8/Pages/Lecture/LecturePage.xaml @@ -55,7 +55,7 @@ - + @@ -77,7 +77,7 @@ - + @@ -100,7 +100,7 @@ - + @@ -117,7 +117,7 @@ - + @@ -141,7 +141,7 @@ - + diff --git a/CampusAppWP8/CampusAppWP8/Pages/Setting/UserProfil.xaml b/CampusAppWP8/CampusAppWP8/Pages/Setting/UserProfil.xaml index 0db945a9..027aa00f 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Setting/UserProfil.xaml +++ b/CampusAppWP8/CampusAppWP8/Pages/Setting/UserProfil.xaml @@ -45,7 +45,7 @@ - + @@ -67,7 +67,7 @@ - + @@ -89,7 +89,7 @@ - + @@ -111,7 +111,7 @@ - + diff --git a/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs b/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs index 9e14041b..e9444955 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs +++ b/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs @@ -303,15 +303,6 @@ namespace CampusAppWP8.Resources { } } - /// - /// Sucht eine lokalisierte Zeichenfolge, die Studiengangauswahl ähnelt. - /// - public static string LectureApp_ListPickerHeaderCourse { - get { - return ResourceManager.GetString("LectureApp_ListPickerHeaderCourse", resourceCulture); - } - } - /// /// Sucht eine lokalisierte Zeichenfolge, die Verantwortlicher ähnelt. /// @@ -384,6 +375,42 @@ namespace CampusAppWP8.Resources { } } + /// + /// Sucht eine lokalisierte Zeichenfolge, die Studiengangsauswahl ähnelt. + /// + public static string ListPickerHeaderCourse { + get { + return ResourceManager.GetString("ListPickerHeaderCourse", resourceCulture); + } + } + + /// + /// Sucht eine lokalisierte Zeichenfolge, die Abschlussauswahl ähnelt. + /// + public static string ListPickerHeaderDegree { + get { + return ResourceManager.GetString("ListPickerHeaderDegree", resourceCulture); + } + } + + /// + /// Sucht eine lokalisierte Zeichenfolge, die Rollenauswahl ähnelt. + /// + public static string ListPickerHeaderRole { + get { + return ResourceManager.GetString("ListPickerHeaderRole", resourceCulture); + } + } + + /// + /// Sucht eine lokalisierte Zeichenfolge, die Semesterauswahl ähnelt. + /// + public static string ListPickerHeaderSemester { + get { + return ResourceManager.GetString("ListPickerHeaderSemester", resourceCulture); + } + } + /// /// Sucht eine lokalisierte Zeichenfolge, die Webmail ähnelt. /// diff --git a/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx b/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx index 350cd768..f4c6f531 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx +++ b/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx @@ -269,9 +269,6 @@ Master - - Studiengangauswahl - Gebäude @@ -344,4 +341,16 @@ Student + + Studiengangsauswahl + + + Abschlussauswahl + + + Rollenauswahl + + + Semesterauswahl + \ No newline at end of file From f79cd5836ea55a8fefb0430ca33a9f0ea703fea5 Mon Sep 17 00:00:00 2001 From: stubbfel Date: Tue, 6 Aug 2013 11:04:43 +0200 Subject: [PATCH 2/4] add mealmodel --- CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj | 1 + .../CampusAppWP8/Model/Mensa/MealModel.cs | 267 ++++++++++++++++++ .../CampusAppWP8/Model/Mensa/MenuWeekModel.cs | 9 +- .../Resources/AppResources.Designer.cs | 18 ++ .../CampusAppWP8/Resources/AppResources.resx | 6 + .../Resources/Constants.Designer.cs | 81 ++++++ .../CampusAppWP8/Resources/Constants.resx | 29 +- .../CampusAppWP8/Resources/Icons.resx | 27 ++ 8 files changed, 433 insertions(+), 5 deletions(-) create mode 100644 CampusAppWP8/CampusAppWP8/Model/Mensa/MealModel.cs diff --git a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj index 847a75fc..cc5f5a59 100644 --- a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj +++ b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj @@ -99,6 +99,7 @@ + diff --git a/CampusAppWP8/CampusAppWP8/Model/Mensa/MealModel.cs b/CampusAppWP8/CampusAppWP8/Model/Mensa/MealModel.cs new file mode 100644 index 00000000..4a6d2e8a --- /dev/null +++ b/CampusAppWP8/CampusAppWP8/Model/Mensa/MealModel.cs @@ -0,0 +1,267 @@ +//----------------------------------------------------------------------- +// +// Company copyright tag. +// +// stubbfel +// 06.08.2013 +//---------------------------------------------------------------------- +namespace CampusAppWP8.Model.Mensa +{ + using System.Xml.Serialization; + using CampusAppWP8.Resources; + + /// + /// Model for a meal + /// + public class MealModel + { + #region Members + + /// + /// Constant for the vegetarian icon + /// + private const string MealIconNameVegetarian = "CAROTTE"; + + /// + /// Constant for the free icon + /// + private const string MealIconNameFree = "FREI"; + + /// + /// Constant for the pig icon + /// + private const string MealIconNamePig = "SCHWEIN"; + + /// + /// Constant for the cow icon + /// + private const string MealIconNameCow = "RIND"; + + /// + /// Constant for the fowl icon + /// + private const string MealIconNameFowl = "GEFL"; + + /// + /// Constant for the cow-pig icon + /// + private const string MealIconNameCowPig = "RINDSCHWEIN"; + + /// + /// Constant for the fish icon + /// + private const string MealIconNameFish = "FISCH"; + + /// + /// Constant for the wild icon + /// + private const string MealIconNameWild = "WILD"; + + /// + /// Constant for the lamb icon + /// + private const string MealIconNameLamb = "LAMM"; + + /// + /// Variable for the id of the meal + /// + /// + /// ValueRange : 0 - 7 + /// + private int mealId; + + /// + /// Name of the meal + /// + private string mealName; + + /// + /// Name of the icon + /// + private string iconName; + + /// + /// Url of the icon + /// + private string iconUrl; + + /// + /// Description of the meal + /// + private string mealDesc; + + #endregion + + #region Proberty + + /// + /// Gets or sets the mealId + /// + /// + /// ValueRange : 0 - 7 + /// + [XmlAttribute("id")] + public int MealId + { + get + { + return this.mealId; + } + + set + { + if (value != this.mealId && value > -1 && value < 8) + { + this.mealId = value; + this.CreateMealName(); + } + } + } + + /// + /// Gets the mealName + /// + public string MealName + { + get + { + return this.mealName; + } + } + + /// + /// Gets or sets the iconName + /// + [XmlAttribute("icon")] + public string IconName + { + get + { + return this.iconName; + } + + set + { + if (value != this.iconName) + { + this.iconName = value; + this.CreateIconUrl(); + } + } + } + + /// + /// Gets the iconUrl + /// + public string IconUrl + { + get + { + return this.iconUrl; + } + } + + /// + /// Gets or sets the mealDescription + /// + [XmlAttribute("desc")] + public string MealDesc + { + get + { + return this.mealDesc; + } + + set + { + if (value != this.mealDesc) + { + this.mealDesc = value; + } + } + } + + #endregion + + #region Methods + + /// + /// Method create depends of the mealId the mealName + /// + private void CreateMealName() + { + switch (this.mealId) + { + case 0: + this.mealName = AppResources.MensaApp_Soup; + break; + case 1: + this.mealName = AppResources.MensaApp_Dinner1; + break; + case 2: + this.mealName = AppResources.MensaApp_Dinner2; + break; + case 3: + this.mealName = AppResources.MensaApp_Dinner3; + break; + case 4: + this.mealName = AppResources.MensaApp_Dinner4; + break; + case 5: + this.mealName = AppResources.MensaApp_Dinner5; + break; + case 6: + this.mealName = AppResources.MensaApp_Bio; + break; + case 7: + this.mealName = AppResources.MensaApp_Action; + break; + default: + this.mealName = string.Empty; + break; + } + } + + /// + /// Method create depends of the iconUrl the iconName + /// + private void CreateIconUrl() + { + switch (this.iconName) + { + case MealModel.MealIconNameVegetarian: + this.iconUrl = Icons.Info; + break; + case MealModel.MealIconNameFree: + this.iconUrl = Icons.Info; + break; + case MealModel.MealIconNameCowPig: + this.iconUrl = Icons.Info; + break; + case MealModel.MealIconNameFish: + this.iconUrl = Icons.Info; + break; + case MealModel.MealIconNameFowl: + this.iconUrl = Icons.Info; + break; + case MealModel.MealIconNameLamb: + this.iconUrl = Icons.Info; + break; + case MealModel.MealIconNamePig: + this.iconUrl = Icons.Info; + break; + case MealModel.MealIconNameWild: + this.iconUrl = Icons.Info; + break; + case MealModel.MealIconNameCow: + this.iconUrl = Icons.Info; + break; + default: + this.iconUrl = string.Empty; + break; + } + } + + #endregion + } +} diff --git a/CampusAppWP8/CampusAppWP8/Model/Mensa/MenuWeekModel.cs b/CampusAppWP8/CampusAppWP8/Model/Mensa/MenuWeekModel.cs index 4093eae8..de26c237 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Mensa/MenuWeekModel.cs +++ b/CampusAppWP8/CampusAppWP8/Model/Mensa/MenuWeekModel.cs @@ -22,7 +22,11 @@ namespace CampusAppWP8.Model.Mensa /// Time when the model was created /// private readonly DateTime createTime; + + #endregion + #region Constructor + /// /// Initializes a new instance of the class. /// @@ -33,7 +37,7 @@ namespace CampusAppWP8.Model.Mensa #endregion - #region Constructor + #region Proberty /// /// Gets or sets the menus for the week @@ -42,9 +46,6 @@ namespace CampusAppWP8.Model.Mensa [XmlArrayItem("Tagesmenu")] public ObservableCollection Menus { get; set; } - #endregion - - #region Proberty /// /// Gets the creation time of the model /// diff --git a/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs b/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs index e9444955..e9372b2d 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs +++ b/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs @@ -474,6 +474,15 @@ namespace CampusAppWP8.Resources { } } + /// + /// Sucht eine lokalisierte Zeichenfolge, die Essen 5 ähnelt. + /// + public static string MensaApp_Dinner5 { + get { + return ResourceManager.GetString("MensaApp_Dinner5", resourceCulture); + } + } + /// /// Sucht eine lokalisierte Zeichenfolge, die 84 ähnelt. /// @@ -492,6 +501,15 @@ namespace CampusAppWP8.Resources { } } + /// + /// Sucht eine lokalisierte Zeichenfolge, die Suppe ähnelt. + /// + public static string MensaApp_Soup { + get { + return ResourceManager.GetString("MensaApp_Soup", resourceCulture); + } + } + /// /// Sucht eine lokalisierte Zeichenfolge, die Mensaplan ähnelt. /// diff --git a/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx b/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx index f4c6f531..af5596e0 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx +++ b/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx @@ -353,4 +353,10 @@ Semesterauswahl + + Essen 5 + + + Suppe + \ No newline at end of file diff --git a/CampusAppWP8/CampusAppWP8/Resources/Constants.Designer.cs b/CampusAppWP8/CampusAppWP8/Resources/Constants.Designer.cs index 479a1426..7520cb92 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/Constants.Designer.cs +++ b/CampusAppWP8/CampusAppWP8/Resources/Constants.Designer.cs @@ -222,6 +222,87 @@ namespace CampusAppWP8.Resources { } } + /// + /// Sucht eine lokalisierte Zeichenfolge, die RIND ähnelt. + /// + public static string MealIconName_Cow { + get { + return ResourceManager.GetString("MealIconName_Cow", resourceCulture); + } + } + + /// + /// Sucht eine lokalisierte Zeichenfolge, die RINDSCHWEIN ähnelt. + /// + public static string MealIconName_CowPig { + get { + return ResourceManager.GetString("MealIconName_CowPig", resourceCulture); + } + } + + /// + /// Sucht eine lokalisierte Zeichenfolge, die FISCH ähnelt. + /// + public static string MealIconName_Fish { + get { + return ResourceManager.GetString("MealIconName_Fish", resourceCulture); + } + } + + /// + /// Sucht eine lokalisierte Zeichenfolge, die GEFL ähnelt. + /// + public static string MealIconName_Fowl { + get { + return ResourceManager.GetString("MealIconName_Fowl", resourceCulture); + } + } + + /// + /// Sucht eine lokalisierte Zeichenfolge, die FREI ähnelt. + /// + public static string MealIconName_Free { + get { + return ResourceManager.GetString("MealIconName_Free", resourceCulture); + } + } + + /// + /// Sucht eine lokalisierte Zeichenfolge, die LAMM ähnelt. + /// + public static string MealIconName_Lamb { + get { + return ResourceManager.GetString("MealIconName_Lamb", resourceCulture); + } + } + + /// + /// Sucht eine lokalisierte Zeichenfolge, die SCHWEIN ähnelt. + /// + public static string MealIconName_Pig { + get { + return ResourceManager.GetString("MealIconName_Pig", resourceCulture); + } + } + + /// + /// Sucht eine lokalisierte Zeichenfolge, die CAROTTE ähnelt. + /// + public static string MealIconName_Vegetarian { + get { + return ResourceManager.GetString("MealIconName_Vegetarian", resourceCulture); + } + } + + /// + /// Sucht eine lokalisierte Zeichenfolge, die WILD ähnelt. + /// + public static string MealIconName_Wild { + get { + return ResourceManager.GetString("MealIconName_Wild", resourceCulture); + } + } + /// /// Sucht eine lokalisierte Zeichenfolge, die Studiengang ähnelt. /// diff --git a/CampusAppWP8/CampusAppWP8/Resources/Constants.resx b/CampusAppWP8/CampusAppWP8/Resources/Constants.resx index ba9aa34f..adcdb9f9 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/Constants.resx +++ b/CampusAppWP8/CampusAppWP8/Resources/Constants.resx @@ -284,7 +284,7 @@ IsolatedStorage_OpeninghoursModel - + user.xml @@ -306,4 +306,31 @@ 999 + + RIND + + + RINDSCHWEIN + + + FISCH + + + GEFL + + + FREI + + + LAMM + + + SCHWEIN + + + CAROTTE + + + WILD + \ No newline at end of file diff --git a/CampusAppWP8/CampusAppWP8/Resources/Icons.resx b/CampusAppWP8/CampusAppWP8/Resources/Icons.resx index cc44f12f..5f901171 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/Icons.resx +++ b/CampusAppWP8/CampusAppWP8/Resources/Icons.resx @@ -123,6 +123,12 @@ campus_159.png + + info_159.png + + + info_159.png + delete_159.png @@ -132,12 +138,24 @@ favorite_159.png + + info_159.png + + + info_159.png + + + info_159.png + homework_159.png info_159.png + + info_159.png + lectures_159.png @@ -156,6 +174,9 @@ phone_159.png + + info_159.png + schedule_159.png @@ -168,7 +189,13 @@ update_159.png + + info_159.png + webmail_159.png + + info_159.png + \ No newline at end of file From a9a96b6ffc5d1a8506e0bae2839afb385368ab6d Mon Sep 17 00:00:00 2001 From: stubbfel Date: Tue, 6 Aug 2013 14:07:43 +0200 Subject: [PATCH 3/4] instert new mensapp --- .../Assets/Icons/LightTheme/info_159.png | Bin 5274 -> 5274 bytes .../CampusAppWP8/Model/Mensa/MealModel.cs | 7 +- .../CampusAppWP8/Model/Mensa/MenuModel.cs | 170 ++---------------- .../CampusAppWP8/Model/Mensa/MenuWeekModel.cs | 4 +- .../CampusAppWP8/Pages/Mensa/MensaPage.xaml | 134 +++----------- .../Pages/Mensa/MensaPage.xaml.cs | 8 +- .../Resources/Constants.Designer.cs | 2 +- .../CampusAppWP8/Resources/Constants.resx | 2 +- 8 files changed, 59 insertions(+), 268 deletions(-) diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/info_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/info_159.png index 1ad39f710b346f8daa20286034d13f6987154590..f95a93ca980802bffe59c4f3f461628d0f8d9192 100644 GIT binary patch delta 2729 zcmbQGIZJbbiWFmUkh>GZx^prw85kH?(j9#r85lP9bN@+Xov0{L@8;>^7*Y}U_HMRM z$V=JdADa&uFn2}FX|n1n-2M92zKm_Ngjl2v_Zg^^-W6}n>MTp%dQZqVD``{a8r952 zYA&(Ovy_h9$~D*+7$n|%u=H-1S(j{ZYV2;ax7z}hMNZf5;PIG$|4rqIlPqcH4(9$Z z_)$Aay?BOXOxcfLb6)pwI@dcpvrTN#e5QNxzwBdW!=C;l26jS+e|YfFiBpf?qILh& z{qyhc`Wj^+Qx~nf@6V@sg^G!%rf4?Dt^dCG;K76bbNBt*xpU{UOGlo+`k@!IBOp35 zGIGX*2?_U<`PZAfIXWKPJXJgVpU2;)JN|uI`ggx{Pkz&ib?f-v-QE3NSEqkDL;cmB z^c6GDYv}3y`+jR{cKymacJ(W@+qhC{gpb_ZoZkHV+gs`Kj}J}V8Cb|ZtmK`A0Hm(&Ye4V z`Q*uym(R5Sw&cO9A8Q^yEVJRs?)VYK+Agd7xc5Y+>uUq)I^~S zt5!(rZ&I&$cgOPl$;s;X-@knMbLuZE+fQfpj5O2sePns~^2Zv%sK=MTCyK3Ez54T% zsZ;k}zjP^R>7ts;f0APwKkikM(RlazwQ*H-weog9zo{<;N?Wcma?}UBt&rHBf8Xrg zot=|c|NHaaRjz>Z*mtfCxzlFO%v=+_eO>AGb+Pel;`Um#+&tyiu<_7ghl*c?Yns~I z+6v6FR{eat?!b>@8Zvy+H*elN_U`WP{{ayZJ5pX=TADv)%9K9~cI?<8dGLm9Zs+qu z9v>fym9%uNKG$lr&+tHHq>PxRmR9|*;IOc3{a5)8+F!{sUz4Z*^vRPy$KHQ;pO-wH zPhh*1-G$S?3b!ZL@FkcXK2Ub=&d%aq*KV=Dak=eVXYsqs1sjKne+!#?Y4dD3E34Yo z?XwN++65%Gy-Yhh%XG=1ABT2T9bL6)?b^4}va+(tT(0%~(aGJ%e&k%*JWp=!+_|fI zTk0d99iA9)WtGM9g$p0HTX;80X6uxcTs+(>G2fYk-_WM&%ZVNJ|Nm8MYHDiljaz^J z`Dam<=7Zm}v$K_#E615iy#D?=_0RUZEgvlxq}!g!vRGIC=f}r4mzVq3SA2bS^}Lq0 zw*Fj;!biKa+q>tyo4(IA*R-_ zw@bCpw70MPowj|;mJbY@nS1ovT3Ytrnlncx`SLPfUVb^7it7LW{>rm7A1vxWZd?<{ z$Y)kwQnIHnIQ!1C&Hd}IXb8x$eapML=K9?mH-6ljsO-M4`29WGJv*!WxbiIQSeA$F z%r7Y|{b*FJ=h6PN#76z?(QfgZJ1(_;ym>tQ6kE<^MXe(p(fjY;U-GCs z#;)Ju@WT(UeSLlH+Me^o>$ZRB43d$zk9EsvRVoyoX1 zx1L=`dB>VHIx%|xXI5^X_jBLMw0$SmWc-!u>iyWOU}a@naL-JDgQwDFp4*zHuaD=> zoy%R2xbo|74ZCCJT-ha7T4!oLKR^FI@Z(?C&yCN0pQ>cH zu54~%joHf|f9n3%>M$q0e*HSSp?DY1dCOzz&G+`rHqXD8kd*W&UiWsjTX^{O**{vC zir)L_gQ>7 zvpj64#q!_&ud}XSS(bL>nzVV|lzH~`|FUnqPObQ6urKh1B;R(49kX0pugdMb+;ZYd zPDDg}{Qtz%)Ksy1uN!}?*{s~#_wncg42F+n)8um{HtGlkXTULqt7QR z##X=WyMSz(wTrmz>%Z3nAdR{+1oVmW!?n`P+-t5X) zS^2uc9U2FCo&WAvS@Ceyeer+oXI#IpT)q1D&-%N&%j=hkRqx-E{^-Da*Z#&v#`lko zcH48ZFtvaB^eJzq|I80DvhlUGwRIXIT0z~y-|pI^HOS3B|9#@|$2+IZo_#yb&g9`v zD?6$CJGOf#Nyv95)~K|7oG5Y3ohVK{k?KfQcEsQxw^P`sh8<~o^BEWz7(8A5T-G@y bG&M2&{LjG9@REU{)PRBERl??jTsJuZk%f6g delta 2717 zcmbQGIZJbb%0x%edjCvk=YW8W{F40QjQj!xPiJR^f};Gi%$!sPhKgHrgVRHTUy9j& zzxTz-yQ5)>cYcs4heD83cZ0}8H7!L>0k00lg*Qb54+^@vvPhp;(81i-*U%#xsKe96 zb%Xth;-bFh#T{Lzem|^UoPBN2_h)DSZM|;ye9h;%o6oZ!;NY3&QEwb*+Q75YNlx%V z^YJ6c9zM}?Xyj5UU=ZNgoT6C#SDBIFN1ct0w$cIieGH5hm$^9@4*1SKU?9`}pZ}H9 z%oxUo7RCc56D_O86pfAMAE#ESTfwuWiapzPxD~du$|$+ zIRWlX3>-WR27w)|nhY$}3<)Qcl`9xpW-^GleG0evsJ%|$xfTOM#mr4MJ5?-Q8>2aN z3)#cN_2e|pd5UX`m?bhL&T`N@R5?@9sL_P~!RIp!3=1ZT3O;E5{I}v9U;Vms=gj)H z@x|-D+Ryf1DJkjkzo+L{7dS95JS?fZ_)kZFvs8mMTSM-@MXK*uGUB)wlz#6{+r;m% zm0`ilTj8GzK%wKhaKg@;H=jOva>MJ0Q*`2~@Y;XrhvE-}|IPVXXY=R#*9ZF^sWckJ zHoCL?cyQ><7oVjv=O=NtB;9$|@BXKLJNN%TvX_;PcqZ+P&=PqZC{)8T(2d`*wFgIj0 zKRjRl|GoWR_XVm94QZZ}3KqZXE(@dCFoyqkTp3Fn9(-5fKTsG=ng*H0{&l# z9P}lj=aXi5xoTzxKgE6TqLb;Dad}iwp#e*I!Lft9~Cp$y}mAogKdKd|nbvhfV@0`Hoxp7IzC80}hm-2#?U+S!!ZQ>!N zJo)6UlTv`@4?nfv7M6XPe+PZU2zbInb1C|vR*_>o4?sVpzarvgt+p0cIR zFmeoCJS*t#iiIJ9ru|V)YZq<{S|8ZHLfE8qmgU)IF;DNM^=lVRy)2a>p7A|%{fm-a zf_JCN`AxqNe(Cf}_ZQP&Fn=lM;cXLbKHib8Avs%uT_RnwTw?tUpJkGlyCsi@7?>Nr zp7DGp|IGZ*2(4{eHKG$waZUA_sy0O;-9C|vWe`Q>7?K-zmAx9lC06!0TY?;PjRC)+^dqrLV{jv0qXb`L~lT^03cgf9EBE3pU0--g8WWJ6Upb zg^pr2@9MVFM$;o|8_(XXDbw0LAsxvuM;$a~F4n$pWme0Cb9#$>OWHho&eYLC@{tKDDkHCy*~`P^lDU3b?<{%+)R zJnp3)qwb#Ge~xwT^WdAocb9W57xT5X`npbURrXTpg}YtK_vbBtH)GzuxQ2N?`OEKB z?tT7CrdI!N$lu&w%fGtwM6hkr{JJQnj<<#Fz@++&N?*y`03)x3RQ`M#SK5yV-5+ z+_kFLcCX#NTyXhLzsY{9=Uq!byy4@vliOBqm)!952HWj*+j6(nCZ;Eer*A*H?(n~!Lu*Br;DfWEN=eX(cS6YbXsq^o!)HeV|P#Ned1N}wJ`Q!)upd))BZ%Y4^Zz@aaW+?)g&l?N&EnoFL@x8d+H@l+wkL@1YnBOzH7a4!X{J{1T+fVx+&Yu_Gdf&NT`G3m)s{a=m zmN%#}rZaaoIyOc#{r*u^qqx7%-s*Phw@o+SI`%Bs=_u;h-?X;r>A|&%87JOMSgZK` z`HXWD&t>wp2GqT{c7Z+dSz>+n;W{4m*7nx$Hv7JUjtHrXhSN>UFWzx3zVGtOWtz*q z+3AM1Em6GT&vg%l?>NTI89l5pyFvbG&6N^|aQR<>l0dOv*m1)-MoZ4`lZTdX)ucBQ_n20y95r65^K@s6`pOA=e0Y8C&bFE-Hmgh_*T~jt zuVM3~i4zK)Rw?>U-j@C<{aISs={2dXoBkcm>)x&}HR;jkN4)SExh-`w!HoN&Goka^s^ebcQN{;T)iE==lfr~llyLmGKTtIO}m=<+w=G4 z@Am6DSH1i(?RReMTEE=Fx5t?;G5=*(=G%6C=as9nmuy3V`mbr%zjo(4F2C>J-1p_W zyk@+iy>pH|QZ8_*eDd-;=l$<;yjHi$daBnvWWOw5CYvs+pXD^`(=4~y!LxoxCq?h_ zKVx_C+N*n2f81}&^UpD{iLCVc9C9-A*2|{LlhZ$)@0mMwZf%|3&pQdX7j3J4o_y|p z7JvTxT>>Q!FS-8jer~+*c*9Z2nEY?0&eHOcebL{Sf0jF+PdTqPPyFAaf2Y@pi|N<>xcd6~xr;L{E}Z^p`sDq& zHB0}#I`CR@{q19ij>+viSz&A#_a*H2+k@qI%4Od#zR&Ofq(-4$@Ch>&U>cv9IQL;A92{20n#kk04(LhALGChK6Q_&6~Jh GZ~_2W=Oab{ diff --git a/CampusAppWP8/CampusAppWP8/Model/Mensa/MealModel.cs b/CampusAppWP8/CampusAppWP8/Model/Mensa/MealModel.cs index 4a6d2e8a..4f59203d 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Mensa/MealModel.cs +++ b/CampusAppWP8/CampusAppWP8/Model/Mensa/MealModel.cs @@ -9,6 +9,7 @@ namespace CampusAppWP8.Model.Mensa { using System.Xml.Serialization; using CampusAppWP8.Resources; + using CampusAppWP8.Utility; /// /// Model for a meal @@ -20,7 +21,7 @@ namespace CampusAppWP8.Model.Mensa /// /// Constant for the vegetarian icon /// - private const string MealIconNameVegetarian = "CAROTTE"; + private const string MealIconNameVegetarian = "CARROTTE"; /// /// Constant for the free icon @@ -110,7 +111,7 @@ namespace CampusAppWP8.Model.Mensa set { - if (value != this.mealId && value > -1 && value < 8) + if (value > -1 && value < 8) { this.mealId = value; this.CreateMealName(); @@ -176,7 +177,7 @@ namespace CampusAppWP8.Model.Mensa { if (value != this.mealDesc) { - this.mealDesc = value; + this.mealDesc = StringManager.StripHTML(value); } } } diff --git a/CampusAppWP8/CampusAppWP8/Model/Mensa/MenuModel.cs b/CampusAppWP8/CampusAppWP8/Model/Mensa/MenuModel.cs index 06d3aa34..0d898992 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Mensa/MenuModel.cs +++ b/CampusAppWP8/CampusAppWP8/Model/Mensa/MenuModel.cs @@ -11,6 +11,8 @@ namespace CampusAppWP8.Model.Mensa using System.Xml.Serialization; using CampusAppWP8.Resources; using CampusAppWP8.Utility; + using System.Collections.ObjectModel; + using System.Globalization; /// /// Model for menu @@ -57,7 +59,7 @@ namespace CampusAppWP8.Model.Mensa /// /// DateTime of the day /// - private DateTime date; + private string date; /// /// DateTime of the monday @@ -80,10 +82,16 @@ namespace CampusAppWP8.Model.Mensa #region Property + /// + /// Gets or sets the menus for the week + /// + [XmlElement("Meal")] + public ObservableCollection Meals { get; set; } + /// /// Gets or sets the WeekDay /// - [XmlElement("Wochentag")] + [XmlAttribute("day")] public string Day { get @@ -93,19 +101,22 @@ namespace CampusAppWP8.Model.Mensa set { - this.SetValue(value, ref this.dayName); - this.CalcDateOfDay(); + if (value != this.dayName) + { + this.dayName = value; + } } } /// /// Gets or sets of Date /// - public DateTime Date + [XmlAttribute("date")] + public string Date { get { - return this.date; + return this.date.ToString(); } set @@ -117,153 +128,6 @@ namespace CampusAppWP8.Model.Mensa } } - /// - /// Gets or sets dinner 1 - /// - [XmlElement("Essen1")] - public string Dinner1 - { - get - { - return this.dinner1; - } - - set - { - this.SetValue(value, ref this.dinner1); - } - } - - /// - /// Gets or sets dinner 2 - /// - [XmlElement("Essen2")] - public string Dinner2 - { - get - { - return this.dinner2; - } - - set - { - this.SetValue(value, ref this.dinner2); - } - } - - /// - /// Gets or sets dinner 3 - /// - [XmlElement("Essen3")] - public string Dinner3 - { - get - { - return this.dinner3; - } - - set - { - this.SetValue(value, ref this.dinner3); - } - } - - /// - /// Gets or sets dinner 4 - /// - [XmlElement("Essen4")] - public string Dinner4 - { - get - { - return this.dinner4; - } - - set - { - this.SetValue(value, ref this.dinner4); - } - } - - /// - /// Gets or sets dinner bio - /// - [XmlElement("Bio")] - public string Bio - { - get - { - return this.bio; - } - - set - { - this.SetValue(value, ref this.bio); - } - } - - /// - /// Gets or sets dinner action - /// - [XmlElement("Aktionstag")] - public string Action - { - get - { - return this.action; - } - - set - { - this.SetValue(value, ref this.action); - } - } - - #endregion - - #region Method - - /// - /// Methods sets the property - /// - /// maybe move to base class - /// new property value - /// name of the property - private void SetValue(string value, ref string property) - { - if (value != null && !string.Empty.Equals(value) && !value.Equals(property)) - { - property = StringManager.StripHTML(value); - } - } - - /// - /// Method calculate the DateTime of the MenuDay - /// - private void CalcDateOfDay() - { - switch (this.dayName) - { - case "Montag": - this.date = this.monday; - break; - case "Diensttag": - this.date = this.monday.AddDays(1); - break; - case "Mittwoch": - this.date = this.monday.AddDays(2); - break; - case "Donnerstag": - this.date = this.monday.AddDays(3); - break; - case "Freitag": - this.date = this.monday.AddDays(4); - break; - default: - this.date = this.monday; - break; - } - } #endregion } } diff --git a/CampusAppWP8/CampusAppWP8/Model/Mensa/MenuWeekModel.cs b/CampusAppWP8/CampusAppWP8/Model/Mensa/MenuWeekModel.cs index de26c237..1451075b 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Mensa/MenuWeekModel.cs +++ b/CampusAppWP8/CampusAppWP8/Model/Mensa/MenuWeekModel.cs @@ -42,8 +42,8 @@ namespace CampusAppWP8.Model.Mensa /// /// Gets or sets the menus for the week /// - [XmlArray("BTU")] - [XmlArrayItem("Tagesmenu")] + [XmlArray("Mealplan")] + [XmlArrayItem("Menu")] public ObservableCollection Menus { get; set; } /// diff --git a/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml index d3813f39..b663f264 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml +++ b/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml @@ -19,127 +19,47 @@ - - + + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + diff --git a/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml.cs index 18bd2c01..46d5f76d 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml.cs @@ -34,6 +34,11 @@ namespace CampusAppWP8.Pages.Mensa /// private int selectedIndex; + /// + /// Flag indicate that the feed was refreshed + /// + private bool refreshed = false; + #endregion #region Constructor @@ -75,7 +80,7 @@ namespace CampusAppWP8.Pages.Mensa /// Arguments of navigation protected override void OnNavigatedFrom(NavigationEventArgs e) { - this.feed.SaveData(); + this.feed.SaveData(this.refreshed); } #endregion @@ -151,6 +156,7 @@ namespace CampusAppWP8.Pages.Mensa { this.ProgressBar.Visibility = System.Windows.Visibility.Visible; this.feed.ForceWebUpdate(); + this.refreshed = true; } #endregion diff --git a/CampusAppWP8/CampusAppWP8/Resources/Constants.Designer.cs b/CampusAppWP8/CampusAppWP8/Resources/Constants.Designer.cs index 7520cb92..1b6ef17d 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/Constants.Designer.cs +++ b/CampusAppWP8/CampusAppWP8/Resources/Constants.Designer.cs @@ -628,7 +628,7 @@ namespace CampusAppWP8.Resources { } /// - /// Sucht eine lokalisierte Zeichenfolge, die http://www.studentenwerk-frankfurt.de/2011/ClassPackage/App_IKMZ_BTU/ ähnelt. + /// Sucht eine lokalisierte Zeichenfolge, die http://www.tu-cottbus.de/campusapp-data/Studentenwerk/index.php?mensa=CottbusBTU&v=1 ähnelt. /// public static string UrlMensa_Week { get { diff --git a/CampusAppWP8/CampusAppWP8/Resources/Constants.resx b/CampusAppWP8/CampusAppWP8/Resources/Constants.resx index adcdb9f9..8520e922 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/Constants.resx +++ b/CampusAppWP8/CampusAppWP8/Resources/Constants.resx @@ -256,7 +256,7 @@ EventsFeed.xml - http://www.studentenwerk-frankfurt.de/2011/ClassPackage/App_IKMZ_BTU/ + http://www.tu-cottbus.de/campusapp-data/Studentenwerk/index.php?mensa=CottbusBTU&v=1 OpeninghoursFeed.xml From 64fc09f62284a9d481503d28afd8e561c645235f Mon Sep 17 00:00:00 2001 From: stubbfel Date: Tue, 6 Aug 2013 14:11:01 +0200 Subject: [PATCH 4/4] finish 138 --- .../CampusAppWP8/Model/Mensa/MenuModel.cs | 30 ------------------- 1 file changed, 30 deletions(-) diff --git a/CampusAppWP8/CampusAppWP8/Model/Mensa/MenuModel.cs b/CampusAppWP8/CampusAppWP8/Model/Mensa/MenuModel.cs index 0d898992..b9ef20f1 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Mensa/MenuModel.cs +++ b/CampusAppWP8/CampusAppWP8/Model/Mensa/MenuModel.cs @@ -21,36 +21,6 @@ namespace CampusAppWP8.Model.Mensa { #region Member - /// - /// Name for bio dinner - /// - private string bio = AppResources.MensaApp_NotToday; - - /// - /// Name for 1. dinner - /// - private string dinner1 = AppResources.MensaApp_NotToday; - - /// - /// Name for 2. dinner - /// - private string dinner2 = AppResources.MensaApp_NotToday; - - /// - /// Name for 3. dinner - /// - private string dinner3 = AppResources.MensaApp_NotToday; - - /// - /// Name for 4. dinner - /// - private string dinner4 = AppResources.MensaApp_NotToday; - - /// - /// Name for action dinner - /// - private string action = AppResources.MensaApp_NotToday; - /// /// Name of the day ///