Zbiór zmian 842 dla trunk/Wierszowki/Wierszowki.Web/Controllers
- Data:
- 2009-10-02 13:15:40 (17 years ago)
- Lokalizacja:
- trunk/Wierszowki/Wierszowki.Web/Controllers
- Pliki:
-
- 4 zmodyfikowane
-
MagazineController.cs (zmodyfikowane) (1 diff)
-
MagazineItemController.cs (zmodyfikowane) (5 diffs)
-
ReportController.cs (zmodyfikowane) (5 diffs)
-
UserController.cs (zmodyfikowane) (7 diffs)
Legenda:
- Bez zmian
- Dodane
- Usunięte
-
trunk/Wierszowki/Wierszowki.Web/Controllers/MagazineController.cs
r752 r842 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> -
trunk/Wierszowki/Wierszowki.Web/Controllers/MagazineItemController.cs
r823 r842 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)); 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); 53 58 } 54 59 var viewData = InitMagazineItemViewData(); 55 60 viewData.MagazineItem = magazineItem; 56 57 return View(viewData); 61 62 return View(viewData); 58 63 } 59 64 … … 65 70 66 71 [Authorize] 67 public ActionResult Edit(int id) 68 { 69 var viewData = InitMagazineItemViewData(); 70 var magazineItem = _service.Find(id); 72 public ActionResult Edit(string id, string powrot, string month, string year, string user_id) 73 { 74 int id1 = 0; 75 int month1 = (month != null) ? Convert.ToInt32(month) : 0; 76 int year1 = (year != null) ? Convert.ToInt32(year) : 0; 77 int user1 = (user_id != null) ? Convert.ToInt32(user_id) : 0; 78 try 79 { 80 id1 = (id != null) ? Convert.ToInt32(id) : 0; 81 } 82 catch 83 { 84 } 85 var viewData = InitMagazineItemViewData(); 86 var magazineItem = _service.Find(id1); 71 87 72 88 if (magazineItem == null) 73 89 { 74 ViewData["message"] = "null"; 75 return View("Confirm"); 76 } 77 90 Info inf = InitInfo(powrot, month1, year1, user1); 91 var confirmViewData = new ConfirmViewData(); 92 93 if (id != "") //nie znaleziono w bazie wierszowki o zadanym id 94 { 95 confirmViewData = InitConfirmViewData(null, OperationType.WrongId, inf); 96 } 97 else //nie podano numeru id 98 { 99 confirmViewData = InitConfirmViewData(null, OperationType.NullId, null); 100 } 101 return View("Confirm", confirmViewData); 102 } 78 103 viewData.MagazineItem = magazineItem; 79 104 viewData.Magazine = magazineItem.Issue.Magazine; 80 105 viewData.Issue = magazineItem.Issue; 81 viewData.IssueList = new SelectList(_context.FindIssuesByMagazineItemId(magazineItem.Issue.Id), "Id", "Number"); 106 viewData.Info = InitInfo(powrot, month1, year1, user1); 107 108 var startDate = DateTime.Now.AddMonths(-3); 109 var endDate = DateTime.Now.AddMonths(1); 110 var issueList = _context.GetIssue().Where(i => i.Date >= startDate && i.Date <= endDate && i.MagazineId == magazineItem.Issue.MagazineId).OrderBy(i => i.Date).ToList(); 111 112 int start_number = issueList[0].Number; 113 int AddId = 0; 114 if (magazineItem.Issue.Number < start_number) 115 { 116 viewData.SmallerMagazineNumber = 1; 117 AddId = magazineItem.Issue.Id; 118 } 119 viewData.IssueList = new SelectList(_context.FindIssuesByMagazineItemId(magazineItem.Issue.Id, AddId), "Id", "Number"); 82 120 return View(viewData); 83 121 } 84 122 [Authorize] 85 123 [AcceptVerbs(HttpVerbs.Post)] 86 public ActionResult Update(MagazineItem magazineItem) 87 { 88 try 89 { 90 //var service = new MagazineItemService(); 124 public ActionResult Update(MagazineItem magazineItem, Info info) 125 { 126 try 127 { 91 128 _service.Update(magazineItem, ControllerContext.HttpContext.User.Identity.Name); 92 129 ModelState.Clear(); … … 99 136 if (ModelState.IsValid) 100 137 { 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 138 var confirmViewData = new ConfirmViewData(); 139 confirmViewData = InitConfirmViewData(_context.Authors.Single(a => a.Id == magazineItem.AuthorId), OperationType.Update, info); 140 return View("Confirm", confirmViewData); 141 } 142 var magazine = _service.Find(magazineItem.Id); 143 var viewData = InitMagazineItemViewData(); 144 viewData.Info = info;//InitInfo(info.powrot, info.month, info.year, info.user_id); 145 viewData.MagazineItem = magazine; 146 return View("Edit", viewData); 147 } 148 private Info InitInfo(string p, int m, int y, int u) 149 { 150 Info inf = new Info(); 151 inf.powrot = p; 152 inf.month = m; 153 inf.year = y; 154 inf.user_id = u; 155 return inf; 156 } 109 157 private MagazineItemViewData InitMagazineItemViewData() 110 158 { 111 159 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 }; 160 { 161 MagazineItem = new MagazineItem(), 162 AuthorList = new SelectList(_context.Authors.OrderBy(a => a.LastName).ToList(), "Id", "FullName"), 163 MagazineList = new SelectList(_context.Magazines.ToList(), "Id", "NickName"), 164 IssueList = new SelectList(_context.FindIssuesByMagazineId(0, 0), "Id", "Name"), 165 ItemTypeList = new SelectList(_context.ItemTypes.ToList(), "Id", "Name"), 166 SmallerMagazineNumber = 0, 167 Info = new Info() 168 }; 119 169 return viewData; 120 170 } 121 171 [Authorize] 122 public ActionResult Delete(int id) 123 { 124 return View("Delete"); 172 public ActionResult Delete(string id, string powrot, string month, string year, string user_id) 173 { 174 int id1 = 0; 175 try 176 { 177 id1 = (id != null) ? Convert.ToInt32(id) : 0; 178 } 179 catch 180 { 181 } 182 var deleteViewData = new DeleteViewData(); 183 int month1 = (month != null) ? Convert.ToInt32(month) : 0; 184 int year1 = (year != null) ? Convert.ToInt32(year) : 0; 185 int user1 = (user_id != null) ? Convert.ToInt32(user_id) : 0; 186 deleteViewData.Info = InitInfo(powrot, month1, year1, user1); 187 return View("Delete", deleteViewData); 125 188 } 126 189 [Authorize] 127 190 [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 191 public ActionResult Delete(MagazineItem magazineItem, Info info) 192 { 193 var magazineItemToDelete = _service.Delete(magazineItem); 194 var confirmViewData = new ConfirmViewData(); 195 if (magazineItemToDelete == null) 196 { 197 confirmViewData = InitConfirmViewData(null, OperationType.WrongId, info); 198 } 199 else 200 { 201 confirmViewData = InitConfirmViewData(magazineItemToDelete.Author, OperationType.Delete, info); 202 } 203 return View("Confirm", confirmViewData); 204 } 205 private ConfirmViewData InitConfirmViewData(Author author, OperationType c_type, Info inf) 206 { 207 var viewData = new ConfirmViewData 208 { 209 Author = author, 210 akcja = c_type, 211 info = inf 212 }; 213 return viewData; 138 214 } 139 215 } -
trunk/Wierszowki/Wierszowki.Web/Controllers/ReportController.cs
r823 r842 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 } -
trunk/Wierszowki/Wierszowki.Web/Controllers/UserController.cs
r823 r842 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 { … … 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 }
