diff --git a/Lab2.TouristInformationCenter/InOutUtils.cs b/Lab2.TouristInformationCenter/InOutUtils.cs index 1604e81..a2e0886 100644 --- a/Lab2.TouristInformationCenter/InOutUtils.cs +++ b/Lab2.TouristInformationCenter/InOutUtils.cs @@ -132,7 +132,7 @@ namespace Lab2.TouristInformationCenter /// Register containing museums from all files public static MuseumsRegister ReadMuseums(params string[] filenames) { - MuseumsRegister mainRegister = new MuseumsRegister(l); + MuseumsRegister mainRegister = new MuseumsRegister(); foreach (string filename in filenames) { if (filename.EndsWith(".csv")) @@ -199,14 +199,14 @@ namespace Lab2.TouristInformationCenter return; } - Console.WriteLine(new string('-', 115)); - Console.WriteLine("| {0,20} | {1,-10} | {2,20} | {3,-10} | {4,-18} | {5,-3} | {6,-4} |", "Vardas", "Miestas", "Atsakingas", "Tipas", "Darbo dienų kiekis", "Kaina", "Turi gidą?"); - Console.WriteLine(new string('-', 115)); + Console.WriteLine(new string('-', 120)); + Console.WriteLine("| {0,-20} | {1,-10} | {2,-20} | {3,-10} | {4,18} | {5,10} | {6,-4} |", "Vardas", "Miestas", "Atsakingas", "Tipas", "Darbo dienų kiekis", "Kaina", "Turi gidą?"); + Console.WriteLine(new string('-', 120)); foreach (Museum m in museums) { - Console.WriteLine("| {0,20} | {1,-10} | {2, 20} | {3,-10} | {4,-18} | {5,-5:f2} | {6,-10} |", m.Name, m.City, m.Manager, m.Type, m.Workdays.Count, m.Price, m.HasGuide ? "Taip" : "Ne"); + Console.WriteLine("| {0,-20} | {1,-10} | {2,-20} | {3,-10} | {4,18} | {5,10:f2} | {6,-10} |", m.Name, m.City, m.Manager, m.Type, m.Workdays.Count, m.Price, m.HasGuide ? "Taip" : "Ne"); } - Console.WriteLine(new string('-', 115)); + Console.WriteLine(new string('-', 120)); } /// diff --git a/Lab2.TouristInformationCenter/MuseumsRegister.cs b/Lab2.TouristInformationCenter/MuseumsRegister.cs index b04a3b5..ef544fe 100644 --- a/Lab2.TouristInformationCenter/MuseumsRegister.cs +++ b/Lab2.TouristInformationCenter/MuseumsRegister.cs @@ -78,7 +78,7 @@ namespace Lab2.TouristInformationCenter /// Find museum that work the most days in a week /// /// Most active museum - private static Museum FindMostActiveMuseum() + private Museum FindMostActiveMuseum() { if (AllMuseums.Count == 0) {