Zbiór zmian 854 dla branches/Abonament/Wierszowki/Wierszowki.Web/Controllers
- Data:
- 2009-10-15 15:45:07 (17 years ago)
- Lokalizacja:
- branches/Abonament
- Pliki:
-
- 6 zmodyfikowane
-
. (zmodyfikowane) (1 prop)
-
Wierszowki/Wierszowki.Web/Controllers/AuthorController.cs (zmodyfikowane) (6 diffs)
-
Wierszowki/Wierszowki.Web/Controllers/MagazineController.cs (zmodyfikowane) (1 diff)
-
Wierszowki/Wierszowki.Web/Controllers/MagazineItemController.cs (zmodyfikowane) (5 diffs)
-
Wierszowki/Wierszowki.Web/Controllers/ReportController.cs (zmodyfikowane) (5 diffs)
-
Wierszowki/Wierszowki.Web/Controllers/UserController.cs (zmodyfikowane) (7 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-8 384 /trunk:708-758,760-853
-
- Property svn:mergeinfo
-
branches/Abonament/Wierszowki/Wierszowki.Web/Controllers/AuthorController.cs
r752 r854 5 5 using Wierszowki.Services; 6 6 using xVal.ServerSide; 7 using System.Collections.Generic; 8 using Wierszowki.Core.Interfaces; 7 9 8 10 namespace Wierszowki.Controllers … … 28 30 { 29 31 var authorViewData = new AuthorViewData 30 31 32 33 32 { 33 Author = new Author(), 34 EmploymentTypeList = new SelectList(_context.GetEmploymentTypes().ToList(), "Id", "Name") 35 }; 34 36 35 37 return View(authorViewData); … … 51 53 52 54 if (ModelState.IsValid) 53 return RedirectToAction("Confirm", author); 55 { 56 var confirmViewData = new ConfirmViewData(); 57 confirmViewData = InitConfirmViewData(author, OperationType.Create, null); 58 return View("Confirm", confirmViewData); 59 //return RedirectToAction("Confirm", author); 60 } 54 61 55 62 … … 74 81 { 75 82 var authorViewData = new AuthorViewData 76 77 78 79 83 { 84 Author = _context.GetAuthorById(id), 85 EmploymentTypeList = new SelectList(_context.GetEmploymentTypes().ToList(), "Id", "Name") 86 }; 80 87 81 88 return View(authorViewData); … … 97 104 98 105 if (ModelState.IsValid) 99 return View("Confirm", author); 100 106 { 107 var confirmViewData = new ConfirmViewData(); 108 confirmViewData = InitConfirmViewData(author, OperationType.Update, null); 109 return View("Confirm", confirmViewData); 110 } 101 111 var authorViewData = new AuthorViewData 102 112 { … … 107 117 return View(authorViewData); 108 118 } 119 private ConfirmViewData InitConfirmViewData(Author author, OperationType c_type, Info inf) 120 { 121 var viewData = new ConfirmViewData 122 { 123 Author = author, 124 akcja = c_type, 125 info = inf 126 }; 127 return viewData; 128 } 109 129 } 110 130 } -
branches/Abonament/Wierszowki/Wierszowki.Web/Controllers/MagazineController.cs
r752 r854 25 25 magazineId = id.Value; 26 26 27 var issues = _context.FindIssuesByMagazineId(magazineId );27 var issues = _context.FindIssuesByMagazineId(magazineId,0); 28 28 29 29 var selectListItems = new List<SelectListItem> -
branches/Abonament/Wierszowki/Wierszowki.Web/Controllers/MagazineItemController.cs
r839 r854 6 6 using Wierszowki.Services; 7 7 using xVal.ServerSide; 8 using System.Collections.Generic; 9 using Wierszowki.Core.Interfaces; 8 10 9 11 namespace Wierszowki.Controllers … … 40 42 try 41 43 { 42 _service.Create(magazineItem, ControllerContext.HttpContext.User.Identity.Name); 44 _service.Create(magazineItem, ControllerContext.HttpContext.User.Identity.Name); 43 45 ModelState.Clear(); 44 46 } … … 47 49 ex.AddModelStateErrors(ModelState, "magazineItem"); 48 50 } 49 51 50 52 if (ModelState.IsValid) 51 53 { 52 return RedirectToAction("Confirm", _context.Authors.Single(a => a.Id == magazineItem.AuthorId)); 53 } 54 Info inf = InitInfo("1", 0, 0, 0); 55 var confirmViewData = new ConfirmViewData(); 56 confirmViewData = InitConfirmViewData(_context.Authors.Single(a => a.Id == magazineItem.AuthorId), OperationType.Create, inf); 57 return View("Confirm", confirmViewData); 58 } 59 var magazine = _service.Find(magazineItem.Id); 54 60 var viewData = InitMagazineItemViewData(); 55 61 viewData.MagazineItem = magazineItem; 56 57 return View(viewData); 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 } 68 return View(viewData); 58 69 } 59 70 … … 65 76 66 77 [Authorize] 67 public ActionResult Edit(int id) 68 { 69 var viewData = InitMagazineItemViewData(); 70 var magazineItem = _service.Find(id); 78 public ActionResult Edit(string id, string powrot, string month, string year, string user_id) 79 { 80 int id1 = 0; 81 int month1 = (month != null) ? Convert.ToInt32(month) : 0; 82 int year1 = (year != null) ? Convert.ToInt32(year) : 0; 83 int user1 = (user_id != null) ? Convert.ToInt32(user_id) : 0; 84 try 85 { 86 id1 = (id != null) ? Convert.ToInt32(id) : 0; 87 } 88 catch 89 { 90 } 91 var viewData = InitMagazineItemViewData(); 92 var magazineItem = _service.Find(id1); 71 93 72 94 if (magazineItem == null) 73 95 { 74 ViewData["message"] = "null"; 75 return View("Confirm"); 76 } 77 96 Info inf = InitInfo(powrot, month1, year1, user1); 97 var confirmViewData = new ConfirmViewData(); 98 99 if (id != "") //nie znaleziono w bazie wierszowki o zadanym id 100 { 101 confirmViewData = InitConfirmViewData(null, OperationType.WrongId, inf); 102 } 103 else //nie podano numeru id 104 { 105 confirmViewData = InitConfirmViewData(null, OperationType.NullId, null); 106 } 107 return View("Confirm", confirmViewData); 108 } 78 109 viewData.MagazineItem = magazineItem; 79 110 viewData.Magazine = magazineItem.Issue.Magazine; 80 111 viewData.Issue = magazineItem.Issue; 81 viewData.IssueList = new SelectList(_context.FindIssuesByMagazineItemId(magazineItem.Issue.Id), "Id", "Number"); 112 viewData.Info = InitInfo(powrot, month1, year1, user1); 113 114 var startDate = DateTime.Now.AddMonths(-3); 115 var endDate = DateTime.Now.AddMonths(1); 116 var issueList = _context.GetIssue().Where(i => i.Date >= startDate && i.Date <= endDate && i.MagazineId == magazineItem.Issue.MagazineId).OrderBy(i => i.Date).ToList(); 117 118 int start_number = issueList[0].Number; 119 int AddId = 0; 120 if (magazineItem.Issue.Number < start_number) 121 { 122 viewData.SmallerMagazineNumber = 1; 123 AddId = magazineItem.Issue.Id; 124 } 125 viewData.IssueList = new SelectList(_context.FindIssuesByMagazineItemId(magazineItem.Issue.Id, AddId), "Id", "Number"); 82 126 return View(viewData); 83 127 } 84 128 [Authorize] 85 129 [AcceptVerbs(HttpVerbs.Post)] 86 public ActionResult Update(MagazineItem magazineItem) 87 { 88 try 89 { 90 //var service = new MagazineItemService(); 130 public ActionResult Update(MagazineItem magazineItem, Info info) 131 { 132 try 133 { 91 134 _service.Update(magazineItem, ControllerContext.HttpContext.User.Identity.Name); 92 135 ModelState.Clear(); … … 99 142 if (ModelState.IsValid) 100 143 { 101 var author = _context.Authors.Single(a => a.Id == magazineItem.AuthorId); 102 return RedirectToAction("Confirm", author); 103 } 104 var viewData = InitMagazineItemViewData(); 105 viewData.MagazineItem = magazineItem; 106 return View(viewData); 107 } 108 144 var confirmViewData = new ConfirmViewData(); 145 confirmViewData = InitConfirmViewData(_context.Authors.Single(a => a.Id == magazineItem.AuthorId), OperationType.Update, info); 146 return View("Confirm", confirmViewData); 147 } 148 var magazine = _service.Find(magazineItem.Id); 149 var viewData = InitMagazineItemViewData(); 150 viewData.Info = info; 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 } 158 return View("Edit", viewData); 159 } 160 private Info InitInfo(string p, int m, int y, int u) 161 { 162 Info inf = new Info(); 163 inf.powrot = p; 164 inf.month = m; 165 inf.year = y; 166 inf.user_id = u; 167 return inf; 168 } 109 169 private MagazineItemViewData InitMagazineItemViewData() 110 170 { 111 171 var viewData = new MagazineItemViewData 112 { 113 MagazineItem = new MagazineItem(), 114 AuthorList = new SelectList(_context.Authors.ToList(), "Id", "FullName"), 115 MagazineList = new SelectList(_context.Magazines.ToList(), "Id", "NickName"), 116 IssueList = new SelectList(_context.FindIssuesByMagazineId(0), "Id", "Name"), 117 ItemTypeList = new SelectList(_context.ItemTypes.ToList(), "Id", "Name") 118 }; 172 { 173 MagazineItem = new MagazineItem(), 174 AuthorList = new SelectList(_context.Authors.OrderBy(a => a.LastName).ToList(), "Id", "FullName"), 175 MagazineList = new SelectList(_context.Magazines.ToList(), "Id", "NickName"), 176 IssueList = new SelectList(_context.FindIssuesByMagazineId(0, 0), "Id", "Name"), 177 ItemTypeList = new SelectList(_context.ItemTypes.ToList(), "Id", "Name"), 178 SmallerMagazineNumber = 0, 179 Info = new Info() 180 }; 119 181 return viewData; 120 182 } 121 183 [Authorize] 122 public ActionResult Delete(int id) 123 { 124 return View("Delete"); 184 public ActionResult Delete(string id, string powrot, string month, string year, string user_id) 185 { 186 int id1 = 0; 187 try 188 { 189 id1 = (id != null) ? Convert.ToInt32(id) : 0; 190 } 191 catch 192 { 193 } 194 var deleteViewData = new DeleteViewData(); 195 int month1 = (month != null) ? Convert.ToInt32(month) : 0; 196 int year1 = (year != null) ? Convert.ToInt32(year) : 0; 197 int user1 = (user_id != null) ? Convert.ToInt32(user_id) : 0; 198 deleteViewData.Info = InitInfo(powrot, month1, year1, user1); 199 return View("Delete", deleteViewData); 125 200 } 126 201 [Authorize] 127 202 [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 203 public ActionResult Delete(MagazineItem magazineItem, Info info) 204 { 205 var magazineItemToDelete = _service.Delete(magazineItem); 206 var confirmViewData = new ConfirmViewData(); 207 if (magazineItemToDelete == null) 208 { 209 confirmViewData = InitConfirmViewData(null, OperationType.WrongId, info); 210 } 211 else 212 { 213 confirmViewData = InitConfirmViewData(magazineItemToDelete.Author, OperationType.Delete, info); 214 } 215 return View("Confirm", confirmViewData); 216 } 217 private ConfirmViewData InitConfirmViewData(Author author, OperationType c_type, Info inf) 218 { 219 var viewData = new ConfirmViewData 220 { 221 Author = author, 222 akcja = c_type, 223 info = inf 224 }; 225 return viewData; 138 226 } 139 227 } -
branches/Abonament/Wierszowki/Wierszowki.Web/Controllers/ReportController.cs
r839 r854 8 8 using Wierszowki.Core.Linq; 9 9 using Wierszowki.Models; 10 using System.Globalization; 10 11 11 12 namespace Wierszowki.Controllers … … 35 36 36 37 var viewData = new ReportViewData 37 38 39 40 UserList = new SelectList(_context.GetUsers().OrderBy(u => u.FirstName).ToList(),"Id","FullName")41 38 { 39 Authors = _context.GetAuthors().OrderBy(a => a.FullName).ToList(), 40 EmploymentTypeList = new SelectList(_context.GetEmploymentTypes().ToList(),"Id","Name"), 41 UserList = new SelectList(_context.GetUsers().OrderBy(u => u.FullName).ToList(),"Id","FullName") 42 }; 42 43 return View(viewData); 43 44 } … … 45 46 public ActionResult All(int year, int month, int user) 46 47 { 47 var items = _repository.Find(m => m.Date.Month == month && m.Date.Year == year && m.CreatedBy == user) 48 var allViewData = new AllViewData(); 49 string error = ""; 50 string naglowek = ""; 51 52 if (user <= 0) 53 { 54 error = "Nie mo¿na wywietliæ wierszówek. Spróbuj jeszcze raz. "; 55 allViewData = InitAllViewData("", error, null, null); 56 return View("Error",allViewData); 57 } 58 var name = ""; 59 var items = new List<MagazineItem>(); 60 if (user > 0) 61 { 62 var u = _context.GetUserById(user); 63 if (u != null) 64 { 65 name = u.FullName; 66 items = _repository.Find(m => m.Date.Month == month && m.Date.Year == year && m.CreatedBy == user) 48 67 .OrderByDescending(m => m.UpdatedOn).ToList(); 49 return View(items); 68 69 if (items.Count <= 0) 70 { 71 error = "Brak wierszówek dla tego u¿ytkownika."; 72 allViewData = InitAllViewData("", error, null, null); 73 return View("Error", allViewData); 74 } 75 } 76 else 77 { 78 //U¿ytkownik bo taki nie istnieje 79 error = "Nie mo¿na wyswietliæ wierszówek, gdy¿ u¿ytkownik nie istnieje. "; 80 allViewData = InitAllViewData("", error, null, null); 81 return View("Error", allViewData); 82 } 83 DateTime dat = new DateTime(1, 1, 1); 84 dat = dat.AddYears(year-1); 85 dat = dat.AddMonths(month-1); 86 87 naglowek = "<div class='st1'>Wierszówki z " + dat.ToString("MM/yyyy", CultureInfo.CreateSpecificCulture("en-US")) + "</div>"; 88 if ( name != "") 89 { 90 naglowek += "<div class='st1'>Wprowadzaj¹cy: <span>" + name + "</span></div>"; 91 } 92 } 93 Info inf = new Info(); 94 inf.powrot = "2"; 95 inf.month = month; 96 inf.year = year; 97 inf.user_id = user; 98 99 allViewData = InitAllViewData(naglowek, error, inf, items); 100 return View("All", allViewData); 50 101 } 51 102 52 103 public ActionResult ToPrice() 53 104 { 105 string naglowek = "Wierszówki do wyceny"; 106 string error = ""; 107 var allViewData = new AllViewData(); 108 Info inf = new Info(); 109 inf.powrot = "1"; 54 110 var items = _repository.Find(m => m.Price <= 0).ToList(); 55 return View("All", items); 111 if ( items.Count <= 0 ) 112 { 113 error = "Brak wierszówek do wyceny."; 114 allViewData = InitAllViewData(naglowek, error, null, null); 115 return View("Error", allViewData); 116 } 117 allViewData = InitAllViewData(naglowek, "", inf, items); 118 return View("All", allViewData); 56 119 } 57 120 … … 69 132 70 133 var viewData = new AuthorCardViewData 71 72 73 74 75 134 { 135 FullName = magazineItems[0].Author.FullName, 136 Date = magazineItems[0].Date, 137 MagazineItems = new Dictionary<string, List<MagazineItem>>() 138 }; 76 139 foreach (var magazineItem in magazineItems) 77 140 { … … 123 186 return View("AuthorsByMagazines", viewData); 124 187 } 188 private AllViewData InitAllViewData(string str, string er, Info inf, List<MagazineItem> list) 189 { 190 var viewData = new AllViewData 191 { 192 naglowek = str, 193 error = er, 194 info = inf, 195 magazine = list 196 }; 197 return viewData; 198 } 125 199 } 126 200 } -
branches/Abonament/Wierszowki/Wierszowki.Web/Controllers/UserController.cs
r839 r854 1 using System; 1 2 using System.Linq; 2 3 using System.Web.Mvc; … … 6 7 using Wierszowki.Services.Interfaces; 7 8 using xVal.ServerSide; 9 using Wierszowki.Models; 10 using System.Collections.Generic; 8 11 9 12 namespace Wierszowki.Controllers … … 52 55 53 56 if (ModelState.IsValid) 54 return View("Confirm", user); 55 57 { 58 var userConfirmViewData = new UserConfirmViewData(); 59 userConfirmViewData = InitUserConfirmViewData("Potwierdzenie dodania u¿ytkownika", "", OperationType.Create, user); 60 return View("Confirm", userConfirmViewData); 61 } 56 62 return View(user); 57 63 } … … 62 68 return View(user); 63 69 } 70 64 71 [Authorize] 65 72 [AcceptVerbs(HttpVerbs.Get)] … … 67 74 { 68 75 User user = _service.Find(id); 76 string errorInfo = ""; 69 77 if (user != null) 70 78 { 71 79 string name = ControllerContext.HttpContext.User.Identity.Name; 72 80 var LogInUser = _service.FindOne(u => u.Login == name); 73 if (LogInUser.Id == user.Id )81 if (LogInUser.Id == user.Id || LogInUser.Id == 1) 74 82 { 75 83 return View(_service.Find(id)); … … 77 85 else 78 86 { 79 ViewData["message"] = "error_user"; 80 return View("Confirm"); 87 var userConfirmViewData = new UserConfirmViewData(); 88 errorInfo = "Nie mo¿na edytowaæ u¿ytkownika, gdy¿ login ró¿ni siê od zalogowanego!!!"; 89 userConfirmViewData = InitUserConfirmViewData("Edycja u¿ytkownika", errorInfo, OperationType.ErrorLogin, null); 90 return View("Confirm", userConfirmViewData); 81 91 } 82 83 92 } 84 ViewData["message"] = "error"; 85 return View("Confirm"); 93 var userConfirmViewData1 = new UserConfirmViewData(); 94 errorInfo = "Nie mo¿na edytowaæ u¿ytkownika, gdy¿ u¿ytkownik o takim id nie istnieje !!!"; 95 userConfirmViewData1 = InitUserConfirmViewData("Edycja u¿ytkownika", errorInfo, OperationType.ErrorUser, null); 96 return View("Confirm", userConfirmViewData1); 86 97 } 87 98 … … 101 112 102 113 if (ModelState.IsValid) 103 return View("Confirm", user); 104 105 114 { 115 var userConfirmViewData = new UserConfirmViewData(); 116 userConfirmViewData = InitUserConfirmViewData("Potwierdzenie edycji u¿ytkownika", "", OperationType.Update, user); 117 return View("Confirm", userConfirmViewData); 118 } 106 119 return View(user); 120 } 121 private UserConfirmViewData InitUserConfirmViewData(string naglowek, string error, OperationType u_type, User user) 122 { 123 var viewData = new UserConfirmViewData 124 { 125 Naglowek = naglowek, 126 ErrorInfo= error, 127 Akcja = u_type, 128 User = user 129 }; 130 return viewData; 107 131 } 108 132 }
