refactoring

Yavsc/Controllers/CommandController.cs

@@ -111,7 +111,7 @@ namespace Yavsc.Controllers
             ViewBag.GoogleSettings = _googleSettings;
             var userid = User.GetUserId();
             var user = _userManager.FindByIdAsync(userid).Result;
-            return View(new BookQuery(new Location(),DateTime.Now.AddHours(4))
+            return View(new BookQuery(activityCode,new Location(),DateTime.Now.AddHours(4))
             {
                 PerformerProfile = pro,
                 PerformerId = pro.PerformerId,
@@ -125,6 +125,7 @@ namespace Yavsc.Controllers
         [ValidateAntiForgeryToken]
         public async Task<IActionResult> Create(BookQuery command)
         {
+            
             var uid = User.GetUserId();
             var prid = command.PerformerId;
             if (string.IsNullOrWhiteSpace(uid)
@@ -181,6 +182,7 @@ namespace Yavsc.Controllers
                         $"{yaev.Message}\r\n-- \r\n{yaev.Previsional}\r\n{yaev.EventDate}\r\n"
                     );
                 }
+            ViewBag.Activity =  _context.Activities.FirstOrDefault(a=>a.Code == command.ActivityCode);
                 ViewBag.GoogleSettings = _googleSettings;
                 return View("CommandConfirmation",command);
             }

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> {
+    public class BookQuery : NominativeServiceCommand<RendezVous>
-    /// <summary>
+    {
-    /// The command identifier
+        /// <summary>
-    /// </summary>
+        /// The command identifier
-    [Key(), DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+        /// </summary>
-    public long Id {get; set; }
+        [Key(), DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+        public long Id { get; set; }
 
-        [Display(Name="Event date")]
+        [Display(Name = "Event date")]
-        public DateTime EventDate{ 
+        public DateTime EventDate
+        {
             get;
             set;
-         }
+        }
-        public Location Location {
+        public Location Location
+        {
             get;
             set;
-            }
+        }
-        
+
-        public LocationType LocationType {
+        public LocationType LocationType
-            set; 
+        {
+            set;
             get;
         }
-        public string Reason { get; set; }
+        public string Reason { get; set; }
-        
+
         public BookQuery()
         {
         }
 
-       public BookQuery(Location eventLocation, DateTime eventDate)
+        public BookQuery(string activityCode, Location eventLocation, DateTime eventDate)
-       {
+        {
-               Location = eventLocation;
+            Location = eventLocation;
-               EventDate = eventDate;
+            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

Yavsc/ViewModels/Manage/AddBankInfoViewModel.cs

@@ -1,6 +1,6 @@
 namespace Yavsc.ViewModels.Manage
 {
-    using Model.Bank;
+    using Models.Bank;
     public class AddBankInfoViewModel
     {
         public BankIdentity Data{get; private set; }

Yavsc/ViewModels/Manage/IndexViewModel.cs

@@ -3,7 +3,7 @@ using Microsoft.AspNet.Identity;
 
 namespace Yavsc.ViewModels.Manage
 {
-    using Model.Bank;
+    using Models.Bank;
     using Models;
     using Models.Workflow;
     public class IndexViewModel

Yavsc/Views/Command/CommandConfirmation.cshtml

@@ -1,7 +1,7 @@
 @model BookQuery
 @using Yavsc.Models.Google.Messaging
 @{
-    ViewData["Title"] = SR["Command confirmation"]+" "+SR[Model.PerformerProfile.ActivityCode];
+    ViewData["Title"] = SR["Command confirmation"]+" "+ViewBag.Activity.Name;
 }
 <h2>@ViewData["Title"]</h2>
     <div class="form-horizontal">

Yavsc/Views/Command/Create.cshtml

@@ -1,15 +1,11 @@
-@model BookQuery
+@model BookQuery 
-@{
+@{ ViewData["Title"] = SR["Book "+ViewBag.Activity.Code]; } 
-    ViewData["Title"] = SR["Book "+ViewBag.Activity.Code];
-}
-@section header{
-    @{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); }
-    
-    <script src="https://maps.googleapis.com/maps/api/js?key=@ViewBag.GoogleSettings.BrowserApiKey"></script>
-    <script type="text/javascript" src="~/lib/moment/moment-with-locales.min.js"></script>
-    <script type="text/javascript" src="~/lib/eonasdan-bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js"></script>
-    <link rel="stylesheet" href="~/lib/eonasdan-bootstrap-datetimepicker/css/bootstrap-datetimepicker.min.css" />
 
+<script src="https://maps.googleapis.com/maps/api/js?key=@ViewBag.GoogleSettings.BrowserApiKey"></script>
+<script type="text/javascript" src="~/lib/moment/moment-with-locales.min.js"></script>
+<script type="text/javascript" src="~/lib/eonasdan-bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js"></script>
+<link rel="stylesheet" href="~/lib/eonasdan-bootstrap-datetimepicker/css/bootstrap-datetimepicker.min.css" />
+@section header {
 <style>
       #map {
         width: 100%;
@@ -22,99 +18,98 @@
           text-decoration: underline;
       }
     </style>
-}
+} 
 @section scripts{
 <script>
-$(document).ready(function(){
+    $(document).ready(function () {
-    
-    var config = {
-        mapId: 'map',
-        addrId: 'Location_Address',
-        longId: 'Location_Longitude',
-        latId: 'Location_Latitude',
-        addrValidationId: 'valloc',
-        formValidId: 'valsum',
-        locComboId: 'loccomb'
-    };
 
-     $.validator.setDefaults({
+        var config = {
-       messages: {
+            mapId: 'map',
-        remote:  "Ce lieu n'est pas identifié par les services de géo-localisation Google",
+            addrId: 'Location_Address',
-        required: "Veuillez renseigner ce champ"
+            longId: 'Location_Longitude',
-       }
+            latId: 'Location_Latitude',
-   });
+            addrValidationId: 'valloc',
-    var gmap = new google.maps.Map(document.getElementById(config.mapId), {
+            formValidId: 'valsum',
-	    zoom: 16,
+            locComboId: 'loccomb'
-	    center: { lat: 48.862854, lng: 2.2056466 }
+        };
-	  });
+
-    var marker;
+        $.validator.setDefaults({
-    function chooseLoc(sender,loc) {
+            messages: {
-        if (sender === 'user') $('#'+config.addrId).val(loc.formatted_address);
+                remote: "Ce lieu n'est pas identifié par les services de géo-localisation Google",
-        var pos = loc.geometry.location;
+                required: "Veuillez renseigner ce champ"
-        var lat = new Number(pos.lat);
+            }
-        var lng = new Number(pos.lng);
-        $('#'+config.latId).val(lat.toLocaleString('en'));
-        $('#'+config.longId).val(lng.toLocaleString('en'));
-        gmap.setCenter(pos);
-        if (marker) { 
-            marker.setMap(null);
-        }
-        marker = new google.maps.Marker({
-            map: gmap,
-            draggable: true,
-            animation: google.maps.Animation.DROP,
-            position: pos
-            });
-        google.maps.event.addListener(marker, 'dragend', function() {
-            // TODO reverse geo code
-            var pos = marker.getPosition();
-                $('#'+config.latId).val(pos.lat);
-                $('#'+config.longId).val(pos.lng);
         });
-        $('#'+config.addrId).valid();
+        var gmap = new google.maps.Map(document.getElementById(config.mapId), {
-        $('#'+config.addrValidationId).empty();
+            zoom: 16,
-        $('#'+config.formValidId).empty();
+            center: { lat: 48.862854, lng: 2.2056466 }
-        return true;
+        });
-    }
+        var marker;
-    
+        function chooseLoc(sender, loc) {
-    $('#EventDate').datepicker({language:'fr'});
+            if (sender === 'user') $('#' + config.addrId).val(loc.formatted_address);
+            var pos = loc.geometry.location;
+            var lat = new Number(pos.lat);
+            var lng = new Number(pos.lng);
+            $('#' + config.latId).val(lat.toLocaleString('en'));
+            $('#' + config.longId).val(lng.toLocaleString('en'));
+            gmap.setCenter(pos);
+            if (marker) {
+                marker.setMap(null);
+            }
+            marker = new google.maps.Marker({
+                map: gmap,
+                draggable: true,
+                animation: google.maps.Animation.DROP,
+                position: pos
+            });
+            google.maps.event.addListener(marker, 'dragend', function () {
+                // TODO reverse geo code
+                var pos = marker.getPosition();
+                $('#' + config.latId).val(pos.lat);
+                $('#' + config.longId).val(pos.lng);
+            });
+            $('#' + config.addrId).valid();
+            $('#' + config.addrValidationId).empty();
+            $('#' + config.formValidId).empty();
+            return true;
+        }
 
-    $('#'+config.addrId).rules("add",
+        $('#EventDate').datepicker({ language: 'fr' });
-    {
+
-        remote: {
+        $('#' + config.addrId).rules("add",
-            url: 'https://maps.googleapis.com/maps/api/geocode/json',
+            {
-            type: 'get',
+                remote: {
-            data: {
+                    url: 'https://maps.googleapis.com/maps/api/geocode/json',
-                sensor: false,
+                    type: 'get',
-                address: function () { return $('#'+config.addrId).val() }
+                    data: {
-                },
+                        sensor: false,
-            dataType: 'json',
+                        address: function () {  return $('#' + config.addrId).val() }
-            dataFilter: function(datastr,type) {
+                    },
-                $('#'+config.locComboId).html("");
+                    dataType: 'json',
-                var data = JSON.parse(datastr);
+                    dataFilter: function (datastr, type) {
-                data.results.forEach(function(element) {
+                        $('#' + config.locComboId).html("");
-                    if (element.formatted_address !== $('#'+config.addrId).val()) {
+                        var data = JSON.parse(datastr);
-                        $('<li>'+element.formatted_address+'</li>')
+                        data.results.forEach(function (element) {
-                        .data("geoloc",element)
+                            if (element.formatted_address !== $('#' + config.addrId).val()) {
-                        .click(function() { chooseLoc('user',$(this).data("geoloc")) })
+                                $('<li>' + element.formatted_address + '</li>')
-                        .appendTo($('#'+config.locComboId));}
+                                    .data("geoloc", element)
-                    else {  }
+                                    .click(function () { chooseLoc('user', $(this).data("geoloc")) })
-                });
+                                    .appendTo($('#' + config.locComboId));
-               if  ((data.status === 'OK') && (data.results.length == 1))
+                            }
-                { 
+                            else { }
-                    chooseLoc('google',data.results[0]);
+                        });
-                    return true;
+                        if ((data.status === 'OK') && (data.results.length == 1)) {
-                } 
+                            chooseLoc('google', data.results[0]);
-                return false;
+                            return true;
-                },
+                        }
-            error: function(xhr, textStatus, errorThrown)
+                        return false;
-                {
+                    },
-                console.log('ajax loading error ... '+textStatus+' ... '+ errorThrown);
+                    error: function (xhr, textStatus, errorThrown) {
-                return false;
+                        console.log('ajax loading error ... ' + textStatus + ' ... ' + errorThrown);
+                        return false;
+                    }
                 }
-         }
+            });
     });
-});
 </script>
 }
 <h2>@ViewData["Title"]</h2>
@@ -122,73 +117,85 @@ $(document).ready(function(){
     <div class="form-horizontal">
         <h4>@SR["Fill in your book query"]</h4>
         <hr />
-<div asp-validation-summary="ValidationSummary.All" class="text-danger" id="valsum"></div>
+        <div asp-validation-summary="ValidationSummary.All" class="text-danger" id="valsum"></div>
         <div class="form-group" has-feedback>
-             <fieldset>
+            <fieldset>
-<legend>Votre évennement</legend>
+                <legend>Votre évennement</legend>
-<label for="EventDate" class="col-md-2 control-label" >
+                <label for="EventDate" class="col-md-2 control-label">
-    @SR["Event date"]
+                    @SR["Event date"]
-</label>
+                </label>
-            <div class="col-md-10">
+                <div class="col-md-10">
-                <div class="container">
+                    <div class="container">
-    <div class="row">
+                        <div class="row">
-        <div class='col-sm-6'>
+                            <div class='col-sm-6'>
-                <div class='input-group date' id='datetimepicker2'>
+                                <div class='input-group date' id='datetimepicker2'>
-                    <input class="form-control" name="EventDate"/>
+                                    <input class="form-control" name="EventDate" />
-                    <span class="input-group-addon">
+                                    <span class="input-group-addon">
                         <span class="glyphicon glyphicon-calendar"></span>
-                    </span>
+                                    </span>
-                </div>
+                                </div>
+                            </div>
+                            <script type="text/javascript">
+                    $(function () {
+                        $('#datetimepicker2').datetimepicker({
+                            locale: 'fr',
+                            format: "YYYY/MM/DD hh:mm"
+                        });
+                    });
+                </script>
+        <span asp-validation-for="EventDate" class="text-danger">
+                </span>
         </div>
-        <script type="text/javascript">
-            $(function () {
-                $('#datetimepicker2').datetimepicker({
-                    locale: 'fr',
-                    format : "YYYY/MM/DD hh:mm"
-                });
-            });
-        </script>
-         <span asp-validation-for="EventDate" class="text-danger" >
-         </span>
     </div>
 </div>
-               
+<label for="Location_Address" class="col-md-2 control-label">
-            </div>
-            <label for="Location_Address" class="col-md-2 control-label">
                 @SR["Location"]
                 </label>
-            <div class="col-md-10">
+<div class="col-md-10">
-            <input asp-for="Location.Address" type="text" name="Location.Address" id="Location_Address"
+                    <div class="container">
-             class="form-control" data-val-required=@SR["SpecifyPlace"] 
+                        <div class="row">
-             data-val-remote=@SR["GoogleDidntGeoLocalized"]>
+                            <div class='col-sm-6'>
-            <span asp-validation-for="Location.Address" class="text-danger" id="valloc" ></span>
+                                <div  >
-            <ul id="loccomb" >
+    <input asp-for="Location.Address" type="text" name="Location.Address" id="Location_Address" class="form-control" data-val-required=@SR[
-            </ul>
+        "SpecifyPlace"] data-val-remote=@SR[ "GoogleDidntGeoLocalized"]>
-            <div id="map"></div>
+    <span asp-validation-for="Location.Address" class="text-danger" id="valloc"></span>
-            </div>
+    <ul id="loccomb">
+    </ul>
+    <div id="map"></div>
+        </div>
+        </div>
+        </div>
+        </div>
 
-             <label for="Reason" class="col-md-2 control-label">
+</div>
+
+<label for="Reason" class="col-md-2 control-label">
                 @SR["GiveAnExplicitReason"]
                 </label>
-            <textarea rows="15" asp-for="Reason" type="text" name="Reason" id="Reason" maxlength="4096" class="form-control"></textarea>
+                <div class="col-md-10">
-            <span asp-validation-for="Reason" class="text-danger"></span>
+                    <div class="container">
-
+                        <div class="row">
-            
+                            <div class='col-sm-6'>
-            @Html.HiddenFor(model=>model.Location.Latitude)
+                                <div id='reason1'>
-            @Html.HiddenFor(model=>model.Location.Longitude)
+<textarea rows="15" asp-for="Reason" type="text" name="Reason" id="Reason" maxlength="4096" class="form-control"></textarea>
-           </fieldset>
+<span asp-validation-for="Reason" class="text-danger"></span> @Html.HiddenFor(model=>model.Location.Latitude) @Html.HiddenFor(model=>model.Location.Longitude)
+</div>
         </div>
-        <div class="form-group">
-            <div class="col-md-offset-2 col-md-10">
-                <input type="submit" value="@SR["Create"]" class="btn btn-default" />
-            </div>
         </div>
-        @Html.HiddenFor(model=>model.Client.Id)
+        </div>
-        @Html.HiddenFor(model=>model.PerformerId)
+        </div>
-        
+</fieldset>
+</div>
+<div class="form-group">
+    <div class="col-md-offset-2 col-md-10">
+        <input type="submit" value="@SR[" Create "]" class="btn btn-default" />
     </div>
-   
+</div>
-               
+@Html.HiddenFor(model=>model.Client.Id) @Html.HiddenFor(model=>model.PerformerId)
+
+</div>
+
+
 </form>
 
-
+@{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); }

Yavsc/wwwroot/css/bootstrap.css

@@ -6458,7 +6458,6 @@ button.close {
   margin: 1px;
   text-indent: -999px;
   cursor: pointer;
-  background-color: #000 \9;
   background-color: rgba(0, 0, 0, 0);
   border: 1px solid #fff;
   border-radius: 10px;