From d0222b28e860fbc84ffdfeabca3469a6a37c7920 Mon Sep 17 00:00:00 2001
From: dmnisson <d.m.nisson@gmail.com>
Date: Mon, 19 Nov 2018 17:02:40 -0800
Subject: [PATCH] #14, close #18: added appropriate display names and
 constraints on Leg model

---
 DriverTracker/DriverTracker.db                | Bin 131072 -> 131072 bytes
 DriverTracker/Models/Leg.cs                   |  36 ++++++++++++++++++
 .../Models/LessThanOrEqualToAttribute.cs      |  24 ++++++++++++
 3 files changed, 60 insertions(+)
 create mode 100644 DriverTracker/Models/LessThanOrEqualToAttribute.cs

diff --git a/DriverTracker/DriverTracker.db b/DriverTracker/DriverTracker.db
index e17322ad523bc20cb94fff67d387ed33c7c93a19..62070544dc885ec1e7670789c9745883e384b607 100644
GIT binary patch
delta 59
zcmZo@;Am*zm>|ulI8nx#QE_9!vV67|4E*_gFE$Gb+~MPEWMSfE;B+)Lwlx+OW}N)J
PuB17uetT9u<Fp0<7bz0H

delta 59
zcmZo@;Am*zm>|ulFj2;tQDI}kvV69e4E*_gFE<Mc+~wnIWM<-J;B+)Lwlx+O=A8Vk
PuB17;etUL3<J1NK7lsnX

diff --git a/DriverTracker/Models/Leg.cs b/DriverTracker/Models/Leg.cs
index 33be760..ccfbf6f 100644
--- a/DriverTracker/Models/Leg.cs
+++ b/DriverTracker/Models/Leg.cs
@@ -1,6 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
 
 namespace DriverTracker.Models
 {
@@ -9,15 +11,49 @@ public class Leg
         public int LegID { get; set; }
         public int DriverID { get; set; }
 
+        [Display(Name = "Pickup Address")]
+        [Required(ErrorMessage = "A leg must have a pickup address.")]
         public string StartAddress { get; set; }
+
+        [Display(Name = "Requested Pickup Time")]
         public DateTime? PickupRequestTime { get; set; }
+
+        [Display(Name = "Pickup Time")]
+        [Required(ErrorMessage = "A leg must have a pickup time.")]
         public DateTime StartTime { get; set; }
+
+        [Display(Name = "Destination Address")]
+        [Required(ErrorMessage = "A leg must end somewhere.")]
         public string DestinationAddress { get; set; }
+
+        [Display(Name = "Arrival Time")]
+        [Required(ErrorMessage = "A leg must end some time.")]
         public DateTime ArrivalTime { get; set; }
+
+        [Display(Name = "Distance")]
+        [Required(ErrorMessage = "A leg must have a distance.")]
+        [Range(0, int.MaxValue, ErrorMessage = "Distance cannot be negative.")]
         public decimal Distance { get; set; }
+
+        [Display(Name = "Fare")]
+        [Required(ErrorMessage = "A fare value is required. Enter 0 for free rides.")]
+        [Range(0, int.MaxValue, ErrorMessage = "Fare cannot be negative.")]
         public decimal Fare { get; set; } // per-passenger fare
+
+        [Display(Name = "Passengers Aboard")]
+        [Required(ErrorMessage = "A number of passengers is required. Enter 0 for non-passenger legs.")]
+        [Range(0, int.MaxValue, ErrorMessage = "Number of passengers cannot be negative.")]
         public int NumOfPassengersAboard { get; set; }
+
+        [Display(Name = "Pickups")]
+        [Required(ErrorMessage = "A number of passengers is required. Enter 0 for non-passenger legs.")]
+        [Range(0, int.MaxValue, ErrorMessage = "Number of pickups cannot be negative.")]
+        [LessThanOrEqualTo("NumOfPassengersAboard", ErrorMessage = "More passengers cannot have been picked up than are now aboard.")]
         public int NumOfPassengersPickedUp { get; set; }
+
+        [Display(Name = "Fuel Cost")]
+        [Required(ErrorMessage = "A fuel cost is required.")]
+        [Range(0, Double.PositiveInfinity, ErrorMessage = "Fuel cost cannot be negative.")]
         public decimal FuelCost { get; set; } // fuel cost per mile
 
         public Driver Driver { get; set; }
diff --git a/DriverTracker/Models/LessThanOrEqualToAttribute.cs b/DriverTracker/Models/LessThanOrEqualToAttribute.cs
new file mode 100644
index 0000000..b691de6
--- /dev/null
+++ b/DriverTracker/Models/LessThanOrEqualToAttribute.cs
@@ -0,0 +1,24 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+
+namespace DriverTracker.Models
+{
+    public class LessThanOrEqualToAttribute : ValidationAttribute
+    {
+        private readonly string _dependentProperty;
+
+        public LessThanOrEqualToAttribute(string dependentProperty)
+        {
+            _dependentProperty = dependentProperty;
+        }
+
+        protected override ValidationResult IsValid(object value, ValidationContext validationContext)
+        {
+            object model = validationContext.ObjectInstance;
+
+            return Convert.ToDecimal(value) > Convert.ToDecimal(model.GetType().GetProperty(_dependentProperty).GetValue(model))
+                ? new ValidationResult(this.ErrorMessage)
+                : ValidationResult.Success;
+        }
+    }
+}