un positionnement de paramètre workflow des pros

This commit is contained in:
Paul Schneider 2017-01-13 16:31:40 +01:00
commit 96746fcc0b
322 changed files with 25893 additions and 3844 deletions

View file

@ -18,6 +18,15 @@ namespace Yavsc.Models
[StringLength(512),Required()]
public string Name {get; set;}
[StringLength(512)]
public string ParentCode { get; set; }
[ForeignKey("ParentCode")]
public virtual Activity Parent { get; set; }
[InverseProperty("Parent")]
public virtual List<Activity> Children { get; set; }
public string Description {get; set;}
/// <summary>
/// Name to associate to a performer in this activity domain
@ -36,5 +45,16 @@ namespace Yavsc.Models
/// <returns></returns>
string ModeratorGroupName { get; set; }
/// <summary>
/// indice de recherche de cette activité
/// rendu par le système.
/// Valide entre 0 et 100,
/// Il démarre à 0.
/// </summary>
[Range(0,100)]
public int Rate { get; set; }
[DisplayAttribute(Name="SettingsClass")]
public string SettingsClassName { get; set; }
}
}

View file

@ -0,0 +1,21 @@
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace Yavsc.Models.Workflow
{
public class CoWorking
{
[Key(), DatabaseGenerated(DatabaseGeneratedOption.Identity)]
public long Id {get; set; }
public string PerformerId { get; set; }
public string WorkingForId { get; set; }
[ForeignKey("PerformerId")]
public virtual PerformerProfile Performer { get; set; }
[ForeignKey("WorkingForId")]
public virtual ApplicationUser WorkingFor { get; set; }
}
}

View file

@ -1,6 +1,6 @@
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using Yavsc.Models.Market;
namespace Yavsc.Models.Workflow
{
@ -12,10 +12,9 @@ namespace Yavsc.Models.Workflow
[ForeignKey("PerformerId"),Display(Name="Performer")]
public virtual ApplicationUser Performer { get; set; }
[Display(Name="Activity"),Required]
public string ActivityCode { get; set; }
public Service Offer { get; set; }
[InverseProperty("User")]
[Display(Name="Activity")]
public virtual List<UserActivity> Activity { get; set; }
[Required,StringLength(14),Display(Name="SIREN"),
RegularExpression(@"^[0-9]{9,14}$", ErrorMessage = "Only numbers are allowed here")]
@ -26,9 +25,6 @@ namespace Yavsc.Models.Workflow
[Required,Display(Name="Organization address"),ForeignKey("OrganizationAddressId")]
public virtual Location OrganizationAddress { get; set; }
[ForeignKey("ActivityCode"),Display(Name="Activity")]
public virtual Activity Activity { get; set; }
[Display(Name="Accept notifications on client query")]
public bool AcceptNotifications { get; set; }
@ -55,7 +51,7 @@ namespace Yavsc.Models.Workflow
[NotMapped]
public bool DoesBlog { get {
return Performer?.Posts != null ? Performer.Posts.Count > 0 : false;
return Performer.Posts?.Count > 0 ;
} }
}

View file

@ -1,6 +1,6 @@
using System.Threading.Tasks;
namespace Yavsc.Models
namespace Yavsc.Models.Process
{
public abstract class Action<TResult,TInput>
{

View file

@ -1,6 +1,6 @@
using System.Collections.Generic;
namespace Yavsc.Models
namespace Yavsc.Models.Process
{
public class Conjonction : List<IRequisition>, IRequisition
{

View file

@ -1,6 +1,6 @@
using System.Collections.Generic;
namespace Yavsc.Models
namespace Yavsc.Models.Process
{
public class Disjonction : List<IRequisition>, IRequisition
{

View file

@ -1,5 +1,5 @@
namespace Yavsc.Models
namespace Yavsc.Models.Process
{
public class ConstInputValue : NamedRequisition
{

View file

@ -1,5 +1,5 @@
namespace Yavsc.Models
namespace Yavsc.Models.Process
{
public abstract class NamedRequisition : IRequisition
{

View file

@ -1,5 +1,5 @@
namespace Yavsc.Models
namespace Yavsc.Models.Process
{
public class Negation<Exp> : IRequisition where Exp : IRequisition
{

View file

@ -1,6 +1,6 @@
using System.ComponentModel.DataAnnotations;
namespace Yavsc.Models
namespace Yavsc.Models.Process
{
/// <summary>
/// An abstract, identified rule

View file

@ -11,7 +11,7 @@ namespace Yavsc.Models {
public long Id { get; set; }
/// <summary>
/// indice de recherche de cette capacité
/// indice de recherche de ce talent
/// rendu par le système.
/// Valide entre 0 et 100,
/// Il démarre à 0.

View file

@ -0,0 +1,24 @@
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace Yavsc.Models.Workflow
{
public class UserActivity
{
[Required]
public string UserId { get; set; }
[ForeignKey("UserId")]
public virtual PerformerProfile User { get; set; }
[Required]
public string DoesCode { get; set; }
[ForeignKey("DoesCode")]
public virtual Activity Does { get; set; }
[Range(0,100)]
public int Weight { get; set; }
}
}

View file

@ -8,12 +8,16 @@ namespace Yavsc.Models
{
[Key(), DatabaseGenerated(DatabaseGeneratedOption.Identity)]
public long Id { get; set; }
[ForeignKeyAttribute("AspNetUsers.Id")]
public string UserId { get; set; }
[ForeignKeyAttribute("Skill.Id")]
[ForeignKey("UserId")]
public virtual ApplicationUser User { get; set; }
public long SkillId { get; set; }
[ForeignKey("SkillId")]
public virtual Skill Skill { get; set; }
public string Comment { get; set; }
public int Rate { get; set; }
}