Nawigacja

Zbiór zmian 785 dla trunk

Data:

2009-07-28 13:46:27 (17 years ago)

Autor:

marek

Opis:

re #194

Lokalizacja:

trunk/Wierszowki/Wierszowki.Web

Pliki:

r752	r785
50	50	if (ModelState.IsValid)
51	51	{
52		var author = _context.Authors.Single(a => a.Id == magazineItem.AuthorId);
53		return RedirectToAction("Confirm", author);
	52	return RedirectToAction("Confirm", _context.Authors.Single(a => a.Id == magazineItem.AuthorId));
54	53	}
55	54
…	…
95	94	{
96	95	var author = _context.Authors.Single(a => a.Id == magazineItem.AuthorId);
	96
97	97	return RedirectToAction("Confirm", author);
98	98	}

r752	r785
40	40	}
41	41
42		public ActionResult All()
	42	public ActionResult All(int year, int month, int user)
43	43	{
44		var items = _context.MagazineItems.ToList();
	44	var items = _repository.Find(m => m.Date.Month == month && m.Date.Year == year && m.CreatedBy == user)
	45	.OrderByDescending(m => m.UpdatedOn).ToList();
45	46	return View(items);
46	47	}

r752	r785
45	45
46	46	routes.MapRoute(
	47	"All", // Route name
	48	"Report/All/{year}/{month}/{user}", // URL with parameters
	49	new { controller = "Report", action = "All", year = DateTime.Now.Year, month = DateTime.Now.Month, user = 0 } // Parameter defaults
	50	);
	51
	52	routes.MapRoute(
47	53	"Default", // Route name
48	54	"{controller}/{action}/{id}", // URL with parameters

r752	r785
9	9	<h2>Pomylnie dodano/zaktualizowano wierszówkê dla: <%= Html.Encode(ViewData.Model.FirstName + " " + ViewData.Model.LastName)%></h2>
10	10	<div>
11		<%=Html.ActionLink("Powrót", "Index", "~~Home~~") %>
	11	<%=Html.ActionLink("Powrót", "Index", "Report") %>
12	12	</div>
13	13	</asp:Content>

r752	r785
72	72	<div class="formitem">
73	73	<label for="MagazineItem.Description">Opis:</label>
74		<%= Html.Text~~Box~~("MagazineItem.Description", Model.MagazineItem.Description, new { title = "Proszê wprowadziæ opis artyku³u." })%>
	74	<%= Html.TextArea("MagazineItem.Description", Model.MagazineItem.Description, new { title = "Proszê wprowadziæ opis artyku³u." })%>
75	75	</div>
76	76	<div class="formitem">

r752	r785
73	73	<div class="formitem">
74	74	<label for="MagazineItem.Description">Opis:</label>
75		<%= Html.Text~~Box~~("MagazineItem.Description", Model.MagazineItem.Description, new { title = "Proszê wprowadziæ opis artyku³u." })%>
	75	<%= Html.TextArea("MagazineItem.Description", Model.MagazineItem.Description, new { title = "Proszê wprowadziæ opis artyku³u." })%>
76	76	</div>
77	77	<div class="formitem">

r752	r785
64	64	</table>
65	65	<p>
66		<%= Html.ActionLink("Powrót", "Index", "~~Home~~") %>
	66	<%= Html.ActionLink("Powrót", "Index", "Report") %>
67	67	</p>
68	68

r772	r785
64	64	<td>
65	65	<%= Html.MonthSelect("month")%>
	66	</td>
	67	</tr>
	68	<tr>
	69	<td></td>
	70	<td><input type="submit" value="Poka¿" /></td>
	71	</tr>
	72	</table>
	73	<% } %>
	74	</td>
	75	<td style="text-align:left; vertical-align:top;">
	76	<h4>Wierszówki miesiêczne wg wprowadzaj¹cego i wybranego miesi¹ca</h4>
	77	<% using (Html.BeginForm("All", "Report")) { %>
	78	<table>
	79	<tr>
	80	<td>
	81	<label for="Year">Rok:</label>
	82	</td>
	83	<td>
	84	<%= Html.YearSelect("year")%>
	85	</td>
	86	</tr>
	87	<tr>
	88	<td>
	89	<label for="Month">Miesi¹c:</label>
	90	</td>
	91	<td>
	92	<%= Html.MonthSelect("month")%>
	93	</td>
	94	</tr>
	95	<tr>
	96	<td>
	97	<label for="user">Wprowadzaj¹cy:</label>
	98	</td>
	99	<td>
	100	<select id="user" name="user">
	101	<option value="3">zbyszek</option>
	102	<option value="4">slawek</option>
	103	</select>
66	104	</td>
67	105	</tr>
…	…
142	180	<% } %>
143	181	</td>
	182	<td style="text-align:left; vertical-align:top;"></td>
144	183	</tr>
145	184	</table>