Merge branch 'develop' into feature/#280

CampusAppWP8/CampusAppWP8/Pages/TimeTable/AppointmentEdit.xaml.cs

@@ -70,6 +70,7 @@ namespace CampusAppWP8.Pages.TimeTable
 
             string appointmentIndexStr = string.Empty;
             string pid = string.Empty;
+            string isoStr = string.Empty;
 
             // Navigate to the selected pivotitem
             
@@ -130,6 +131,16 @@ namespace CampusAppWP8.Pages.TimeTable
                     }
                 }
             }
+            else if (NavigationContext.QueryString.TryGetValue(Constants.ParamIsoKey, out isoStr))
+            {
+                string appointmentStr = App.LoadFromIsolatedStorage<string>(isoStr);
+
+                AppointmentModel newModel = new AppointmentModel(appointmentStr);
+
+                this.InTitle.Text = newModel.Title;
+                this.InLocation.Text = newModel.Location;
+                //TODO
+            }
             else
             {
                 this.HeadLine.Text = AppResources.Creating;

CampusAppWP8/CampusAppWP8/Resources/Constants.resx

@@ -609,4 +609,7 @@
   <data name="UrlMensaPrice" xml:space="preserve">
     <value>http://www.tu-cottbus.de/campusapp-data/canteens.php?v=1</value>
   </data>
+  <data name="ParamIsoKey" xml:space="preserve">
+    <value>isolated</value>
+  </data>
 </root>

CampusAppWP8/CampusAppWP8/Resources/Constants1.Designer.cs

@@ -681,6 +681,15 @@ namespace CampusAppWP8.Resources {
             }
         }
         
+        /// <summary>
+        ///   Sucht eine lokalisierte Zeichenfolge, die isolated ähnelt.
+        /// </summary>
+        public static string ParamIsoKey {
+            get {
+                return ResourceManager.GetString("ParamIsoKey", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Sucht eine lokalisierte Zeichenfolge, die ActivityId ähnelt.
         /// </summary>