Index: PostgreSqlDotnetCore/Controllers/BlogController.cs =================================================================== --- PostgreSqlDotnetCore/Controllers/BlogController.cs (revision a850333d2357c1139a7902482a700bca9f59f04c) +++ PostgreSqlDotnetCore/Controllers/BlogController.cs (revision e90ba32557c3c52a93ec0b76184f5617270553ce) @@ -60,5 +60,5 @@ // Список на блог постови - var blogPosts = await db.BlogPostControllerObj.ToListAsync(); + var blogPosts = await db.BlogUsers.ToListAsync(); // Вземи тековниот корисник @@ -105,4 +105,5 @@ blogClass.BlogPostAnswers = blogAnswers; ViewBag.OnlyAdminManager = await checkAuthorizationSpecificRoleAsync(RoleConstants.Admin) ?? await checkAuthorizationSpecificRoleAsync(RoleConstants.Manager); + ViewBag.CurrentUserId = customerClass?.id; return View(blogClass); } @@ -301,4 +302,15 @@ // POST: Customer/Delete/5 + /* + [HttpPost, ActionName("Delete")] + [ValidateAntiForgeryToken] + public ActionResult DeleteConfirmed(int id) + { + BlogPostConsultation blogClass = db.BlogPostControllerObj.Find(id); + db.BlogPostControllerObj.Remove(blogClass); + db.SaveChanges(); + return RedirectToAction("Index"); + } + */ [HttpPost, ActionName("Delete")] @@ -306,14 +318,40 @@ public ActionResult DeleteConfirmed(int id) { + // Наоѓање на објектот по ID BlogPostConsultation blogClass = db.BlogPostControllerObj.Find(id); + + // Проверка дали објектот е пронајден + if (blogClass == null) + { + // Ако објектот не е пронајден, враќаме 404 Not Found или друга соодветна акција + return View(null); + } + // prvo izbrisi gi site odgovori po sot BlogId e primaren kluc vo drugata tabela + + // query + var query = from st in db.BlogPostAnswersObj + where st.BlogPostConsultationid == blogClass.id + select st; + //elenaaa + var blogAnswers = query.ToList(); + foreach (BlogPostAnswers answerClass in blogAnswers) + { + db.BlogPostAnswersObj.Remove(answerClass); + db.SaveChanges(); + + } + + // Отстранување на објектот ако е пронајден db.BlogPostControllerObj.Remove(blogClass); db.SaveChanges(); + + // Пренасочување на корисникот кон Index страницата return RedirectToAction("Index"); } - + // GET: Customer/Delete/5 // GET: Customer/Delete/5 // GET: Customer/Delete/5 - + Index: PostgreSqlDotnetCore/Controllers/BlogPostAnswersController.cs =================================================================== --- PostgreSqlDotnetCore/Controllers/BlogPostAnswersController.cs (revision a850333d2357c1139a7902482a700bca9f59f04c) +++ PostgreSqlDotnetCore/Controllers/BlogPostAnswersController.cs (revision e90ba32557c3c52a93ec0b76184f5617270553ce) @@ -155,11 +155,17 @@ public ActionResult Edit([Bind(include: "id,parent_id,reply,root_post,usersID")] BlogPostAnswers answerClass) { - if (ModelState.IsValid) - { - db.Entry(answerClass).State = EntityState.Modified; + + BlogPostAnswers answerClassDB = db.BlogPostAnswersObj.Find(answerClass.id); + if (answerClassDB != null && !answerClassDB.reply.Equals(answerClass.reply)) + { + answerClassDB.reply = answerClass.reply; + answerClassDB.parent_id = answerClass.parent_id; + db.Entry(answerClassDB).State = EntityState.Modified; db.SaveChanges(); - return RedirectToAction("Index"); - } - return View(answerClass); + //return RedirectToAction("Index"); + int id = answerClassDB.BlogPostConsultationid; + return RedirectToAction("Details", "Blog", new { id }); + } + return View(answerClassDB); } Index: PostgreSqlDotnetCore/Controllers/PetCaresController.cs =================================================================== --- PostgreSqlDotnetCore/Controllers/PetCaresController.cs (revision a850333d2357c1139a7902482a700bca9f59f04c) +++ PostgreSqlDotnetCore/Controllers/PetCaresController.cs (revision e90ba32557c3c52a93ec0b76184f5617270553ce) @@ -57,4 +57,5 @@ { // check for permission + bool isAuthenticated = User.Identity.IsAuthenticated; UsersClass customerClass = await getCrrentUser(); // set if is authenticated @@ -75,5 +76,5 @@ var userPetCares = - await query.ToListAsync(); + await query.Include(n => n.PetsClass).ToListAsync(); return View(userPetCares); @@ -81,5 +82,5 @@ else { - return View(db.PetCaresObj.ToList()); + return View(db.PetCaresObj.Include(n => n.PetsClass).ToList()); } @@ -280,11 +281,26 @@ // POST: Customer/Delete/5 + /* [HttpPost, ActionName("Delete")] + [ValidateAntiForgeryToken] + public ActionResult DeleteConfirmed(int id) + { + Pet_CaresClass peClass = db.PetCaresObj.Find(id); + db.PetCaresObj.Remove(peClass); + db.SaveChanges(); + return RedirectToAction("Index"); + } + */ + [HttpPost, ActionName("Delete")] [ValidateAntiForgeryToken] - public ActionResult DeleteConfirmed(int id) - { - Pet_CaresClass peClass = db.PetCaresObj.Find(id); + public async Task DeleteConfirmed(int id) + { + Pet_CaresClass peClass = await db.PetCaresObj.FindAsync(id); + if (peClass == null) + { + return RedirectToAction("NotExist", "Error"); + } db.PetCaresObj.Remove(peClass); - db.SaveChanges(); + await db.SaveChangesAsync(); return RedirectToAction("Index"); } Index: PostgreSqlDotnetCore/Data/ApplicationDbContext.cs =================================================================== --- PostgreSqlDotnetCore/Data/ApplicationDbContext.cs (revision a850333d2357c1139a7902482a700bca9f59f04c) +++ PostgreSqlDotnetCore/Data/ApplicationDbContext.cs (revision e90ba32557c3c52a93ec0b76184f5617270553ce) @@ -60,8 +60,11 @@ base.OnModelCreating(modelBuilder); + + modelBuilder.Entity().HasNoKey().ToView("view_userss_consultationss"); + base.OnModelCreating(modelBuilder); // Configure the relationship between VetCenter and CitiesClass - - + + // ... model definition ... } @@ -73,4 +76,5 @@ public virtual DbSet VetCentersWithCity { get; set; } + public virtual DbSet BlogUsers { get; set; } public virtual DbSet BlogPostControllerObj { get; set; } public virtual DbSet RoleControllerObj { get; set; } Index: PostgreSqlDotnetCore/Models/BlogUsers.cs =================================================================== --- PostgreSqlDotnetCore/Models/BlogUsers.cs (revision e90ba32557c3c52a93ec0b76184f5617270553ce) +++ PostgreSqlDotnetCore/Models/BlogUsers.cs (revision e90ba32557c3c52a93ec0b76184f5617270553ce) @@ -0,0 +1,17 @@ +// File: Models/VetCenterWithCity.cs + +namespace PostgreSqlDotnetCore.Models +{ + public class BlogUsers + { + public int id { get; set; } + public int users_id { get; set; } + public string user_name { get; set; } + public string user_lastname { get; set; } + public string user_email { get; set; } // Додајте име на градот + public string consultation_title { get; set; } + public string consultation_description { get; set; } + public DateOnly consultation_date { get; set; } + + } +} Index: PostgreSqlDotnetCore/Models/Pet_CaresClass.cs =================================================================== --- PostgreSqlDotnetCore/Models/Pet_CaresClass.cs (revision a850333d2357c1139a7902482a700bca9f59f04c) +++ PostgreSqlDotnetCore/Models/Pet_CaresClass.cs (revision e90ba32557c3c52a93ec0b76184f5617270553ce) @@ -22,8 +22,8 @@ public DateTime start_date { get; set; } - // [ForeignKey("PetsClass")] - // [Column("petid")] + [ForeignKey("PetsClass")] + [Column("pet_id")] public int pet_id { get; set; } - //public PetsClass PetsClass { get; set; } + public PetsClass PetsClass { get; set; } Index: PostgreSqlDotnetCore/Views/Blog/Details.cshtml =================================================================== --- PostgreSqlDotnetCore/Views/Blog/Details.cshtml (revision a850333d2357c1139a7902482a700bca9f59f04c) +++ PostgreSqlDotnetCore/Views/Blog/Details.cshtml (revision e90ba32557c3c52a93ec0b76184f5617270553ce) @@ -77,10 +77,22 @@ - @Html.ActionLink("Edit", "Edit", "BlogPostAnswers", new { id = item.id }) | - @Html.ActionLink("Details", "Details", "BlogPostAnswers", new { id = item.id }) | - @Html.ActionLink("Delete", "Delete", "BlogPostAnswers", new { id = item.id }) - + + @Html.ActionLink("Details", "Details", "BlogPostAnswers", new { id = item.id }) @Html.ActionLink("Create an Answer", "Create", "BlogPostAnswers", new { id = item.BlogPostConsultationid, parentId = item.id }) + + @if (item.usersid == ViewBag.CurrentUserId) + + { + + + @Html.ActionLink("Edit", "Edit", "BlogPostAnswers", new { id = item.id }) + @Html.ActionLink("Delete", "Delete", "BlogPostAnswers", new { id = item.id }) + + + + } + + } @@ -90,5 +102,15 @@

@Html.ActionLink("Create an Answer", "Create", "BlogPostAnswers", new { id = Model.id, parentId = Model.id }) - @Html.ActionLink("Edit", "Edit", new { id = Model.id }) | @Html.ActionLink("Back to List", "Index")

+ + +@if (Model.users_id == ViewBag.CurrentUserId) + +{ +

+ @Html.ActionLink("Edit", "Edit", new { id = Model.id }) + + +

+} Index: PostgreSqlDotnetCore/Views/Blog/Index.cshtml =================================================================== --- PostgreSqlDotnetCore/Views/Blog/Index.cshtml (revision a850333d2357c1139a7902482a700bca9f59f04c) +++ PostgreSqlDotnetCore/Views/Blog/Index.cshtml (revision e90ba32557c3c52a93ec0b76184f5617270553ce) @@ -1,3 +1,3 @@ -@model IEnumerable +@model IEnumerable @{ @@ -14,14 +14,20 @@ - @Html.DisplayNameFor(model => model.date_askes) + @Html.DisplayNameFor(model => model.id) - @Html.DisplayNameFor(model => model.title) + @Html.DisplayNameFor(model => model.user_name) - @Html.DisplayNameFor(model => model.description) + @Html.DisplayNameFor(model => model.user_email) - @Html.DisplayNameFor(model => model.users_id) + @Html.DisplayNameFor(model => model.consultation_title) + + + @Html.DisplayNameFor(model => model.consultation_description) + + + @Html.DisplayNameFor(model => model.consultation_date) @@ -33,16 +39,21 @@ - @Html.DisplayFor(modelItem => item.date_askes) + @Html.DisplayFor(modelItem => item.id) - @Html.DisplayFor(modelItem => item.title) + @Html.DisplayFor(modelItem => item.user_name) - - @Html.DisplayFor(modelItem => item.description) + @Html.DisplayFor(model => item.user_email) - - @Html.DisplayFor(model => item.users_id) - + + @Html.DisplayFor(modelItem => item.consultation_title) + + + @Html.DisplayFor(modelItem => item.consultation_description) + + + @Html.DisplayFor(modelItem => item.consultation_date) + @* Index: PostgreSqlDotnetCore/Views/PetCares/Index.cshtml =================================================================== --- PostgreSqlDotnetCore/Views/PetCares/Index.cshtml (revision a850333d2357c1139a7902482a700bca9f59f04c) +++ PostgreSqlDotnetCore/Views/PetCares/Index.cshtml (revision e90ba32557c3c52a93ec0b76184f5617270553ce) @@ -31,4 +31,7 @@ @Html.DisplayNameFor(model => model.vetcentersid) + + @Html.DisplayNameFor(model => model.PetsClass.name) + @@ -36,34 +39,38 @@ -@foreach (var item in Model) { - - - @Html.DisplayFor(modelItem => item.title) - - - @Html.DisplayFor(modelItem => item.description) - - - @Html.DisplayFor(modelItem => item.dateending) - + @foreach (var item in Model) + { + + + @Html.DisplayFor(modelItem => item.title) + + + @Html.DisplayFor(modelItem => item.description) + + + @Html.DisplayFor(modelItem => item.dateending) + @Html.DisplayFor(modelItem => item.start_date) - - @Html.DisplayFor(modelItem => item.usersid) - - - @Html.DisplayFor(modelItem => item.vetcentersid) - + + @Html.DisplayFor(modelItem => item.usersid) + + + @Html.DisplayFor(modelItem => item.vetcentersid) + + + @Html.DisplayFor(modelItem => item.PetsClass.name) + - - @Html.ActionLink("Edit", "Edit", new { id = item.id }) | - @Html.ActionLink("Details", "Details", new { id = item.id }) | - @Html.ActionLink("Delete", "Delete", new { id = item.id }) - - -} + + @Html.ActionLink("Edit", "Edit", new { id = item.id }) | + @Html.ActionLink("Details", "Details", new { id = item.id }) | + @Html.ActionLink("Delete", "Delete", new { id = item.id }) + + + }