Skip to content

TD-5304-Notifications Page - Anchors are used for buttons #1006

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Parent: Merge RC changes into CI
merged 1 commit into from
Feb 27, 2025
Merged

TD-5304-Notifications Page - Anchors are used for buttons #1006

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions LearningHub.Nhs.WebUI/Scripts/vuesrc/notification/notification.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<a href="#" @click="showNotification(notification)">{{ notification.title }}</a>
</td>
<td class="px-sm-3 py-sm-3">
<div class="d-flex justify-content-between"
<div class="d-flex justify-content-between"
v-for="item in notificationTypeContent(notification.notificationType)">
{{ item.text }}&nbsp;
<i :class="item.className"></i>
Expand All @@ -45,7 +45,7 @@
</td>
<td class="px-sm-3 py-sm-3">
<div class="d-flex justify-content-between" v-if="notification.userDismissable">
<button data-target="#deleteModal" class="nhsuk-button nhsuk-u-margin-bottom-0" data-toggle="modal" @click="selectNotification(notification)">Delete</button>
<button data-target="#deleteModal" class="nhsuk-button" data-toggle="modal" @click="selectNotification(notification)">Delete</button>
</div>
</td>
</tr>
Expand Down Expand Up @@ -74,10 +74,7 @@
<i :class="['fal fa-envelope' + (notification.readOnDate != null ? '-open text-success' : '')]">&nbsp;</i>
<a href="#" @click="showNotification(notification)">{{ notification.title }}</a>
</div>

<a href="#deleteModalButton" data-toggle="modal" @click="deleteNotification()" aria-label="Delete" v-if="notification.userDismissable">
<i class="fas fa-ellipsis-h fa-lg" style="color: #435563;"></i>
</a>
<button data-target="#deleteModalButton" class="nhsuk-button" data-toggle="modal" @click="deleteNotification()" aria-label="Delete" v-if="notification.userDismissable">Delete</button>
</div>

<paging v-bind="this.pagingModel" @loadPage="loadPage"></paging>
Expand Down Expand Up @@ -173,7 +170,7 @@
.catch(e => console.log(e));
}
},
async deleteNotification() {
async deleteNotification() {
await axios.delete(
'/api/notification/' + this.selectedNotification.notificationId + '?userNotificationId=' + this.selectedNotification.id)
.catch(e => console.log(e));
Expand Down
Loading