4.2.x

cypress/e2e/admin-quiz_and_surveys.cy.js

@@ -123,7 +123,6 @@ context('Admin: Generate Quiz and Surveys Screenshots', () => {
     })
 
     it('quiz runs table', () => {
-        cy.viewport(1500, 1800)
         cy.visit('/administrator/quizzes/ShortScienceQuiz/runs')
         cy.get('[data-cy="userFilterBtn"]')
         cy.get('[data-cy="row0-userCell"]')

cypress/e2e/admin.cy.js

@@ -755,6 +755,12 @@ context('Admin: Generate Screenshots', () => {
 
         cy.get('[data-cy="userCell_bob1@email.org"]')
         cy.snap('page-global-badge-access')
+
+        cy.visit('/administrator/globalBadges/MoviesandShowsExpertBadge/users')
+        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();
+        cy.snap('page-global-badge-users')
     })
 
     it('Notifications', () => {
@@ -769,4 +775,37 @@ context('Admin: Generate Screenshots', () => {
         cy.snap('component-notifications-dropdown', null, {clip: { x: 370, y: 0, width: 540, height: 550 }});
     });
 
+
+    it('user overall progress', () => {
+        cy.intercept('/app/progress-metrics**').as('progressMetrics')
+        cy.visit('/administrator/users-progress');
+        cy.wait('@progressMetrics')
+
+        cy.get('[data-pc-name="headercell"] [data-pc-section="columntitle"]').contains('User')
+        cy.snap('page-users-overall-progress')
+
+        cy.get('[data-cy="confQuizExclusionBtn"]').click()
+        cy.get('[data-cy="confIncludedMetricsDialog"] [data-pc-section="sourcelistcontainer"] [data-pc-section="option"][aria-posinset="1"]').click()
+        cy.get('[data-cy="confIncludedMetricsDialog"] [data-pc-name="pcmovetotargetbutton"]').click()
+        cy.snap('component-configure-quiz-metrics-inclusions', '[data-pc-name="dialog"]')
+    });
+
+    it('global quiz runs', () => {
+        cy.intercept('/app/quiz-runs**').as('quizRuns')
+        cy.visit('/administrator/quiz-runs');
+        cy.wait('@quizRuns')
+        cy.get('[data-cy="quizRunsHistoryTable"] [data-cy="skillsBTableTotalRows"]')
+
+        cy.snap('page-global-quiz-runs')
+    });
+
+    it('global metrics page', () => {
+        cy.intercept('/app/overall-metrics/overallDistinctUsersOverTimeMetricsBuilder**').as('overallDistinctUsersOverTime');
+        cy.visit('/administrator/overall-metrics');
+        cy.wait('@overallDistinctUsersOverTime');
+
+        cy.get('[data-cy="overallMetricsProjectsCard"]').should('be.visible');
+
+        cy.snap('page-global-metrics')
+    });
 })

docs/dashboard/user-guide/global-badges.md

@@ -28,6 +28,33 @@ please navigate to ``Home -> Global Badges -> Manage -> Access`` page.
 
 ![Global BadgeAccess](../../screenshots/admin/page-global-badge-access.png)
 
+## User Progress Table
+
+Track user progress toward earning Global Badges using the User Progress Table, accessible via the Global Badges management interface. This table provides a comprehensive overview of user performance, including:
+
+- **User**: Display user ID, first name, and last name (if available)
+- **Badge Progress**: View total skills achieved, levels earned, and overall percent complete toward the Global Badge
+- **Skill Last Earned**: See the date and time when skills were last earned by each user
+
+![User Progress Table](../../screenshots/admin/page-global-badge-users.png)
+
+::: tip
+**Important**: A user that has to contributed to any project referenced in the Global Badge will show up in the Global Badges Users table.
+:::
+
+### Badge Progress Details
+
+The Badge Progress column shows:
+- **Skills Achieved**: Number of skills completed out of total required skills
+- **Levels Achieved**: Number of project levels earned out of total required levels
+- **Overall Progress**: Combined percentage of skills and levels completed
+
+### Filters, Sorting And Export
+
+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
+- 
 ## Creating Global Badges
 
 ### Step 1: Create a New Badge
@@ -47,4 +74,4 @@ After creation, set up the badge criteria:
 2. Locate your badge
 3. Click the `Go Live` button in the bottom-right corner of the Badge overview
 
-> **Important**: When published, the system automatically awards the badge to all users who already meet the requirements.
+> **Important**: When published, the system automatically awards the badge to all users who already meet the requirements.

docs/dashboard/user-guide/metrics.md

@@ -52,6 +52,35 @@ In addition to the skill metrics table, the page offers several useful filters t
 
 Admins can also export the entire table to Excel format using the `Export All Rows` button located at the top right of the table.
 
+## Global Metrics
+
+To view Global Metrics, please navigate to `Projects -> Metrics`. These metrics will be for all of the projects and
+quizzes that you are currently assigned as an administrator.
+
+![page-global-metrics.png](../../screenshots/admin/page-global-metrics.png)
+
+### Configuring Included Projects and Quizzes
+
+There are times where you may have a number of projects, quizzes, and surveys that you do not want to include in the overall
+progress page, metrics, and quizzes pages.
+
+There is a very easy way to include or exclude projects and quizzes from your view. Please note that the configuration
+buttons are within the projects and assessment information cards at the top of the page.
+
+Clicking on the settings button will open a modal where you can select the projects and quizzes that you want to include
+in the overall progress page, metrics, and quizzes pages.
+
+For example, for quizzes and surveys:
+
+![component-configure-quiz-metrics-inclusions.png](../../screenshots/admin/component-configure-quiz-metrics-inclusions.png)
+
+Select one or more items to exclude or include, then use the controls in the middle to move the items between inclusion and exclusion lists.
+
+::: tip
+- Please note that these inclusion/exclusion settings are user-specific and will only apply to you.
+- Please note that these settings apply to multiple pages, including the Global Metrics, Overall Users Progress and Global Quiz and Survey Runs.
+:::
+
 ## Single Skill Metrics
 
 The Single Skill Metrics Section provides detailed metrics for a specific skill, allowing admins to dive deeper into the performance and usage of that skill.

docs/dashboard/user-guide/quizzes-and-surveys.md

@@ -54,6 +54,10 @@ To administer a quiz click `Manage` button for that quiz on the `Quizzes and Sur
 
 ![Quiz Page Screenshot](../../screenshots/admin/page-quiz.png)
 
+::: tip
+The answer portion of each question can be collapsed or expanded. Use the **Expand All**/**Collapse All** button (`+`/`-`) at the top of the page to control all questions at once, or click the individual expand/collapse icons (`>`/`⌄`) next to each question text.
+:::
+
 To add a new question please click `Question +` button.
 
 ![New Questions Modal Screenshot](../../screenshots/admin/modal-new-question.png)
@@ -324,6 +328,10 @@ To administer a survey click the `Manage` button for that survey on the `Quizzes
 
 ![Quiz Page Screenshot](../../screenshots/admin/page-survey.png)
 
+::: tip
+The answer portion of each question can be collapsed or expanded. Use the **Expand All**/**Collapse All** button (`+`/`-`) at the top of the page to control all questions at once, or click the individual expand/collapse icons (`>`/`⌄`) next to each question text.
+:::
+
 To add a new question please click the `Question +` button.
 
 ![New Questions Modal Screenshot](../../screenshots/admin/modal-new-survey-question.png)
@@ -426,13 +434,15 @@ To track individual quiz/survey attempts, visit the **Runs** page (`Quizzes and
 **Runs Table Features:**
 - **User** - The user who attempted the quiz/survey
 - **Status** - Current state: **Passed**, **Failed**, or **Needs Grading**
-- **Runtime** - Time taken to complete the quiz/survey
 - **Started** - Date and time when the attempt began
-- **Results** - Number of correct answers out of total questions
 - **Actions** - Delete button to remove the attempt
+- **Runtime** - (Optional) Time taken to complete the quiz/survey
+- **Results** - (Optional) Number of correct answers out of total questions
 
-::: tip
-The runs table can be filtered by user to find specific attempts.
+::: tip Tips
+- The runs table can be filtered by user to find specific attempts.
+- To export quiz runs, click the `Export` button at the top of the table.
+- Optional fields can be added and removed using the dropdown above the table.
 :::
 
 Click the **run details button** next to a user to view comprehensive information about that specific quiz/survey attempt.
@@ -443,6 +453,48 @@ Click the **run details button** next to a user to view comprehensive informatio
 Quiz results will depict selected answer(s) and their correctness status. Survey results will simply display which answers were selected.
 :::
 
+## Global Runs
+
+To view runs across all of the Quizzes and Surveys that you are an administrator for, please navigate to `Projects -> Quiz/Survey Runs`.
+
+![page-global-quiz-runs.png](../../screenshots/admin/page-global-quiz-runs.png)
+
+**Runs Table Features:**
+- **User** - The user who attempted the quiz/survey
+- **Name** - The name of the quiz/survey
+- **Type** - Whether this is a quiz or survey
+- **Status** - Current state: **Passed**, **Failed**, **In Progress**, **Completed** or **Needs Grading**
+- **Started** - Date and time when the attempt began
+- **Runtime** - (optional) Time taken to complete the quiz/survey
+- **Results** - (optional) Number of correct answers out of total questions
+
+::: tip Tips
+- To export quiz runs, click the `Export` button at the top of the table.
+- Optional fields can be added and removed using the dropdown above the table.
+::: 
+
+### Configuring Included Quizzes
+
+There are times where you may have a number of quizzes and surveys that you do not want to include in the overall
+progress page, metrics, and quiz runs pages.
+
+There is a very easy way to include or exclude quizzes and surveys from your view. Please note the configuration
+button within the assessment information card at the top of the page.
+
+Clicking on the settings button will open a modal where you can select the quizzes and surveys that you want to include
+in the overall progress page, metrics, and quiz runs pages.
+
+For example, for quizzes and surveys:
+
+![component-configure-quiz-metrics-inclusions.png](../../screenshots/admin/component-configure-quiz-metrics-inclusions.png)
+
+Select one or more items to exclude or include, then use the controls in the middle to move the items between inclusion and exclusion lists.
+
+::: tip
+- Please note that these inclusion/exclusion settings are user-specific and will only apply to you.
+- Please note that these settings apply to multiple pages, including the Global Metrics, Overall Users Progress and Global Quiz and Survey Runs.
+:::
+
 ## Skill Association
 
 A Quiz/Survey association to an existing skill requires successful completion of that Quiz/Survey

docs/dashboard/user-guide/settings.md

@@ -38,7 +38,7 @@ The ```Security``` menu item supports the administration of [Root](/dashboard/us
 ![Security Settings](../../screenshots/admin/page-settings-security.png)
 
 
-To grant [Root](/dashboard/user-guide/users.html#root) or [Supervisor](/dashboard/user-guide/users.html#supervisor) privileges to a user, that user must have an existing account for the SkillTree Dashboard. User management will also prevent the removal of any permissions from the currently authenticated user.  
+To grant [Root](/dashboard/user-guide/users.html#root) privileges to a user, that user must have an existing account for the SkillTree Dashboard. User management will also prevent the removal of any permissions from the currently authenticated user.  
 
 ## Email Settings
 <requires-role role="Root" />