dimitar/studenthousedashboard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Delete, Edit Announcement, style fixes

Browse Source
This commit is contained in:
Dimitar Byalkov
2023-05-14 12:57:32 +02:00
parent 765fa8774d
commit 1adaef73e7
10 changed files with 178 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
StudentHouseDashboard/Data/AnnouncementRepository.cs
View File

@@ -37,6 +37,27 @@ namespace Data
}
return announcements;
}
public Announcement GetAnnouncementById(int id)
{
UserRepository userRepository = new UserRepository();
using (SqlConnection conn = SqlConnectionHelper.CreateConnection())
{
string sql = "SELECT * FROM Announcements WHERE ID = @id;";
SqlCommand cmd = new SqlCommand(sql, conn);
cmd.Parameters.AddWithValue("id", id);
var reader = cmd.ExecuteReader();
reader.Read();
Announcement announcement = new Announcement(Convert.ToInt32(reader["ID"]),
userRepository.GetUserById(Convert.ToInt32(reader["Author"])),
reader["Description"].ToString(), reader["Title"].ToString(),
(DateTime)reader["PublishDate"], (bool)reader["IsImportant"],
(bool)reader["IsSticky"]);
CommentRepository commentRepository = new CommentRepository();
announcement.Comments = commentRepository.GetAllCommentsOnAnnouncement(announcement.ID);
conn.Close();
return announcement;
}
}
public List<Announcement> GetAnnouncementsByPage(int? p, int? c)
{
List<Announcement> announcements = new List<Announcement>();

5
StudentHouseDashboard/Logic/AnnouncementManager.cs
View File

@@ -20,6 +20,10 @@ namespace Logic
{
return announcementRepository.GetAllAnnouncements();
}
public Announcement GetAnnouncementById(int id)
{
return announcementRepository.GetAnnouncementById(id);
}
public List<Announcement> GetAnnouncementsByPage(int? p, int? c)
{
return announcementRepository.GetAnnouncementsByPage(p, c);
@@ -30,6 +34,7 @@ namespace Logic
}
public bool UpdateAnnouncement(int id, string title, string description, bool isImportant, bool isSticky)
{
description += $"{Environment.NewLine}{Environment.NewLine}Updated: {DateTime.Now.ToString("g")}";
return announcementRepository.UpdateAnnouncement(id, title, description, isImportant, isSticky);
}
public bool DeleteAnnouncement(int id)

2
StudentHouseDashboard/Models/GenericMessage.cs
View File

@@ -26,7 +26,7 @@ namespace Models
}
public int ID
{
get; private set;
get; set;
}
public User Author

8
StudentHouseDashboard/WebApp/Pages/Announcement.cshtml
View File

@@ -7,13 +7,17 @@
Announcement announcement = (Announcement)ViewData["announcement"];
ViewData["Title"] = $"{announcement.Title}";
}
<h1>@announcement.Title</h1>
<h1 @if (announcement.IsImportant)
{
@: style="color: red;"
}>@announcement.Title
</h1>
<p>
Published @announcement.PublishDate.ToString("g") by @announcement.Author.Name
@Html.Raw((announcement.Author.Role == UserRole.ADMIN || announcement.Author.Role == UserRole.MANAGER)
? $"<b>({CultureInfo.CurrentCulture.TextInfo.ToTitleCase(announcement.Author.Role.ToString().ToLower())})</b>"
: "")
@(announcement.IsImportant ? "Important" : "") @(announcement.IsSticky ? "Sticky" : "")
@(announcement.IsSticky ? "Pinned" : "")
</p>
<p>
@if (User.FindFirst(ClaimTypes.Role).Value == "ADMIN" || User.Identity.Name == announcement.Author.Name)

7
StudentHouseDashboard/WebApp/Pages/Announcements.cshtml
View File

@@ -15,9 +15,12 @@
{
<div class="card" style="display:inline-flex; width: 18rem;">
<div class="card-body">
<h5 class="card-title">@announcement.Title</h5>
<h5 class="card-title" @if (announcement.IsImportant)
{
@: style="color: red;"
}>@announcement.Title</h5>
<h6 class="card-subtitle mb-2 text-muted">@announcement.Author.Name</h6>
<p class="card-text">@announcement.Description.PadRight(100).Trim()</p>
<p class="card-text">@announcement.Description.PadRight(100).Substring(0,100).Trim()</p>
<a href="./Announcement?id=@announcement.ID" class="btn btn-primary">More details</a>
</div>
</div>

4
StudentHouseDashboard/WebApp/Pages/CreateAnnouncement.cshtml.cs
View File

@@ -13,13 +13,13 @@ namespace WebApp.Pages
public void OnGet()
{
}
public void OnPost()
public IActionResult OnPost()
{
AnnouncementManager announcementManager = new AnnouncementManager();
UserManager userManager = new UserManager();
User user = userManager.GetUserById(int.Parse(User.FindFirstValue("id")));
announcementManager.CreateAnnouncement(Announcement.Title, Announcement.Description, user, DateTime.Now, Announcement.IsImportant, Announcement.IsSticky);
RedirectToPage("Announcements");
return RedirectToPage("Announcements");
}
}
}

31
StudentHouseDashboard/WebApp/Pages/DeleteAnnouncement.cshtml Normal file
View File

@@ -0,0 +1,31 @@
@page
@using Models;
@model WebApp.Pages.DeleteAnnouncementModel
@{
ViewData["Title"] = "Delete announcement";
Announcement announcement = (Announcement)ViewData["announcement"];
}
@if (announcement == null)
{
<div class="alert alert-danger" role="alert">
Unable to find announcement! Do you have permission?
</div>
<a type="button" class="btn btn-primary" asp-page="Announcements">Return to all announcements</a>
}
else
{
<form method="post">
<h1>Are you sure you want to delete this announcement?</h1>
<div class="card">
<div class="card-body">
<h5 class="card-title">@announcement.Title</h5>
<h6 class="card-subtitle mb-2 text-body-secondary">@announcement.Author.Name - @announcement.PublishDate</h6>
<p class="card-text">@Html.Raw(announcement.Description.Replace(Environment.NewLine, "<br />"))</p>
</div>
</div>
<input type="hidden" asp-for="AnnouncementId" value="@announcement.ID" />
<input type="submit" value="Yes" class="btn btn-danger" />
<a type="button" class="btn btn-secondary" asp-page="Announcements">No</a>
</form>
}

32
StudentHouseDashboard/WebApp/Pages/DeleteAnnouncement.cshtml.cs Normal file
View File

@@ -0,0 +1,32 @@
using Logic;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.RazorPages;
using Models;
using System.Security.Claims;
namespace WebApp.Pages
{
public class DeleteAnnouncementModel : PageModel
{
[BindProperty]
public int AnnouncementId { get; set; }
public void OnGet(int id)
{
AnnouncementManager announcementManager = new AnnouncementManager();
if (id != null)
{
Announcement announcement = announcementManager.GetAnnouncementById(id);
if (announcement.Author.ID == int.Parse(User.FindFirstValue("id")) || User.IsInRole("ADMIN"))
{
ViewData["announcement"] = announcement;
}
}
}
public IActionResult OnPost()
{
AnnouncementManager announcementManager = new AnnouncementManager();
announcementManager.DeleteAnnouncement(AnnouncementId);
return RedirectToPage("Announcements");
}
}
}

43
StudentHouseDashboard/WebApp/Pages/EditAnnouncement.cshtml Normal file
View File

@@ -0,0 +1,43 @@
@page
@using Models;
@model WebApp.Pages.EditAnnouncementModel
@{
ViewData["Title"] = "Edit announcement";
Model.Announcement = (Announcement)ViewData["announcement"];
}
<h1>@ViewData["Title"]</h1>
@if (Model.Announcement == null)
{
<div class="alert alert-danger" role="alert">
Unable to find announcement! Do you have permission?
</div>
<a type="button" class="btn btn-primary" asp-page="Announcements">Return to all announcements</a>
}
else
{
<form method="post">
<div class="mb-3">
<label asp-for="Announcement.Title" class="form-label">Title: </label>
<input asp-for="Announcement.Title" class="form-control" />
</div>
@if (HttpContext.User.IsInRole("ADMIN") || HttpContext.User.IsInRole("MANAGER"))
{
<div class="mb-3">
<label asp-for="Announcement.IsImportant" class="form-label">Important: </label>
@Html.CheckBoxFor(model => model.Announcement.IsImportant)
</div>
<div class="mb-3">
<label asp-for="Announcement.IsSticky" class="form-label">Pinned: </label>
@Html.CheckBoxFor(model => model.Announcement.IsSticky)
</div>
}
<div class="mb-3">
<label asp-for="Announcement.Description" class="form-label">Description: </label>
<textarea asp-for="Announcement.Description" class="form-control" rows="5"></textarea>
</div>
<input type="hidden" asp-for="Announcement.ID" />
<input type="submit" value="Save" class="btn btn-primary" />
</form>
}

32
StudentHouseDashboard/WebApp/Pages/EditAnnouncement.cshtml.cs Normal file
View File

@@ -0,0 +1,32 @@
using Logic;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.RazorPages;
using Models;
using System.Security.Claims;
namespace WebApp.Pages
{
public class EditAnnouncementModel : PageModel
{
[BindProperty]
public Announcement Announcement { get; set; }
public void OnGet(int id)
{
AnnouncementManager announcementManager = new AnnouncementManager();
if (id != null)
{
Announcement announcement = announcementManager.GetAnnouncementById(id);
if (announcement.Author.ID == int.Parse(User.FindFirstValue("id")) || User.IsInRole("ADMIN") )
{
ViewData["announcement"] = announcement;
}
}
}
public IActionResult OnPost()
{
AnnouncementManager announcementManager = new AnnouncementManager();
announcementManager.UpdateAnnouncement(Announcement.ID, Announcement.Title, Announcement.Description, Announcement.IsImportant, Announcement.IsSticky);
return RedirectToPage("Announcements");
}
}
}