diff --git a/Yavsc/Models/Haircut/BrusherProfile.cs b/Yavsc/Models/Haircut/BrusherProfile.cs index 7871bc49..24e60a1a 100644 --- a/Yavsc/Models/Haircut/BrusherProfile.cs +++ b/Yavsc/Models/Haircut/BrusherProfile.cs @@ -24,95 +24,94 @@ namespace Yavsc.Models.Haircut [Display(Name="Fin de la journée")] public int EndOfTheDay { get; set;} - [Display(Name="Coût d'une coupe femme cheveux longs")] + [Display(Name="Coupe femme cheveux longs"),DisplayFormat(DataFormatString="{0:C}")] public decimal WomenLongCutPrice { get; set; } - [Display(Name="Coût d'une coupe femme cheveux mi-longs")] + [Display(Name="Coupe femme cheveux mi-longs"),DisplayFormat(DataFormatString="{0:C}")] public decimal WomenHalfCutPrice { get; set; } - [Display(Name="Coût d'une coupe femme cheveux courts")] + [Display(Name="Coupe femme cheveux courts"),DisplayFormat(DataFormatString="{0:C}")] public decimal WomenShortCutPrice { get; set; } - [Display(Name="Coût d'une coupe homme")] + [Display(Name="Coupe homme"),DisplayFormat(DataFormatString="{0:C}")] public decimal ManCutPrice { get; set; } - [Display(Name="Coût d'une coupe enfant")] + [Display(Name="Coupe enfant"),DisplayFormat(DataFormatString="{0:C}")] public decimal KidCutPrice { get; set; } - [Display(Name="Coût d'un brushing cheveux longs")] + [Display(Name="Brushing cheveux longs"),DisplayFormat(DataFormatString="{0:C}")] public decimal LongBrushingPrice { get; set; } - [Display(Name="Coût d'un brushing cheveux mi-longs")] + [Display(Name="Brushing cheveux mi-longs"),DisplayFormat(DataFormatString="{0:C}")] public decimal HalfBrushingPrice { get; set; } - [Display(Name="Coût d'un brushing cheveux courts")] + [Display(Name="Brushing cheveux courts"),DisplayFormat(DataFormatString="{0:C}")] public decimal ShortBrushingPrice { get; set; } - [Display(Name="Coût du shamoing")] + [Display(Name="Shampoing"),DisplayFormat(DataFormatString="{0:C}")] public decimal ShampooPrice { get; set; } - [Display(Name="Coût du soin")] + [Display(Name="Soin"),DisplayFormat(DataFormatString="{0:C}")] public decimal CarePrice { get; set; } - [Display(Name="Coût d'une couleur cheveux longs")] + [Display(Name="couleur cheveux longs"),DisplayFormat(DataFormatString="{0:C}")] public decimal LongColorPrice { get; set; } - [Display(Name="Coût d'une couleur cheveux mi-longs")] + [Display(Name="couleur cheveux mi-longs"),DisplayFormat(DataFormatString="{0:C}")] public decimal HalfColorPrice { get; set; } - [Display(Name="Coût d'une couleur cheveux courts")] + [Display(Name="couleur cheveux courts"),DisplayFormat(DataFormatString="{0:C}")] public decimal ShortColorPrice { get; set; } - [Display(Name="Coût d'une couleur multiple cheveux longs")] + [Display(Name="couleur multiple cheveux longs"),DisplayFormat(DataFormatString="{0:C}")] public decimal LongMultiColorPrice { get; set; } - [Display(Name="Coût d'une couleur multiple cheveux mi-longs")] + [Display(Name="couleur multiple cheveux mi-longs"),DisplayFormat(DataFormatString="{0:C}")] public decimal HalfMultiColorPrice { get; set; } - [Display(Name="Coût d'une couleur multiple cheveux courts")] + [Display(Name="couleur multiple cheveux courts"),DisplayFormat(DataFormatString="{0:C}")] public decimal ShortMultiColorPrice { get; set; } - [Display(Name="Coût d'une permanente cheveux longs")] + [Display(Name="permanente cheveux longs"),DisplayFormat(DataFormatString="{0:C}")] public decimal LongPermanentPrice { get; set; } - [Display(Name="Coût d'une permanente cheveux mi-longs")] + [Display(Name="permanente cheveux mi-longs"),DisplayFormat(DataFormatString="{0:C}")] public decimal HalfPermanentPrice { get; set; } - [Display(Name="Coût d'une permanente cheveux courts")] + [Display(Name="permanente cheveux courts"),DisplayFormat(DataFormatString="{0:C}")] public decimal ShortPermanentPrice { get; set; } - [Display(Name="Coût d'un défrisage cheveux longs")] + [Display(Name="défrisage cheveux longs"),DisplayFormat(DataFormatString="{0:C}")] public decimal LongDefrisPrice { get; set; } - [Display(Name="Coût d'un défrisage cheveux mi-longs")] + [Display(Name="défrisage cheveux mi-longs"),DisplayFormat(DataFormatString="{0:C}")] public decimal HalfDefrisPrice { get; set; } - [Display(Name="Coût d'un défrisage cheveux courts")] + [Display(Name="défrisage cheveux courts"),DisplayFormat(DataFormatString="{0:C}")] public decimal ShortDefrisPrice { get; set; } - [Display(Name="Coût des mêches sur cheveux longs")] + [Display(Name="mêches sur cheveux longs"),DisplayFormat(DataFormatString="{0:C}")] public decimal LongMechPrice { get; set; } - [Display(Name="Coût des mêches sur cheveux mi-longs")] + [Display(Name="mêches sur cheveux mi-longs"),DisplayFormat(DataFormatString="{0:C}")] public decimal HalfMechPrice { get; set; } - [Display(Name="Coût des mêches sur cheveux courts")] + [Display(Name="mêches sur cheveux courts"),DisplayFormat(DataFormatString="{0:C}")] public decimal ShortMechPrice { get; set; } - [Display(Name="Coût du balayage cheveux longs")] + [Display(Name="balayage cheveux longs"),DisplayFormat(DataFormatString="{0:C}")] public decimal LongBalayagePrice { get; set; } - [Display(Name="Coût du balayage cheveux mi-longs")] + [Display(Name="balayage cheveux mi-longs"),DisplayFormat(DataFormatString="{0:C}")] public decimal HalfBalayagePrice { get; set; } - [Display(Name="Coût du balayage cheveux courts")] + [Display(Name="balayage cheveux courts"),DisplayFormat(DataFormatString="{0:C}")] public decimal ShortBalayagePrice { get; set; } - } } \ No newline at end of file diff --git a/Yavsc/Models/Workflow/PerformerProfile.cs b/Yavsc/Models/Workflow/PerformerProfile.cs index b6318e03..31e30233 100644 --- a/Yavsc/Models/Workflow/PerformerProfile.cs +++ b/Yavsc/Models/Workflow/PerformerProfile.cs @@ -42,10 +42,10 @@ namespace Yavsc.Models.Workflow [Display(Name="Active")] public bool Active { get; set; } - [Display(Name="Maximal Daily Cost (euro/day)")] + [Display(Name="Maximal Daily Cost (euro/day)"),DisplayFormat(DataFormatString="{0:C}")] public int? MaxDailyCost { get; set; } - [Display(Name="Minimal Daily Cost (euro/day)")] + [Display(Name="Minimal Daily Cost (euro/day)"),DisplayFormat(DataFormatString="{0:C}")] public int? MinDailyCost { get; set; } [Display(Name="Rate from clients")] diff --git a/Yavsc/Views/BrusherProfile/Index.cshtml b/Yavsc/Views/BrusherProfile/Index.cshtml index f3a715e5..84efd2d1 100644 --- a/Yavsc/Views/BrusherProfile/Index.cshtml +++ b/Yavsc/Views/BrusherProfile/Index.cshtml @@ -9,6 +9,11 @@
@if (Model!=null) { + +
+Disponibilités + +
@Html.DisplayNameFor(model => model.EndOfTheDay) @@ -22,6 +27,19 @@
@Html.Partial("HourFromMinutes", Model.StartOfTheDay)
+
+
+
+Tarifs hors coiffure ou coupe + + +
+
+ @Html.DisplayNameFor(model => model.ShampooPrice) +
+
+ @Html.DisplayFor(model => model.ShampooPrice) +
@Html.DisplayNameFor(model => model.CarePrice) @@ -29,71 +47,49 @@
@Html.DisplayFor(model => model.CarePrice)
-
- @Html.DisplayNameFor(model => model.HalfBalayagePrice) -
-
- @Html.DisplayFor(model => model.HalfBalayagePrice) -
-
- @Html.DisplayNameFor(model => model.HalfBrushingPrice) -
-
- @Html.DisplayFor(model => model.HalfBrushingPrice) -
-
- @Html.DisplayNameFor(model => model.HalfColorPrice) -
-
- @Html.DisplayFor(model => model.HalfColorPrice) -
-
- @Html.DisplayNameFor(model => model.HalfDefrisPrice) -
-
- @Html.DisplayFor(model => model.HalfDefrisPrice) -
-
- @Html.DisplayNameFor(model => model.HalfMechPrice) -
-
- @Html.DisplayFor(model => model.HalfMechPrice) -
-
- @Html.DisplayNameFor(model => model.HalfMultiColorPrice) -
-
- @Html.DisplayFor(model => model.HalfMultiColorPrice) -
-
- @Html.DisplayNameFor(model => model.HalfPermanentPrice) -
-
- @Html.DisplayFor(model => model.HalfPermanentPrice) -
-
- @Html.DisplayNameFor(model => model.KidCutPrice) -
-
- @Html.DisplayFor(model => model.KidCutPrice) -
+ +
+
+ +
+Tarifs balayages + + +
@Html.DisplayNameFor(model => model.LongBalayagePrice)
@Html.DisplayFor(model => model.LongBalayagePrice)
+
- @Html.DisplayNameFor(model => model.LongBrushingPrice) + @Html.DisplayNameFor(model => model.HalfBalayagePrice)
- @Html.DisplayFor(model => model.LongBrushingPrice) + @Html.DisplayFor(model => model.HalfBalayagePrice)
-
- @Html.DisplayNameFor(model => model.LongColorPrice) + +
+ @Html.DisplayNameFor(model => model.ShortBalayagePrice)
- @Html.DisplayFor(model => model.LongColorPrice) + @Html.DisplayFor(model => model.ShortBalayagePrice) +
+
+
+ +
+Tarifs défrisage + + +
+ +
+ @Html.DisplayNameFor(model => model.HalfDefrisPrice) +
+
+ @Html.DisplayFor(model => model.HalfDefrisPrice)
@Html.DisplayNameFor(model => model.LongDefrisPrice) @@ -101,72 +97,186 @@
@Html.DisplayFor(model => model.LongDefrisPrice)
-
- @Html.DisplayNameFor(model => model.LongMechPrice) -
-
- @Html.DisplayFor(model => model.LongMechPrice) -
-
- @Html.DisplayNameFor(model => model.LongMultiColorPrice) -
-
- @Html.DisplayFor(model => model.LongMultiColorPrice) -
-
- @Html.DisplayNameFor(model => model.LongPermanentPrice) -
-
- @Html.DisplayFor(model => model.LongPermanentPrice) -
-
- @Html.DisplayNameFor(model => model.ManCutPrice) -
-
- @Html.DisplayFor(model => model.ManCutPrice) -
-
- @Html.DisplayNameFor(model => model.ShampooPrice) -
-
- @Html.DisplayFor(model => model.ShampooPrice) -
-
- @Html.DisplayNameFor(model => model.ShortBalayagePrice) -
-
- @Html.DisplayFor(model => model.ShortBalayagePrice) -
-
- @Html.DisplayNameFor(model => model.ShortBrushingPrice) -
-
- @Html.DisplayFor(model => model.ShortBrushingPrice) -
-
- @Html.DisplayNameFor(model => model.ShortColorPrice) -
-
- @Html.DisplayFor(model => model.ShortColorPrice) -
@Html.DisplayNameFor(model => model.ShortDefrisPrice)
@Html.DisplayFor(model => model.ShortDefrisPrice)
+
+
+ +
+Tarifs mèches + + +
+
+ @Html.DisplayNameFor(model => model.HalfMechPrice) +
+
+ @Html.DisplayFor(model => model.HalfMechPrice) +
+
+ @Html.DisplayNameFor(model => model.LongMechPrice) +
+
+ @Html.DisplayFor(model => model.LongMechPrice) +
@Html.DisplayNameFor(model => model.ShortMechPrice)
@Html.DisplayFor(model => model.ShortMechPrice)
+ + + + +
+
+
+Tarifs coupes + + +
+ + +
+ @Html.DisplayNameFor(model => model.WomenHalfCutPrice) +
+
+ @Html.DisplayFor(model => model.WomenHalfCutPrice) +
+ +
+ @Html.DisplayNameFor(model => model.WomenLongCutPrice) +
+
+ @Html.DisplayFor(model => model.WomenLongCutPrice) +
+ +
+ @Html.DisplayNameFor(model => model.WomenShortCutPrice) +
+
+ @Html.DisplayFor(model => model.WomenShortCutPrice) +
+ + +
+ @Html.DisplayNameFor(model => model.ManCutPrice) +
+
+ @Html.DisplayFor(model => model.ManCutPrice) +
+ +
+ @Html.DisplayNameFor(model => model.KidCutPrice) +
+
+ @Html.DisplayFor(model => model.KidCutPrice) +
+ +
+
+
+Tarifs couleurs + + +
+
+ @Html.DisplayNameFor(model => model.LongColorPrice) +
+
+ @Html.DisplayFor(model => model.LongColorPrice) +
+
+ @Html.DisplayNameFor(model => model.HalfColorPrice) +
+
+ @Html.DisplayFor(model => model.HalfColorPrice) +
+ +
+ @Html.DisplayNameFor(model => model.ShortColorPrice) +
+
+ @Html.DisplayFor(model => model.ShortColorPrice) +
+
+
@Html.DisplayNameFor(model => model.ShortMultiColorPrice)
@Html.DisplayFor(model => model.ShortMultiColorPrice)
+
+ @Html.DisplayNameFor(model => model.HalfMultiColorPrice) +
+
+ @Html.DisplayFor(model => model.HalfMultiColorPrice) +
+
+ @Html.DisplayNameFor(model => model.LongMultiColorPrice) +
+
+ @Html.DisplayFor(model => model.LongMultiColorPrice) +
+ +
+
+
+Tarifs burshing + + +
+ +
+ @Html.DisplayNameFor(model => model.LongBrushingPrice) +
+
+ @Html.DisplayFor(model => model.LongBrushingPrice) +
+
+ @Html.DisplayNameFor(model => model.HalfBrushingPrice) +
+
+ @Html.DisplayFor(model => model.HalfBrushingPrice) +
+ +
+ @Html.DisplayNameFor(model => model.ShortBrushingPrice) +
+
+ @Html.DisplayFor(model => model.ShortBrushingPrice) +
+ + + +
+
+
+Tarifs permanentes + + +
+ +
+ @Html.DisplayNameFor(model => model.LongPermanentPrice) +
+
+ @Html.DisplayFor(model => model.LongPermanentPrice) +
+
+ @Html.DisplayNameFor(model => model.HalfPermanentPrice) +
+
+ @Html.DisplayFor(model => model.HalfPermanentPrice) +
+ +
@Html.DisplayNameFor(model => model.ShortPermanentPrice)
@@ -174,25 +284,13 @@ @Html.DisplayFor(model => model.ShortPermanentPrice) -
- @Html.DisplayNameFor(model => model.WomenHalfCutPrice) -
-
- @Html.DisplayFor(model => model.WomenHalfCutPrice) -
-
- @Html.DisplayNameFor(model => model.WomenLongCutPrice) -
-
- @Html.DisplayFor(model => model.WomenLongCutPrice) -
-
- @Html.DisplayNameFor(model => model.WomenShortCutPrice) -
-
- @Html.DisplayFor(model => model.WomenShortCutPrice) -
-
} + + + +
+ + + } else { @SR["Aucun profile renseigné"] } diff --git a/Yavsc/Views/Shared/HourFromMinutes.cshtml b/Yavsc/Views/Shared/HourFromMinutes.cshtml index 319acb5b..d74689b0 100644 --- a/Yavsc/Views/Shared/HourFromMinutes.cshtml +++ b/Yavsc/Views/Shared/HourFromMinutes.cshtml @@ -1,2 +1,2 @@ @model int -@(Model/60):@(Model%60) \ No newline at end of file +@((Model/60).ToString("00")):@((Model%60).ToString("00")) \ No newline at end of file