From 612547c4a1c76a2629cf1928b57a583f2453b361 Mon Sep 17 00:00:00 2001 From: Paul Schneider Date: Wed, 16 Nov 2016 10:16:24 +0100 Subject: [PATCH 1/4] a better name --- Yavsc/Helpers/TeXHelpers.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Yavsc/Helpers/TeXHelpers.cs b/Yavsc/Helpers/TeXHelpers.cs index 3f5860f9..59052165 100644 --- a/Yavsc/Helpers/TeXHelpers.cs +++ b/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); } } From dfa034afcf5d1f5210668b4159ea01827639debc Mon Sep 17 00:00:00 2001 From: Paul Schneider Date: Wed, 16 Nov 2016 10:17:24 +0100 Subject: [PATCH 2/4] a form model --- Yavsc/Model/Forms/Field.cs | 21 +++++++++++++++++++++ Yavsc/Model/Forms/FieldSet.cs | 11 +++++++++++ Yavsc/Model/Forms/Form.cs | 14 ++++++++++++++ Yavsc/Model/Forms/Validation/Method.cs | 17 +++++++++++++++++ Yavsc/Model/Forms/Validation/Required.cs | 7 +++++++ 5 files changed, 70 insertions(+) create mode 100644 Yavsc/Model/Forms/Field.cs create mode 100644 Yavsc/Model/Forms/FieldSet.cs create mode 100644 Yavsc/Model/Forms/Form.cs create mode 100644 Yavsc/Model/Forms/Validation/Method.cs create mode 100644 Yavsc/Model/Forms/Validation/Required.cs diff --git a/Yavsc/Model/Forms/Field.cs b/Yavsc/Model/Forms/Field.cs new file mode 100644 index 00000000..e2e12b6f --- /dev/null +++ b/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; } + + } +} \ No newline at end of file diff --git a/Yavsc/Model/Forms/FieldSet.cs b/Yavsc/Model/Forms/FieldSet.cs new file mode 100644 index 00000000..93ebae4f --- /dev/null +++ b/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 Fields { get; set; } + + } +} \ No newline at end of file diff --git a/Yavsc/Model/Forms/Form.cs b/Yavsc/Model/Forms/Form.cs new file mode 100644 index 00000000..683fd6f2 --- /dev/null +++ b/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 Content { get; set; } + } +} \ No newline at end of file diff --git a/Yavsc/Model/Forms/Validation/Method.cs b/Yavsc/Model/Forms/Validation/Method.cs new file mode 100644 index 00000000..13649d94 --- /dev/null +++ b/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; } + + /// + /// TODO localisation ... + /// + /// + [Required] + public string ErrorMessage { get; set; } + } +} \ No newline at end of file diff --git a/Yavsc/Model/Forms/Validation/Required.cs b/Yavsc/Model/Forms/Validation/Required.cs new file mode 100644 index 00000000..3008c121 --- /dev/null +++ b/Yavsc/Model/Forms/Validation/Required.cs @@ -0,0 +1,7 @@ +namespace Yavsc.Model.Forms.Validation +{ + public class Required : Method + { + + } +} \ No newline at end of file From c3bd9aa12e9c8de654b395d1180756f1c03a65ac Mon Sep 17 00:00:00 2001 From: Paul Schneider Date: Wed, 16 Nov 2016 10:17:39 +0100 Subject: [PATCH 3/4] code formatting --- Yavsc/Model/Market/Money.cs | 3 +++ Yavsc/Model/Market/Product.cs | 2 ++ Yavsc/Model/Market/Service.cs | 1 + 3 files changed, 6 insertions(+) diff --git a/Yavsc/Model/Market/Money.cs b/Yavsc/Model/Market/Money.cs index 7bb4b175..fd6a5546 100644 --- a/Yavsc/Model/Market/Money.cs +++ b/Yavsc/Model/Market/Money.cs @@ -1,6 +1,9 @@ using System; namespace Yavsc.Models.Market { + /// + /// Not yet used! + /// public class Money : IUnit { public Money(string name, decimal euroExchangeRate) diff --git a/Yavsc/Model/Market/Product.cs b/Yavsc/Model/Market/Product.cs index 9c500f9f..e616ffe0 100644 --- a/Yavsc/Model/Market/Product.cs +++ b/Yavsc/Model/Market/Product.cs @@ -25,6 +25,8 @@ namespace Yavsc.Models.Market /// /// public decimal? Price { get; set; } + + // TODO make use of public Money Money { get; set; } } } diff --git a/Yavsc/Model/Market/Service.cs b/Yavsc/Model/Market/Service.cs index 4d116294..e6095690 100644 --- a/Yavsc/Model/Market/Service.cs +++ b/Yavsc/Model/Market/Service.cs @@ -25,6 +25,7 @@ namespace Yavsc.Models.Market { [NotMapped] public List Billing { get; set; } + } } \ No newline at end of file From c10e8880876d29bcce29dbe1621585622bf419fd Mon Sep 17 00:00:00 2001 From: Paul Schneider Date: Wed, 16 Nov 2016 10:18:17 +0100 Subject: [PATCH 4/4] uses the new helper to get files --- Yavsc/Controllers/EstimateController.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Yavsc/Controllers/EstimateController.cs b/Yavsc/Controllers/EstimateController.cs index e142560a..919a2db5 100644 --- a/Yavsc/Controllers/EstimateController.cs +++ b/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); }