diff --git a/.vs/FakturyWeb/DesignTimeBuild/.dtbcache.v2 b/.vs/FakturyWeb/DesignTimeBuild/.dtbcache.v2 index f0b2835..f5ab35f 100644 Binary files a/.vs/FakturyWeb/DesignTimeBuild/.dtbcache.v2 and b/.vs/FakturyWeb/DesignTimeBuild/.dtbcache.v2 differ diff --git a/.vs/FakturyWeb/v16/.suo b/.vs/FakturyWeb/v16/.suo index 22a0804..57945c4 100644 Binary files a/.vs/FakturyWeb/v16/.suo and b/.vs/FakturyWeb/v16/.suo differ diff --git a/Models/Faktura.cs b/Models/Faktura.cs index 896c935..8871260 100644 --- a/Models/Faktura.cs +++ b/Models/Faktura.cs @@ -14,6 +14,8 @@ namespace RazorPagesMovie.Models public int ID { get; set; } [Required] + [DisplayName("Zákazník")] + [Range(1, Int32.MaxValue, ErrorMessage = "Vyberte zákazníka ze seznamu")] public int ZakaznikID { get; set; } public ZAKAZNIK ZAKAZNIK { get; set; } @@ -22,50 +24,71 @@ namespace RazorPagesMovie.Models public ICollection PLATBY { get; set; } + [DisplayName("Číslo")] public string CISLO { get; set; } public int CISLO_ABS { get; set; } [DataType(DataType.Date)] + [DisplayName("Datum vystavení")] public DateTime VYSTAVENI { get; set; } [DataType(DataType.Date)] + [DisplayName("Datum splatnosti")] public DateTime SPLATNOST { get; set; } + [DisplayName("Dodavatel")] public string D_PRAJM { get; set; } + [DisplayName("Ulice")] public string D_ULICE { get; set; } + [DisplayName("Město")] public string D_MESTO { get; set; } + [DisplayName("PSČ")] public string D_PSC { get; set; } + [DisplayName("IČ")] public string D_IC { get; set; } + [DisplayName("DIČ")] public string D_DIC { get; set; } + [DisplayName("Bankovní účet")] public string D_BANKA { get; set; } + [DisplayName("Telefon")] public string D_TELEFON { get; set; } + [DisplayName("E-mail")] public string D_EMAIL { get; set; } + [DisplayName("Web")] public string D_WEB { get; set; } + [DisplayName("Odběratel")] public string O_PRAJM { get; set; } + [DisplayName("Ulice")] public string O_ULICE { get; set; } + [DisplayName("Město")] public string O_MESTO { get; set; } + [DisplayName("PSČ")] public string O_PSC { get; set; } + [DisplayName("IČ")] public string O_IC { get; set; } + [DisplayName("DIČ")] public string O_DIC { get; set; } + [DisplayName("Forma úhrady")] public byte FORMA_UHRADY { get; set; } + [DisplayName("Popis činností")] public string CINNOSTI { get; set; } diff --git a/Models/SeedData.cs b/Models/SeedData.cs index 21eeb0a..e00ee3e 100644 --- a/Models/SeedData.cs +++ b/Models/SeedData.cs @@ -25,8 +25,13 @@ namespace RazorPagesMovie.Models new ZAKAZNIK { - JMENO = "Kowalski 5", - PRIJMENI = "Don" + JMENO = "Petr", + PRIJMENI = "Zajíc", + ULICE = "Větrná 622", + MESTO = "Stráž nad Nisou", + PSC = "46330", + IC="12345678", + DIC="2255881054" }, new ZAKAZNIK diff --git a/Pages/Faktury/Create.cshtml b/Pages/Faktury/Create.cshtml index 0a85048..02ec9d0 100644 --- a/Pages/Faktury/Create.cshtml +++ b/Pages/Faktury/Create.cshtml @@ -28,7 +28,9 @@
- +
@@ -137,37 +139,37 @@
- +
- +
- +
- +
- +
- +
@@ -203,22 +205,28 @@ diff --git a/Pages/Faktury/Create.cshtml.cs b/Pages/Faktury/Create.cshtml.cs index ed2081b..5281cdf 100644 --- a/Pages/Faktury/Create.cshtml.cs +++ b/Pages/Faktury/Create.cshtml.cs @@ -48,10 +48,11 @@ namespace FakturyWeb.Pages.Faktury return RedirectToPage("./Index"); } - public ActionResult GetZakaznik(string lastname) + + public ActionResult OnGetZakaznik(string id) { - - return Page(); + List myZakaznik = _context.ZAKAZNIK.Where(fruit => fruit.ID == Convert.ToInt32(id)).ToList(); + return new JsonResult(myZakaznik); } } }