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
|
|
@ -1,110 +0,0 @@
|
|||
//
|
||||
// PerformerProfile.cs
|
||||
//
|
||||
// Author:
|
||||
// Paul Schneider <paul@pschneider.fr>
|
||||
//
|
||||
// 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 <http://www.gnu.org/licenses/>.
|
||||
using System;
|
||||
using Yavsc.Model.RolesAndMembers;
|
||||
using Yavsc.Model.Skill;
|
||||
using System.Web.Security;
|
||||
using System.Web.Profile;
|
||||
using System.Collections.Generic;
|
||||
using Yavsc.Model;
|
||||
using System.ComponentModel;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.Linq;
|
||||
|
||||
namespace Yavsc.Model.Skill
|
||||
{
|
||||
/// <summary>
|
||||
/// Performer profile.
|
||||
/// </summary>
|
||||
public class PerformerProfile: IRating, IIdentified
|
||||
{
|
||||
/// <summary>
|
||||
/// Initializes a new instance of the <see cref="Yavsc.Model.Skill.PerformerProfile"/> class.
|
||||
/// </summary>
|
||||
public PerformerProfile()
|
||||
{
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Gets or sets the name of the user.
|
||||
/// </summary>
|
||||
/// <value>The name of the user.</value>
|
||||
[Localizable(true), Required(ErrorMessage = "S'il vous plait, entrez un nom d'utilisateur")
|
||||
,Display(ResourceType=typeof(LocalizedText),Name="User_name"),RegularExpression("([a-z]|[A-Z]|[0-9] )+")]
|
||||
public string UserName { get; set; }
|
||||
public long Id { get; set; }
|
||||
/// <summary>
|
||||
/// Gets or sets the skills.
|
||||
/// </summary>
|
||||
/// <value>The skills.</value>
|
||||
public virtual IEnumerable<UserSkill> Skills { get; set; }
|
||||
/// <summary>
|
||||
/// Initializes a new instance of the <see cref="Yavsc.FrontOffice.PerformerProfile"/> class.
|
||||
/// </summary>
|
||||
/// <param name="username">Username.</param>
|
||||
public PerformerProfile(string username)
|
||||
{
|
||||
UserName = username;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Gets the user.
|
||||
/// </summary>
|
||||
/// <returns>The user.</returns>
|
||||
public MembershipUser GetUser()
|
||||
{
|
||||
return Membership.GetUser (UserName);
|
||||
}
|
||||
private Profile yavscCLientProfile = null;
|
||||
|
||||
/// <summary>
|
||||
/// Gets the yavsc C lient profile.
|
||||
/// </summary>
|
||||
/// <value>The yavsc C lient profile.</value>
|
||||
public Profile YavscCLientProfile
|
||||
{
|
||||
get {
|
||||
if (yavscCLientProfile == null)
|
||||
yavscCLientProfile = new Profile (
|
||||
ProfileBase.Create (UserName));
|
||||
return yavscCLientProfile;
|
||||
}
|
||||
}
|
||||
/// <summary>
|
||||
/// Gets or sets the rate.
|
||||
/// </summary>
|
||||
/// <value>The rate.</value>
|
||||
public int Rate {
|
||||
get ;
|
||||
set ;
|
||||
}
|
||||
/// <summary>
|
||||
/// Determines whether this instance references the specified skillId.
|
||||
/// </summary>
|
||||
/// <returns><c>true</c> if this instance has skill the specified skillId; otherwise, <c>false</c>.</returns>
|
||||
/// <param name="skillId">Skill identifier.</param>
|
||||
public bool HasSkill(long skillId)
|
||||
{
|
||||
return Skills.Any (x => x.SkillId == skillId);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -30,7 +30,7 @@ namespace Yavsc.Model.Skill
|
|||
/// <summary>
|
||||
/// Skill.
|
||||
/// </summary>
|
||||
public class Skill : IRating {
|
||||
public class SkillEntity : IRating {
|
||||
|
||||
/// <summary>
|
||||
/// Gets or sets the identifier.
|
||||
|
|
@ -22,6 +22,7 @@ using System;
|
|||
using System.Configuration;
|
||||
using System.Reflection;
|
||||
using System.Configuration.Provider;
|
||||
using Yavsc.Model.FrontOffice;
|
||||
|
||||
namespace Yavsc.Model.Skill
|
||||
{
|
||||
|
|
@ -49,7 +50,7 @@ namespace Yavsc.Model.Skill
|
|||
/// Create or modifies the specified skill.
|
||||
/// </summary>
|
||||
/// <param name="skill">the skill.</param>
|
||||
public static long DeclareSkill(Skill skill) {
|
||||
public static long DeclareSkill(SkillEntity skill) {
|
||||
Provider.Declare(skill);
|
||||
return skill.Id;
|
||||
}
|
||||
|
|
@ -85,7 +86,7 @@ namespace Yavsc.Model.Skill
|
|||
/// </summary>
|
||||
/// <returns>The skill identifier.</returns>
|
||||
/// <param name="pattern">Pattern.</param>
|
||||
public static Skill [] FindSkill(string pattern){
|
||||
public static SkillEntity [] FindSkill(string pattern){
|
||||
return Provider.FindSkill(pattern);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@
|
|||
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
using System;
|
||||
using System.Configuration.Provider;
|
||||
using Yavsc.Model.FrontOffice;
|
||||
|
||||
namespace Yavsc.Model.Skill
|
||||
{
|
||||
|
|
@ -32,7 +33,7 @@ namespace Yavsc.Model.Skill
|
|||
/// Declare the specified skill.
|
||||
/// </summary>
|
||||
/// <param name="skill">Skill.</param>
|
||||
public abstract long Declare(Skill skill) ;
|
||||
public abstract long Declare(SkillEntity skill) ;
|
||||
|
||||
/// <summary>
|
||||
/// Declare the specified user skill.
|
||||
|
|
@ -57,7 +58,7 @@ namespace Yavsc.Model.Skill
|
|||
/// </summary>
|
||||
/// <returns>The skill identifier.</returns>
|
||||
/// <param name="pattern">Pattern.</param>
|
||||
public abstract Skill [] FindSkill(string pattern);
|
||||
public abstract SkillEntity [] FindSkill(string pattern);
|
||||
|
||||
/// <summary>
|
||||
/// Gets the user skills.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue