This commit is contained in:
2017-04-08 09:17:15 +02:00
parent 2d08770288
commit 2f0c1ff25f
35 changed files with 2787 additions and 62 deletions

View File

@ -31,6 +31,7 @@ namespace Yavsc.Models.Billing
get; set;
}
[DisplayAttribute(Name="Status de la requête")]
public QueryStatus Status { get; set; }
[Required]
@ -39,7 +40,7 @@ namespace Yavsc.Models.Billing
/// <summary>
/// The client
/// </summary>
[ForeignKey("ClientId")]
[ForeignKey("ClientId"),Display(Name="Client")]
public ApplicationUser Client { get; set; }
[Required]
@ -47,13 +48,13 @@ namespace Yavsc.Models.Billing
/// <summary>
/// The performer identifier
/// </summary>
[ForeignKey("PerformerId")]
[ForeignKey("PerformerId"),Display(Name="Préstataire")]
public PerformerProfile PerformerProfile { get; set; }
public DateTime? ValidationDate {get; set;}
[Display(Name="Montant prévisionel de la préstation")]
public decimal? Previsional { get; set; }
/// <summary>
/// The bill
@ -63,7 +64,7 @@ namespace Yavsc.Models.Billing
[Required]
public string ActivityCode { get; set; }
[ForeignKey("ActivityCode"),JsonIgnore]
[ForeignKey("ActivityCode"),JsonIgnore,Display(Name="Domaine d'activité")]
public virtual Activity Context  { get; set ; }
}
}

View File

@ -15,13 +15,15 @@ namespace Yavsc.Models.Haircut
[Required]
public long PrestationId { get; set; }
[ForeignKey("PrestationId"),Required]
[ForeignKey("PrestationId"),Required,Display(Name="Préstation")]
public virtual HairPrestation Prestation { get; set; }
[ForeignKey("LocationId")]
[Display(Name="Lieu du rendez-vous")]
public virtual Location Location { get; set; }
[Display(Name="Date et heure")]
public DateTime? EventDate
{
get;
@ -34,5 +36,9 @@ namespace Yavsc.Models.Haircut
set;
}
[Display(Name="Informations complémentaires"),
StringLengthAttribute(512)]
public string AdditionalInfo { get; set; }
}
}

View File

@ -1,4 +1,5 @@
using System;
using System.ComponentModel.DataAnnotations;
using Yavsc.Models.Auth;
using Yavsc.Models.Relationship;
using YavscLib;
@ -30,6 +31,7 @@ namespace Yavsc.Models.Haircut.Views
Status = query.Status;
Location = query.Location;
EventDate = query.EventDate;
AdditionalInfo = query.AdditionalInfo;
}
public long Id { get; set; }
public HairPrestation Prestation { get; set; }
@ -43,5 +45,7 @@ namespace Yavsc.Models.Haircut.Views
set;
}
[Display(Name="Informations complémentaires")]
public string AdditionalInfo { get; set; }
}
}