- Data:
- 2009-10-06 13:35:06 (17 years ago)
- Lokalizacja:
- trunk/Wierszowki/Wierszowki.Web
- Pliki:
-
- 5 dodane
- 8 zmodyfikowane
-
Controllers/MagazineItemController.cs (zmodyfikowane) (2 diffs)
-
Controllers/UserController.cs (zmodyfikowane) (1 diff)
-
Scripts/jqueryvalid.js (dodane)
-
Scripts/xValAuthor.js (dodane)
-
Scripts/xValCreateMagazineItem.js (dodane)
-
Scripts/xValEditMagazineItem.js (dodane)
-
Scripts/xValUser.js (dodane)
-
Views/Author/Create.aspx (zmodyfikowane) (3 diffs)
-
Views/Author/Edit.aspx (zmodyfikowane) (2 diffs)
-
Views/MagazineItem/Create.aspx (zmodyfikowane) (6 diffs)
-
Views/MagazineItem/Edit.aspx (zmodyfikowane) (2 diffs)
-
Views/User/Create.aspx (zmodyfikowane) (3 diffs)
-
Views/User/Edit.aspx (zmodyfikowane) (2 diffs)
Legenda:
- Bez zmian
- Dodane
- Usunięte
-
trunk/Wierszowki/Wierszowki.Web/Controllers/MagazineItemController.cs
r842 r847 57 57 return View("Confirm", confirmViewData); 58 58 } 59 var magazine = _service.Find(magazineItem.Id); 59 60 var viewData = InitMagazineItemViewData(); 60 61 viewData.MagazineItem = magazineItem; 61 62 if (magazineItem.IssueId != 0) 63 { 64 viewData.Issue = _context.Issues.Single(i => i.Id == magazineItem.IssueId); 65 viewData.Magazine = viewData.Issue.Magazine; 66 viewData.IssueList = new SelectList(_context.FindIssuesByMagazineItemId(magazineItem.IssueId, 0), "Id", "Number"); 67 } 62 68 return View(viewData); 63 69 } … … 142 148 var magazine = _service.Find(magazineItem.Id); 143 149 var viewData = InitMagazineItemViewData(); 144 viewData.Info = info; //InitInfo(info.powrot, info.month, info.year, info.user_id);150 viewData.Info = info; 145 151 viewData.MagazineItem = magazine; 152 if (magazineItem.IssueId != 0) 153 { 154 viewData.Issue = _context.Issues.Single(i => i.Id == magazine.IssueId); 155 viewData.Magazine = magazine.Issue.Magazine; 156 viewData.IssueList = new SelectList(_context.FindIssuesByMagazineItemId(magazine.Issue.Id, 0), "Id", "Number"); 157 } 146 158 return View("Edit", viewData); 147 159 } -
trunk/Wierszowki/Wierszowki.Web/Controllers/UserController.cs
r842 r847 79 79 string name = ControllerContext.HttpContext.User.Identity.Name; 80 80 var LogInUser = _service.FindOne(u => u.Login == name); 81 if (LogInUser.Id == user.Id )81 if (LogInUser.Id == user.Id || LogInUser.Id == 1) 82 82 { 83 83 return View(_service.Find(id)); -
trunk/Wierszowki/Wierszowki.Web/Views/Author/Create.aspx
r844 r847 12 12 <script src="../../Scripts/jquery.validate.js" type="text/javascript" ></script> 13 13 <script src="../../Scripts/xVal.jquery.validate.js" type="text/javascript"></script> 14 <script src="../../Scripts/jqueryvalid.js" type="text/javascript"></script> 15 <script src="../../Scripts/xValAuthor.js" type="text/javascript"></script> 14 16 </asp:Content> 15 17 <asp:Content ID="Content1" ContentPlaceHolderID="TitleContent" runat="server"> … … 18 20 19 21 <asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server"> 20 <script type="text/javascript">21 $(function() {22 jQuery.validator.setDefaults({23 success: "valid"24 });25 $("#myform").validate({26 rules: {27 "Author.FirstName": { required: true },28 "Author.LastName": { required: true },29 "Author.EmploymentTypeId": { required: true, range: [1, 10] }30 },31 messages: {32 "Author.FirstName": { required: "Proszê podaæ imiê autora." },33 "Author.LastName": { required: "Proszê podaæ nazwisko autora." },34 "Author.EmploymentTypeId": { required: "Proszê wybraæ typ zatrudnienia.", range: "dshvsh" }35 }36 });37 $("#myform").change(function() {38 $("#myform").valid();39 });40 });41 </script>42 22 <h2>Dodaj autora</h2> 43 23 … … 49 29 <fieldset> 50 30 <legend>Dane autora</legend> 51 < p>31 <div class="formitem"> 52 32 <label for="FirstName">Imiê:</label> 53 33 <%= Html.TextBox("Author.FirstName", Model.Author.FirstName)%> 54 34 <%= Html.ValidationMessage("FirstName", "*") %> 55 </p> 56 <p> 35 <br /> 36 </div> 37 <div class="formitem"> 57 38 <label for="LastName">Nazwisko:</label> 58 39 <%= Html.TextBox("Author.LastName", Model.Author.LastName)%> 59 40 <%= Html.ValidationMessage("LastName", "*")%> 60 </p> 61 <p> 41 <br /> 42 </div> 43 <div class="formitem"> 62 44 <label for="LastName">Zatrudnienie:</label> 63 45 <%= Html.DropDownList("Author.EmploymentTypeId", ViewData.Model.EmploymentTypeList, "-- proszê wybraæ --") %> 64 46 <%= Html.ValidationMessage("EmploymentTypeId", "*")%> 65 </p> 66 <p> 47 <br /> 48 </div> 49 <div class="formitem"> 67 50 <input type="submit" value="Dodaj" /> 68 </ p>51 </div> 69 52 </fieldset> 70 53 -
trunk/Wierszowki/Wierszowki.Web/Views/Author/Edit.aspx
r844 r847 12 12 <script src="../../Scripts/jquery.validate.js" type="text/javascript" ></script> 13 13 <script src="../../Scripts/xVal.jquery.validate.js" type="text/javascript"></script> 14 <script src="../../Scripts/jqueryvalid.js" type="text/javascript"></script> 15 <script src="../../Scripts/xValAuthor.js" type="text/javascript"></script> 14 16 </asp:Content> 15 17 … … 19 21 20 22 <asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server"> 21 <script type="text/javascript">22 $(function() {23 jQuery.validator.setDefaults({24 success: "valid"25 });26 $("#myform").validate({27 rules: {28 "Author.FirstName": { required: true },29 "Author.LastName": { required: true },30 "Author.EmploymentTypeId": { required: true, range:[1,10]}31 },32 messages: {33 "Author.FirstName": { required: "Proszê podaæ imiê autora." },34 "Author.LastName": { required: "Proszê podaæ nazwisko autora." },35 "Author.EmploymentTypeId": { required: "Proszê wybraæ typ zatrudnienia.",range:"dshvsh" }36 }37 });38 $("#myform").change(function() {39 $("#myform").valid();40 });41 });42 </script>43 23 <h2>Edytuj autora</h2> 44 24 -
trunk/Wierszowki/Wierszowki.Web/Views/MagazineItem/Create.aspx
r846 r847 12 12 <script src="../../Scripts/jquery.validate.js" type="text/javascript" ></script> 13 13 <script src="../../Scripts/xVal.jquery.validate.js" type="text/javascript"></script> 14 <script src="../../Scripts/jqueryvalid.js" type="text/javascript"></script> 15 <script src="../../Scripts/xValCreateMagazineItem.js" type="text/javascript"></script> 14 16 </asp:Content> 15 17 … … 20 22 <asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server"> 21 23 <script type="text/javascript"> 22 $(function() { 23 24 $("#Magazine").change(function() { 25 var magazineId = $("#Magazine > option:selected").attr("value"); 24 $(document).ready(function() { 25 $("#Magazine_Id").change(function() { 26 var magazineId = $("#Magazine_Id > option:selected").attr("value"); 26 27 var urlAction = "<%= Url.Action("FindIssuesById", "Magazine") %>"; 27 28 urlAction = urlAction + "/" + magazineId; … … 29 30 $("#IssueId").addItems(data); 30 31 }); 31 }); 32 jQuery.validator.setDefaults({ 33 success: "valid" 34 }); 35 jQuery.validator.addMethod("DateCorrectFormat", function(data, element) { 36 return data.match(/^(19|20)\d\d(-)(0[1-9]|1[012])$/); 37 }, "Podaj prawid³ow¹ datê i format (0000-00)."); 38 39 jQuery.validator.addMethod("RangePrice", function(cena, element) { 40 return cena.match(/^((0([,]\d\d)?)|([1-9](\d){0,2}([,]\d\d)?)|([1]{1}[0]{3}([,][0]{2})?))$/); 41 },"Wymagany format to 0,00 , a wartoæ nie mo¿e byæ wiêksza ni¿ 1000."); 42 43 $("#myform").validate({ 44 rules: { 45 AuthorId: { required: true }, 46 IssueId: { required: true, min:1 }, 47 ItemTypeId: { required: true }, 48 Date: { required: true, DateCorrectFormat: true }, 49 Caption: { required: true, maxlength: 255 }, 50 Description: { maxlength: 255 }, 51 Bonus: { required: true, RangePrice: true}, 52 Price: { required: true, RangePrice: true} 53 }, 54 messages: { 55 AuthorId: { required: "Proszê wybraæ autora." }, 56 IssueId: { required: "Proszê wybraæ numer wydania. Musisz najpierw wybraæ Gazetê.", min: "Prosze wybraæ numer wydania. Musisz najpierw wybraæ Gazetê." }, 57 ItemTypeId: { required: "Proszê wybraæ typ wierszówki." }, 58 Date: { required: "Proszê podaæ miesi¹c"}, 59 Caption: { required: "Proszê podaæ tytu³ wierszówki.", maxlength: "Tytu³ jest za d³ugi." }, 60 Description: { maxlength:"Opis jest za d³ugi."}, 61 Bonus: { required: "Proszê wprowadziæ bonus do wierszówki."}, 62 Price: { required: "Proszê wprowadziæ wycenê wierszówki."} 63 } 64 }); 65 $("#myform").submit(function() { 66 $("#myform").valid(); 67 }); 68 }); 32 }); 33 }); 69 34 </script> 70 35 <h2>Dodaj wierszówkê</h2> … … 83 48 <div class="formitem"> 84 49 <label for="Magazine">Gazeta:</label> 85 <%= Html.DropDownList("Magazine ", ViewData.Model.MagazineList, "-- proszê wybraæ --")%>86 <%= Html.ValidationMessage("Magazine ", "*")%>50 <%= Html.DropDownList("Magazine.Id", ViewData.Model.MagazineList, "-- proszê wybraæ --")%> 51 <%= Html.ValidationMessage("Magazine.Id", "*")%> 87 52 <br /> 88 53 </div> … … 107 72 <div class="formitem"> 108 73 <label for="MagazineItem.Caption">Tytu³:</label> 109 <%= Html.TextBox("Caption", ViewData.Model.MagazineItem.Caption , new { title = "Proszê wprowadziæ tytu³ artyku³u." })%>74 <%= Html.TextBox("Caption", ViewData.Model.MagazineItem.Caption)%> 110 75 <%= Html.ValidationMessage("Caption", "*")%> 111 76 <br /> … … 113 78 <div class="formitem"> 114 79 <label for="MagazineItem.Description">Opis:</label> 115 <%= Html.TextArea("Description", ViewData.Model.MagazineItem.Description , new { title = "Proszê wprowadziæ opis artyku³u." })%>80 <%= Html.TextArea("Description", ViewData.Model.MagazineItem.Description)%> 116 81 <br /> 117 82 </div> -
trunk/Wierszowki/Wierszowki.Web/Views/MagazineItem/Edit.aspx
r846 r847 12 12 <script src="../../Scripts/jquery.validate.js" type="text/javascript" ></script> 13 13 <script src="../../Scripts/xVal.jquery.validate.js" type="text/javascript"></script> 14 <script src="../../Scripts/jqueryvalid.js" type="text/javascript"></script> 15 <script src="../../Scripts/xValEditMagazineItem.js" type="text/javascript"></script> 14 16 </asp:Content> 15 17 … … 20 22 <asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server"> 21 23 <script type="text/javascript"> 22 $(function() { 23 $("#Magazine_Id").change(function() { 24 var magazineId = $("#Magazine_Id > option:selected").attr("value"); 25 var urlAction = "<%= Url.Action("FindIssuesById", "Magazine") %>"; 26 urlAction = urlAction + "/" + magazineId; 27 $.getJSON(urlAction, function(data) { 24 $(document).ready(function() { 25 $("#Magazine_Id").change(function() { 26 27 var magazineId = $("#Magazine_Id > option:selected").attr("value"); 28 var urlAction = "<%= Url.Action("FindIssuesById", "Magazine") %>"; 29 urlAction = urlAction + "/" + magazineId; 30 $.getJSON(urlAction, function(data) { 28 31 $("#MagazineItem_IssueId").addItems(data); 29 32 }); 30 }); 31 jQuery.validator.setDefaults({ 32 success: "valid" 33 }); 34 jQuery.validator.addMethod("DateCorrectFormat", function(data, element) { 35 return data.match(/^(19|20)\d\d(-)(0[1-9]|1[012])$/); 36 }, "Podaj prawid³ow¹ datê i format (0000-00)."); 37 38 jQuery.validator.addMethod("RangePrice", function(cena, element) { 39 return cena.match(/^((0([,]\d\d)?)|([1-9](\d){0,2}([,]\d\d)?)|([1]{1}[0]{3}([,][0]{2})?))$/); 40 },"Wymagany format to 0,00 , a wartoæ nie mo¿e byæ wiêksza ni¿ 1000."); 41 42 $("#myform").validate({ 43 rules: { 44 "MagazineItem.AuthorId": { required: true }, 45 "MagazineItem.IssueId": { required: true, min:1 }, 46 "MagazineItem.ItemTypeId": { required: true }, 47 "MagazineItem.Date": { required: true, DateCorrectFormat: true }, 48 "MagazineItem.Caption": { required: true, maxlength: 255 }, 49 "MagazineItem.Description": { maxlength: 255 }, 50 "MagazineItem.Bonus": { required: true, RangePrice: true}, 51 "MagazineItem.Price": { required: true, RangePrice: true} 52 }, 53 messages: { 54 "MagazineItem.AuthorId": { required: "Proszê wybraæ autora." }, 55 "MagazineItem.IssueId": { required: "Proszê wybraæ numer wydania. Musisz najpierw wybraæ Gazetê.", min: "Prosze wybraæ numer wydania. Musisz najpierw wybraæ Gazetê." }, 56 "MagazineItem.ItemTypeId": { required: "Proszê wybraæ typ wierszówki." }, 57 "MagazineItem.Date": { required: "Proszê wprowadziæ miesi¹c."}, 58 "MagazineItem.Caption": { required: "Proszê wprowadziæ tytu³ wierszówki.", maxlength: "Tytu³ jest za d³ugi." }, 59 "MagazineItem.Description": { maxlength:"Opis jest za d³ugi."}, 60 "MagazineItem.Bonus": { required: "Proszê wprowadziæ bonus do wierszówki."}, 61 "MagazineItem.Price": { required: "Proszê wprowadziæ wycenê wierszówki."} 62 } 63 }); 64 $("#myform").submit(function() { 65 $("#myform").valid(); 66 }); 67 }); 33 }); 34 }); 68 35 </script> 69 36 <h2>Edytuj wierszówkê</h2> -
trunk/Wierszowki/Wierszowki.Web/Views/User/Create.aspx
r752 r847 1 1 <%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage<Wierszowki.Core.Linq.User>" %> 2 2 <%@ Import namespace="Wierszowki.Core.Validation"%> 3 <asp:Content ID="js" ContentPlaceHolderID="jsContent" runat="server"> 4 <script src="../../Scripts/jquery-1.3.1.js" type="text/javascript"></script> 5 <script src="../../Scripts/jquery-1.3.1.min.js" type="text/javascript"></script> 6 <script src="../../Scripts/jquery.form.js" type="text/javascript"></script> 7 <script src="../../Scripts/jquery.blockUI.js" type="text/javascript"></script> 8 <script src="../../Scripts/date.js" type="text/javascript"></script> 9 <script src="../../Scripts/jquery.datePicker.js" type="text/javascript"></script> 10 <script src="../../Scripts/spiffy.js" type="text/javascript"></script> 11 <script src="../../Scripts/jHelper.js" type="text/javascript"></script> 12 <script src="../../Scripts/jquery.validate.js" type="text/javascript" ></script> 13 <script src="../../Scripts/xVal.jquery.validate.js" type="text/javascript"></script> 14 <script src="../../Scripts/jqueryvalid.js" type="text/javascript"></script> 15 <script src="../../Scripts/xValUser.js" type="text/javascript"></script> 16 </asp:Content> 3 17 <asp:Content ID="Content1" ContentPlaceHolderID="TitleContent" runat="server"> 4 18 Dodaj u¿ytkownika … … 11 25 <%= Html.ValidationSummary("Proszê poprawiæ b³êdy i spróbowaæ ponownie.") %> 12 26 13 <% using (Html.BeginForm("Create", "User", Model)) {%> 14 27 <% using (Html.BeginForm("Create", "User", Model, FormMethod.Post, new { id = "myform" })) 28 { 29 %> 15 30 <fieldset> 16 31 <legend>Dane u¿ytkownika</legend> … … 43 58 44 59 <div> 45 <%=Html.ActionLink("Powrót do listy u¿ytkowników", "Index") %> 60 <%=Html.ActionLink("Powrót do listy u¿ytkowników", "Index") %> 61 <%=Html.ClientSideValidation<UserValidation>()%> 46 62 </div> 47 63 -
trunk/Wierszowki/Wierszowki.Web/Views/User/Edit.aspx
r844 r847 12 12 <script src="../../Scripts/jquery.validate.js" type="text/javascript" ></script> 13 13 <script src="../../Scripts/xVal.jquery.validate.js" type="text/javascript"></script> 14 <script src="../../Scripts/jqueryvalid.js" type="text/javascript"></script> 15 <script src="../../Scripts/xValUser.js" type="text/javascript"></script> 14 16 </asp:Content> 15 17 … … 19 21 20 22 <asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server"> 21 <script type="text/javascript">22 $(function() {23 jQuery.validator.setDefaults({24 success: "valid"25 });26 $("#myform").validate({27 rules: {28 FirstName: { required: true },29 LastName: { required: true },30 Password: { required: true },31 Login: {required: true }32 },33 messages: {34 FirstName: { required: "Proszê podaæ imiê." },35 LastName: { required: "Proszê podaæ nazwisko." },36 Password: { required: "Proszê podaæ has³o." },37 Login: { required: "Proszê podaæ login."}38 }39 });40 $("#myform").change(function() {41 $("#myform").valid();42 });43 });44 </script>45 23 <h2>Edytuj u¿ytkownika</h2> 46 24
