refabrique des commandes

Yavsc/Model/Billing/Command.cs

@@ -0,0 +1,9 @@
+using Yavsc.Models.Market;
+
+namespace Yavsc.Models.Billing
+{
+
+ public class Command<P> where P:BaseProduct {
+ }
+    
+ }

Yavsc/Model/Billing/CommandLine.cs

@@ -1,9 +1,9 @@
 
-
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
+using Yavsc.Models.Market;
 
-namespace Yavsc.Models
+namespace Yavsc.Models.Billing
 {
 
  public class CommandLine {

Yavsc/Model/Billing/Estimate.cs

@@ -3,10 +3,11 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
+using Yavsc.Models.Booking;
 
-namespace Yavsc.Models
+namespace Yavsc.Models.Billing
 {
-    public partial class Estimate
+    public partial class RDVEstimate
     {
         [Key(), DatabaseGenerated(DatabaseGeneratedOption.Identity)]
         public long Id { get; set; }
@@ -19,7 +20,7 @@ namespace Yavsc.Models
         /// </summary>
         /// <returns></returns>
         [ForeignKey("CommandId")]
-        public virtual Command Command { get; set; }
+        public BookQuery Query { get; set; }  
         public string Description { get; set; }
         public int? Status { get; set; }
         public string Title { get; set; }

Yavsc/Model/Billing/EstimateAgreement.cs

@@ -1,9 +1,9 @@
 
 using System;
 
-namespace Yavsc.Models
+namespace Yavsc.Models.Billing
 {
-    public partial class EstimateAgreement : Estimate
+    public partial class EstimateAgreement : RDVEstimate
     {
         public DateTime ClientValidationDate { get; set; }
     }

Yavsc/Model/Billing/NominatvieCommande.cs

@@ -3,17 +3,13 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
+using Yavsc.Models.Market;
+using Yavsc.Models.Workflow;
 
-namespace Yavsc.Models
+namespace Yavsc.Models.Billing
 {
 
- public class Command {
-
-    /// <summary>
-    /// The command identifier
-    /// </summary>
-    [Key(), DatabaseGenerated(DatabaseGeneratedOption.Identity)]
-    public long Id {get; set; }
+ public class NominativeServiceCommand : Command<Service> {
 
     public string ClientId { get; set; }
 
@@ -40,6 +36,10 @@ namespace Yavsc.Models
     public DateTime CreationDate {get; set;}
 
     public decimal? Previsional { get; set; }
+    /// <summary>
+    /// The bill
+    /// </summary>
+    /// <returns></returns>
     public List<CommandLine> Bill { get; set; }
 
     ///<summary>

Yavsc/Model/Billing/histoestim.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Yavsc.Models
+namespace Yavsc.Models.Billing
 {
     public partial class histoestim
     {

Yavsc/Model/Billing/satisfaction.cs

@@ -2,7 +2,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Yavsc.Models
+namespace Yavsc.Models.Billing
 {
     public partial class satisfaction
     {

Yavsc/Model/Billing/writtings.cs

@@ -1,5 +1,5 @@
 
-namespace Yavsc.Models
+namespace Yavsc.Models.Billing
 {
     public partial class writtings
     {

Yavsc/Model/Billing/wrtags.cs

@@ -1,5 +1,5 @@
 
-namespace Yavsc.Models
+namespace Yavsc.Models.Billing
 {
     public partial class wrtags
     {