refactoring

Yavsc/Models/Bank/BankIdentity.cs

@@ -2,7 +2,7 @@ using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Yavsc.Model.Bank
+namespace Yavsc.Models.Bank
 {
     public class BankIdentity
     {

Yavsc/Models/Booking/BookQuery.cs

@@ -1,6 +1,7 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
+using Newtonsoft.Json;
 using Yavsc.Models.Billing;
 using Yavsc.Models.Relationship;
 
@@ -10,37 +11,49 @@ namespace Yavsc.Models.Booking
     /// Query, for a date, with a given perfomer, at this given place.
     /// </summary>
 
-    public class BookQuery : NominativeServiceCommand<RendezVous> {
-    /// <summary>
-    /// The command identifier
-    /// </summary>
-    [Key(), DatabaseGenerated(DatabaseGeneratedOption.Identity)]
-    public long Id {get; set; }
+    public class BookQuery : NominativeServiceCommand<RendezVous>
+    {
+        /// <summary>
+        /// The command identifier
+        /// </summary>
+        [Key(), DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+        public long Id { get; set; }
 
-        [Display(Name="Event date")]
-        public DateTime EventDate{ 
+        [Display(Name = "Event date")]
+        public DateTime EventDate
+        {
             get;
             set;
-         }
-        public Location Location {
+        }
+        public Location Location
+        {
             get;
             set;
-            }
-        
-        public LocationType LocationType {
-            set; 
+        }
+
+        public LocationType LocationType
+        {
+            set;
             get;
         }
-        public string Reason { get; set; }
-        
+        public string Reason { get; set; }
+
         public BookQuery()
         {
         }
 
-       public BookQuery(Location eventLocation, DateTime eventDate)
-       {
-               Location = eventLocation;
-               EventDate = eventDate;
-       }
+        public BookQuery(string activityCode, Location eventLocation, DateTime eventDate)
+        {
+            Location = eventLocation;
+            EventDate = eventDate;
+            ActivityCode = activityCode;
+        }
+
+        [Required]
+        public string ActivityCode { get; set; }
+
+        [ForeignKey("ActivityCode"),JsonIgnore]
+        public virtual Activity Context  { get; set ; }
+
     }
 }

Yavsc/Models/Forms/Field.cs

@@ -1,9 +1,9 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-using Yavsc.Model.Forms.Validation;
 
-namespace Yavsc.Model.Forms
+namespace Yavsc.Models.Forms
 {
+    using Validation;
     public abstract class Field
     {
         [Key,DatabaseGenerated(DatabaseGeneratedOption.Identity)]

Yavsc/Models/Forms/FieldSet.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Yavsc.Model.Forms
+namespace Yavsc.Models.Forms
 {
     public class FieldSet
     {

Yavsc/Models/Forms/Validation/Method.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Yavsc.Model.Forms.Validation
+namespace Yavsc.Models.Forms.Validation
 {
     public class Method
     {

Yavsc/Models/Forms/Validation/Required.cs

@@ -1,4 +1,4 @@
-namespace Yavsc.Model.Forms.Validation
+namespace Yavsc.Models.Forms.Validation
 {
     public class Required : Method
     {

Yavsc/Models/Identity/ApplicationUser.cs

@@ -5,7 +5,7 @@ using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using Yavsc.Models.Identity;
 using Yavsc.Models.Chat;
-using Yavsc.Model.Bank;
+using Yavsc.Models.Bank;
 using Yavsc.Models.Access;
 
 namespace Yavsc.Models