diff --git a/Yavsc/ApiControllers/DjProfileApiController.cs b/Yavsc/ApiControllers/DjProfileApiController.cs index f0471658..92b95e78 100644 --- a/Yavsc/ApiControllers/DjProfileApiController.cs +++ b/Yavsc/ApiControllers/DjProfileApiController.cs @@ -1,5 +1,3 @@ - - namespace Yavsc.ApiControllers { using Models; @@ -12,4 +10,4 @@ namespace Yavsc.ApiControllers } } -} +} \ No newline at end of file diff --git a/Yavsc/ApiControllers/MusicalPreferencesApiController.cs b/Yavsc/ApiControllers/MusicalPreferencesApiController.cs index b75931fe..60c3a5b3 100644 --- a/Yavsc/ApiControllers/MusicalPreferencesApiController.cs +++ b/Yavsc/ApiControllers/MusicalPreferencesApiController.cs @@ -46,7 +46,6 @@ namespace Yavsc.Controllers } // PUT: api/MusicalPreferencesApi/5 - [HttpPut("{id}")] public IActionResult PutMusicalPreference(string id, [FromBody] MusicalPreference musicalPreference) { if (!ModelState.IsValid) diff --git a/Yavsc/Controllers/ActivityController.cs b/Yavsc/Controllers/ActivityController.cs index ac072680..2f5010b5 100644 --- a/Yavsc/Controllers/ActivityController.cs +++ b/Yavsc/Controllers/ActivityController.cs @@ -94,6 +94,9 @@ namespace Yavsc.Controllers } } + + + // GET: Activity/Details/5 public IActionResult Details(string id) { diff --git a/Yavsc/Controllers/DoController.cs b/Yavsc/Controllers/DoController.cs index f24c2e42..d1d81bfb 100644 --- a/Yavsc/Controllers/DoController.cs +++ b/Yavsc/Controllers/DoController.cs @@ -49,7 +49,6 @@ namespace Yavsc.Controllers ViewBag.HasConfigurableSettings = (userActivity.Does.SettingsClassName != null); if (ViewBag.HasConfigurableSettings) ViewBag.SettingsClassControllerName = Startup.ProfileTypes[userActivity.Does.SettingsClassName].Name; - return View(userActivity); } diff --git a/Yavsc/Models/ApplicationDbContext.cs b/Yavsc/Models/ApplicationDbContext.cs index 17c5d4ec..f3a310c4 100644 --- a/Yavsc/Models/ApplicationDbContext.cs +++ b/Yavsc/Models/ApplicationDbContext.cs @@ -1,4 +1,4 @@ - + using System; using System.Linq; using System.Threading.Tasks; diff --git a/Yavsc/Models/Booking/MusicalPreference.cs b/Yavsc/Models/Booking/MusicalPreference.cs index 0670bdd6..97e491a6 100644 --- a/Yavsc/Models/Booking/MusicalPreference.cs +++ b/Yavsc/Models/Booking/MusicalPreference.cs @@ -17,9 +17,6 @@ namespace Yavsc.Models.Booking [Required] public long TendencyId {get; set; } - - - } } diff --git a/Yavsc/Models/Booking/Profiles/DjPerformerProfile.cs b/Yavsc/Models/Booking/Profiles/DjPerformerProfile.cs new file mode 100644 index 00000000..18613e15 --- /dev/null +++ b/Yavsc/Models/Booking/Profiles/DjPerformerProfile.cs @@ -0,0 +1,15 @@ +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations.Schema; +using Yavsc.Models.Workflow; + +namespace Yavsc.Models.Booking +{ + public class DjPerformerProfile : SpecializationSettings + { + public string SoundCloudId { get; set; } + + [InverseProperty("OwnerProfile")] + public virtual List SoundColor { get; set; } + + } +} \ No newline at end of file diff --git a/Yavsc/Models/Booking/Profiles/FormationPerformerProfile.cs b/Yavsc/Models/Booking/Profiles/FormationPerformerProfile.cs new file mode 100644 index 00000000..66b86c49 --- /dev/null +++ b/Yavsc/Models/Booking/Profiles/FormationPerformerProfile.cs @@ -0,0 +1,12 @@ +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations.Schema; +using Yavsc.Models.Workflow; + +namespace Yavsc.Models.Booking.Profiles +{ + public class FormationPerformerProfile + { + [InverseProperty("WorkingFor")] + public virtual List CoWorking { get; set; } + } +} \ No newline at end of file diff --git a/Yavsc/Models/Booking/Profiles/MusicianPerformerProfile.cs b/Yavsc/Models/Booking/Profiles/MusicianPerformerProfile.cs new file mode 100644 index 00000000..191344ea --- /dev/null +++ b/Yavsc/Models/Booking/Profiles/MusicianPerformerProfile.cs @@ -0,0 +1,14 @@ +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations.Schema; +using Yavsc.Models.Workflow; + +namespace Yavsc.Models.Booking +{ + public class MusicianPerformerProfile : PerformerProfile + { + [InverseProperty("Profile")] + public virtual List Instrumentation { + get; set; + } + } +} \ No newline at end of file diff --git a/Yavsc/Models/Booking/Profiles/StarPerformerProfile.cs b/Yavsc/Models/Booking/Profiles/StarPerformerProfile.cs new file mode 100644 index 00000000..1dc1a077 --- /dev/null +++ b/Yavsc/Models/Booking/Profiles/StarPerformerProfile.cs @@ -0,0 +1,12 @@ +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations.Schema; +using Yavsc.Models.Workflow; + +namespace Yavsc.Models.Booking.Profiles +{ + public class StarPerformerProfile : PerformerProfile + { + [InverseProperty("OwnerProfile")] + public virtual List SoundColor { get; set; } + } +} \ No newline at end of file diff --git a/Yavsc/Models/Workflow/Activity.cs b/Yavsc/Models/Workflow/Activity.cs index 38842598..35d1bdc4 100644 --- a/Yavsc/Models/Workflow/Activity.cs +++ b/Yavsc/Models/Workflow/Activity.cs @@ -53,7 +53,6 @@ namespace Yavsc.Models /// [Range(0,100)] public int Rate { get; set; } - [DisplayAttribute(Name="SettingsClass")] public string SettingsClassName { get; set; } } diff --git a/Yavsc/Models/Workflow/Specialization.cs b/Yavsc/Models/Workflow/Specialization.cs new file mode 100644 index 00000000..47b2773b --- /dev/null +++ b/Yavsc/Models/Workflow/Specialization.cs @@ -0,0 +1,15 @@ +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; + +namespace Yavsc.Models.Workflow +{ + public abstract class SpecializationSettings + { + [Key] + public long UserActivityId { get; set; } + + [ForeignKey("UserActivityId")] + public virtual UserActivity Context { get; set; } + + } +} \ No newline at end of file diff --git a/Yavsc/Models/Workflow/UserActivity.cs b/Yavsc/Models/Workflow/UserActivity.cs index 5ba30d04..4c413c32 100644 --- a/Yavsc/Models/Workflow/UserActivity.cs +++ b/Yavsc/Models/Workflow/UserActivity.cs @@ -19,6 +19,5 @@ namespace Yavsc.Models.Workflow [Range(0,100)] public int Weight { get; set; } - } } \ No newline at end of file diff --git a/Yavsc/Views/Activity/Index.cshtml b/Yavsc/Views/Activity/Index.cshtml index 2af9ee9b..78a4f758 100644 --- a/Yavsc/Views/Activity/Index.cshtml +++ b/Yavsc/Views/Activity/Index.cshtml @@ -61,6 +61,9 @@ } + + @Html.DisplayFor(modelItem => item.Children) + Edit | Details | diff --git a/Yavsc/Views/Do/Create.cshtml b/Yavsc/Views/Do/Create.cshtml index 4de66bab..7835aa54 100644 --- a/Yavsc/Views/Do/Create.cshtml +++ b/Yavsc/Views/Do/Create.cshtml @@ -17,6 +17,7 @@
+
diff --git a/Yavsc/Views/Do/Edit.cshtml b/Yavsc/Views/Do/Edit.cshtml index a4f94a6f..1b82b58c 100644 --- a/Yavsc/Views/Do/Edit.cshtml +++ b/Yavsc/Views/Do/Edit.cshtml @@ -27,4 +27,4 @@
Back to List -
\ No newline at end of file + diff --git a/Yavsc/Views/Shared/PerformerProfile.cshtml b/Yavsc/Views/Shared/PerformerProfile.cshtml new file mode 100644 index 00000000..dccb92aa --- /dev/null +++ b/Yavsc/Views/Shared/PerformerProfile.cshtml @@ -0,0 +1,42 @@ +@model PerformerProfile + +
+ @if (Model.Performer != null) { + @if (Model.Performer.Avatar != null) { + avatar + } + @Model.Performer.UserName + +
    + +
  • @SR["Rating"]: @Model.Rate %
  • + @if (Model.MinDailyCost != null) { +
  • @SR["MinDailyCost"]: @Model.MinDailyCost€
  • + } + @if (Model.MinDailyCost != null) { +
  • @SR["MaxDailyCost"]: @Model.MaxDailyCost€
  • + } + @if (Model.WebSite!=null) { +
  • @SR["WebSite"]: @Model.WebSite
  • + } + @if (Model.DoesBlog) { +
  • @SR["His blog"] +
  • + } + @if (!string.IsNullOrEmpty( + Model.Performer.DedicatedGoogleCalendar)) + { +
  • @SR["Exposes his Google calendar!"] +
  • + } + @if (Model.Performer.Devices?.Count>0) + { +
  • @SR["Uses the mobile application, and receives push notifications"] +
  • + } + +
+ + } +
diff --git a/Yavsc/project.lock.json b/Yavsc/project.lock.json index 8ce84367..fa392e09 100644 --- a/Yavsc/project.lock.json +++ b/Yavsc/project.lock.json @@ -199,12 +199,12 @@ "Zlib.Portable.Signed": "1.11.0" }, "compile": { - "lib/net45/Google.Apis.dll": {}, - "lib/net45/Google.Apis.PlatformServices.dll": {} + "lib/net45/Google.Apis.PlatformServices.dll": {}, + "lib/net45/Google.Apis.dll": {} }, "runtime": { - "lib/net45/Google.Apis.dll": {}, - "lib/net45/Google.Apis.PlatformServices.dll": {} + "lib/net45/Google.Apis.PlatformServices.dll": {}, + "lib/net45/Google.Apis.dll": {} } }, "Google.Apis.Core/1.11.1": { @@ -2823,7 +2823,7 @@ } } }, - "DNX,Version=v4.5.1/debian.8-x86": { + "DNX,Version=v4.5.1/win7-x86": { "Antlr/3.4.1.9004": { "type": "package", "compile": { @@ -3020,12 +3020,12 @@ "Zlib.Portable.Signed": "1.11.0" }, "compile": { - "lib/net45/Google.Apis.dll": {}, - "lib/net45/Google.Apis.PlatformServices.dll": {} + "lib/net45/Google.Apis.PlatformServices.dll": {}, + "lib/net45/Google.Apis.dll": {} }, "runtime": { - "lib/net45/Google.Apis.dll": {}, - "lib/net45/Google.Apis.PlatformServices.dll": {} + "lib/net45/Google.Apis.PlatformServices.dll": {}, + "lib/net45/Google.Apis.dll": {} } }, "Google.Apis.Core/1.11.1": { @@ -4125,6 +4125,9 @@ }, "runtime": { "lib/dnx451/Microsoft.AspNet.Server.Kestrel.dll": {} + }, + "native": { + "runtimes/win7-x86/native/libuv.dll": {} } }, "Microsoft.AspNet.Server.WebListener/1.0.0-rc1-final": { @@ -5644,7 +5647,7 @@ } } }, - "DNX,Version=v4.5.1/debian.8-x64": { + "DNX,Version=v4.5.1/win7-x64": { "Antlr/3.4.1.9004": { "type": "package", "compile": { @@ -5841,12 +5844,12 @@ "Zlib.Portable.Signed": "1.11.0" }, "compile": { - "lib/net45/Google.Apis.dll": {}, - "lib/net45/Google.Apis.PlatformServices.dll": {} + "lib/net45/Google.Apis.PlatformServices.dll": {}, + "lib/net45/Google.Apis.dll": {} }, "runtime": { - "lib/net45/Google.Apis.dll": {}, - "lib/net45/Google.Apis.PlatformServices.dll": {} + "lib/net45/Google.Apis.PlatformServices.dll": {}, + "lib/net45/Google.Apis.dll": {} } }, "Google.Apis.Core/1.11.1": { @@ -6946,6 +6949,9 @@ }, "runtime": { "lib/dnx451/Microsoft.AspNet.Server.Kestrel.dll": {} + }, + "native": { + "runtimes/win7-x64/native/libuv.dll": {} } }, "Microsoft.AspNet.Server.WebListener/1.0.0-rc1-final": { @@ -8735,7 +8741,7 @@ }, "MarkdownDeep-av.NET/1.5.4": { "type": "package", - "sha512": "89nafNRqR3hqKU0rQzHb+BGpoxjImo7pfOQj8vNALB3MloBye0jqMv9eqpKP+QIDLtMS8gHf7uP1kAIkhsOg+Q==", + "sha512": "vefP0tYO2IGOw0iuZt5mtTuu+IFaqjMaoo+GLk4nyhHibfYGFr4glG8JxvxIpHialgwtmeK4F+9HUiKnBXIhbA==", "files": [ "lib/dnxcore50/MarkdownDeep.dll", "lib/MonoAndroid10/MarkdownDeep.dll", @@ -10984,7 +10990,7 @@ "System.Reflection.Metadata/1.1.0": { "type": "package", "serviceable": true, - "sha512": "a8VsRm/B0Ik1o5FumSMWmpwbG7cvIIajAYhzTTy9VB9XItByJDQHGZkQTIAdsvVJ6MI5O3uH/lb0izgQDlDIWA==", + "sha512": "RLIE4sSt2zngMLuqM6YmxBH99mTumtT4DNZE4+msfEaInUP5iCLQT+BHPl+2cjSAP1pdALyAjLB8RtCB+WGGWQ==", "files": [ "lib/dotnet5.2/System.Reflection.Metadata.dll", "lib/dotnet5.2/System.Reflection.Metadata.xml",