Réorganisations.
La page de reservation par défaut est maintenant la reservation dite simple. Fonctionnalités en cours de développement: 1) la reservation dite simple 2) la notification à la reservation 3) l'activité principale exercée 4) l'integration d'un premier thème clair * MEA.sql: définit la valeur MEA du profile (Main Exerted Activity) dans la base de donnée * Booking.aspx: Imlémente la vue du formulaire de reservation simple, c'etait avant la reservation classique, sur une période plutôt qu'un jour. La reservation classique est renomée `EavyBooking`. * SimpleBookingQuery.cs: Implémente une simple commande de rendez-vous, en tant que commande du workflow. * .gitignore: ignorer les configuration des pré et prod totem. * SkillEntity.cs: * SkillManager.cs: * Skills.aspx: * SkillProvider.cs: * SkillController.cs: * UserSkills.aspx: * NpgsqlSkillProvider.cs: refactorisation (-Skill+SkillEntity) * NpgsqlProfileProvider.cs: Fixe un bug introduit avec l'implementation des profiles anonymes. * FrontOfficeController.cs: definit l'interface de cotation des compétences attendues * UserCard.ascx: Imlémente une carte utilisateur. * Web.config: déclare le code activité principale exercée parmis les valeurs du profile authentifié. * Web.csproj: ajoute les nouveaux formulaire de reservation au projet. * PerformerProfile.cs: S'assure d'avoir une valeur pour le nom d'utilisateur à la création. * LocalizedText.resx: * LocalizedText.Designer.cs: "date préférée" en anglais * LocalizedText.fr.resx: * LocalizedText.fr.Designer.cs: "date préférée" en français * Profile.cs: à la creation d'un profile, on doit avoir un nom d'utilisateur, même dans le cas où le profile est anonyme (dans ce cas, on l'appelle identifiant anonyme). Sinon, on lève une exception. * YavscModel.csproj: * refactorisation: le nom `Skill` est celui de l'espace, celui de la classe devient `SkillEntity`. * Creation de la requête dite simple d'un rendez-vous (pour prestation) à une date donnée (sans heure), concernant simplement une activité. * EavyBooking.aspx: Implémente la reservation lourde
This commit is contained in:
parent
439759cb16
commit
fe97f14831
29 changed files with 319 additions and 77 deletions
56
web/Views/FrontOffice/Booking.aspx
Normal file
56
web/Views/FrontOffice/Booking.aspx
Normal file
|
|
@ -0,0 +1,56 @@
|
|||
<%@ Page Title="Booking" Language="C#" MasterPageFile="~/Models/App.master" Inherits="System.Web.Mvc.ViewPage<SimpleBookingQuery>" %>
|
||||
<asp:Content ContentPlaceHolderID="head" ID="headContent" runat="server">
|
||||
<link rel="stylesheet" type="text/css" href="/App_Themes/jquery.timepicker.css" />
|
||||
<script type="text/javascript" src="/Scripts/globalize/globalize.js"></script>
|
||||
<script type="text/javascript" src="/Scripts/jquery.mousewheel.js"></script>
|
||||
<script type="text/javascript" src="/Scripts/globalize/cultures/globalize.culture.fr.js"></script>
|
||||
<script type="text/javascript" src="/Scripts/datepicker-fr.js"></script>
|
||||
<script type="text/javascript" src="/Scripts/datepicker-en-GB.js"></script>
|
||||
<script type="text/javascript" src="/Scripts/jquery.timepicker.min.js"></script>
|
||||
</asp:Content>
|
||||
|
||||
<asp:Content ContentPlaceHolderID="MainContent" ID="MainContentContent" runat="server">
|
||||
<% using ( Html.BeginForm("Booking") ) { %>
|
||||
|
||||
<fieldset>
|
||||
<legend>Préferences musicales</legend>
|
||||
<%= Html.LabelFor(model=>model.Needs) %>:
|
||||
<ul>
|
||||
<% foreach (var need in Model.Needs) { %>
|
||||
<li><%= need.Name %> <%= Html.Partial("RateSkillControl",need)%></li>
|
||||
<% } %>
|
||||
</ul>
|
||||
<%= Html.ValidationMessageFor(model=>model.Needs) %>
|
||||
</fieldset>
|
||||
|
||||
<fieldset>
|
||||
<legend>Date de l'événement</legend>
|
||||
Intervention souhaitée le
|
||||
<input type="text" id="PreferedDate" name="PreferedDate" class="start date" value="<%=Model.PreferedDate.ToString("yyyy/MM/dd")%>">
|
||||
<%= Html.ValidationMessageFor( model=>model.PreferedDate ) %>
|
||||
</fieldset>
|
||||
<script>
|
||||
$(document).ready(function(){
|
||||
$('[data-type="rate-site-skill"]').rate({target: 'FrontOffice/RateSkill'});
|
||||
var tpconfig = {
|
||||
'timeFormat': 'H:i',
|
||||
'showDuration': true,
|
||||
'disableTimeRanges': [
|
||||
['17:01pm', '24:01pm'],
|
||||
['0am', '9am']
|
||||
]};
|
||||
$.datepicker.setDefaults($.datepicker.regional[ "fr" ] );
|
||||
var dpconfig = {
|
||||
'format': 'yy/mm/dd',
|
||||
'autoclose': true } ;
|
||||
|
||||
// $('#PreferedHour').timepicker(tpconfig);
|
||||
$('#PreferedDate').datepicker(dpconfig);
|
||||
|
||||
});
|
||||
</script>
|
||||
|
||||
<input type="submit">
|
||||
<% } %>
|
||||
</asp:Content>
|
||||
|
||||
61
web/Views/FrontOffice/EavyBooking.aspx
Normal file
61
web/Views/FrontOffice/EavyBooking.aspx
Normal file
|
|
@ -0,0 +1,61 @@
|
|||
<%@ Page Title="Booking" Language="C#" Inherits="System.Web.Mvc.ViewPage<BookingQuery>" MasterPageFile="~/Models/App.master" %>
|
||||
<asp:Content ContentPlaceHolderID="head" ID="headContent" runat="server">
|
||||
<link rel="stylesheet" type="text/css" href="/App_Themes/jquery.timepicker.css" />
|
||||
<script type="text/javascript" src="/Scripts/globalize/globalize.js"></script>
|
||||
<script type="text/javascript" src="/Scripts/jquery.mousewheel.js"></script>
|
||||
<script type="text/javascript" src="/Scripts/globalize/cultures/globalize.culture.fr.js"></script>
|
||||
<script type="text/javascript" src="/Scripts/datepicker-fr.js"></script>
|
||||
<script type="text/javascript" src="/Scripts/datepicker-en-GB.js"></script>
|
||||
<script type="text/javascript" src="/Scripts/jquery.timepicker.min.js"></script>
|
||||
<script type="text/javascript" src="/Scripts/datepair.js"></script>
|
||||
<script type="text/javascript" src="/Scripts/jquery.datepair.min.js"></script>
|
||||
</asp:Content>
|
||||
|
||||
<asp:Content ContentPlaceHolderID="MainContent" ID="MainContentContent" runat="server">
|
||||
<% using ( Html.BeginForm("Book","Google") ) { %>
|
||||
<div id="book" >Date d'intervention :
|
||||
Intervention souhaitée entre le
|
||||
<input type="text" id="StartDate" name="StartDate" class="start date" value="<%=Model.StartDate.ToString("yyyy/MM/dd")%>">
|
||||
<%= Html.ValidationMessageFor( model=>model.StartDate ) %>
|
||||
et le
|
||||
<input type="text" id="EndDate" name="EndDate" class="end date" value="<%=Model.StartDate.ToString("yyyy/MM/dd")%>">
|
||||
<%= Html.ValidationMessageFor(model=>model.EndDate) %>
|
||||
<br>
|
||||
Heure et durée d'intervention souhaitée
|
||||
<%= Html.LabelFor(model=>model.StartHour) %>
|
||||
<input type="text" id="StartHour" name="StartHour" class="start time" value="<%=Model.StartHour%>">
|
||||
<%= Html.ValidationMessageFor(model=>model.StartHour) %>
|
||||
|
||||
<%= Html.LabelFor(model=>model.EndHour) %>
|
||||
<input type="text" id="EndHour" name="EndHour" class="end time" value="<%=Model.EndHour%>">
|
||||
<%= Html.ValidationMessageFor(model=>model.EndHour) %>
|
||||
</div>
|
||||
<fieldset>
|
||||
<legend>Intervenant</legend>
|
||||
<%= Html.LabelFor(model=>model.Roles) %>:
|
||||
<%= Html.TextBoxFor(model=>model.Roles) %>
|
||||
<%= Html.ValidationMessageFor(model=>model.Roles) %>
|
||||
</fieldset>
|
||||
<script>
|
||||
$(document).ready(function(){
|
||||
var tpconfig = {
|
||||
'timeFormat': 'H:i',
|
||||
'showDuration': true,
|
||||
'disableTimeRanges': [
|
||||
['17:01pm', '24:01pm'],
|
||||
['0am', '9am']
|
||||
]};
|
||||
$.datepicker.setDefaults($.datepicker.regional[ "fr" ] );
|
||||
var dpconfig = {
|
||||
'format': 'yy/mm/dd',
|
||||
'autoclose': true } ;
|
||||
|
||||
$('#book .time').timepicker(tpconfig);
|
||||
$('#book .date').datepicker(dpconfig);
|
||||
$('#book').datepair();
|
||||
});
|
||||
</script>
|
||||
|
||||
<input type="submit">
|
||||
<% } %>
|
||||
</asp:Content>
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
<%@ Page Title="Skills" Language="C#" MasterPageFile="~/Models/App.master" Inherits="System.Web.Mvc.ViewPage<IEnumerable<Skill>>" %>
|
||||
<%@ Page Title="Skills" Language="C#" MasterPageFile="~/Models/App.master" Inherits="System.Web.Mvc.ViewPage<IEnumerable<SkillEntity>>" %>
|
||||
|
||||
<asp:Content ID="headContent" ContentPlaceHolderID="head" runat="server">
|
||||
<script src="<%=Url.Content("~/Scripts/yavsc.skills.js")%>"></script>
|
||||
|
|
@ -10,8 +10,6 @@
|
|||
</asp:Content>
|
||||
|
||||
<asp:Content ID="MainContentContent" ContentPlaceHolderID="MainContent" runat="server">
|
||||
|
||||
|
||||
<aside class="control">
|
||||
<form method="post" action="DeclareSkill">
|
||||
<fieldset>
|
||||
|
|
|
|||
|
|
@ -1,2 +1,14 @@
|
|||
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %>
|
||||
|
||||
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<PerformerProfile>" %>
|
||||
<img src="<%=Url.AvatarUrl(HttpContext.Current.User.Identity.Name)%>" alt="avatar" class="iconsmall" />
|
||||
<%=Html.Encode(Model.UserName)%> <%= Html.Partial("RateControl",Model) %>
|
||||
<ul>
|
||||
<% foreach (var skill in Model.Skills) { %>
|
||||
<li>
|
||||
<%=Html.Encode(skill.SkillName)%> <%= Html.Partial("RateControl",skill) %>
|
||||
<%=Html.Encode(skill.Comment)%>
|
||||
</li>
|
||||
<% } %>
|
||||
</ul>
|
||||
<% if (Model.HasCalendar()) { %>
|
||||
<i class="fa fa-check">Calendrier Google Disponible</i>
|
||||
<% } %>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<div id="Err_skillId" class="field-validation-error"></div>
|
||||
<h2>
|
||||
<select id="SkillId" >
|
||||
<% foreach (var skill in (Skill[]) ViewData["SiteSkills"]) {
|
||||
<% foreach (var skill in (SkillEntity[]) ViewData["SiteSkills"]) {
|
||||
if (Model.HasSkill(skill.Id)) {%>
|
||||
<option value="<%=skill.Id%>" disabled>
|
||||
<%=skill.Name%></option>
|
||||
|
|
@ -52,5 +52,4 @@ if (Model.HasSkill(skill.Id)) {%>
|
|||
</li>
|
||||
<% } %>
|
||||
</ul>
|
||||
|
||||
</asp:Content>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue