Merge pull request #346 from NationalSecurityAgency/4.3.X

rmmayo · web-flow · commit 8bcfa25ef135 · 2026-04-27T11:31:18.000-04:00
4.3.x
diff --git a/cypress/e2e/admin.cy.js b/cypress/e2e/admin.cy.js
@@ -429,6 +429,7 @@ context('Admin: Generate Screenshots', () => {
     })
 
     it('Gen Expiration Settings page', () => {
+        cy.intercept('/public/isFeatureSupported?feature=emailservice', 'true');
         cy.visit('/administrator/projects/movies/subjects/Action/skills/TheMatrix/config-expiration')
         cy.snap('page-expiration-config', '[data-cy="nav"]')
     })
@@ -755,11 +756,17 @@ context('Admin: Generate Screenshots', () => {
 
         cy.get('[data-cy="userCell_bob1@email.org"]')
         cy.snap('page-global-badge-access')
+    })
 
+    it('page - global badges users', () => {
+        cy.intercept('/admin/badges/MoviesandShowsExpertBadge/users**').as('getUsers')
         cy.visit('/administrator/globalBadges/MoviesandShowsExpertBadge/users')
+        cy.wait('@getUsers')
+        cy.get('[data-cy="users-skillIdFilter"]').type('uid{enter}')
+        cy.wait('@getUsers')
         cy.get('[data-cy="usersTable"]').contains('Levels')
         cy.get('[data-cy="usersTable"] [data-pc-name="pcrowperpagedropdown"]')
-          .click().get('[data-pc-section="option"]').contains('5').click();
+            .click().get('[data-pc-section="option"]').contains('5').click();
         cy.snap('page-global-badge-users')
     })
 
diff --git a/cypress/e2e/progress-and-ranking.cy.js b/cypress/e2e/progress-and-ranking.cy.js
@@ -188,7 +188,7 @@ context('Progress and Ranking: Generate Screenshots', () => {
     cy.get('[data-cy="myQuizAttemptsTable"] [data-cy="skillsBTableTotalRows"]').should('have.text', '9')
     cy.snap('page-my-quiz-attempts');
 
-    cy.get('[data-cy="myQuizAttemptsTable"] [data-p-index="0"] a').click()
+    cy.get('[data-cy="myQuizAttemptsTable"] [data-p-index="0"] [data-cy="viewQuizAttempt"]').click()
     cy.snap('page-my-quiz-single-attempt');
   })
 
diff --git a/docs/dashboard/user-guide/global-badges.md b/docs/dashboard/user-guide/global-badges.md
@@ -54,7 +54,12 @@ The Badge Progress column shows:
 The User Progress Table offers filtering, sorting, and export capabilities to help you analyze user performance. You can:
 - Filter by user ID, first name, and last name using the User Filter
 - Sort any column by clicking its header
-- 
+- Export table data to Excel by clicking the Export button in the top right
+
+::: tip
+Filters are applied to the exported data.
+:::
+
 ## Creating Global Badges
 
 ### Step 1: Create a New Badge
diff --git a/docs/dashboard/user-guide/skills-catalog.md b/docs/dashboard/user-guide/skills-catalog.md
@@ -34,7 +34,7 @@ To import skills please follow these steps:
 
 1. **Import one or more skills** - skills will be disabled; disabled skills do not contribute to the overall points and skill occurrences do not propagate to the imported skills prior to import finalization (step 3)
 2. *(Optional)* **Adjust imported skills' ``Point Increment``** to match your project's point system/layout
-3. **Finalize imported skills** - user points from the original project are migrated and level achievements are calculated. After finalization, user points and achievements against the original exported skill will continue toi be propagated to the imported copy as they take place.
+3. **Finalize imported skills** - user points from the original project are migrated and level achievements are calculated. After finalization, user points and achievements against the original exported skill will continue to be propagated to the imported copy as they take place.
 
 Catalog Skills can be easily imported by navigating to the subject's page (``Project -> Subject``) 
 and clicking the ``Import`` button on the top right. The import dialog allows users to locate, select and
@@ -93,6 +93,13 @@ The Finalization process exists to protect importing projects from premature lev
 Please note that the finalization process is expensive and may take several minutes to complete.
 :::
 
+::: tip User Progress Filtering
+After skills are finalized, user progress tables will feature an **"Exclude Users that only earned points in imported skills"** toggle switch. 
+When enabled, only users who have earned at least one point in native (non-imported) skills will be displayed in the progress tables. 
+This filtering capability allows administrators to easily distinguish between users who have made progress specifically in their project's original skills versus those whose progress comes from a combination of both local and imported achievements.
+The toggle switch state is saved in the browser's local storage and will persist as you navigate between user progress tables for the overall project, subjects, skills, or badges.
+:::
+
 ## Good To Know
 
 This section will cover several features and inner-workings of the Skills Catalog. 
diff --git a/docs/dashboard/user-guide/skills.md b/docs/dashboard/user-guide/skills.md
@@ -141,11 +141,30 @@ The default option for all skills is set to `Never`, so that the skill will neve
 
 The `Yearly` and `Monthly` options allow for the skill to be configured to expire on a recurring basis.  For example, you can configure a skill so that *all* user's points and achievements earned for this skill will be removed annually on December 31st.  
 
-The `Daily with the ability to retain` option allows for the skill to be configured to expire based on usage. This option requires the user to continue to exercise the skill after achieving it in order to avoid losing their points. Once a user achieves the skill, 
-the user must perform the skill at least once within the number of days configured.  After performing the skill, the "timer" will be reset and the user will once again be required to perform the skill within the configured number of days to avoid losing the points they have earned since achieving this skill.
+The `Daily with the ability to retain` option configures skills to expire based on user activity. After achieving this skill, users must continue performing it within the configured number of days to maintain their points. Each time the skill is performed, the timer resets, requiring users to repeat the skill within the specified timeframe to keep their earned points."
+
+### Expiration Notifications
 
 Skills that are configured to expire will have warnings visualized in the Skills Display, letting the user know when the skill will is set to expire.
 
+Additionally, you can enable email notifications to alert users when their skills are about to expire or have expired. The `Email Notifications Enabled` checkbox allows you to:
+
+- Send automatic email notifications to users when their skills are approaching expiration
+- Provide users with advance warning so they can take action to maintain their skill achievements
+- Ensure users stay informed about the status of their expiring skills
+
+When enabled, users will receive different types of email notifications based on the expiration configuration:
+
+For skills configured with `Monthly` or `Yearly` expiration, users receive notifications **after** their achievements have expired. These notifications inform users that their skill achievements have been removed and provide information about the next scheduled expiration date.
+
+For skills configured with `Daily with ability to retain`, users receive **warning notifications** before their achievements expire. These notifications:
+- Are sent when a user's achievement is approaching expiration
+- Include the number of days remaining until expiration
+- Provide a retention deadline so users can take action to maintain their achievements
+- Are only sent once per expiration cycle to avoid notification fatigue
+
+This differentiated approach ensures users receive timely and relevant notifications based on their skill expiration configuration.
+
 ### Expiration History
 
 A history of skills that have been expired can be viewed from the `Skill Expiration History` table on the `Project` page.
@@ -337,7 +356,7 @@ to learn more please visit the [Self Reporting](/dashboard/user-guide/self-repor
 ## Move Skills
 Move Skills is a feature that allows project administrators to move skills to other subjects or skill groups within the same project.
 When skills are moved, users' points are preserved for those skills and level-based achievements are 
-properly re-calculted for both origination and destination subject/group.
+properly re-calculated for both origination and destination subject/group.
 
 ::: tip
 The ability to move skills between subjects gives project administrators gives project administrators the ability to refine their training profile after the initial creation of skills.
diff --git a/docs/dashboard/user-guide/users.md b/docs/dashboard/user-guide/users.md
@@ -25,13 +25,26 @@ The User Progress Table offers filtering, sorting, and export capabilities to he
 
 - Filter by user ID, first name, and last name using the User Filter
 - Filter by minimum and maximum user progress percentage using the User Progress filter
+- *"Exclude Users that only earned points in imported skills"* toggle switch - only shown when there are [Skill Catalog](/dashboard/user-guide/skills-catalog.html#importing-skills) imported skills.  
 - Sort any column by clicking its header
 - Export table data to Excel by clicking the Export button in the top right
 
 ::: tip
 Note that the export will respect any currently applied filters.
 :::
 
+##### Progress Table with Imported Skills
+
+If the project has imported and finalized skills from the [Skill Catalog](/dashboard/user-guide/skills-catalog.html#importing-skills), user progress tables will feature an **"Exclude Users that only earned points in imported skills"** toggle switch.
+When enabled, only users who have earned at least one point in native (non-imported) skills will be displayed in the progress tables.
+
+This filtering capability allows administrators to easily distinguish between users who have made progress specifically in their project's original skills versus those whose progress comes from a combination of both local and imported achievements.
+
+::: tip
+The toggle switch state is saved in the browser's local storage and will persist as you navigate between user progress tables for the overall project, subjects, skills, or badges.
+:::
+
+
 ### Users Archive 
 
 Users can be archived and restored in batches or individually. Archived users are excluded from project visualizations, metrics, and tables.
diff --git a/docs/release-notes/skills-service.md b/docs/release-notes/skills-service.md
@@ -8,6 +8,19 @@ To obtain deployable artifacts please visit [Distributions](/dashboard/install-g
 
 </conditional>
 
+## 4.3
+<release-date date="April 2026" />
+- **Quiz Experience Enhancements**
+  - **[Project Association Visibility](/training-participation/training-portfolio.html#quizzes-and-surveys-history)** - Enhanced My Quiz Attempts table and single attempt pages to display project associations with navigation back to the originating skill
+  - **Try Again Functionality** - Added "Try Again" button on quiz-attempt pages when quizzes are failed and additional attempts remain available
+- **[Native Skills Filter](/dashboard/user-guide/users.html#progress-table-with-imported-skills)** - Added filter to project Users pages to display only users with points from native (non-imported) skills, with toggle option to show/hide imported points and achievements
+- **[Automated Email Notifications](/dashboard/user-guide/skills.html#expiration-notifications)**
+  - **Expiration Reminders** - Automated email notifications to remind users when skills with daily expiration settings are approaching expiration
+  - **Expiration Notifications** - Email notifications to inform users when monthly or yearly expiration skills have passed their expiration date and achievements were removed
+- **Skill Page Navigation** - Added Previous/Next skill navigation buttons to the bottom of trainee skill pages for easier progression through training content
+- **[Global Badge Export](/dashboard/user-guide/global-badges.html#filters-sorting-and-export)** - Implemented Excel export functionality for the Global Badge users table, including all visible columns and respecting applied filters
+- **Character Limit Indicators** - Added character limit feedback for better user experience when entering plain multi-line text content
+- **Bug Fixes**
 
 ## 4.2
 <release-date date="March 2026" />
diff --git a/docs/screenshots/admin/page-expiration-config.png b/docs/screenshots/admin/page-expiration-config.png
diff --git a/docs/screenshots/admin/page-global-badge-users.png b/docs/screenshots/admin/page-global-badge-users.png
diff --git a/docs/screenshots/progress-and-ranking/page-my-quiz-attempts.png b/docs/screenshots/progress-and-ranking/page-my-quiz-attempts.png
diff --git a/docs/screenshots/progress-and-ranking/page-my-quiz-single-attempt.png b/docs/screenshots/progress-and-ranking/page-my-quiz-single-attempt.png
diff --git a/docs/training-participation/take-training.md b/docs/training-participation/take-training.md
@@ -175,7 +175,7 @@ Additional optional elements may appear in the skill details, depending on the s
 - **Enhanced Media**: Optional video or audio content to enrich the learning experience
 - **Expiration**: A clear deadline indicating when the skill will expire (if applicable)
 
-Use the **Next** and **Previous** buttons at the top of the skill page to move between skills.
+Use the **Next** and **Previous** buttons featured both at the top and the bottom of the skill page to move between skills.
 
 ::: tip Keyboard Shortcuts
 Navigate between skills using these keyboard shortcuts:
diff --git a/docs/training-participation/training-portfolio.md b/docs/training-participation/training-portfolio.md
@@ -46,8 +46,16 @@ View your completed quizzes and surveys by clicking the **History** button on th
 
 ![page-my-quiz-attempts.png](../screenshots/progress-and-ranking/page-my-quiz-attempts.png)
 
+The table contains the following columns:
+- **Name**: Quiz or survey name, click on a name to view details
+- **Type**: Quiz or Survey
+- **Status**: Completion status (Passed, Failed, Needs Grading)
+- **Skills**: Associated skills earned upon completion, click on a skill to view details
+- **Runtime**: Total time taken
+- **Started**: Date and time started
+
 The **My Quizzes and Surveys** page features a searchable and sortable history table of all your passed and failed quizzes, as well as completed surveys.
-You can drill down into a quiz or survey attempt by clicking on its name.
+Click on any quiz or survey name to view detailed information about that attempt.
 
 ![page-my-quiz-single-attempt.png](../screenshots/progress-and-ranking/page-my-quiz-single-attempt.png)
 
@@ -58,6 +66,14 @@ For quizzes, the answers shown depend on the attempt's status:
 - `Failed` Quiz: answers may be shown or not depending on how quiz administrator selected to configure the quiz
 - `Needs Grading` Quiz: answers are not displayed as they are not yet graded
 
+::: tip
+If a quiz attempt is in a Failed state, you can re-take the quiz by clicking the **Try Again** button.
+:::
+
+::: tip
+If a quiz is associated with one or more skills, they can be found in the Associated Skills card. Clicking on a skill will take you to its details page.
+:::
+
 ## My Badges
 
 View your earned and available badges by visiting the **My Badges** page from the **My Projects** page.
