From a8743512c02fc7c63e1cb0bd8ee64faa2b517bbe Mon Sep 17 00:00:00 2001 From: WilliamAlkawaz <77669116+WilliamAlkawaz@users.noreply.github.com> Date: Tue, 30 Mar 2021 22:16:26 +1300 Subject: [PATCH 01/20] Update Program.cs --- Order.Management/Program.cs | 86 ++++++++++++++++++++++++++----------- 1 file changed, 61 insertions(+), 25 deletions(-) diff --git a/Order.Management/Program.cs b/Order.Management/Program.cs index 1422f85..2b049c6 100644 --- a/Order.Management/Program.cs +++ b/Order.Management/Program.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Text.RegularExpressions; namespace Order.Management { @@ -22,12 +23,9 @@ static void Main(string[] args) // Order Circle Input public static Circle OrderCirclesInput() { - Console.Write("\nPlease input the number of Red Circle: "); - int redCircle = Convert.ToInt32(userInput()); - Console.Write("Please input the number of Blue Circle: "); - int blueCircle = Convert.ToInt32(userInput()); - Console.Write("Please input the number of Yellow Circle: "); - int yellowCircle = Convert.ToInt32(userInput()); + int redCircle = ReadInt("\nPlease input the number of Red Circle: "); + int blueCircle = ReadInt("Please input the number of Blue Circle: "); + int yellowCircle = ReadInt("Please input the number of Yellow Circle: "); Circle circle = new Circle(redCircle, blueCircle, yellowCircle); return circle; @@ -36,12 +34,9 @@ public static Circle OrderCirclesInput() // Order Squares Input public static Square OrderSquaresInput() { - Console.Write("\nPlease input the number of Red Squares: "); - int redSquare = Convert.ToInt32(userInput()); - Console.Write("Please input the number of Blue Squares: "); - int blueSquare = Convert.ToInt32(userInput()); - Console.Write("Please input the number of Yellow Squares: "); - int yellowSquare = Convert.ToInt32(userInput()); + int redSquare = ReadInt("\nPlease input the number of Red Squares: "); + int blueSquare = ReadInt("Please input the number of Blue Squares: "); + int yellowSquare = ReadInt("Please input the number of Yellow Squares: "); Square square = new Square(redSquare, blueSquare, yellowSquare); return square; @@ -50,12 +45,9 @@ public static Square OrderSquaresInput() // Order Triangles Input public static Triangle OrderTrianglesInput() { - Console.Write("\nPlease input the number of Red Triangles: "); - int redTriangle = Convert.ToInt32(userInput()); - Console.Write("Please input the number of Blue Triangles: "); - int blueTriangle = Convert.ToInt32(userInput()); - Console.Write("Please input the number of Yellow Triangles: "); - int yellowTriangle = Convert.ToInt32(userInput()); + int redTriangle = ReadInt("\nPlease input the number of Red Triangles: "); + int blueTriangle = ReadInt("Please input the number of Blue Triangles: "); + int yellowTriangle = ReadInt("Please input the number of Yellow Triangles: "); Triangle triangle = new Triangle(redTriangle, blueTriangle, yellowTriangle); return triangle; @@ -69,7 +61,6 @@ public static string userInput() { Console.WriteLine("please enter valid details"); input = Console.ReadLine(); - } return input; } @@ -98,12 +89,9 @@ private static void InvoiceReport(string customerName, string address, string du // Get customer Info private static (string customerName, string address, string dueDate) CustomerInfoInput() { - Console.Write("Please input your Name: "); - string customerName = userInput(); - Console.Write("Please input your Address: "); - string address = userInput(); - Console.Write("Please input your Due Date: "); - string dueDate = userInput(); + string customerName = ReadName("Please input your Name: "); + string address = ReadAddress("Please input your Address: "); + string dueDate = ReadDate("Please input your Due Date: ").ToString(); return (customerName, address, dueDate); } @@ -120,5 +108,53 @@ private static List CustomerOrderInput() orderedShapes.Add(circle); return orderedShapes; } + + // Create a funcion to read int only + private static int ReadInt(string prompt) + { + Console.Write(prompt); + string number = Console.ReadLine(); + int value; + while(!Int32.TryParse(number, out value)) + { + Console.Write("Not a valid number, try again: "); + number = Console.ReadLine(); + } + return value; + } + private static string ReadName(string prompt) + { + Console.Write(prompt); + string name = Console.ReadLine(); + while (!Regex.IsMatch(name, @"^[A-Za-zÀ-ú]+ [A-Za-zÀ-ú]+$")) + { + Console.Write("Name must be 1-35 alfanum, try again: "); + name = Console.ReadLine(); + } + return name; + } + public static string ReadAddress(string prompt) + { + Console.Write(prompt); + string input = Console.ReadLine(); + while (string.IsNullOrEmpty(input)) + { + Console.Write("Please enter a valid address: "); + input = Console.ReadLine(); + } + return input; + } + private static DateTime ReadDate(string prompt) + { + Console.Write(prompt); + string date = Console.ReadLine(); + DateTime value; + while (!DateTime.TryParse(date, out value)) + { + Console.Write("Not a valid date, try again: "); + date = Console.ReadLine(); + } + return value; + } } } From c89c4d5b9f4c14f52b19c0d3015ecc8ca27e4e10 Mon Sep 17 00:00:00 2001 From: WilliamAlkawaz <77669116+WilliamAlkawaz@users.noreply.github.com> Date: Tue, 30 Mar 2021 22:20:03 +1300 Subject: [PATCH 02/20] Update Program.cs --- Order.Management/Program.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Order.Management/Program.cs b/Order.Management/Program.cs index 2b049c6..7d56301 100644 --- a/Order.Management/Program.cs +++ b/Order.Management/Program.cs @@ -122,6 +122,7 @@ private static int ReadInt(string prompt) } return value; } + // Create a function to read names only {first name + last name} private static string ReadName(string prompt) { Console.Write(prompt); @@ -133,6 +134,7 @@ private static string ReadName(string prompt) } return name; } + // Create a fuction to read string only. This can be improved depending on the address format public static string ReadAddress(string prompt) { Console.Write(prompt); @@ -144,6 +146,7 @@ public static string ReadAddress(string prompt) } return input; } + // Create a function that returns a DateTime type only private static DateTime ReadDate(string prompt) { Console.Write(prompt); From d811448c5ded1b09f266ec967b9ff5ac0b2cd495 Mon Sep 17 00:00:00 2001 From: WilliamAlkawaz <77669116+WilliamAlkawaz@users.noreply.github.com> Date: Wed, 31 Mar 2021 08:01:42 +1300 Subject: [PATCH 03/20] Update Shape.cs --- Order.Management/Shape.cs | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Order.Management/Shape.cs b/Order.Management/Shape.cs index 7f5c61c..6347a07 100644 --- a/Order.Management/Shape.cs +++ b/Order.Management/Shape.cs @@ -4,6 +4,16 @@ namespace Order.Management { + /* + The main Math class + Contains all methods for performing basic math functions + /// + /// The main Shape class. + /// Abstract class contains all methods for performing basic shape functions. + /// + /// + /// More specific shapes can inherit this class. + /// abstract class Shape { public string Name { get; set; } From 8d90b64d0394e6cb16b0d13c42a02e497bd0c0df Mon Sep 17 00:00:00 2001 From: WilliamAlkawaz <77669116+WilliamAlkawaz@users.noreply.github.com> Date: Wed, 31 Mar 2021 09:28:17 +1300 Subject: [PATCH 04/20] Update Order.cs --- Order.Management/Order.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Order.Management/Order.cs b/Order.Management/Order.cs index 235c789..e5dea67 100644 --- a/Order.Management/Order.cs +++ b/Order.Management/Order.cs @@ -13,8 +13,9 @@ abstract class Order public List OrderedBlocks { get; set; } public abstract void GenerateReport(); - - public string ToString() + + // Add override to eliminate warning + public override string ToString() { return "\nName: " + CustomerName + " Address: " + Address + " Due Date: " + DueDate + " Order #: " + OrderNumber; } From b21d552b25fe06a0e7ed8f8f65835006c5b68635 Mon Sep 17 00:00:00 2001 From: WilliamAlkawaz <77669116+WilliamAlkawaz@users.noreply.github.com> Date: Wed, 31 Mar 2021 09:28:35 +1300 Subject: [PATCH 05/20] Update Shape.cs --- Order.Management/Shape.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/Order.Management/Shape.cs b/Order.Management/Shape.cs index 6347a07..4ea7353 100644 --- a/Order.Management/Shape.cs +++ b/Order.Management/Shape.cs @@ -7,6 +7,7 @@ namespace Order.Management /* The main Math class Contains all methods for performing basic math functions +*/ /// /// The main Shape class. /// Abstract class contains all methods for performing basic shape functions. From fc02c37c34a634b9b0fca8c68e905f5eb13c0a9b Mon Sep 17 00:00:00 2001 From: WilliamAlkawaz <77669116+WilliamAlkawaz@users.noreply.github.com> Date: Wed, 31 Mar 2021 09:30:17 +1300 Subject: [PATCH 06/20] Update Program.cs --- Order.Management/Program.cs | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/Order.Management/Program.cs b/Order.Management/Program.cs index 7d56301..c3fee54 100644 --- a/Order.Management/Program.cs +++ b/Order.Management/Program.cs @@ -53,18 +53,6 @@ public static Triangle OrderTrianglesInput() return triangle; } - // User Console Input - public static string userInput() - { - string input = Console.ReadLine(); - while (string.IsNullOrEmpty(input)) - { - Console.WriteLine("please enter valid details"); - input = Console.ReadLine(); - } - return input; - } - // Generate Painting Report private static void PaintingReport(string customerName, string address, string dueDate, List orderedShapes) { From 4d1b789d8be5115489372c6818fc8bcb47bab05e Mon Sep 17 00:00:00 2001 From: WilliamAlkawaz <77669116+WilliamAlkawaz@users.noreply.github.com> Date: Wed, 31 Mar 2021 09:56:35 +1300 Subject: [PATCH 07/20] Update Circle.cs --- Order.Management/Circle.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Order.Management/Circle.cs b/Order.Management/Circle.cs index 9824ecc..af4e866 100644 --- a/Order.Management/Circle.cs +++ b/Order.Management/Circle.cs @@ -16,20 +16,20 @@ public Circle(int red, int blue, int yellow) base.NumberOfBlueShape = blue; base.NumberOfYellowShape = yellow; } - public override int Total() + public override double Total() { return RedCirclesTotal() + BlueCirclesTotal() + YellowCirclesTotal(); } - public int RedCirclesTotal() + public double RedCirclesTotal() { return (base.NumberOfRedShape * Price); } - public int BlueCirclesTotal() + public double BlueCirclesTotal() { return (base.NumberOfBlueShape * Price); } - public int YellowCirclesTotal() + public double YellowCirclesTotal() { return (base.NumberOfYellowShape * Price); } From b94cb463ba3a389d0d762592429cf577358fa0e0 Mon Sep 17 00:00:00 2001 From: WilliamAlkawaz <77669116+WilliamAlkawaz@users.noreply.github.com> Date: Wed, 31 Mar 2021 09:56:39 +1300 Subject: [PATCH 08/20] Update CuttingListReport.cs --- Order.Management/CuttingListReport.cs | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/Order.Management/CuttingListReport.cs b/Order.Management/CuttingListReport.cs index 125d45f..0d142eb 100644 --- a/Order.Management/CuttingListReport.cs +++ b/Order.Management/CuttingListReport.cs @@ -6,7 +6,7 @@ namespace Order.Management { class CuttingListReport : Order { - public int tableWidth = 20; + private int tableWidth = 20; public CuttingListReport(string customerName, string customerAddress, string dueDate, List shapes) { base.CustomerName = customerName; @@ -23,18 +23,16 @@ public override void GenerateReport() } public void generateTable() { - PrintLine(); + PrintLine(new string('-', tableWidth)); PrintRow(" ", " Qty "); - PrintLine(); + PrintLine(new string('-', tableWidth)); PrintRow("Square",base.OrderedBlocks[0].TotalQuantityOfShape().ToString()); PrintRow("Triangle", base.OrderedBlocks[1].TotalQuantityOfShape().ToString()); PrintRow("Circle", base.OrderedBlocks[2].TotalQuantityOfShape().ToString()); - PrintLine(); - } - public void PrintLine() - { - Console.WriteLine(new string('-', tableWidth)); + PrintLine(new string('-', tableWidth)); } + //Consider moving this to the base class + public void PrintRow(params string[] columns) { From 7d1adbfa01cb2ba69df16d2d56ad9318fa15ca09 Mon Sep 17 00:00:00 2001 From: WilliamAlkawaz <77669116+WilliamAlkawaz@users.noreply.github.com> Date: Wed, 31 Mar 2021 09:56:42 +1300 Subject: [PATCH 09/20] Update InvoiceReport.cs --- Order.Management/InvoiceReport.cs | 41 ++++++++++++++----------------- 1 file changed, 19 insertions(+), 22 deletions(-) diff --git a/Order.Management/InvoiceReport.cs b/Order.Management/InvoiceReport.cs index 78443c3..15aaa32 100644 --- a/Order.Management/InvoiceReport.cs +++ b/Order.Management/InvoiceReport.cs @@ -6,13 +6,13 @@ namespace Order.Management { class InvoiceReport : Order { - public int tableWidth = 73; + private int tableWidth = 73; public InvoiceReport(string customerName, string customerAddress, string dueDate, List shapes) { - base.CustomerName = customerName; - base.Address = customerAddress; - base.DueDate = dueDate; - base.OrderedBlocks = shapes; + CustomerName = customerName; + Address = customerAddress; + DueDate = dueDate; + OrderedBlocks = shapes; } public override void GenerateReport() @@ -28,45 +28,42 @@ public override void GenerateReport() public void RedPaintSurcharge() { - Console.WriteLine("Red Color Surcharge " + TotalAmountOfRedShapes() + " @ $" + base.OrderedBlocks[0].AdditionalCharge + " ppi = $" + TotalPriceRedPaintSurcharge()); + Console.WriteLine("Red Color Surcharge " + TotalAmountOfRedShapes() + " @ $" + OrderedBlocks[0].AdditionalCharge + " ppi = $" + TotalPriceRedPaintSurcharge()); } public int TotalAmountOfRedShapes() { - return base.OrderedBlocks[0].NumberOfRedShape + base.OrderedBlocks[1].NumberOfRedShape + - base.OrderedBlocks[2].NumberOfRedShape; + return OrderedBlocks[0].NumberOfRedShape + OrderedBlocks[1].NumberOfRedShape + + OrderedBlocks[2].NumberOfRedShape; } public int TotalPriceRedPaintSurcharge() { - return TotalAmountOfRedShapes() * base.OrderedBlocks[0].AdditionalCharge; + return TotalAmountOfRedShapes() * OrderedBlocks[0].AdditionalCharge; } public void GenerateTable() { - PrintLine(); + PrintLine(new string('-', tableWidth)); PrintRow(" ", " Red ", " Blue ", " Yellow "); - PrintLine(); - PrintRow("Square", base.OrderedBlocks[0].NumberOfRedShape.ToString(), base.OrderedBlocks[0].NumberOfBlueShape.ToString(), base.OrderedBlocks[0].NumberOfYellowShape.ToString()); - PrintRow("Triangle", base.OrderedBlocks[1].NumberOfRedShape.ToString(), base.OrderedBlocks[1].NumberOfBlueShape.ToString(), base.OrderedBlocks[1].NumberOfYellowShape.ToString()); - PrintRow("Circle", base.OrderedBlocks[2].NumberOfRedShape.ToString(), base.OrderedBlocks[2].NumberOfBlueShape.ToString(), base.OrderedBlocks[2].NumberOfYellowShape.ToString()); - PrintLine(); + PrintLine(new string('-', tableWidth)); + PrintRow("Square", OrderedBlocks[0].NumberOfRedShape.ToString(), OrderedBlocks[0].NumberOfBlueShape.ToString(), OrderedBlocks[0].NumberOfYellowShape.ToString()); + PrintRow("Triangle", OrderedBlocks[1].NumberOfRedShape.ToString(), OrderedBlocks[1].NumberOfBlueShape.ToString(), OrderedBlocks[1].NumberOfYellowShape.ToString()); + PrintRow("Circle", OrderedBlocks[2].NumberOfRedShape.ToString(), OrderedBlocks[2].NumberOfBlueShape.ToString(), OrderedBlocks[2].NumberOfYellowShape.ToString()); + PrintLine(new string('-', tableWidth)); } public void OrderSquareDetails() { - Console.WriteLine("\nSquares " + base.OrderedBlocks[0].TotalQuantityOfShape() + " @ $" + base.OrderedBlocks[0].Price + " ppi = $" + base.OrderedBlocks[0].Total()); + Console.WriteLine("\nSquares " + OrderedBlocks[0].TotalQuantityOfShape() + " @ $" + OrderedBlocks[0].Price + " ppi = $" + OrderedBlocks[0].Total()); } public void OrderTriangleDetails() { - Console.WriteLine("Triangles " + base.OrderedBlocks[1].TotalQuantityOfShape() + " @ $" + base.OrderedBlocks[1].Price + " ppi = $" + base.OrderedBlocks[1].Total()); + Console.WriteLine("Triangles " + OrderedBlocks[1].TotalQuantityOfShape() + " @ $" + OrderedBlocks[1].Price + " ppi = $" + OrderedBlocks[1].Total()); } public void OrderCircleDetails() { - Console.WriteLine("Circles " + base.OrderedBlocks[2].TotalQuantityOfShape() + " @ $" + base.OrderedBlocks[2].Price + " ppi = $" + base.OrderedBlocks[2].Total()); - } - public void PrintLine() - { - Console.WriteLine(new string('-', tableWidth)); + Console.WriteLine("Circles " + OrderedBlocks[2].TotalQuantityOfShape() + " @ $" + OrderedBlocks[2].Price + " ppi = $" + OrderedBlocks[2].Total()); } + //Consider moving this to the base class public void PrintRow(params string[] columns) { From d947efdd8254defdeac002ea7085257be06533e6 Mon Sep 17 00:00:00 2001 From: WilliamAlkawaz <77669116+WilliamAlkawaz@users.noreply.github.com> Date: Wed, 31 Mar 2021 09:56:49 +1300 Subject: [PATCH 10/20] Update Order.cs --- Order.Management/Order.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Order.Management/Order.cs b/Order.Management/Order.cs index e5dea67..2645cc3 100644 --- a/Order.Management/Order.cs +++ b/Order.Management/Order.cs @@ -19,5 +19,10 @@ public override string ToString() { return "\nName: " + CustomerName + " Address: " + Address + " Due Date: " + DueDate + " Order #: " + OrderNumber; } + + public void PrintLine(string lineToPrint) + { + Console.WriteLine(lineToPrint); + } } } From 9139ea1440876b497bf92c85e93cbfeae9b1e489 Mon Sep 17 00:00:00 2001 From: WilliamAlkawaz <77669116+WilliamAlkawaz@users.noreply.github.com> Date: Wed, 31 Mar 2021 09:56:51 +1300 Subject: [PATCH 11/20] Update Shape.cs --- Order.Management/Shape.cs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Order.Management/Shape.cs b/Order.Management/Shape.cs index 4ea7353..2f1306e 100644 --- a/Order.Management/Shape.cs +++ b/Order.Management/Shape.cs @@ -18,7 +18,12 @@ The main Math class abstract class Shape { public string Name { get; set; } - public int Price { get; set; } + private double _price; + //Price is decimal value of 2 decimal places + public double Price { + get { return Math.Round(_price, 2); } + set { _price = value; } + } public int AdditionalCharge { get; set; } public int NumberOfRedShape { get; set; } public int NumberOfBlueShape { get; set; } @@ -32,7 +37,7 @@ public int AdditionalChargeTotal() { return NumberOfRedShape * AdditionalCharge; } - public abstract int Total(); + public abstract double Total(); } } From 94fb6d184305305a516d73745a036325ae8b57c5 Mon Sep 17 00:00:00 2001 From: WilliamAlkawaz <77669116+WilliamAlkawaz@users.noreply.github.com> Date: Wed, 31 Mar 2021 09:56:54 +1300 Subject: [PATCH 12/20] Update Triangle.cs --- Order.Management/Triangle.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Order.Management/Triangle.cs b/Order.Management/Triangle.cs index dbf48ff..cdcf90e 100644 --- a/Order.Management/Triangle.cs +++ b/Order.Management/Triangle.cs @@ -17,20 +17,20 @@ public Triangle(int numberOfRedTriangles, int numberOfBlueTriangles, int numberO base.NumberOfYellowShape = numberOfYellowTriangles; } - public override int Total() + public override double Total() { return RedTrianglesTotal() + BlueTrianglesTotal() + YellowTrianglesTotal(); } - public int RedTrianglesTotal() + public double RedTrianglesTotal() { return (base.NumberOfRedShape * Price); } - public int BlueTrianglesTotal() + public double BlueTrianglesTotal() { return (base.NumberOfBlueShape * Price); } - public int YellowTrianglesTotal() + public double YellowTrianglesTotal() { return (base.NumberOfYellowShape * Price); } From 51b1e88585e20bb6254dafe15a47008960bd7cdf Mon Sep 17 00:00:00 2001 From: WilliamAlkawaz <77669116+WilliamAlkawaz@users.noreply.github.com> Date: Wed, 31 Mar 2021 09:56:58 +1300 Subject: [PATCH 13/20] Update PaintingReport.cs --- Order.Management/PaintingReport.cs | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/Order.Management/PaintingReport.cs b/Order.Management/PaintingReport.cs index 9b61c83..7605806 100644 --- a/Order.Management/PaintingReport.cs +++ b/Order.Management/PaintingReport.cs @@ -23,19 +23,15 @@ public override void GenerateReport() public void generateTable() { - PrintLine(); + PrintLine(new string('-', tableWidth)); PrintRow(" ", " Red ", " Blue ", " Yellow "); - PrintLine(); + PrintLine(new string('-', tableWidth)); PrintRow("Square", base.OrderedBlocks[0].NumberOfRedShape.ToString(), base.OrderedBlocks[0].NumberOfBlueShape.ToString(), base.OrderedBlocks[0].NumberOfYellowShape.ToString()); PrintRow("Triangle", base.OrderedBlocks[1].NumberOfRedShape.ToString(), base.OrderedBlocks[1].NumberOfBlueShape.ToString(), base.OrderedBlocks[1].NumberOfYellowShape.ToString()); PrintRow("Circle", base.OrderedBlocks[2].NumberOfRedShape.ToString(), base.OrderedBlocks[2].NumberOfBlueShape.ToString(), base.OrderedBlocks[2].NumberOfYellowShape.ToString()); - PrintLine(); - } - - public void PrintLine() - { - Console.WriteLine(new string('-', tableWidth)); + PrintLine(new string('-', tableWidth)); } + //Consider moving this to the base class public void PrintRow(params string[] columns) { From eb63fb81a37dde139172312dae4773e90ea51500 Mon Sep 17 00:00:00 2001 From: WilliamAlkawaz <77669116+WilliamAlkawaz@users.noreply.github.com> Date: Wed, 31 Mar 2021 09:57:01 +1300 Subject: [PATCH 14/20] Update Square.cs --- Order.Management/Square.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Order.Management/Square.cs b/Order.Management/Square.cs index 017601e..a5e9bdf 100644 --- a/Order.Management/Square.cs +++ b/Order.Management/Square.cs @@ -19,20 +19,20 @@ public Square(int numberOfRedSquares, int numberOfBlueSquares, int numberOfYello base.NumberOfYellowShape = numberOfYellowSquares; } - public override int Total() + public override double Total() { return RedSquaresTotal() + BlueSquaresTotal() + YellowSquaresTotal(); } - public int RedSquaresTotal() + public double RedSquaresTotal() { return (base.NumberOfRedShape * Price); } - public int BlueSquaresTotal() + public double BlueSquaresTotal() { return (base.NumberOfBlueShape * Price); } - public int YellowSquaresTotal() + public double YellowSquaresTotal() { return (base.NumberOfYellowShape * Price); } From ca73181a5548f4304fc69f77d62d517ba8874c58 Mon Sep 17 00:00:00 2001 From: WilliamAlkawaz <77669116+WilliamAlkawaz@users.noreply.github.com> Date: Wed, 31 Mar 2021 10:11:58 +1300 Subject: [PATCH 15/20] Update Circle.cs --- Order.Management/Circle.cs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Order.Management/Circle.cs b/Order.Management/Circle.cs index af4e866..95ec542 100644 --- a/Order.Management/Circle.cs +++ b/Order.Management/Circle.cs @@ -6,15 +6,15 @@ namespace Order.Management { class Circle : Shape { - public int circlePrice = 3; + private double circlePrice = 3; public Circle(int red, int blue, int yellow) { Name = "Circle"; - base.Price = circlePrice; + Price = circlePrice; AdditionalCharge = 1; - base.NumberOfRedShape = red; - base.NumberOfBlueShape = blue; - base.NumberOfYellowShape = yellow; + NumberOfRedShape = red; + NumberOfBlueShape = blue; + NumberOfYellowShape = yellow; } public override double Total() { @@ -23,15 +23,15 @@ public override double Total() public double RedCirclesTotal() { - return (base.NumberOfRedShape * Price); + return (NumberOfRedShape * Price); } public double BlueCirclesTotal() { - return (base.NumberOfBlueShape * Price); + return (NumberOfBlueShape * Price); } public double YellowCirclesTotal() { - return (base.NumberOfYellowShape * Price); + return (NumberOfYellowShape * Price); } } } From e00b47fe68884ada11b49967705d9ca93a85211c Mon Sep 17 00:00:00 2001 From: WilliamAlkawaz <77669116+WilliamAlkawaz@users.noreply.github.com> Date: Wed, 31 Mar 2021 10:12:01 +1300 Subject: [PATCH 16/20] Update CuttingListReport.cs --- Order.Management/CuttingListReport.cs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Order.Management/CuttingListReport.cs b/Order.Management/CuttingListReport.cs index 0d142eb..bb415f7 100644 --- a/Order.Management/CuttingListReport.cs +++ b/Order.Management/CuttingListReport.cs @@ -9,16 +9,16 @@ class CuttingListReport : Order private int tableWidth = 20; public CuttingListReport(string customerName, string customerAddress, string dueDate, List shapes) { - base.CustomerName = customerName; - base.Address = customerAddress; - base.DueDate = dueDate; - base.OrderedBlocks = shapes; + CustomerName = customerName; + Address = customerAddress; + DueDate = dueDate; + OrderedBlocks = shapes; } public override void GenerateReport() { Console.WriteLine("\nYour cutting list has been generated: "); - Console.WriteLine(base.ToString()); + Console.WriteLine(ToString()); generateTable(); } public void generateTable() @@ -26,9 +26,9 @@ public void generateTable() PrintLine(new string('-', tableWidth)); PrintRow(" ", " Qty "); PrintLine(new string('-', tableWidth)); - PrintRow("Square",base.OrderedBlocks[0].TotalQuantityOfShape().ToString()); - PrintRow("Triangle", base.OrderedBlocks[1].TotalQuantityOfShape().ToString()); - PrintRow("Circle", base.OrderedBlocks[2].TotalQuantityOfShape().ToString()); + PrintRow("Square", OrderedBlocks[0].TotalQuantityOfShape().ToString()); + PrintRow("Triangle", OrderedBlocks[1].TotalQuantityOfShape().ToString()); + PrintRow("Circle", OrderedBlocks[2].TotalQuantityOfShape().ToString()); PrintLine(new string('-', tableWidth)); } //Consider moving this to the base class From 70beff08e53dc94ec706ade2e6e92acbd9e75e19 Mon Sep 17 00:00:00 2001 From: WilliamAlkawaz <77669116+WilliamAlkawaz@users.noreply.github.com> Date: Wed, 31 Mar 2021 10:12:05 +1300 Subject: [PATCH 17/20] Update PaintingReport.cs --- Order.Management/PaintingReport.cs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Order.Management/PaintingReport.cs b/Order.Management/PaintingReport.cs index 7605806..9be2a4f 100644 --- a/Order.Management/PaintingReport.cs +++ b/Order.Management/PaintingReport.cs @@ -9,10 +9,10 @@ class PaintingReport : Order public int tableWidth = 73; public PaintingReport(string customerName, string customerAddress, string dueDate, List shapes) { - base.CustomerName = customerName; - base.Address = customerAddress; - base.DueDate = dueDate; - base.OrderedBlocks = shapes; + CustomerName = customerName; + Address = customerAddress; + DueDate = dueDate; + OrderedBlocks = shapes; } public override void GenerateReport() { @@ -26,9 +26,9 @@ public void generateTable() PrintLine(new string('-', tableWidth)); PrintRow(" ", " Red ", " Blue ", " Yellow "); PrintLine(new string('-', tableWidth)); - PrintRow("Square", base.OrderedBlocks[0].NumberOfRedShape.ToString(), base.OrderedBlocks[0].NumberOfBlueShape.ToString(), base.OrderedBlocks[0].NumberOfYellowShape.ToString()); - PrintRow("Triangle", base.OrderedBlocks[1].NumberOfRedShape.ToString(), base.OrderedBlocks[1].NumberOfBlueShape.ToString(), base.OrderedBlocks[1].NumberOfYellowShape.ToString()); - PrintRow("Circle", base.OrderedBlocks[2].NumberOfRedShape.ToString(), base.OrderedBlocks[2].NumberOfBlueShape.ToString(), base.OrderedBlocks[2].NumberOfYellowShape.ToString()); + PrintRow("Square", OrderedBlocks[0].NumberOfRedShape.ToString(), OrderedBlocks[0].NumberOfBlueShape.ToString(), OrderedBlocks[0].NumberOfYellowShape.ToString()); + PrintRow("Triangle", OrderedBlocks[1].NumberOfRedShape.ToString(), OrderedBlocks[1].NumberOfBlueShape.ToString(), OrderedBlocks[1].NumberOfYellowShape.ToString()); + PrintRow("Circle", OrderedBlocks[2].NumberOfRedShape.ToString(), OrderedBlocks[2].NumberOfBlueShape.ToString(), OrderedBlocks[2].NumberOfYellowShape.ToString()); PrintLine(new string('-', tableWidth)); } //Consider moving this to the base class From 6029955081f7ac58d53ce6c84ad3eb02d10622e5 Mon Sep 17 00:00:00 2001 From: WilliamAlkawaz <77669116+WilliamAlkawaz@users.noreply.github.com> Date: Wed, 31 Mar 2021 10:12:09 +1300 Subject: [PATCH 18/20] Update Shape.cs --- Order.Management/Shape.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/Order.Management/Shape.cs b/Order.Management/Shape.cs index 2f1306e..4d0963e 100644 --- a/Order.Management/Shape.cs +++ b/Order.Management/Shape.cs @@ -32,7 +32,6 @@ public int TotalQuantityOfShape() { return NumberOfRedShape + NumberOfBlueShape + NumberOfYellowShape; } - public int AdditionalChargeTotal() { return NumberOfRedShape * AdditionalCharge; From 9ad3b08985a62e9ff2465ad8bd53dfdca67e37cd Mon Sep 17 00:00:00 2001 From: WilliamAlkawaz <77669116+WilliamAlkawaz@users.noreply.github.com> Date: Wed, 31 Mar 2021 10:12:12 +1300 Subject: [PATCH 19/20] Update Square.cs --- Order.Management/Square.cs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Order.Management/Square.cs b/Order.Management/Square.cs index a5e9bdf..0b82331 100644 --- a/Order.Management/Square.cs +++ b/Order.Management/Square.cs @@ -7,16 +7,16 @@ namespace Order.Management class Square : Shape { - public int SquarePrice = 1; + private double squarePrice = 1; public Square(int numberOfRedSquares, int numberOfBlueSquares, int numberOfYellowSquares) { Name = "Square"; - base.Price = SquarePrice; + Price = squarePrice; AdditionalCharge = 1; - base.NumberOfRedShape = numberOfRedSquares; - base.NumberOfBlueShape = numberOfBlueSquares; - base.NumberOfYellowShape = numberOfYellowSquares; + NumberOfRedShape = numberOfRedSquares; + NumberOfBlueShape = numberOfBlueSquares; + NumberOfYellowShape = numberOfYellowSquares; } public override double Total() @@ -26,15 +26,15 @@ public override double Total() public double RedSquaresTotal() { - return (base.NumberOfRedShape * Price); + return (NumberOfRedShape * Price); } public double BlueSquaresTotal() { - return (base.NumberOfBlueShape * Price); + return (NumberOfBlueShape * Price); } public double YellowSquaresTotal() { - return (base.NumberOfYellowShape * Price); + return (NumberOfYellowShape * Price); } } } From 17134b54eb117762a8393920c23c6b5f7eeb25f9 Mon Sep 17 00:00:00 2001 From: WilliamAlkawaz <77669116+WilliamAlkawaz@users.noreply.github.com> Date: Wed, 31 Mar 2021 10:12:15 +1300 Subject: [PATCH 20/20] Update Triangle.cs --- Order.Management/Triangle.cs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Order.Management/Triangle.cs b/Order.Management/Triangle.cs index cdcf90e..f142728 100644 --- a/Order.Management/Triangle.cs +++ b/Order.Management/Triangle.cs @@ -6,15 +6,15 @@ namespace Order.Management { class Triangle : Shape { - public int TrianglePrice = 2; + private double trianglePrice = 2; public Triangle(int numberOfRedTriangles, int numberOfBlueTriangles, int numberOfYellowTriangles) { Name = "Triangle"; - base.Price = TrianglePrice; + Price = trianglePrice; AdditionalCharge = 1; - base.NumberOfRedShape = numberOfRedTriangles; - base.NumberOfBlueShape = numberOfBlueTriangles; - base.NumberOfYellowShape = numberOfYellowTriangles; + NumberOfRedShape = numberOfRedTriangles; + NumberOfBlueShape = numberOfBlueTriangles; + NumberOfYellowShape = numberOfYellowTriangles; } public override double Total() @@ -24,15 +24,15 @@ public override double Total() public double RedTrianglesTotal() { - return (base.NumberOfRedShape * Price); + return (NumberOfRedShape * Price); } public double BlueTrianglesTotal() { - return (base.NumberOfBlueShape * Price); + return (NumberOfBlueShape * Price); } public double YellowTrianglesTotal() { - return (base.NumberOfYellowShape * Price); + return (NumberOfYellowShape * Price); } }