diff --git a/web/ApiControllers/BackOfficeController.cs b/web/ApiControllers/BackOfficeController.cs index f57f60a7..ba01dd89 100644 --- a/web/ApiControllers/BackOfficeController.cs +++ b/web/ApiControllers/BackOfficeController.cs @@ -43,7 +43,7 @@ namespace Yavsc.ApiControllers /// Evpub. [Authorize(Roles="BackOffice")] [AcceptVerbs("POST")] - public MessageWithPayloadResponse NotifyEvent(EventPub evpub) { + public MessageWithPayloadResponse NotifyEvent(EventCirclesPub evpub) { return GoogleHelpers.NotifyEvent(evpub); } diff --git a/web/App_Themes/images/blanc.png b/web/App_Themes/images/blanc.png new file mode 100644 index 00000000..61792efb Binary files /dev/null and b/web/App_Themes/images/blanc.png differ diff --git a/web/App_Themes/images/live-concert-388160_1280.jpg b/web/App_Themes/images/live-concert-388160_1280.jpg new file mode 100644 index 00000000..abb4fbdf Binary files /dev/null and b/web/App_Themes/images/live-concert-388160_1280.jpg differ diff --git a/web/App_Themes/images/live-concert-388160_1280.s.jpg b/web/App_Themes/images/live-concert-388160_1280.s.jpg new file mode 100644 index 00000000..e4c5d6bf Binary files /dev/null and b/web/App_Themes/images/live-concert-388160_1280.s.jpg differ diff --git a/web/App_Themes/images/live-concert-388160_1280.xxs.jpg b/web/App_Themes/images/live-concert-388160_1280.xxs.jpg new file mode 100644 index 00000000..c399ff2a Binary files /dev/null and b/web/App_Themes/images/live-concert-388160_1280.xxs.jpg differ diff --git a/web/App_Themes/images/logo-white.png b/web/App_Themes/images/logo-white.png new file mode 100644 index 00000000..09e73b77 Binary files /dev/null and b/web/App_Themes/images/logo-white.png differ diff --git a/web/App_Themes/images/musician-923526_1.nb.jpg b/web/App_Themes/images/musician-923526_1.nb.jpg new file mode 100644 index 00000000..d88e7910 Binary files /dev/null and b/web/App_Themes/images/musician-923526_1.nb.jpg differ diff --git a/web/App_Themes/images/musician-923526_1.nb.xs.jpg b/web/App_Themes/images/musician-923526_1.nb.xs.jpg new file mode 100644 index 00000000..42c7a360 Binary files /dev/null and b/web/App_Themes/images/musician-923526_1.nb.xs.jpg differ diff --git a/web/App_Themes/images/musician-923526_1.nb.xxs.jpg b/web/App_Themes/images/musician-923526_1.nb.xxs.jpg new file mode 100644 index 00000000..9220785c Binary files /dev/null and b/web/App_Themes/images/musician-923526_1.nb.xxs.jpg differ diff --git a/web/App_Themes/images/musician-923526_1.nbb.jpg b/web/App_Themes/images/musician-923526_1.nbb.jpg new file mode 100644 index 00000000..a599a28c Binary files /dev/null and b/web/App_Themes/images/musician-923526_1.nbb.jpg differ diff --git a/web/App_Themes/images/musician-923526_1.nbb.xs.jpg b/web/App_Themes/images/musician-923526_1.nbb.xs.jpg new file mode 100644 index 00000000..1dcd6009 Binary files /dev/null and b/web/App_Themes/images/musician-923526_1.nbb.xs.jpg differ diff --git a/web/App_Themes/images/musician-923526_1.nbb.xxs.jpg b/web/App_Themes/images/musician-923526_1.nbb.xxs.jpg new file mode 100644 index 00000000..efddc883 Binary files /dev/null and b/web/App_Themes/images/musician-923526_1.nbb.xxs.jpg differ diff --git a/web/App_Themes/images/musician-923526_1.nbbi.jpg b/web/App_Themes/images/musician-923526_1.nbbi.jpg new file mode 100644 index 00000000..5b3ce3b3 Binary files /dev/null and b/web/App_Themes/images/musician-923526_1.nbbi.jpg differ diff --git a/web/App_Themes/images/musician-923526_1.nbbi.xs.jpg b/web/App_Themes/images/musician-923526_1.nbbi.xs.jpg new file mode 100644 index 00000000..3807ad26 Binary files /dev/null and b/web/App_Themes/images/musician-923526_1.nbbi.xs.jpg differ diff --git a/web/App_Themes/images/musician-923526_1.nbbi.xxs.jpg b/web/App_Themes/images/musician-923526_1.nbbi.xxs.jpg new file mode 100644 index 00000000..a22d2cfc Binary files /dev/null and b/web/App_Themes/images/musician-923526_1.nbbi.xxs.jpg differ diff --git a/web/App_Themes/images/musician-923526_1280.jpg b/web/App_Themes/images/musician-923526_1280.jpg new file mode 100644 index 00000000..648150c1 Binary files /dev/null and b/web/App_Themes/images/musician-923526_1280.jpg differ diff --git a/web/App_Themes/images/musician-923526_1280.s.jpg b/web/App_Themes/images/musician-923526_1280.s.jpg new file mode 100644 index 00000000..ffabe2e2 Binary files /dev/null and b/web/App_Themes/images/musician-923526_1280.s.jpg differ diff --git a/web/App_Themes/images/musician-923526_1280.xxs.jpg b/web/App_Themes/images/musician-923526_1280.xxs.jpg new file mode 100644 index 00000000..3de92207 Binary files /dev/null and b/web/App_Themes/images/musician-923526_1280.xxs.jpg differ diff --git a/web/ChangeLog b/web/ChangeLog index d452e0b3..546c3f33 100644 --- a/web/ChangeLog +++ b/web/ChangeLog @@ -1,3 +1,27 @@ +2015-12-23 Paul Schneider + + * blanc.png: + * logo-white.png: + * musician-923526_1280.jpg: + * musician-923526_1.nb.jpg: + * musician-923526_1.nbb.jpg: + * musician-923526_1280.s.jpg: + * musician-923526_1.nbbi.jpg: + * musician-923526_1.nb.xs.jpg: + * live-concert-388160_1280.jpg: + * musician-923526_1280.xxs.jpg: + * musician-923526_1.nbb.xs.jpg: + * musician-923526_1.nb.xxs.jpg: + * musician-923526_1.nbbi.xs.jpg: + * musician-923526_1.nbb.xxs.jpg: + * musician-923526_1.nbbi.xxs.jpg: + * live-concert-388160_1280.s.jpg: + * live-concert-388160_1280.xxs.jpg: + + * BackOfficeController.cs: + * FrontOfficeController.cs: + * BackOfficeController.cs: refabrication + 2015-12-23 Paul Schneider * AccountController.cs: implémente la methode de login de diff --git a/web/Controllers/BackOfficeController.cs b/web/Controllers/BackOfficeController.cs index e028d3a9..bdb5c793 100644 --- a/web/Controllers/BackOfficeController.cs +++ b/web/Controllers/BackOfficeController.cs @@ -31,7 +31,7 @@ namespace Yavsc.Controllers /// /// The event. /// Evpub. - public ActionResult NotifyEvent(EventPub evpub) + public ActionResult NotifyEvent(EventCirclesPub evpub) { if (ModelState.IsValid) { ViewData ["NotifyEvent"] = evpub; diff --git a/web/Controllers/FrontOfficeController.cs b/web/Controllers/FrontOfficeController.cs index 579f8be0..81c78dbf 100644 --- a/web/Controllers/FrontOfficeController.cs +++ b/web/Controllers/FrontOfficeController.cs @@ -50,7 +50,7 @@ namespace Yavsc.Controllers /// /// The pub. /// Model. - public ActionResult EventPub (EventPub model) + public ActionResult EventPub (EventCirclesPub model) { return View (model); } diff --git a/yavscModel/Calendar/EventPub.cs b/yavscModel/Calendar/EventCirclesPub.cs similarity index 95% rename from yavscModel/Calendar/EventPub.cs rename to yavscModel/Calendar/EventCirclesPub.cs index 3baea083..cdf67df3 100644 --- a/yavscModel/Calendar/EventPub.cs +++ b/yavscModel/Calendar/EventCirclesPub.cs @@ -24,19 +24,19 @@ using System.ComponentModel.DataAnnotations; using Yavsc.Model; using Yavsc.Model.RolesAndMembers; using Yavsc.Model.Circles; +using Yavsc.Model.FrontOffice; namespace Yavsc.Model.Calendar { /// /// Event pub. /// - public class EventPub: YaEvent + public class EventCirclesPub: YaEvent { /// /// Gets or sets the circles. /// /// The circles. - [Required(ErrorMessageResourceName="DoSpecifyCircles",ErrorMessageResourceType=typeof(LocalizedText)), Display(ResourceType=typeof(LocalizedText),Name="Circles")] public long [] CircleIds { get; set; } diff --git a/yavscModel/Calendar/NominativeEventPub.cs b/yavscModel/Calendar/NominativeEventPub.cs new file mode 100644 index 00000000..a7a1a17d --- /dev/null +++ b/yavscModel/Calendar/NominativeEventPub.cs @@ -0,0 +1,46 @@ +// +// NominativeEventPub.cs +// +// Author: +// Paul Schneider +// +// Copyright (c) 2015 GNU GPL +// +// 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 . + +using System; +using System.Web.Http; +using System.ComponentModel.DataAnnotations; +using Yavsc.Model; +using Yavsc.Model.RolesAndMembers; +using Yavsc.Model.Circles; +using Yavsc.Model.FrontOffice; + +namespace Yavsc.Model.Calendar +{ + + public class NominativeEventPub: YaEvent, INominative + { + #region INominative implementation + public string PerformerName { + get { + throw new NotImplementedException (); + } + set { + throw new NotImplementedException (); + } + } + #endregion + } +} diff --git a/yavscModel/ChangeLog b/yavscModel/ChangeLog index abb3f7a7..0bc3e1ed 100644 --- a/yavscModel/ChangeLog +++ b/yavscModel/ChangeLog @@ -1,3 +1,27 @@ +2015-12-23 Paul Schneider + + * EventCirclesPub.cs: + * NominativeEventPub.cs: refabrication + + * Commande.cs: implémente une description pour toute commande, + dans la classe concrete + + * SimpleBookingQuery.cs: la description d'une commande simple + de rdv + + * GoogleHelpers.cs: implemente l'envoi d'une notification + nominative (à un prestataire en particulier) + + * LocalizedText.resx: + * LocalizedText.fr.resx: + * LocalizedText.Designer.cs: + * LocalizedText.fr.Designer.cs: traductions + + * WorkFlowManager.cs: envoie une notification à la demande de + devis d'un client + + * YavscModel.csproj: notifications privée. + 2015-12-23 Paul Schneider * INominative.cs: Interface d'un objet destiné à un diff --git a/yavscModel/FrontOffice/Commande.cs b/yavscModel/FrontOffice/Commande.cs index 093f7d6b..2c704f62 100644 --- a/yavscModel/FrontOffice/Commande.cs +++ b/yavscModel/FrontOffice/Commande.cs @@ -153,6 +153,7 @@ namespace Yavsc.Model.FrontOffice var cmd = ci.Invoke (new object[]{ }); return cmd as Command; } + public abstract string GetDescription (); } } diff --git a/yavscModel/FrontOffice/SimpleBookingQuery.cs b/yavscModel/FrontOffice/SimpleBookingQuery.cs index 2d8d7d36..c8816fe6 100644 --- a/yavscModel/FrontOffice/SimpleBookingQuery.cs +++ b/yavscModel/FrontOffice/SimpleBookingQuery.cs @@ -33,6 +33,19 @@ namespace Yavsc.Model.FrontOffice /// public class SimpleBookingQuery: Command { + #region implemented abstract members of Command + + public override string GetDescription () + { + return + string.Format ( + LocalizedText.SomeoneAskingYouForAnEstimate, + ClientName, + LocalizedText.aprestation+" "+ PreferedDate.ToString("D")); + } + + #endregion + /// /// Gets or sets the MEA code. /// diff --git a/yavscModel/Google/Api/GoogleHelpers.cs b/yavscModel/Google/Api/GoogleHelpers.cs index 6c67b0d6..a8d7f4fd 100644 --- a/yavscModel/Google/Api/GoogleHelpers.cs +++ b/yavscModel/Google/Api/GoogleHelpers.cs @@ -102,35 +102,59 @@ namespace Yavsc.Model.Google.Api /// /// The event. /// Evpub. - public static MessageWithPayloadResponse NotifyEvent(EventPub evpub) { + public static MessageWithPayloadResponse NotifyEvent(EventCirclesPub evpub) { using (var r = new SimpleJsonPostMethod,MessageWithPayloadResponse>( "https://gcm-http.googleapis.com/gcm/send")) { - var users = Circle.Union (evpub.CircleIds); - var regids = new List (); - var to = new List (); - foreach (var u in users) { - var p = ProfileBase.Create (u); - if (p != null) { - var regid = p.GetPropertyValue("gregid"); - if (regid == null) { - var muser = Membership.GetUser (u); - to.Add (muser.Email); + if (evpub.CircleIds != null) { + var users = Circle.Union (evpub.CircleIds); + var regids = new List (); + var to = new List (); + foreach (var u in users) { + var p = ProfileBase.Create (u); + if (p != null) { + var regid = p.GetPropertyValue ("gregid"); + if (regid == null) { + var muser = Membership.GetUser (u); + to.Add (muser.Email); + } else + regids.Add ((string)regid); } - else regids.Add ((string)regid); } + if (regids.Count == 0) + throw new InvalidOperationException + ("No recipient where found for this circle list"); + + var msg = new MessageWithPayload () { + notification = new Notification() { title = evpub.Title, body = evpub.Description, icon = "event" }, + data = new YaEvent[] { (YaEvent)evpub }, registration_ids = regids.ToArray() }; + return r.Invoke (msg); + + } else { + throw new NotImplementedException (); } - if (regids.Count == 0) - throw new InvalidOperationException - ("No recipient where found for this circle list"); - + } + } + /// + /// Notifies the event. + /// + /// The event. + /// Evpub. + public static MessageWithPayloadResponse NotifyEvent (NominativeEventPub evpub) + { + using (var r = + new SimpleJsonPostMethod,MessageWithPayloadResponse> ( + "https://gcm-http.googleapis.com/gcm/send")) { + var userprofile = ProfileBase.Create (evpub.PerformerName); + var regid = userprofile.GetPropertyValue ("gregid") as string; + if (regid == null) + throw new NotImplementedException ("Notification via e-mail"); var msg = new MessageWithPayload () { notification = new Notification() { title = evpub.Title, body = evpub.Description, icon = "event" }, - data = new YaEvent[] { (YaEvent)evpub }, registration_ids = regids.ToArray() }; + data = new YaEvent[] { (YaEvent)evpub }, registration_ids = new string[] { regid } }; return r.Invoke (msg); } } - } } diff --git a/yavscModel/LocalizedText.Designer.cs b/yavscModel/LocalizedText.Designer.cs index 55db1577..96fdd798 100644 --- a/yavscModel/LocalizedText.Designer.cs +++ b/yavscModel/LocalizedText.Designer.cs @@ -46,87 +46,99 @@ namespace Yavsc.Model { } } - public static string EventWebPage { + public static string Comment { get { - return ResourceManager.GetString("EventWebPage", resourceCulture); + return ResourceManager.GetString("Comment", resourceCulture); } } - public static string ProviderId { + public static string Submit { get { - return ResourceManager.GetString("ProviderId", resourceCulture); + return ResourceManager.GetString("Submit", resourceCulture); } } - public static string I_understood { + public static string no_content { get { - return ResourceManager.GetString("I_understood", resourceCulture); + return ResourceManager.GetString("no_content", resourceCulture); } } - public static string Needs { + public static string FillInAFutureDate { get { - return ResourceManager.GetString("Needs", resourceCulture); + return ResourceManager.GetString("FillInAFutureDate", resourceCulture); } } - public static string BookingTitleArtiste { + public static string MEACode { get { - return ResourceManager.GetString("BookingTitleArtiste", resourceCulture); + return ResourceManager.GetString("MEACode", resourceCulture); } } - public static string BillSourceCode { + public static string Google_calendar_ { get { - return ResourceManager.GetString("BillSourceCode", resourceCulture); + return ResourceManager.GetString("Google_calendar_", resourceCulture); } } - public static string access_denied { + public static string StartDate { get { - return ResourceManager.GetString("access_denied", resourceCulture); + return ResourceManager.GetString("StartDate", resourceCulture); } } - public static string Message_sent { + public static string Hide_source { get { - return ResourceManager.GetString("Message_sent", resourceCulture); + return ResourceManager.GetString("Hide_source", resourceCulture); } } - public static string MEACode { + public static string DisplayName { get { - return ResourceManager.GetString("MEACode", resourceCulture); + return ResourceManager.GetString("DisplayName", resourceCulture); } } - public static string from { + public static string ProviderName { get { - return ResourceManager.GetString("from", resourceCulture); + return ResourceManager.GetString("ProviderName", resourceCulture); } } - public static string ChooseADateInTheFutur { + public static string Welcome { get { - return ResourceManager.GetString("ChooseADateInTheFutur", resourceCulture); + return ResourceManager.GetString("Welcome", resourceCulture); } } - public static string XHasBeenNotified { + public static string none { get { - return ResourceManager.GetString("XHasBeenNotified", resourceCulture); + return ResourceManager.GetString("none", resourceCulture); } } - public static string Photo { + public static string UsersInRole { get { - return ResourceManager.GetString("Photo", resourceCulture); + return ResourceManager.GetString("UsersInRole", resourceCulture); } } - public static string Preview { + public static string ExistantDB { get { - return ResourceManager.GetString("Preview", resourceCulture); + return ResourceManager.GetString("ExistantDB", resourceCulture); + } + } + + public static string Remove { + get { + return ResourceManager.GetString("Remove", resourceCulture); + } + } + + public static string Date_search { + get { + return ResourceManager.GetString("Date_search", resourceCulture); } } @@ -136,333 +148,333 @@ namespace Yavsc.Model { } } - public static string DisplayName { + public static string PerformanceDate { get { - return ResourceManager.GetString("DisplayName", resourceCulture); + return ResourceManager.GetString("PerformanceDate", resourceCulture); } } - public static string Circles { + public static string Logout { get { - return ResourceManager.GetString("Circles", resourceCulture); + return ResourceManager.GetString("Logout", resourceCulture); } } - public static string DoAnEstimate { + public static string Photo { get { - return ResourceManager.GetString("DoAnEstimate", resourceCulture); + return ResourceManager.GetString("Photo", resourceCulture); } } - public static string AnIMessageHasbeenSent { + public static string ChooseADateInTheFutur { get { - return ResourceManager.GetString("AnIMessageHasbeenSent", resourceCulture); + return ResourceManager.GetString("ChooseADateInTheFutur", resourceCulture); } } - public static string NoSkillforthisactivity { + public static string Google_registration_id { get { - return ResourceManager.GetString("NoSkillforthisactivity", resourceCulture); + return ResourceManager.GetString("Google_registration_id", resourceCulture); } } - public static string was_added_to_the_empty_role { + public static string Pdf_version { get { - return ResourceManager.GetString("was_added_to_the_empty_role", resourceCulture); + return ResourceManager.GetString("Pdf_version", resourceCulture); } } - public static string UserNotInThisRole { + public static string Message_sent { get { - return ResourceManager.GetString("UserNotInThisRole", resourceCulture); + return ResourceManager.GetString("Message_sent", resourceCulture); } } - public static string Not_Approuved { + public static string hidden { get { - return ResourceManager.GetString("Not_Approuved", resourceCulture); + return ResourceManager.GetString("hidden", resourceCulture); } } - public static string Create { + public static string EndDate { get { - return ResourceManager.GetString("Create", resourceCulture); + return ResourceManager.GetString("EndDate", resourceCulture); } } - public static string User_name { + public static string Circles { get { - return ResourceManager.GetString("User_name", resourceCulture); + return ResourceManager.GetString("Circles", resourceCulture); } } - public static string Estimate_not_found { + public static string Name { get { - return ResourceManager.GetString("Estimate_not_found", resourceCulture); + return ResourceManager.GetString("Name", resourceCulture); } } - public static string ExistantDB { + public static string StartHour { get { - return ResourceManager.GetString("ExistantDB", resourceCulture); + return ResourceManager.GetString("StartHour", resourceCulture); } } - public static string Performers { + public static string ProviderId { get { - return ResourceManager.GetString("Performers", resourceCulture); + return ResourceManager.GetString("ProviderId", resourceCulture); } } - public static string Activities { + public static string XHasBeenNotified { get { - return ResourceManager.GetString("Activities", resourceCulture); + return ResourceManager.GetString("XHasBeenNotified", resourceCulture); } } - public static string Members { + public static string ImgLocator { get { - return ResourceManager.GetString("Members", resourceCulture); + return ResourceManager.GetString("ImgLocator", resourceCulture); } } - public static string Google_calendar { + public static string Performers { get { - return ResourceManager.GetString("Google_calendar", resourceCulture); + return ResourceManager.GetString("Performers", resourceCulture); } } - public static string Person { + public static string Non_existent_user { get { - return ResourceManager.GetString("Person", resourceCulture); + return ResourceManager.GetString("Non_existent_user", resourceCulture); } } - public static string Private_circle { + public static string New_Tag { get { - return ResourceManager.GetString("Private_circle", resourceCulture); + return ResourceManager.GetString("New_Tag", resourceCulture); } } - public static string ImportException { + public static string role_created { get { - return ResourceManager.GetString("ImportException", resourceCulture); + return ResourceManager.GetString("role_created", resourceCulture); } } - public static string Google_calendar_ { + public static string ImportException { get { - return ResourceManager.GetString("Google_calendar_", resourceCulture); + return ResourceManager.GetString("ImportException", resourceCulture); } } - public static string ProviderName { + public static string Search { get { - return ResourceManager.GetString("ProviderName", resourceCulture); + return ResourceManager.GetString("Search", resourceCulture); } } - public static string Ciffer { + public static string Unitary_cost { get { - return ResourceManager.GetString("Ciffer", resourceCulture); + return ResourceManager.GetString("Unitary_cost", resourceCulture); } } - public static string EndHour { + public static string Remember_me { get { - return ResourceManager.GetString("EndHour", resourceCulture); + return ResourceManager.GetString("Remember_me", resourceCulture); } } - public static string available { + public static string Create { get { - return ResourceManager.GetString("available", resourceCulture); + return ResourceManager.GetString("Create", resourceCulture); } } - public static string ImgLocator { + public static string Consultant { get { - return ResourceManager.GetString("ImgLocator", resourceCulture); + return ResourceManager.GetString("Consultant", resourceCulture); } } - public static string Catalog { + public static string BillAccessControl { get { - return ResourceManager.GetString("Catalog", resourceCulture); + return ResourceManager.GetString("BillAccessControl", resourceCulture); } } - public static string SubmitChanges { + public static string EventWebPage { get { - return ResourceManager.GetString("SubmitChanges", resourceCulture); + return ResourceManager.GetString("EventWebPage", resourceCulture); } } - public static string ThisPerformerGivesAccessToHisCalendarAndSeemsToBeAvailableThis { + public static string Google_error { get { - return ResourceManager.GetString("ThisPerformerGivesAccessToHisCalendarAndSeemsToBeAvailableThis", resourceCulture); + return ResourceManager.GetString("Google_error", resourceCulture); } } - public static string ThisPerformerGivesAccessToHisCalendarAndItAppearsHeShouldNotBeAvailableThis { + public static string MinDate { get { - return ResourceManager.GetString("ThisPerformerGivesAccessToHisCalendarAndItAppearsHeShouldNotBeAvailableThis", resourceCulture); + return ResourceManager.GetString("MinDate", resourceCulture); } } - public static string none { + public static string Online { get { - return ResourceManager.GetString("none", resourceCulture); + return ResourceManager.GetString("Online", resourceCulture); } } - public static string ThisPerformerDoesntGiveAccessToHisCalendar { + public static string Not_Approuved { get { - return ResourceManager.GetString("ThisPerformerDoesntGiveAccessToHisCalendar", resourceCulture); + return ResourceManager.GetString("Not_Approuved", resourceCulture); } } - public static string entries { + public static string Bill_removal { get { - return ResourceManager.GetString("entries", resourceCulture); + return ResourceManager.GetString("Bill_removal", resourceCulture); } } - public static string Description { + public static string is_licensed_by { get { - return ResourceManager.GetString("Description", resourceCulture); + return ResourceManager.GetString("is_licensed_by", resourceCulture); } } - public static string StartDateAfterEndDate { + public static string BookingTitle6829C { get { - return ResourceManager.GetString("StartDateAfterEndDate", resourceCulture); + return ResourceManager.GetString("BookingTitle6829C", resourceCulture); } } - public static string Tag_name { + public static string No_calendar_for_this_user { get { - return ResourceManager.GetString("Tag_name", resourceCulture); + return ResourceManager.GetString("No_calendar_for_this_user", resourceCulture); } } - public static string Home { + public static string EndHour { get { - return ResourceManager.GetString("Home", resourceCulture); + return ResourceManager.GetString("EndHour", resourceCulture); } } - public static string Pdf_version { + public static string aprestation { get { - return ResourceManager.GetString("Pdf_version", resourceCulture); + return ResourceManager.GetString("aprestation", resourceCulture); } } - public static string Comment { + public static string BillSourceCode { get { - return ResourceManager.GetString("Comment", resourceCulture); + return ResourceManager.GetString("BillSourceCode", resourceCulture); } } - public static string Posted { + public static string Needs { get { - return ResourceManager.GetString("Posted", resourceCulture); + return ResourceManager.GetString("Needs", resourceCulture); } } - public static string ChooseATitle { + public static string Members { get { - return ResourceManager.GetString("ChooseATitle", resourceCulture); + return ResourceManager.GetString("Members", resourceCulture); } } - public static string Title { + public static string Icons_made_by { get { - return ResourceManager.GetString("Title", resourceCulture); + return ResourceManager.GetString("Icons_made_by", resourceCulture); } } - public static string DoNotPublishMyActivity { + public static string YourNeed { get { - return ResourceManager.GetString("DoNotPublishMyActivity", resourceCulture); + return ResourceManager.GetString("YourNeed", resourceCulture); } } - public static string Tex_version { + public static string Edited { get { - return ResourceManager.GetString("Tex_version", resourceCulture); + return ResourceManager.GetString("Edited", resourceCulture); } } - public static string Item_added_to_basket { + public static string EditRelatedSkills { get { - return ResourceManager.GetString("Item_added_to_basket", resourceCulture); + return ResourceManager.GetString("EditRelatedSkills", resourceCulture); } } - public static string DuplicateUserName { + public static string Tex_version { get { - return ResourceManager.GetString("DuplicateUserName", resourceCulture); + return ResourceManager.GetString("Tex_version", resourceCulture); } } - public static string AuthenticatedOnly { + public static string Private_circle { get { - return ResourceManager.GetString("AuthenticatedOnly", resourceCulture); + return ResourceManager.GetString("Private_circle", resourceCulture); } } - public static string No_calendar_for_this_user { + public static string AnIMessageHasbeenSent { get { - return ResourceManager.GetString("No_calendar_for_this_user", resourceCulture); + return ResourceManager.GetString("AnIMessageHasbeenSent", resourceCulture); } } - public static string Icons_made_by { + public static string MaxDate { get { - return ResourceManager.GetString("Icons_made_by", resourceCulture); + return ResourceManager.GetString("MaxDate", resourceCulture); } } - public static string Hide { + public static string View_source { get { - return ResourceManager.GetString("Hide", resourceCulture); + return ResourceManager.GetString("View_source", resourceCulture); } } - public static string PhotoUpdated { + public static string BillCreated { get { - return ResourceManager.GetString("PhotoUpdated", resourceCulture); + return ResourceManager.GetString("BillCreated", resourceCulture); } } - public static string PerformanceDate { + public static string available { get { - return ResourceManager.GetString("PerformanceDate", resourceCulture); + return ResourceManager.GetString("available", resourceCulture); } } - public static string younotadmin { + public static string Title { get { - return ResourceManager.GetString("younotadmin", resourceCulture); + return ResourceManager.GetString("Title", resourceCulture); } } - public static string Need { + public static string Preview { get { - return ResourceManager.GetString("Need", resourceCulture); + return ResourceManager.GetString("Preview", resourceCulture); } } - public static string AboutContent { + public static string Estimate_not_found { get { - return ResourceManager.GetString("AboutContent", resourceCulture); + return ResourceManager.GetString("Estimate_not_found", resourceCulture); } } - public static string YourNeed { + public static string Skill { get { - return ResourceManager.GetString("YourNeed", resourceCulture); + return ResourceManager.GetString("Skill", resourceCulture); } } @@ -472,411 +484,417 @@ namespace Yavsc.Model { } } - public static string New_Tag { + public static string ChooseADescription { get { - return ResourceManager.GetString("New_Tag", resourceCulture); + return ResourceManager.GetString("ChooseADescription", resourceCulture); } } - public static string BookingTitle6829C { + public static string UserNotInThisRole { get { - return ResourceManager.GetString("BookingTitle6829C", resourceCulture); + return ResourceManager.GetString("UserNotInThisRole", resourceCulture); } } - public static string Google_registration_id { + public static string AuthenticatedOnly { get { - return ResourceManager.GetString("Google_registration_id", resourceCulture); + return ResourceManager.GetString("AuthenticatedOnly", resourceCulture); + } + } + + public static string User_name { + get { + return ResourceManager.GetString("User_name", resourceCulture); } } - public static string Bill_removal { + public static string Item_added_to_basket { get { - return ResourceManager.GetString("Bill_removal", resourceCulture); + return ResourceManager.GetString("Item_added_to_basket", resourceCulture); } } - public static string Modify { + public static string InternalServerError { get { - return ResourceManager.GetString("Modify", resourceCulture); + return ResourceManager.GetString("InternalServerError", resourceCulture); } } - public static string Xshouldbeavailable { + public static string YourEstimates { get { - return ResourceManager.GetString("Xshouldbeavailable", resourceCulture); + return ResourceManager.GetString("YourEstimates", resourceCulture); } } - public static string Google_error { + public static string Skills { get { - return ResourceManager.GetString("Google_error", resourceCulture); + return ResourceManager.GetString("Skills", resourceCulture); } } - public static string DoTag { + public static string Xshouldbeavailable { get { - return ResourceManager.GetString("DoTag", resourceCulture); + return ResourceManager.GetString("Xshouldbeavailable", resourceCulture); } } - public static string Register { + public static string Role { get { - return ResourceManager.GetString("Register", resourceCulture); + return ResourceManager.GetString("Role", resourceCulture); } } - public static string About { + public static string Google_calendar { get { - return ResourceManager.GetString("About", resourceCulture); + return ResourceManager.GetString("Google_calendar", resourceCulture); } } - public static string ChooseADescription { + public static string BookingTitleArtiste { get { - return ResourceManager.GetString("ChooseADescription", resourceCulture); + return ResourceManager.GetString("BookingTitleArtiste", resourceCulture); } } - public static string was_added_to_the_role { + public static string StartDateAfterEndDate { get { - return ResourceManager.GetString("was_added_to_the_role", resourceCulture); + return ResourceManager.GetString("StartDateAfterEndDate", resourceCulture); } } - public static string Offline { + public static string YourMEACode { get { - return ResourceManager.GetString("Offline", resourceCulture); + return ResourceManager.GetString("YourMEACode", resourceCulture); } } - public static string Bill_edition { + public static string ManagedSiteSkills { get { - return ResourceManager.GetString("Bill_edition", resourceCulture); + return ResourceManager.GetString("ManagedSiteSkills", resourceCulture); } } - public static string InternalServerError { + public static string ThisPerformerDoesntGiveAccessToHisCalendar { get { - return ResourceManager.GetString("InternalServerError", resourceCulture); + return ResourceManager.GetString("ThisPerformerDoesntGiveAccessToHisCalendar", resourceCulture); } } - public static string MaxDate { + public static string Hide { get { - return ResourceManager.GetString("MaxDate", resourceCulture); + return ResourceManager.GetString("Hide", resourceCulture); } } - public static string YourEstimates { + public static string access_denied { get { - return ResourceManager.GetString("YourEstimates", resourceCulture); + return ResourceManager.GetString("access_denied", resourceCulture); } } - public static string Name { + public static string DocTemplateException { get { - return ResourceManager.GetString("Name", resourceCulture); + return ResourceManager.GetString("DocTemplateException", resourceCulture); } } - public static string Non_existent_user { + public static string ThisPerformerGivesAccessToHisCalendarAndSeemsToBeAvailableThis { get { - return ResourceManager.GetString("Non_existent_user", resourceCulture); + return ResourceManager.GetString("ThisPerformerGivesAccessToHisCalendarAndSeemsToBeAvailableThis", resourceCulture); } } - public static string Count { + public static string was_added_to_the_empty_role { get { - return ResourceManager.GetString("Count", resourceCulture); + return ResourceManager.GetString("was_added_to_the_empty_role", resourceCulture); } } - public static string PreferedDate { + public static string Tag_name { get { - return ResourceManager.GetString("PreferedDate", resourceCulture); + return ResourceManager.GetString("Tag_name", resourceCulture); } } - public static string Edit { + public static string My_Estimates { get { - return ResourceManager.GetString("Edit", resourceCulture); + return ResourceManager.GetString("My_Estimates", resourceCulture); } } - public static string Date_search { + public static string DoSpecifyCircles { get { - return ResourceManager.GetString("Date_search", resourceCulture); + return ResourceManager.GetString("DoSpecifyCircles", resourceCulture); } } - public static string Skill { + public static string Edit { get { - return ResourceManager.GetString("Skill", resourceCulture); + return ResourceManager.GetString("Edit", resourceCulture); } } - public static string role_created { + public static string Register { get { - return ResourceManager.GetString("role_created", resourceCulture); + return ResourceManager.GetString("Register", resourceCulture); } } - public static string YourMEACode { + public static string ThisPerformerGivesAccessToHisCalendarAndItAppearsHeShouldNotBeAvailableThis { get { - return ResourceManager.GetString("YourMEACode", resourceCulture); + return ResourceManager.GetString("ThisPerformerGivesAccessToHisCalendarAndItAppearsHeShouldNotBeAvailableThis", resourceCulture); } } - public static string ManagedSiteSkills { + public static string younotadmin { get { - return ResourceManager.GetString("ManagedSiteSkills", resourceCulture); + return ResourceManager.GetString("younotadmin", resourceCulture); } } - public static string Role { + public static string SubmitChanges { get { - return ResourceManager.GetString("Role", resourceCulture); + return ResourceManager.GetString("SubmitChanges", resourceCulture); } } - public static string User_List { + public static string Ciffer { get { - return ResourceManager.GetString("User_List", resourceCulture); + return ResourceManager.GetString("Ciffer", resourceCulture); } } - public static string SiteSkills { + public static string yourquerytransmitted { get { - return ResourceManager.GetString("SiteSkills", resourceCulture); + return ResourceManager.GetString("yourquerytransmitted", resourceCulture); } } - public static string ThisSiteUsesCookies { + public static string Home { get { - return ResourceManager.GetString("ThisSiteUsesCookies", resourceCulture); + return ResourceManager.GetString("Home", resourceCulture); } } - public static string ReadMore { + public static string DoTag { get { - return ResourceManager.GetString("ReadMore", resourceCulture); + return ResourceManager.GetString("DoTag", resourceCulture); } } - public static string View_source { + public static string Activities { get { - return ResourceManager.GetString("View_source", resourceCulture); + return ResourceManager.GetString("Activities", resourceCulture); } } - public static string EndDate { + public static string AskForAnEstimate { get { - return ResourceManager.GetString("EndDate", resourceCulture); + return ResourceManager.GetString("AskForAnEstimate", resourceCulture); } } - public static string Logout { + public static string PhotoUpdated { get { - return ResourceManager.GetString("Logout", resourceCulture); + return ResourceManager.GetString("PhotoUpdated", resourceCulture); } } - public static string MinDate { + public static string Description { get { - return ResourceManager.GetString("MinDate", resourceCulture); + return ResourceManager.GetString("Description", resourceCulture); } } - public static string is_licensed_by { + public static string from { get { - return ResourceManager.GetString("is_licensed_by", resourceCulture); + return ResourceManager.GetString("from", resourceCulture); } } - public static string Edited { + public static string UserSkills { get { - return ResourceManager.GetString("Edited", resourceCulture); + return ResourceManager.GetString("UserSkills", resourceCulture); } } - public static string Remember_me { + public static string DoAnEstimate { get { - return ResourceManager.GetString("Remember_me", resourceCulture); + return ResourceManager.GetString("DoAnEstimate", resourceCulture); } } - public static string hidden { + public static string DoNotPublishMyActivity { get { - return ResourceManager.GetString("hidden", resourceCulture); + return ResourceManager.GetString("DoNotPublishMyActivity", resourceCulture); } } - public static string Skills { + public static string Catalog { get { - return ResourceManager.GetString("Skills", resourceCulture); + return ResourceManager.GetString("Catalog", resourceCulture); } } - public static string Consultant { + public static string I_understood { get { - return ResourceManager.GetString("Consultant", resourceCulture); + return ResourceManager.GetString("I_understood", resourceCulture); } } - public static string DuplicateEmail { + public static string ThisSiteUsesCookies { get { - return ResourceManager.GetString("DuplicateEmail", resourceCulture); + return ResourceManager.GetString("ThisSiteUsesCookies", resourceCulture); } } - public static string BillUpdated { + public static string YourSkills { get { - return ResourceManager.GetString("BillUpdated", resourceCulture); + return ResourceManager.GetString("YourSkills", resourceCulture); } } - public static string BillAccessControl { + public static string Bill_edition { get { - return ResourceManager.GetString("BillAccessControl", resourceCulture); + return ResourceManager.GetString("Bill_edition", resourceCulture); } } - public static string StartDate { + public static string User_List { get { - return ResourceManager.GetString("StartDate", resourceCulture); + return ResourceManager.GetString("User_List", resourceCulture); } } - public static string Hide_source { + public static string DuplicateEmail { get { - return ResourceManager.GetString("Hide_source", resourceCulture); + return ResourceManager.GetString("DuplicateEmail", resourceCulture); } } - public static string DocTemplateException { + public static string ChooseATitle { get { - return ResourceManager.GetString("DocTemplateException", resourceCulture); + return ResourceManager.GetString("ChooseATitle", resourceCulture); } } - public static string additionally { + public static string BillUpdated { get { - return ResourceManager.GetString("additionally", resourceCulture); + return ResourceManager.GetString("BillUpdated", resourceCulture); } } - public static string yourquerytransmitted { + public static string About { get { - return ResourceManager.GetString("yourquerytransmitted", resourceCulture); + return ResourceManager.GetString("About", resourceCulture); } } - public static string no_content { + public static string NoSkillforthisactivity { get { - return ResourceManager.GetString("no_content", resourceCulture); + return ResourceManager.GetString("NoSkillforthisactivity", resourceCulture); } } - public static string StartHour { + public static string Need { get { - return ResourceManager.GetString("StartHour", resourceCulture); + return ResourceManager.GetString("Need", resourceCulture); } } - public static string Unitary_cost { + public static string was_added_to_the_role { get { - return ResourceManager.GetString("Unitary_cost", resourceCulture); + return ResourceManager.GetString("was_added_to_the_role", resourceCulture); } } - public static string Welcome { + public static string DuplicateUserName { get { - return ResourceManager.GetString("Welcome", resourceCulture); + return ResourceManager.GetString("DuplicateUserName", resourceCulture); } } - public static string YourSkills { + public static string ReadMore { get { - return ResourceManager.GetString("YourSkills", resourceCulture); + return ResourceManager.GetString("ReadMore", resourceCulture); } } - public static string UserSkills { + public static string SomeoneAskingYouForAnEstimate { get { - return ResourceManager.GetString("UserSkills", resourceCulture); + return ResourceManager.GetString("SomeoneAskingYouForAnEstimate", resourceCulture); } } - public static string Submit { + public static string AboutContent { get { - return ResourceManager.GetString("Submit", resourceCulture); + return ResourceManager.GetString("AboutContent", resourceCulture); } } - public static string Online { + public static string PreferedDate { get { - return ResourceManager.GetString("Online", resourceCulture); + return ResourceManager.GetString("PreferedDate", resourceCulture); } } - public static string BillCreated { + public static string entries { get { - return ResourceManager.GetString("BillCreated", resourceCulture); + return ResourceManager.GetString("entries", resourceCulture); } } - public static string EditRelatedSkills { + public static string Posted { get { - return ResourceManager.GetString("EditRelatedSkills", resourceCulture); + return ResourceManager.GetString("Posted", resourceCulture); } } - public static string DoSpecifyCircles { + public static string DB { get { - return ResourceManager.GetString("DoSpecifyCircles", resourceCulture); + return ResourceManager.GetString("DB", resourceCulture); } } - public static string Search { + public static string Person { get { - return ResourceManager.GetString("Search", resourceCulture); + return ResourceManager.GetString("Person", resourceCulture); } } - public static string UsersInRole { + public static string Count { get { - return ResourceManager.GetString("UsersInRole", resourceCulture); + return ResourceManager.GetString("Count", resourceCulture); } } - public static string DB { + public static string Profile_edition { get { - return ResourceManager.GetString("DB", resourceCulture); + return ResourceManager.GetString("Profile_edition", resourceCulture); } } - public static string Remove { + public static string Offline { get { - return ResourceManager.GetString("Remove", resourceCulture); + return ResourceManager.GetString("Offline", resourceCulture); } } - public static string Profile_edition { + public static string SiteSkills { get { - return ResourceManager.GetString("Profile_edition", resourceCulture); + return ResourceManager.GetString("SiteSkills", resourceCulture); } } - public static string My_Estimates { + public static string additionally { get { - return ResourceManager.GetString("My_Estimates", resourceCulture); + return ResourceManager.GetString("additionally", resourceCulture); } } - public static string FillInAFutureDate { + public static string Modify { get { - return ResourceManager.GetString("FillInAFutureDate", resourceCulture); + return ResourceManager.GetString("Modify", resourceCulture); } } } diff --git a/yavscModel/LocalizedText.fr.Designer.cs b/yavscModel/LocalizedText.fr.Designer.cs index 629dbb49..34d85b43 100644 --- a/yavscModel/LocalizedText.fr.Designer.cs +++ b/yavscModel/LocalizedText.fr.Designer.cs @@ -454,12 +454,6 @@ namespace Yavsc.Model { } } - public static string AboutContent { - get { - return ResourceManager.GetString("AboutContent", resourceCulture); - } - } - public static string YourNeed { get { return ResourceManager.GetString("YourNeed", resourceCulture); @@ -526,9 +520,9 @@ namespace Yavsc.Model { } } - public static string Logout { + public static string About { get { - return ResourceManager.GetString("Logout", resourceCulture); + return ResourceManager.GetString("About", resourceCulture); } } @@ -568,15 +562,21 @@ namespace Yavsc.Model { } } + public static string YourEstimates { + get { + return ResourceManager.GetString("YourEstimates", resourceCulture); + } + } + public static string Name { get { return ResourceManager.GetString("Name", resourceCulture); } } - public static string Non_existent_user { + public static string aprestation { get { - return ResourceManager.GetString("Non_existent_user", resourceCulture); + return ResourceManager.GetString("aprestation", resourceCulture); } } @@ -670,9 +670,9 @@ namespace Yavsc.Model { } } - public static string YourEstimates { + public static string Logout { get { - return ResourceManager.GetString("YourEstimates", resourceCulture); + return ResourceManager.GetString("Logout", resourceCulture); } } @@ -736,15 +736,21 @@ namespace Yavsc.Model { } } - public static string yourquerytransmitted { + public static string Hide_source { get { - return ResourceManager.GetString("yourquerytransmitted", resourceCulture); + return ResourceManager.GetString("Hide_source", resourceCulture); } } - public static string Hide_source { + public static string AskForAnEstimate { get { - return ResourceManager.GetString("Hide_source", resourceCulture); + return ResourceManager.GetString("AskForAnEstimate", resourceCulture); + } + } + + public static string SomeoneAskingYouForAnEstimate { + get { + return ResourceManager.GetString("SomeoneAskingYouForAnEstimate", resourceCulture); } } @@ -760,9 +766,9 @@ namespace Yavsc.Model { } } - public static string About { + public static string yourquerytransmitted { get { - return ResourceManager.GetString("About", resourceCulture); + return ResourceManager.GetString("yourquerytransmitted", resourceCulture); } } @@ -850,12 +856,24 @@ namespace Yavsc.Model { } } + public static string Non_existent_user { + get { + return ResourceManager.GetString("Non_existent_user", resourceCulture); + } + } + public static string Profile_edition { get { return ResourceManager.GetString("Profile_edition", resourceCulture); } } + public static string prestation { + get { + return ResourceManager.GetString("prestation", resourceCulture); + } + } + public static string My_Estimates { get { return ResourceManager.GetString("My_Estimates", resourceCulture); diff --git a/yavscModel/LocalizedText.fr.resx b/yavscModel/LocalizedText.fr.resx index 149a68fc..90a60ad1 100644 --- a/yavscModel/LocalizedText.fr.resx +++ b/yavscModel/LocalizedText.fr.resx @@ -20,6 +20,7 @@ Un message instantané a été envoyé à {0}, lui présentant votre demande. Vous devriez être contacté très rapidement. Demander un devis + une prestation disponible Seuls les utilisateurs authentifiés peuvent accèder à cette information. Panier @@ -111,6 +112,7 @@ Référence produit Lire la suite ... Rôle + prestation Identifiant du fournisseur Nom du fournisseur Enregistez-vous @@ -121,7 +123,8 @@ Talents/Compétences/Spécialités gérés sur ce site Compétence Talents/Compétences/Spécialités - Date de début + {0} would want you to establish an estimate concerning {1} + Date de début La date de fin doit être postérieure à la date de début. Heure de début Soumettre diff --git a/yavscModel/LocalizedText.resx b/yavscModel/LocalizedText.resx index 5c3c60bb..416d9fe0 100644 --- a/yavscModel/LocalizedText.resx +++ b/yavscModel/LocalizedText.resx @@ -21,6 +21,7 @@ Activities An instant message has been sent to {0}, showing to him your query. You should be contacted very soon. + a prestation Ask for an estimate available You must be authenticated in order to access this information @@ -124,6 +125,7 @@ role created Search Talents/Compétences/Spécialités gérés sur ce site + {0} would want you to establish an estimate concerning {1} Skill Skills Start date diff --git a/yavscModel/WorkFlow/WorkFlowManager.cs b/yavscModel/WorkFlow/WorkFlowManager.cs index 2ed9c8e4..6794db3e 100644 --- a/yavscModel/WorkFlow/WorkFlowManager.cs +++ b/yavscModel/WorkFlow/WorkFlowManager.cs @@ -8,6 +8,8 @@ using Yavsc.Model.FrontOffice.Catalog; using System.Collections.Generic; using Yavsc.Model.Skill; using System.Linq; +using Yavsc.Model.Calendar; +using Yavsc.Model.Google.Api; namespace Yavsc.Model.WorkFlow { @@ -75,7 +77,16 @@ namespace Yavsc.Model.WorkFlow /// COM. public static long RegisterCommand(Command com) { - return DefaultProvider.RegisterCommand (com); + long cmdid = DefaultProvider.RegisterCommand (com); + + if (com.GetType ().GetInterface ("INominative") != null) { + INominative cmdn = com as INominative; + NominativeEventPub ev = new NominativeEventPub (); + ev.PerformerName = cmdn.PerformerName; + ev.Description = com.GetDescription (); + GoogleHelpers.NotifyEvent (ev); + } + return cmdid; } /// diff --git a/yavscModel/YavscModel.csproj b/yavscModel/YavscModel.csproj index 76b3df04..263e65f4 100644 --- a/yavscModel/YavscModel.csproj +++ b/yavscModel/YavscModel.csproj @@ -153,7 +153,6 @@ - @@ -246,6 +245,8 @@ + +