* CalendarController.cs:

* Web.csproj:
* Global.asax.cs:
* instdb.sql:
* TemplateException.cs:
* ValidateAjaxAttribute.cs:
* TemplateException.cs:
* WorkFlowController.cs:
* NFCircle.cs:
* Circle.cs:
* NFEventPub.cs:
* Period.cs:
* OpenDay.cs:
* NFUserPrefs.cs:
* YaEvent.cs:
* WeekDay.cs:
* Position.cs:
* EventPub.cs:
* Resources.Designer.cs:
* Schedule.cs:
* Period.cs:
* NFEvent.cs:
* EventType.cs:
* WeekDay.cs:
* OpenDay.cs:
* FrontOfficeApiController.cs:
* UserPrefs.cs:
* Position.cs:
* Schedule.cs:
* Publishing.cs:
* EventType.cs:
* Periodicity.cs:
* Publishing.cs:
* Periodicity.cs:
* ProvidedEvent.cs:
* ProvidedEvent.cs:
* NightFlashController.cs:
* EstablishmentType.cs:
* ProviderPublicInfo.cs:
* EstablishmentType.cs:
* PositionAndKeyphrase.cs:
* ProviderPublicInfo.cs:
* PositionAndKeyphrase.cs: refactoring

web/ApiControllers/Calendar/CalendarController.cs

@@ -21,14 +21,14 @@
 using System;
 using System.Web.Http;
 using System.ComponentModel.DataAnnotations;
-using Yavsc.ApiControllers.NightFlash.Model;
+using Yavsc.ApiControllers.Calendar.Model;
 
-namespace Yavsc.ApiControllers.NightFlash
+namespace Yavsc.ApiControllers.Calendar
 {
 	/// <summary>
 	/// Night flash controller.
 	/// </summary>
-	public class NightFlashController: ApiController
+	public class CalendarController: ApiController
 	{
 		/// <summary>
 		/// List events according the specified search arguments.
@@ -36,19 +36,18 @@ namespace Yavsc.ApiControllers.NightFlash
 		/// <param name="args">Arguments.</param>
 		[ValidateAjaxAttribute]
 		[HttpGet]
-		public NFEvent[] List ([FromUri] PositionAndKeyphrase args)
+		public YaEvent[] List ([FromUri] PositionAndKeyphrase args)
 		{
-			return new NFEvent[] {
-				new NFEvent () {
-					Title = "Test",
+			return new YaEvent[] {
+				new YaEvent () {
 					Description = "Test Descr",
-					EventType = "Night club special bubble party",
+					Title = "Night club special bubble party",
 					Location = new Position() {
 						Longitude = 0,
 						Latitude = 0 
 					}
 				},
-				new NFEvent () {
+				new YaEvent () {
 					Title = "Test2",
 					ImgLocator = "http://bla/im.png",
 					Location = new Position() {
@@ -56,16 +55,15 @@ namespace Yavsc.ApiControllers.NightFlash
 						Latitude = 0 
 					}
 				},
-				new NFEvent () {
-					Title = "Test",
+				new YaEvent () {
 					Description = "Test Descr",
-					EventType = "Night club special bubble party",
+					Title = "Night club special bubble party",
 					Location = new Position() {
 						Longitude = 0,
 						Latitude = 0 
 					}
 				},
-				new NFEvent () {
+				new YaEvent () {
 					Title = "Test2",
 					ImgLocator = "http://bla/im.png",
 					Location = new Position() {
@@ -81,7 +79,7 @@ namespace Yavsc.ApiControllers.NightFlash
 		/// </summary>
 		/// <param name="ProviderId">Provider identifier.</param>
 		[HttpGet]
-		public ProviderPublicInfo Provider ([FromUri] string ProviderId)
+		public ProviderPublicInfo ProviderInfo ([FromUri] string ProviderId)
 		{
 			return new ProviderPublicInfo () {
 				DisplayName = "Yavsc clubing",
@@ -123,6 +121,11 @@ namespace Yavsc.ApiControllers.NightFlash
 		{
 			return -1;
 		}
+
+		[Authorize]
+		void NotifyEvent(EventPub evpub) {
+			throw new NotImplementedException();
+		}
 	}
 }
 

web/ApiControllers/Calendar/Model/Circle.cs

@@ -0,0 +1,35 @@
+//
+//  NightFlashController.cs
+//
+//  Author:
+//       Paul Schneider <paulschneider@free.fr>
+//
+//  Copyright (c) 2015 Paul Schneider
+//
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU Lesser General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+using System;
+using System.Web.Http;
+using System.ComponentModel.DataAnnotations;
+
+namespace Yavsc.ApiControllers.Calendar.Model
+{
+	class Circle
+	{
+		public string Title { get; set; }
+		string [] Users { get; set; }
+	}
+
+}
+
+

web/ApiControllers/Calendar/Model/EstablishmentType.cs

@@ -0,0 +1,62 @@
+//
+//  NFEvent.cs
+//
+//  Author:
+//       Paul Schneider <paulschneider@free.fr>
+//
+//  Copyright (c) 2015 Paul Schneider
+//
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU Lesser General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+using System;
+using System.Web.Http;
+using System.ComponentModel.DataAnnotations;
+
+namespace Yavsc.ApiControllers.Calendar.Model
+{
+	/// <summary>
+	/// Establishment type.
+	/// </summary>
+	public enum EstablishmentType
+	{
+		/// <summary>
+		/// The discotheque.
+		/// </summary>
+		Discotheque,
+		/// <summary>
+		/// The piano bar.
+		/// </summary>
+		PianoBar,
+		/// <summary>
+		/// The bar.
+		/// </summary>
+		Bar,
+		/// <summary>
+		/// The place publique.
+		/// </summary>
+		PlacePublique,
+		/// <summary>
+		/// The maison privee.
+		/// </summary>
+		MaisonPrivee,
+		/// <summary>
+		/// The domaine publique.
+		/// </summary>
+		DomainePublique,
+		/// <summary>
+		/// The domaine prive.
+		/// </summary>
+		DomainePrive
+	}
+}

web/ApiControllers/Calendar/Model/EventPub.cs

@@ -0,0 +1,35 @@
+//
+//  NightFlashController.cs
+//
+//  Author:
+//       Paul Schneider <paulschneider@free.fr>
+//
+//  Copyright (c) 2015 Paul Schneider
+//
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU Lesser General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+using System;
+using System.Web.Http;
+using System.ComponentModel.DataAnnotations;
+using Yavsc.ApiControllers.Calendar.Model;
+
+namespace Yavsc.ApiControllers.Calendar.Model
+{
+	class EventPub: YaEvent
+	{
+		Circle[] Circles { get; set; }
+	}
+
+}
+
+

web/ApiControllers/Calendar/Model/EventType.cs

@@ -1,5 +1,5 @@
 //
-//  NFEvent.cs
+//  EventType.cs
 //
 //  Author:
 //       Paul Schneider <paulschneider@free.fr>
@@ -23,58 +23,49 @@ using System;
 using System.Web.Http;
 using System.ComponentModel.DataAnnotations;
 
-namespace Yavsc.ApiControllers.NightFlash.Model
+namespace Yavsc.ApiControllers.Calendar.Model
 {
-
 	/// <summary>
-	/// NF event.
+	/// Event type.
 	/// </summary>
-	public class NFEvent
+	public enum EventType
 	{
 		/// <summary>
-		/// The title.
+		/// The concert gratuit.
 		/// </summary>
-		[Required] public string Title { get; set; }
+		ConcertGratuit,
 		/// <summary>
-		/// The description.
+		/// The concert prive.
 		/// </summary>
-		[Required] public string Description { get; set; }
+		ConcertPrive,
 		/// <summary>
-		/// The type of the event.
+		/// The distraciton.
 		/// </summary>
-		[Required] public string EventType { get; set; }
+		Distraciton,
 		/// <summary>
-		/// The location.
+		/// The rencontre.
 		/// </summary>
-		[Required] public Position Location { get; set; }
+		Rencontre,
 		/// <summary>
-		/// The start date.
+		/// The assemblee.
 		/// </summary>
-		[Required] public DateTime StartDate { get; set; }
+		Assemblee,
 		/// <summary>
-		/// The name of the NF provider.
+		/// The reunion.
 		/// </summary>
-		[Required] public string NFProviderName { get; set; }
+		Reunion,
 		/// <summary>
-		/// The NF provider identifier.
+		/// The bureau.
 		/// </summary>
-		[Required] public string NFProviderId { get; set; }
+		Bureau,
 		/// <summary>
-		/// The type of the location.
+		/// The manifestation.
 		/// </summary>
-		[Required] public string LocationType { get; set; }
+		Manifestation,
 		/// <summary>
-		/// The promotion code.
+		/// The zone de danger.
 		/// </summary>
-		public string PromotionCode { get; set; }
-		/// <summary>
-		/// The event web page.
-		/// </summary>
-		public string EventWebPage { get; set; }
-		/// <summary>
-		/// The image locator.
-		/// </summary>
-		public string ImgLocator { get; set; }
+		ZoneDeDanger
 	}
 	
 }

web/ApiControllers/Calendar/Model/OpenDay.cs

@@ -23,7 +23,7 @@ using System;
 using System.Web.Http;
 using System.ComponentModel.DataAnnotations;
 
-namespace Yavsc.ApiControllers.NightFlash.Model
+namespace Yavsc.ApiControllers.Calendar.Model
 {
 
 	/// <summary>
@@ -35,6 +35,11 @@ namespace Yavsc.ApiControllers.NightFlash.Model
 		/// </summary>
 		[Required]
 		public WeekDay Day;
+
+		/// <summary>
+		/// Gets or sets the s.
+		/// </summary>
+		/// <value>The s.</value>
 		public TimeSpan S { get; set; }
 
 		// ASSERT Start <= End

web/ApiControllers/Calendar/Model/Period.cs

@@ -23,14 +23,22 @@ using System;
 using System.Web.Http;
 using System.ComponentModel.DataAnnotations;
 
-namespace Yavsc.ApiControllers.NightFlash.Model
+namespace Yavsc.ApiControllers.Calendar.Model
 {
 	/// <summary>
 	/// Hollydays.
 	/// </summary>
 	public class Period {
+		/// <summary>
+		/// Gets or sets the start.
+		/// </summary>
+		/// <value>The start.</value>
 		[Required]
 		public DateTime Start { get; set; }
+		/// <summary>
+		/// Gets or sets the end.
+		/// </summary>
+		/// <value>The end.</value>
 		[Required]
 		public DateTime End { get; set; }
 	}

web/ApiControllers/Calendar/Model/Periodicity.cs

@@ -23,7 +23,7 @@ using System;
 using System.Web.Http;
 using System.ComponentModel.DataAnnotations;
 
-namespace Yavsc.ApiControllers.NightFlash.Model
+namespace Yavsc.ApiControllers.Calendar.Model
 {
 	/// <summary>
 	/// Periodicity.
@@ -33,10 +33,25 @@ namespace Yavsc.ApiControllers.NightFlash.Model
 		/// The daily.
 		/// </summary>
 		Daily,
+		/// <summary>
+		/// The weekly.
+		/// </summary>
 		Weekly,
+		/// <summary>
+		/// The monthly.
+		/// </summary>
 		Monthly,
+		/// <summary>
+		/// The three m.
+		/// </summary>
 		ThreeM,
+		/// <summary>
+		/// The six m.
+		/// </summary>
 		SixM,
+		/// <summary>
+		/// The yearly.
+		/// </summary>
 		Yearly
 	}
 	

web/ApiControllers/Calendar/Model/Position.cs

@@ -23,7 +23,7 @@ using System;
 using System.Web.Http;
 using System.ComponentModel.DataAnnotations;
 
-namespace Yavsc.ApiControllers.NightFlash.Model
+namespace Yavsc.ApiControllers.Calendar.Model
 {
 	/// <summary>
 	/// Position.
@@ -38,6 +38,7 @@ namespace Yavsc.ApiControllers.NightFlash.Model
 		/// The latitude.
 		/// </summary>
 		public double Latitude { get; set; }
+
 	}
 	
 }

web/ApiControllers/Calendar/Model/PositionAndKeyphrase.cs

@@ -23,7 +23,7 @@ using System;
 using System.Web.Http;
 using System.ComponentModel.DataAnnotations;
 
-namespace Yavsc.ApiControllers.NightFlash.Model
+namespace Yavsc.ApiControllers.Calendar.Model
 {
 	/// <summary>
 	/// Position and keyphrase.

web/ApiControllers/Calendar/Model/ProvidedEvent.cs

@@ -23,13 +23,13 @@ using System;
 using System.Web.Http;
 using System.ComponentModel.DataAnnotations;
 
-namespace Yavsc.ApiControllers.NightFlash.Model
+namespace Yavsc.ApiControllers.Calendar.Model
 {
 
 	/// <summary>
 	/// Provided event.
 	/// </summary>
-	public class ProvidedEvent : NFEvent { 
+	public class ProvidedEvent : YaEvent { 
 		/// <summary>
 		/// The privacy.
 		/// </summary>

web/ApiControllers/Calendar/Model/ProviderPublicInfo.cs

@@ -23,7 +23,7 @@ using System;
 using System.Web.Http;
 using System.ComponentModel.DataAnnotations;
 
-namespace Yavsc.ApiControllers.NightFlash.Model
+namespace Yavsc.ApiControllers.Calendar.Model
 {
 	/// <summary>
 	/// Provider public info.

web/ApiControllers/Calendar/Model/Publishing.cs

@@ -23,7 +23,7 @@ using System;
 using System.Web.Http;
 using System.ComponentModel.DataAnnotations;
 
-namespace Yavsc.ApiControllers.NightFlash.Model
+namespace Yavsc.ApiControllers.Calendar.Model
 {
 
 	/// <summary>

web/ApiControllers/Calendar/Model/Schedule.cs

@@ -23,12 +23,16 @@ using System;
 using System.Web.Http;
 using System.ComponentModel.DataAnnotations;
 
-namespace Yavsc.ApiControllers.NightFlash.Model
+namespace Yavsc.ApiControllers.Calendar.Model
 {
 	/// <summary>
 	/// Schedule.
 	/// </summary>
 	public class Schedule {
+		/// <summary>
+		/// Gets or sets the period.
+		/// </summary>
+		/// <value>The period.</value>
 		public Periodicity Period { get; set; }
 
 		/// <summary>

web/ApiControllers/Calendar/Model/UserPrefs.cs

@@ -0,0 +1,34 @@
+//
+//  NightFlashController.cs
+//
+//  Author:
+//       Paul Schneider <paulschneider@free.fr>
+//
+//  Copyright (c) 2015 Paul Schneider
+//
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU Lesser General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+using System;
+using System.Web.Http;
+using System.ComponentModel.DataAnnotations;
+using System.Collections.Generic;
+
+namespace Yavsc.ApiControllers.Calendar.Model
+{
+	class UserPrefs
+	{
+		Circle [] Circles { get; set ; }
+		Dictionary<string,double> MusicTypeRatings { get; set; }
+		Dictionary<string,double> LocationTypeRatings { get; set; }
+	}
+}

web/ApiControllers/Calendar/Model/WeekDay.cs

@@ -23,7 +23,7 @@ using System;
 using System.Web.Http;
 using System.ComponentModel.DataAnnotations;
 
-namespace Yavsc.ApiControllers.NightFlash.Model
+namespace Yavsc.ApiControllers.Calendar.Model
 {
 	/// <summary>
 	/// Week day.

web/ApiControllers/Calendar/Model/YaEvent.cs

@@ -0,0 +1,101 @@
+//
+//  NFEvent.cs
+//
+//  Author:
+//       Paul Schneider <paulschneider@free.fr>
+//
+//  Copyright (c) 2015 Paul Schneider
+//
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU Lesser General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+using System;
+using System.Web.Http;
+using System.ComponentModel.DataAnnotations;
+
+namespace Yavsc.ApiControllers.Calendar.Model
+{
+
+	/// <summary>
+	/// NF event.
+	/// </summary>
+	public class YaEvent
+	{
+		/// <summary>
+		/// Initializes a new instance of the <see cref="Yavsc.ApiControllers.Calendar.Model.YaEvent"/> class.
+		/// </summary>
+		public YaEvent()
+		{
+			this.EstabType = EstablishmentType.DomainePublique;
+			this.NFEvType = EventType.Distraciton;
+		}
+
+		/// <summary>
+		/// Gets or sets the type of the NF ev.
+		/// </summary>
+		/// <value>The type of the NF ev.</value>
+		[Required]
+		public EventType NFEvType { get; set; }
+
+		/// <summary>
+		/// Gets or sets the type of the estab.
+		/// </summary>
+		/// <value>The type of the estab.</value>
+		[Required(ErrorMessage="Please, choose an establisment type.")]
+		public EstablishmentType EstabType { get; set; }
+
+		/// <summary>
+		/// The title.
+		/// </summary>
+		[Required(ErrorMessage="Please, choose a .")] 
+		public string Title { get; set; }
+		/// <summary>
+		/// The description.
+		/// </summary>
+		[Required(ErrorMessage="Please, choose a Description.")] public string Description { get; set; }
+		/// <summary>
+		/// The location.
+		/// </summary>
+		[Required(ErrorMessage="Please, choose a Location.")] public Position Location { get; set; }
+		/// <summary>
+		/// The start date.
+		/// </summary>
+		[Required(ErrorMessage="Please, choose a Start Date.")] public DateTime StartDate { get; set; }
+
+		/// <summary>
+		/// Gets or sets the end date.
+		/// </summary>
+		/// <value>The end date.</value>
+		[Required(ErrorMessage="Please, choose an End Date.")] public DateTime EndDate { get; set; }
+		/// <summary>
+		/// The name of the NF provider.
+		/// </summary>
+		[Required(ErrorMessage="Please, choose a Nigth Flash Provider Name.")] public string NFProviderName { get; set; }
+		/// <summary>
+		/// The NF provider identifier.
+		/// </summary>
+		[Required(ErrorMessage="Please, choose a Night Flash Provider Identifier.")] public string NFProviderId { get; set; }
+		/// <summary>
+		/// The promotion code.
+		/// </summary>
+		public string PromotionCode { get; set; }
+		/// <summary>
+		/// The event web page.
+		/// </summary>
+		public string EventWebPage { get; set; }
+		/// <summary>
+		/// The image locator.
+		/// </summary>-
+		public string ImgLocator { get; set; }
+	}
+}

web/ApiControllers/FrontOfficeApiController.cs

@@ -124,7 +124,7 @@ namespace Yavsc.ApiControllers
 		/// Gets the estimate in pdf format from tex generation.
 		/// </summary>
 		/// <returns>The to pdf.</returns>
-		/// <param name="estimid">Estimid.</param>
+		/// <param name="id">Estimid.</param>
 		[AcceptVerbs("GET")]
 		public HttpResponseMessage EstimateToPdf (long id)
 		{

web/ApiControllers/WorkFlowController.cs

@@ -53,11 +53,12 @@ namespace Yavsc.ApiControllers
 				Membership.GetUser().UserName,client,title,description);
 		}
 
+
+
 		/// <summary>
-		/// Register the specified model and isapprouved.
+		/// Register the specified userModel.
 		/// </summary>
-		/// <param name="model">Model.</param>
-		/// <param name="isapprouved">If set to <c>true</c> isapprouved.</param>
+		/// <param name="userModel">User model.</param>
 		[HttpGet]
 		[ValidateAjax]
 		[Authorize(Roles="Admin,FrontOffice")]