Merge branch 'vnext' of https://github.com/pazof/yavsc.git

Yavsc/Controllers/EstimateController.cs

@@ -65,7 +65,6 @@ namespace Yavsc.Controllers
             DirectoryInfo di = new DirectoryInfo(_site.UserFiles.DirName);
            
 
-            ViewBag.Files = estimate.GetFileContent(di.FullName);
             return View(estimate);
         }
 
@@ -148,7 +147,9 @@ namespace Yavsc.Controllers
             {
                 return HttpNotFound();
             }
-            ViewBag.Files = estimate.GetFileContent(_site.UserFiles.DirName);
+            
+            ViewBag.Files = User.GetUserFiles(null);
+
             return View(estimate);
         }
 

Yavsc/Helpers/TeXHelpers.cs

@@ -25,7 +25,7 @@ namespace Yavsc.Helpers
             }
         }
 
-        public readonly static Replacement[] SpecialCharsToCommands = 
+        public readonly static Replacement[] SpecialCharsRendering = 
         {
             new Replacement("<","\\textless"),
             new Replacement(">","\\textgreater"),
@@ -53,7 +53,7 @@ namespace Yavsc.Helpers
         string data;
         public TeXString(string str) {
             data = str;
-            foreach (var r in SpecialCharsToCommands) {
+            foreach (var r in SpecialCharsRendering) {
                 data = r.Execute(data);
             }
         }

Yavsc/Model/Forms/Field.cs

@@ -0,0 +1,21 @@
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using Yavsc.Model.Forms.Validation;
+
+namespace Yavsc.Model.Forms
+{
+    public abstract class Field
+    {
+        [Key,DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+        public long Id {  get; set; }
+        public abstract Method [] ValidationMethods ();
+
+        public string Name { get; set; }
+
+        public string Label { get; set; }
+        public string PlaceHolder { get; set; }
+
+        public string ValueType { get; set; }
+
+    }
+}

Yavsc/Model/Forms/FieldSet.cs

@@ -0,0 +1,11 @@
+using System.Collections.Generic;
+
+namespace Yavsc.Model.Forms
+{
+    public class FieldSet
+    {
+        public string Legend {get; set;}
+        public List<Field> Fields { get; set; }
+        
+    }
+}

Yavsc/Model/Forms/Form.cs

@@ -0,0 +1,14 @@
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+
+namespace Yavsc.Model.Forms
+{
+    public class Form
+    {
+        [Key]
+        public string Id {get; set;}
+
+        public string Summary { get; set; } 
+        public List<IFormNode> Content { get; set; }
+    }
+}

Yavsc/Model/Forms/Validation/Method.cs

@@ -0,0 +1,17 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace Yavsc.Model.Forms.Validation
+{
+    public class Method
+    {
+        [Key]
+        public string Name {get; set; }
+        
+        /// <summary>
+        /// TODO localisation ...
+        /// </summary>
+        /// <returns></returns>
+        [Required]
+        public string ErrorMessage { get; set; }
+    }
+}

Yavsc/Model/Forms/Validation/Required.cs

@@ -0,0 +1,7 @@
+namespace Yavsc.Model.Forms.Validation
+{
+    public class Required : Method
+    {
+        
+    }
+}

Yavsc/Model/Market/Money.cs

@@ -1,6 +1,9 @@
 using System;
 
 namespace Yavsc.Models.Market {
+    /// <summary>
+ /// Not yet used!
+ /// </summary>
  public class Money : IUnit<decimal>
     {
         public Money(string name, decimal euroExchangeRate)

Yavsc/Model/Market/Product.cs

@@ -25,6 +25,8 @@ namespace Yavsc.Models.Market
         /// </summary>
         /// <returns></returns>
         public decimal? Price { get; set; }
+
+       // TODO make use of public Money Money { get; set; }
     }
 
 }

Yavsc/Model/Market/Service.cs

@@ -25,6 +25,7 @@ namespace Yavsc.Models.Market {
         [NotMapped]
         public List<IBillingClause> Billing { get; set; }
         
+        
     }
 
 }