Nawigacja

← Previous Change
Next Change →

Zbiór zmian 854 dla branches/Abonament/Wierszowki/Wierszowki.Web/Views/Report

Data:

2009-10-15 15:45:07 (17 years ago)

Autor:

marek

Opis:

re #184 - merged with latest trunk

Lokalizacja:

branches/Abonament

Pliki:

: 4 zmodyfikowane

. (zmodyfikowane) (1 prop)
Wierszowki/Wierszowki.Web/Views/Report/All.aspx (zmodyfikowane) (4 diffs)
Wierszowki/Wierszowki.Web/Views/Report/Authors.aspx (zmodyfikowane) (2 diffs)
Wierszowki/Wierszowki.Web/Views/Report/Index.aspx (zmodyfikowane) (2 diffs)

Legenda:

: Bez zmian
: Dodane
: Usunięte

branches/Abonament

Property svn:mergeinfo

old	new
2	2	/branches/ReklamaReorganizacja:568-731
3	3	/tags/BazaReklam_1.1.28:831
4		/trunk:708-758,760-838
	4	/trunk:708-758,760-853

branches/Abonament/Wierszowki/Wierszowki.Web/Views/Report/All.aspx

r839	r854
1		<%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage<~~IEnumerable<Wierszowki.Core.Linq.MagazineItem>~~>" %>
	1	<%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage<Wierszowki.Models.AllViewData>" %>
2	2
3	3	<asp:Content ID="Content1" ContentPlaceHolderID="TitleContent" runat="server">
4		Wierszówki ~~do wyceny~~
	4	Wierszówki
5	5	</asp:Content>
6	6
7	7	<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
8		<h2>Wierszówki do wyceny</h2>
	8	<% if (ViewData.Model.naglowek != null){ %>
	9	<h2><%= ViewData.Model.naglowek %></h2>
	10	<% } %>
9	11	<table>
10	12	<tr>
…	…
22	24	<th>Ostatnia aktualizacja</th>
23	25	</tr>
24
25		~~<% foreach (var item in Model) { %>~~
26	26
	27	<% int number = 0;
	28	foreach (var item in ViewData.Model.magazine) {
	29	number += 1;
	30	%>
27	31	<tr>
28	32	<td>
29		<%= Html.ActionLink("Edycja", "Edit", "MagazineItem", new { id=item.Id }, null) %>
	33	<%
	34	if (ViewData.Model.info.powrot == "1")
	35	{
	36	%>
	37	<%= Html.ActionLink("Edycja", "Edit", "MagazineItem", new { id = item.Id, powrot = "1", month = ViewData.Model.info.month, year = ViewData.Model.info.year, user_id = ViewData.Model.info.user_id }, null)%>
	38	<%
	39	}
	40	else if (ViewData.Model.info.powrot == "2")
	41	{
	42	%>
	43	<%= Html.ActionLink("Edycja", "Edit", "MagazineItem", new { id = item.Id, powrot = "2", month = ViewData.Model.info.month, year = ViewData.Model.info.year, user_id = ViewData.Model.info.user_id }, null)%>
	44	<%
	45	}
	46	%>
30	47	</td>
31	48	<td>
32		<%= Html.ActionLink("Usuñ", "Delete", "MagazineItem", new { id=item.Id }, null) %>
	49	<%
	50	if (ViewData.Model.info.powrot == "1")
	51	{
	52	%>
	53	<%= Html.ActionLink("Usuñ", "Delete", "MagazineItem", new { id = item.Id, powrot="1", month = ViewData.Model.info.month, year = ViewData.Model.info.year, user_id = ViewData.Model.info.user_id }, null)%>
	54	<%
	55	}
	56	else if (ViewData.Model.info.powrot == "2")
	57	{
	58	%>
	59	<%= Html.ActionLink("Usuñ", "Delete", "MagazineItem", new { id = item.Id, powrot="2", month = ViewData.Model.info.month, year = ViewData.Model.info.year, user_id = ViewData.Model.info.user_id }, null)%>
	60	<%
	61	}
	62	%>
33	63	</td>
34	64	<td>
35	65	<%= Html.Encode(item.Date.ToString("yyyy-MM")) %>
36	66	</td>
37		<td>
	67	<td width="85px">
38	68	<%= Html.Encode(item.Author.FullName) %>
39	69	</td>
40		<td>
	70	<td width="62px">
41	71	<%= Html.Encode(item.Issue.Identifier)%>
42	72	</td>
43		<td>
	73	<td width="48px">
44	74	<%= Html.Encode(item.ItemType.Name) %>
45	75	</td>
46		<td>
	76	<td width="150px">
47	77	<%= Html.Encode(item.Caption) %>
48	78	</td>
49		<td>
	79	<td width="140px">
50	80	<%= Html.Encode(item.Description) %>
51	81	</td>
…	…
59	89	<%= Html.Encode(item.CreatedByUser.Login) %>
60	90	</td>
61		<td>
	91	<td width="140px">
62	92	<%= Html.Encode(item.UpdatedOn) %>
63	93	</td>
…	…
68	98	</table>
69	99	<p>
70		<%= Html.ActionLink("Powrót", "Index", "Report") %>
	100	<%
	101	if (ViewData.Model.info.powrot == "1")
	102	{
	103	%>
	104	<%= Html.ActionLink("Powrót", "Index", "Home")%> \|
	105	<%
	106	}
	107	else
	108	{
	109	%>
	110	<%= Html.ActionLink("Powrót", "Index", "Report")%> \|
	111	<%
	112	}
	113	%>
	114	Liczba wierszówek: <%=number%>
71	115	</p>
72	116

branches/Abonament/Wierszowki/Wierszowki.Web/Views/Report/Authors.aspx

r752	r854
26	26	<tr>
27	27	<td>
28		<%= Html.Encode(item.FirstName + " " + item.LastName)%>
	28	<%= Html.Encode(item.FirstName + " " + item.LastName)%>
29	29	</td>
30	30	<td>
…	…
35	35	</td>
36	36	<td>
37		<%= Html.Encode(String.Format("{0:F}", item.Total)) %>
	37	<%= Html.Encode(String.Format("{0:F}", item.Total))%>
38	38	</td>
39	39	</tr>

branches/Abonament/Wierszowki/Wierszowki.Web/Views/Report/Index.aspx

r839	r854
9	9	<h2>Raporty</h2>
10	10	<h3>Proszê wybraæ raport:</h3>
11		<table class="reportTable">
	11	<table class="reportTable" cellpadding=4 cellspacing=4>
12	12	<tr>
13	13	<td style="text-align:left; vertical-align:top;">
…	…
176	176	</tr>
177	177	</table>
	178	<%= Html.ActionLink("Strona g³ówna", "Index", "Home")%>
178	179	</asp:Content>

Pobierz w innym formacie: