Nawigacja

r752	r838
125	125	public void Delete(T entity)
126	126	{
127		~~using (var dc = new WierszowkiDataContext()~~)
	127	if (entity != null)
128	128	{
129		dc.GetTable<T>().Attach(entity);
130		dc.GetTable<T>().DeleteOnSubmit(entity);
131		dc.SubmitChanges();
	129	_dataContext.GetTable<T>().DeleteOnSubmit(entity);
	130	_dataContext.SubmitChanges();
132	131	}
133	132	}

branches/Emisje/Wierszowki/Wierszowki.Model/Linq/User.cs

r752	r838
8	8	public partial class User : UserValidation, IIdentifiable
9	9	{
	10	public string FullName { get { return FirstName + " " + LastName; } }
10	11	}
11	12	}

branches/Emisje/Wierszowki/Wierszowki.Model/Linq/WierszowkiDataContext.cs

r752	r838
60	60	public IQueryable<Issue> FindIssuesByMagazineId(int magazineId)
61	61	{
62		var startDate = DateTime.Now.AddMonths(-1);
	62	var startDate = DateTime.Now.AddMonths(-3);
63	63	var endDate = DateTime.Now.AddMonths(1);
64	64

branches/Emisje/Wierszowki/Wierszowki.Model/Properties/Settings.Designer.cs

r752	r838
27	27	[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
28	28	[global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.ConnectionString)]
29		[global::System.Configuration.DefaultSettingValueAttribute("Data Source=~~sql.ct.com.pl;Initial Catalog=Wierszowki;Persist Security Info=True;U~~" +
30		"~~ser ID=wwwadmin;Password=adm1648~~;")]
	29	[global::System.Configuration.DefaultSettingValueAttribute("Data Source=10.0.0.30;Initial Catalog=Wierszowki;Persist Security Info=True;User " +
	30	"ID=sa;Password=POLzax;")]
31	31	public string WierszowkiConnectionString {
32	32	get {

branches/Emisje/Wierszowki/Wierszowki.Model/Properties/Settings.settings

r752	r838
6	6	<DesignTimeValue Profile="(Default)"><?xml version="1.0" encoding="utf-16"?>
7	7	<SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
8		<ConnectionString>Data Source=~~sql.ct.com.pl;Initial Catalog=Wierszowki;Persist Security Info=True;User ID=wwwadmin;Password=adm1648~~;</ConnectionString>
	8	<ConnectionString>Data Source=10.0.0.30;Initial Catalog=Wierszowki;Persist Security Info=True;User ID=sa;Password=POLzax;</ConnectionString>
9	9	<ProviderName>System.Data.SqlClient</ProviderName>
10	10	</SerializableConnectionString></DesignTimeValue>
11		<Value Profile="(Default)">Data Source=~~sql.ct.com.pl;Initial Catalog=Wierszowki;Persist Security Info=True;User ID=wwwadmin;Password=adm1648~~;</Value>
	11	<Value Profile="(Default)">Data Source=10.0.0.30;Initial Catalog=Wierszowki;Persist Security Info=True;User ID=sa;Password=POLzax;</Value>
12	12	</Setting>
13	13	</Settings>

branches/Emisje/Wierszowki/Wierszowki.Model/app.config

r752	r838
5	5	<connectionStrings>
6	6	<add name="Wierszowki.Core.Properties.Settings.WierszowkiConnectionString"
7		connectionString="Data Source=~~sql.ct.com.pl;Initial Catalog=Wierszowki;Persist Security Info=True;User ID=wwwadmin;Password=adm1648~~;"
	7	connectionString="Data Source=10.0.0.30;Initial Catalog=Wierszowki;Persist Security Info=True;User ID=sa;Password=POLzax;"
8	8	providerName="System.Data.SqlClient" />
9	9	</connectionStrings>

branches/Emisje/Wierszowki/Wierszowki.Services/AuthorService.cs

r752	r838
8	8	namespace Wierszowki.Services
9	9	{
	10
10	11	public class AuthorService : BaseService
11	12	{

branches/Emisje/Wierszowki/Wierszowki.Services/MagazineItemService.cs

r752	r838
28	28	public MagazineItem Find(int id)
29	29	{
30		return _repository.Find(id).Single~~();~~
	30	return _repository.Find(id).SingleOrDefault();
31	31	}
32	32
…	…
35	35	var errors = DataAnnotationsValidationRunner.GetErrors(magazineItem);
36	36	if (errors.Any())
	37	{
37	38	throw new RulesException(errors);
	39	}
	40	var errors1 = new List<ErrorInfo>();
	41	errors1 = ShowError(magazineItem);
	42	if (errors1.Count() > 0) throw new RulesException(errors1.AsEnumerable());
38	43
39	44	var user = _userRepository.FindOne(u => u.Login == currentUser);
…	…
45	50
46	51	_repository.Insert(magazineItem);
	52
	53	}
	54
	55	private List<ErrorInfo> ShowError(MagazineItem magazineItem)
	56	{
	57	var errors1 = new List<ErrorInfo>();
	58	if (magazineItem.IssueId <= 0)
	59	{
	60	ErrorInfo e1 = new ErrorInfo("Magazine", "Proszę wybrać gazetę!");
	61	errors1.Add(e1);
	62	ErrorInfo e = new ErrorInfo("IssueId", "Proszę wybrać numer wydania!");
	63	errors1.Add(e);
	64	}
	65	return errors1;
47	66	}
48	67
…	…
52	71	if (errors.Any())
53	72	throw new RulesException(errors);
	73
	74	var errors1 = new List<ErrorInfo>();
	75	errors1 = ShowError(magazineItem);
	76	if (errors1.Count() > 0) throw new RulesException(errors1.AsEnumerable());
	77
54	78
55	79	var user = _userRepository.FindOne(u => u.Login == currentUser);
…	…
70	94	_repository.Update(magazineItemToUpdate);
71	95	}
	96	public void Delete(MagazineItem magazineItem)
	97	{
	98	var magazineItemToDelete = _repository.FindOne(magazineItem.Id);
	99	if (magazineItemToDelete != null)
	100	{
	101	_repository.Delete(magazineItemToDelete);
72	102	}
73	103	}
	104	}
	105	}

branches/Emisje/Wierszowki/Wierszowki.Services/UserService.cs

r752	r838
65	65	public User Find(int id)
66	66	{
67		return _repository.Find(id).Single();
	67	return _repository.Find(id).SingleOrDefault();
68	68	}
69	69

branches/Emisje/Wierszowki/Wierszowki.Web/Controllers/MagazineItemController.cs

r796	r838
52	52	return RedirectToAction("Confirm", _context.Authors.Single(a => a.Id == magazineItem.AuthorId));
53	53	}
54
55	54	var viewData = InitMagazineItemViewData();
56	55	viewData.MagazineItem = magazineItem;
	56
57	57	return View(viewData);
58	58	}
…	…
69	69	var viewData = InitMagazineItemViewData();
70	70	var magazineItem = _service.Find(id);
	71
	72	if (magazineItem == null)
	73	{
	74	ViewData["message"] = "null";
	75	return View("Confirm");
	76	}
	77
71	78	viewData.MagazineItem = magazineItem;
72	79	viewData.Magazine = magazineItem.Issue.Magazine;
…	…
75	82	return View(viewData);
76	83	}
77
78	84	[Authorize]
79	85	[AcceptVerbs(HttpVerbs.Post)]
…	…
94	100	{
95	101	var author = _context.Authors.Single(a => a.Id == magazineItem.AuthorId);
96
97	102	return RedirectToAction("Confirm", author);
98	103	}
99
100	104	var viewData = InitMagazineItemViewData();
101	105	viewData.MagazineItem = magazineItem;
…	…
115	119	return viewData;
116	120	}
	121	[Authorize]
	122	public ActionResult Delete(int id)
	123	{
	124	return View("Delete");
	125	}
	126	[Authorize]
	127	[AcceptVerbs(HttpVerbs.Post)]
	128	public ActionResult Delete(MagazineItem magazineItem)
	129	{
	130	_service.Delete(magazineItem);
	131	if (magazineItem.AuthorId == 0){
	132	ViewData["message"] = "null";
	133	return View("Confirm");
	134	}
	135	ViewData["message"] = "delete";
	136	return View("Confirm");
	137
	138	}
117	139	}
118	140	}

branches/Emisje/Wierszowki/Wierszowki.Web/Controllers/ReportController.cs

r796	r838
33	33	public ActionResult Index()
34	34	{
	35
35	36	var viewData = new ReportViewData
36	37	{
37		Authors = _context.GetAuthors().OrderBy(a => a.FullName).ToList()
	38	Authors = _context.GetAuthors().OrderBy(a => a.FullName).ToList(),
	39	EmploymentTypeList = new SelectList(_context.GetEmploymentTypes().ToList(),"Id","Name"),
	40	UserList = new SelectList(_context.GetUsers().OrderBy(u => u.FirstName).ToList(),"Id","FullName")
38	41	};
39	42	return View(viewData);

branches/Emisje/Wierszowki/Wierszowki.Web/Controllers/UserController.cs

r752	r838
62	62	return View(user);
63	63	}
64
65	64	[Authorize]
66	65	[AcceptVerbs(HttpVerbs.Get)]
67	66	public ActionResult Edit(int id)
68	67	{
	68	User user = _service.Find(id);
	69	if (user != null)
	70	{
	71	string name = ControllerContext.HttpContext.User.Identity.Name;
	72	var LogInUser = _service.FindOne(u => u.Login == name);
	73	if (LogInUser.Id == user.Id)
	74	{
69	75	return View(_service.Find(id));
	76	}
	77	else
	78	{
	79	ViewData["message"] = "error_user";
	80	return View("Confirm");
	81	}
	82
	83	}
	84	ViewData["message"] = "error";
	85	return View("Confirm");
70	86	}
71	87
…	…
77	93	{
78	94	_service.Update(user);
	95
79	96	}
80	97	catch (RulesException ex)

branches/Emisje/Wierszowki/Wierszowki.Web/Models/ReportViewData.cs

r752	r838
15	15	public List<Magazine> Magazines { get; set; }
16	16	public Dictionary<int, Dictionary<string, decimal>> ReportData { get; set; }
	17	public SelectList EmploymentTypeList { get; set; }
	18	public SelectList UserList { get; set; }
17	19	}
18	20	}

branches/Emisje/Wierszowki/Wierszowki.Web/Views/MagazineItem/Confirm.aspx

r796	r838
4	4	Potwierdzenie dodania wierszówki
5	5	</asp:Content>
6
7	6	<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
8
	7	<%
	8	if (ViewData["message"] == "delete")
	9	{
	10	%>
	11	<h4>Pomylnie usuniêto wierszówkê!</h4>
	12	<%
	13	}
	14	else if(ViewData["message"] == "null"){
	15	%>
	16	<h6>Nie mo¿na wykonaæ operacji. B³êdny numer id!!! </h6>
	17	<% }
	18	else
	19	{
	20	%>
9	21	<h2>Pomylnie dodano/zaktualizowano wierszówkê dla: <%= Html.Encode(ViewData.Model.FirstName + " " + ViewData.Model.LastName)%></h2>
	22	<%
	23	}
	24	%>
10	25	<div>
11	26	<%=Html.ActionLink("Powrót", "Index", "Report") %>

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

r796	r838
9	9	<table>
10	10	<tr>
	11	<th></th>
11	12	<th></th>
12	13	<th>Miesi¹c</th>
…	…
27	28	<td>
28	29	<%= Html.ActionLink("Edycja", "Edit", "MagazineItem", new { id=item.Id }, null) %>
	30	</td>
	31	<td>
	32	<%= Html.ActionLink("Usuñ", "Delete", "MagazineItem", new { id=item.Id }, null) %>
29	33	</td>
30	34	<td>

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

r796	r838
98	98	</td>
99	99	<td>
100		<select id="user" name="user">
101		<option value="3">zbyszek</option>
102		<option value="4">slawek</option>
103		</select>
	100
	101	<%= Html.DropDownList("user", Model.UserList)%>
104	102	</td>
105	103	</tr>
…	…
165	163	</td>
166	164	<td>
167		<select id="employment" name="employment">
168		<option value="1">AACT</option>
169		<option value="2">Sam Press</option>
170		<option value="3">Umowa o dzie³o</option>
171		<option value="4">Faktura VAT</option>
172		</select>
	165	<%= Html.DropDownList("employment", Model.EmploymentTypeList)%>
173	166	</td>
174	167	</tr>

branches/Emisje/Wierszowki/Wierszowki.Web/Views/User/Confirm.aspx

r752	r838
6	6
7	7	<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
8
	8	<%if (ViewData["message"] == "error_user")
	9	{
	10	%>
	11	<h4>Nie mo¿na edytowaæ u¿ytkownika, gdy¿ login ró¿ni siê od zalogowanego!!!</h4>
	12	<%
	13	}
	14	else if (ViewData["message"] == "error")
	15	{
	16	%>
	17	<h6>Nie mo¿na edytowaæ u¿ytkownika, gdy¿ u¿ytkownik o takim id nie istnieje !!!</h6>
	18	<%
	19	}
	20	else
	21	{
	22	%>
9	23	<h2>Pomylnie dodano/zaktualizowano u¿ytkownika: <%= Html.Encode(ViewData.Model.FirstName + " " + ViewData.Model.LastName) %></h2>
	24	<%
	25	}
	26	%>
10	27	<div>
11	28	<%=Html.ActionLink("Powrót do listy u¿ytkowników", "Index") %>

branches/Emisje/Wierszowki/Wierszowki.Web/Wierszowki.Web.csproj

r752	r838
116	116	<Content Include="Views\Author\Index.aspx" />
117	117	<Content Include="Views\MagazineItem\Confirm.aspx" />
	118	<Content Include="Views\MagazineItem\Delete.aspx" />
118	119	<Content Include="Views\MagazineItem\Edit.aspx" />
119	120	<Content Include="Views\MagazineItem\Create.aspx" />

Nawigacja

Zbiór zmian 838 dla branches/Emisje/Wierszowki

Legenda:

Pobierz w innym formacie: