Index: trunk/Wierszowki/Wierszowki.Web/Controllers/MagazineItemController.cs =================================================================== --- trunk/Wierszowki/Wierszowki.Web/Controllers/MagazineItemController.cs (revision 842) +++ trunk/Wierszowki/Wierszowki.Web/Controllers/MagazineItemController.cs (revision 847) @@ -57,7 +57,13 @@ return View("Confirm", confirmViewData); } + var magazine = _service.Find(magazineItem.Id); var viewData = InitMagazineItemViewData(); viewData.MagazineItem = magazineItem; - + if (magazineItem.IssueId != 0) + { + viewData.Issue = _context.Issues.Single(i => i.Id == magazineItem.IssueId); + viewData.Magazine = viewData.Issue.Magazine; + viewData.IssueList = new SelectList(_context.FindIssuesByMagazineItemId(magazineItem.IssueId, 0), "Id", "Number"); + } return View(viewData); } @@ -142,6 +148,12 @@ var magazine = _service.Find(magazineItem.Id); var viewData = InitMagazineItemViewData(); - viewData.Info = info;//InitInfo(info.powrot, info.month, info.year, info.user_id); + viewData.Info = info; viewData.MagazineItem = magazine; + if (magazineItem.IssueId != 0) + { + viewData.Issue = _context.Issues.Single(i => i.Id == magazine.IssueId); + viewData.Magazine = magazine.Issue.Magazine; + viewData.IssueList = new SelectList(_context.FindIssuesByMagazineItemId(magazine.Issue.Id, 0), "Id", "Number"); + } return View("Edit", viewData); } Index: trunk/Wierszowki/Wierszowki.Web/Controllers/UserController.cs =================================================================== --- trunk/Wierszowki/Wierszowki.Web/Controllers/UserController.cs (revision 842) +++ trunk/Wierszowki/Wierszowki.Web/Controllers/UserController.cs (revision 847) @@ -79,5 +79,5 @@ string name = ControllerContext.HttpContext.User.Identity.Name; var LogInUser = _service.FindOne(u => u.Login == name); - if (LogInUser.Id == user.Id) + if (LogInUser.Id == user.Id || LogInUser.Id == 1) { return View(_service.Find(id)); Index: trunk/Wierszowki/Wierszowki.Web/Scripts/xValUser.js =================================================================== --- trunk/Wierszowki/Wierszowki.Web/Scripts/xValUser.js (revision 847) +++ trunk/Wierszowki/Wierszowki.Web/Scripts/xValUser.js (revision 847) @@ -0,0 +1,16 @@ +$(document).ready(function() { + $("#myform").validate({ + rules: { + FirstName: { required: true }, + LastName: { required: true }, + Password: { required: true }, + Login: { required: true } + }, + messages: { + FirstName: { required: "Proszę podać imię." }, + LastName: { required: "Proszę podać nazwisko." }, + Password: { required: "Proszę podać hasło." }, + Login: { required: "Proszę podać login." } + } + }); +}); Index: trunk/Wierszowki/Wierszowki.Web/Scripts/xValEditMagazineItem.js =================================================================== --- trunk/Wierszowki/Wierszowki.Web/Scripts/xValEditMagazineItem.js (revision 847) +++ trunk/Wierszowki/Wierszowki.Web/Scripts/xValEditMagazineItem.js (revision 847) @@ -0,0 +1,24 @@ +$(document).ready(function() { + $("#myform").validate({ + rules: { + "MagazineItem.AuthorId": { required: true }, + "MagazineItem.IssueId": { required: true, min: 1 }, + "MagazineItem.ItemTypeId": { required: true }, + "MagazineItem.Date": { required: true, DateCorrectFormat: true }, + "MagazineItem.Caption": { required: true, maxlength: 255 }, + "MagazineItem.Description": { maxlength: 255 }, + "MagazineItem.Bonus": { required: true, RangePrice: true }, + "MagazineItem.Price": { required: true, RangePrice: true } + }, + messages: { + "MagazineItem.AuthorId": { required: "Proszę wybrać autora." }, + "MagazineItem.IssueId": { required: "Proszę wybrać numer wydania. Musisz najpierw wybrać Gazetę.", min: "Prosze wybrać numer wydania. Musisz najpierw wybrać Gazetę." }, + "MagazineItem.ItemTypeId": { required: "Proszę wybrać typ wierszówki." }, + "MagazineItem.Date": { required: "Proszę wprowadzić miesiąc." }, + "MagazineItem.Caption": { required: "Proszę wprowadzić tytuł wierszówki.", maxlength: "Tytuł jest za długi." }, + "MagazineItem.Description": { maxlength: "Opis jest za długi." }, + "MagazineItem.Bonus": { required: "Proszę wprowadzić bonus do wierszówki." }, + "MagazineItem.Price": { required: "Proszę wprowadzić wycenę wierszówki." } + } + }); +}); Index: trunk/Wierszowki/Wierszowki.Web/Scripts/xValCreateMagazineItem.js =================================================================== --- trunk/Wierszowki/Wierszowki.Web/Scripts/xValCreateMagazineItem.js (revision 847) +++ trunk/Wierszowki/Wierszowki.Web/Scripts/xValCreateMagazineItem.js (revision 847) @@ -0,0 +1,24 @@ +$(document).ready(function() { + $("#myform").validate({ + rules: { + AuthorId: { required: true }, + IssueId: { required: true, min: 1 }, + ItemTypeId: { required: true }, + Date: { required: true, DateCorrectFormat: true }, + Caption: { required: true, maxlength: 255 }, + Description: { maxlength: 255 }, + Bonus: { required: true, RangePrice: true }, + Price: { required: true, RangePrice: true } + }, + messages: { + AuthorId: { required: "Proszę wybrać autora." }, + IssueId: { required: "Proszę wybrać numer wydania. Musisz najpierw wybrać Gazetę.", min: "Prosze wybrać numer wydania. Musisz najpierw wybrać Gazetę." }, + ItemTypeId: { required: "Proszę wybrać typ wierszówki." }, + Date: { required: "Proszę podać miesiąc" }, + Caption: { required: "Proszę podać tytuł wierszówki.", maxlength: "Tytuł jest za długi." }, + Description: { maxlength: "Opis jest za długi." }, + Bonus: { required: "Proszę wprowadzić bonus do wierszówki." }, + Price: { required: "Proszę wprowadzić wycenę wierszówki." } + } + }); +}); Index: trunk/Wierszowki/Wierszowki.Web/Scripts/xValAuthor.js =================================================================== --- trunk/Wierszowki/Wierszowki.Web/Scripts/xValAuthor.js (revision 847) +++ trunk/Wierszowki/Wierszowki.Web/Scripts/xValAuthor.js (revision 847) @@ -0,0 +1,14 @@ +$(document).ready(function() { + $("#myform").validate({ + rules: { + "Author.FirstName": { required: true }, + "Author.LastName": { required: true }, + "Author.EmploymentTypeId": { required: true, range: [1, 10] } + }, + messages: { + "Author.FirstName": { required: "Proszę podać imię autora." }, + "Author.LastName": { required: "Proszę podać nazwisko autora." }, + "Author.EmploymentTypeId": { required: "Proszę wybrać typ zatrudnienia.", range: "" } + } + }); +}); Index: trunk/Wierszowki/Wierszowki.Web/Scripts/jqueryvalid.js =================================================================== --- trunk/Wierszowki/Wierszowki.Web/Scripts/jqueryvalid.js (revision 847) +++ trunk/Wierszowki/Wierszowki.Web/Scripts/jqueryvalid.js (revision 847) @@ -0,0 +1,16 @@ +$(document).ready(function() { + jQuery.validator.setDefaults({ + success: "valid" + }); + jQuery.validator.addMethod("DateCorrectFormat", function(data, element) { + return data.match(/^(19|20)\d\d(-)(0[1-9]|1[012])$/); + }, "Podaj prawidłową datę i format (0000-00)."); + + jQuery.validator.addMethod("RangePrice", function(cena, element) { + return cena.match(/^((0([,]\d\d)?)|([1-9](\d){0,2}([,]\d\d)?)|([1]{1}[0]{3}([,][0]{2})?))$/); + }, "Wymagany format to 0,00 , a wartość nie może być większa niż 1000."); + + $("#myform").submit(function() { + $("#myform").valid(); + }); +}); Index: trunk/Wierszowki/Wierszowki.Web/Views/Author/Edit.aspx =================================================================== --- trunk/Wierszowki/Wierszowki.Web/Views/Author/Edit.aspx (revision 844) +++ trunk/Wierszowki/Wierszowki.Web/Views/Author/Edit.aspx (revision 847) @@ -12,4 +12,6 @@ + + @@ -19,26 +21,4 @@ -

Edytuj autora

Index: trunk/Wierszowki/Wierszowki.Web/Views/Author/Create.aspx =================================================================== --- trunk/Wierszowki/Wierszowki.Web/Views/Author/Create.aspx (revision 844) +++ trunk/Wierszowki/Wierszowki.Web/Views/Author/Create.aspx (revision 847) @@ -12,4 +12,6 @@ + + @@ -18,26 +20,4 @@ -

Dodaj autora

@@ -49,22 +29,25 @@
Dane autora -

+

<%= Html.TextBox("Author.FirstName", Model.Author.FirstName)%> <%= Html.ValidationMessage("FirstName", "*") %> -

-

+
+

+
<%= Html.TextBox("Author.LastName", Model.Author.LastName)%> <%= Html.ValidationMessage("LastName", "*")%> -

-

+
+

+
<%= Html.DropDownList("Author.EmploymentTypeId", ViewData.Model.EmploymentTypeList, "-- proszê wybraæ --") %> <%= Html.ValidationMessage("EmploymentTypeId", "*")%> -

-

+
+

+
-

+
Index: trunk/Wierszowki/Wierszowki.Web/Views/MagazineItem/Edit.aspx =================================================================== --- trunk/Wierszowki/Wierszowki.Web/Views/MagazineItem/Edit.aspx (revision 846) +++ trunk/Wierszowki/Wierszowki.Web/Views/MagazineItem/Edit.aspx (revision 847) @@ -12,4 +12,6 @@ + + @@ -20,50 +22,15 @@

Edytuj wierszówkê

Index: trunk/Wierszowki/Wierszowki.Web/Views/MagazineItem/Create.aspx =================================================================== --- trunk/Wierszowki/Wierszowki.Web/Views/MagazineItem/Create.aspx (revision 846) +++ trunk/Wierszowki/Wierszowki.Web/Views/MagazineItem/Create.aspx (revision 847) @@ -12,4 +12,6 @@ + + @@ -20,8 +22,7 @@

Dodaj wierszówkê

@@ -83,6 +48,6 @@
- <%= Html.DropDownList("Magazine", ViewData.Model.MagazineList, "-- proszê wybraæ --")%> - <%= Html.ValidationMessage("Magazine", "*")%> + <%= Html.DropDownList("Magazine.Id", ViewData.Model.MagazineList, "-- proszê wybraæ --")%> + <%= Html.ValidationMessage("Magazine.Id", "*")%>
@@ -107,5 +72,5 @@
- <%= Html.TextBox("Caption", ViewData.Model.MagazineItem.Caption, new { title = "Proszê wprowadziæ tytu³ artyku³u." })%> + <%= Html.TextBox("Caption", ViewData.Model.MagazineItem.Caption)%> <%= Html.ValidationMessage("Caption", "*")%>
@@ -113,5 +78,5 @@
- <%= Html.TextArea("Description", ViewData.Model.MagazineItem.Description, new { title = "Proszê wprowadziæ opis artyku³u." })%> + <%= Html.TextArea("Description", ViewData.Model.MagazineItem.Description)%>
Index: trunk/Wierszowki/Wierszowki.Web/Views/User/Edit.aspx =================================================================== --- trunk/Wierszowki/Wierszowki.Web/Views/User/Edit.aspx (revision 844) +++ trunk/Wierszowki/Wierszowki.Web/Views/User/Edit.aspx (revision 847) @@ -12,4 +12,6 @@ + + @@ -19,28 +21,4 @@ -

Edytuj u¿ytkownika

Index: trunk/Wierszowki/Wierszowki.Web/Views/User/Create.aspx =================================================================== --- trunk/Wierszowki/Wierszowki.Web/Views/User/Create.aspx (revision 752) +++ trunk/Wierszowki/Wierszowki.Web/Views/User/Create.aspx (revision 847) @@ -1,4 +1,18 @@ <%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage" %> - +<%@ Import namespace="Wierszowki.Core.Validation"%> + + + + + + + + + + + + + + Dodaj u¿ytkownika @@ -11,6 +25,7 @@ <%= Html.ValidationSummary("Proszê poprawiæ b³êdy i spróbowaæ ponownie.") %> - <% using (Html.BeginForm("Create", "User", Model)) {%> - + <% using (Html.BeginForm("Create", "User", Model, FormMethod.Post, new { id = "myform" })) + { + %>
Dane u¿ytkownika @@ -43,5 +58,6 @@
- <%=Html.ActionLink("Powrót do listy u¿ytkowników", "Index") %> + <%=Html.ActionLink("Powrót do listy u¿ytkowników", "Index") %> + <%=Html.ClientSideValidation()%>