notazof/yavsc
1
0
Fork 0
Code Issues Pull requests Projects 1 Releases 3 Packages Wiki Activity Actions

refactoring

Browse source
This commit is contained in:
Paul Schneider 2018-08-01 03:12:08 +02:00
commit fb044dabcb
16 changed files with 11 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Yavsc.Server/Models/Billing/NominativeServiceCommand.cs
View file

@ -18,7 +18,7 @@ namespace Yavsc.Models.Billing
public string GetInvoiceId() { return GetType().Name + "/" + Id; }
public abstract long Id { get; set; }
public abstract string GetDescription ();
public abstract string Description { get; }
[Required()]
public bool Consent { get; set; }

6
Yavsc.Server/Models/HairCut/HairCutQuery.cs
View file

@ -20,13 +20,13 @@ namespace Yavsc.Models.Haircut
{
// Bill description
public override string GetDescription()
public override string Description { get
{
string type = ResourcesHelpers.GlobalLocalizer[this.GetType().Name];
string gender = ResourcesHelpers.GlobalLocalizer[this.Prestation.Gender.ToString()];
return $"{type} ({gender})";
}
}
[Key(), DatabaseGenerated(DatabaseGeneratedOption.Identity)]
@ -387,7 +387,7 @@ Prestation.Gender == HairCutGenders.Women ?
string address = Location?.Address??"[pas de lieu spécifié]";
var p = Prestation;
string total = GetBillItems().Addition().ToString("C",CultureInfo.CurrentUICulture);
string strprestation = GetDescription();
string strprestation = Description;
string bill = string.Join("\n", GetBillItems().Select(
l=> $"{l.Name} {l.Description} {l.UnitaryCost} € " +
((l.Count != 1) ? "*"+l.Count.ToString() : "")));

5
Yavsc.Server/Models/HairCut/HairMultiCutQuery.cs
View file

@ -25,10 +25,7 @@ namespace Yavsc.Models.Haircut
public class HairMultiCutQuery : NominativeServiceCommand
{
// Bill description
public override string GetDescription()
{
return "Prestation en coiffure à domicile [commande groupée]";
}
public override string Description => "Prestation en coiffure à domicile [commande groupée]" ;
[Key(), DatabaseGenerated(DatabaseGeneratedOption.Identity)]
override public long Id { get; set; }

11
Yavsc.Server/Models/IT/Project.cs
View file

@ -61,15 +61,8 @@ namespace Yavsc.Server.Models.IT
{
return bill;
}
public string Description { get; set; }
public override string GetDescription()
{
return Description;
}
string description;
public override string Description => description;
public Project()
{

5
Yavsc.Server/Models/Workflow/RdvQuery.cs
View file

@ -42,10 +42,7 @@ namespace Yavsc.Models.Workflow
[Display(Name="GiveAnExplicitReason")]
public string Reason { get; set; }
public override string GetDescription ()
{
return "Rendez-vous";
}
public override string Description => "Rendez-vous";
public RdvQuery()
{