Skip to content

Commit

Permalink
feat: Add icons to summary table [PT-188404151]
Browse files Browse the repository at this point in the history 
This was missing in the initial development.
  • Loading branch information
@dougmartin
dougmartin committed Oct 25, 2024
1 parent 1f9fcd4 commit 0de1fd4
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 14 deletions.
46 changes: 34 additions & 12 deletions cypress/integration/portal-dashboard/portal-dashboard-activity-score.spec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ context("Portal Dashboard Anonymous Mode",() =>{
cy.get("[class^='feedback-legend--feedbackBadgeLegend__rubric_score--']").should("exist");
cy.get("[class^='feedback-legend--feedbackBadgeLegend__rubric_score_avg--']")
.should("contain", "Avg. Score:")
.should("contain", "0 / 6");
.should("contain", "0 / 12");
cy.get("[class^='feedback-legend--feedbackBadgeLegend__rubric_summary']")
.should("contain", "Rubric Summary:")
.should("contain", "N/A");
Expand Down Expand Up @@ -139,25 +139,29 @@ context("Portal Dashboard Anonymous Mode",() =>{
score.verifyScoreDisplayedInRubricScoreHeader();
cy.get("[class^='feedback-legend--feedbackBadgeLegend__rubric_score_avg--']")
.should("contain", "Avg. Score:")
.should("contain", "0 / 6");
.should("contain", "0 / 12");
cy.get('[data-cy=rubric-summary-icon]').should("contain", "N/A");
cy.get('[class^=rubric-summary-icon--rubricSummaryIconRows--]').should("not.exist");
score.getActivityFeedbackScore().eq(0).find('[class*=activity-feedback-score--scoreLabel--]').should("contain", "Score");
score.getActivityFeedbackScore().eq(0).should("contain", "N/A");
score.selectRubricScore(1, 1, 1);
score.selectRubricScore(1, 2, 2);
score.selectRubricScore(1, 3, 1);
score.selectRubricScore(1, 4, 2);
score.selectRubricScore(2, 1, 2);
score.selectRubricScore(2, 2, 1);
cy.get("[class^='feedback-legend--feedbackBadgeLegend__rubric_score_avg--']").should("contain", "4.5 / 6");
score.selectRubricScore(2, 3, 2);
score.selectRubricScore(2, 4, 1);
cy.get("[class^='feedback-legend--feedbackBadgeLegend__rubric_score_avg--']").should("contain", "9.5 / 12");
cy.get('[class^=rubric-summary-icon--rubricSummaryIconRows--]').should("exist");
cy.get('[data-cy=navigation-select]').click();
cy.get('[data-cy="list-item-progress-dashboard"]').should('be.visible').click();
cy.get('[data-cy="collapsed-activity-button"]').find('[class^=level-viewer--activityInnerButton--]').eq(0).click();
cy.get('[data-cy="activity-score"]')
.should("contain", "Rubric")
.should("contain", "Score");
cy.get('[class*=student-answers--score--]').eq(2).should("contain", "5/6");
cy.get('[class*=student-answers--score--]').eq(3).should("contain", "4/6");
cy.get('[class*=student-answers--score--]').eq(2).should("contain", "10/12");
cy.get('[class*=student-answers--score--]').eq(3).should("contain", "9/12");
cy.get('[class*=student-answers--score--]').eq(4).should("contain", "N/A");
cy.get('[data-cy="activity-score"]').eq(0).click();
cy.get('[data-cy=activity-level-feedback-button]').invoke("attr", "class").should("contain", "active");
Expand Down Expand Up @@ -206,20 +210,24 @@ context("Portal Dashboard Anonymous Mode",() =>{
score.selectRubricScore(1, 1, 1);
score.getRubricSummaryIcon().find('[class^=rubric-summary-icon--rubricSummaryIconRows--]').should("not.exist");
score.selectRubricScore(1, 2, 1);
score.selectRubricScore(1, 3, 1);
score.selectRubricScore(1, 4, 1);
score.getActivityFeedbackScore().eq(0).should("not.contain", "N/A");
score.getRubricSummaryIcon().find('[class^=rubric-summary-icon--rubricSummaryIconRows--]').should("exist");
score.verifyRubricSummaryIcon("Proficient", "height: 18px; width: 100%; background-color: rgb(189, 223, 194);");
score.verifyRubricSummaryIcon("Proficient", "height: 12px; width: 100%; background-color: rgb(189, 223, 194);");
score.selectRubricScore(2, 1, 2);
score.verifyRubricSummaryIcon("Proficient", "height: 18px; width: 100%; background-color: rgb(189, 223, 194);");
score.verifyRubricSummaryIcon("Proficient", "height: 12px; width: 100%; background-color: rgb(189, 223, 194);");
score.getRubricSummaryIcon().click();
score.getRubricSummaryDetailsDialog().should("exist");
score.getRubricSummaryDetailsDialog().find('[data-cy=rubric-summary-modal-header]').should("contain", "Rubric Summary Details");
score.verifyRubricSummaryDetailsDialog("Proficient", "100%");
score.verifyRubricSummaryDetailsDialog("Beginning", "0%");
score.getRubricSummaryDetailsDialogCloseButton().click();
score.selectRubricScore(2, 2, 3);
score.verifyRubricSummaryIcon("Proficient", "height: 18px; width: 50%; background-color: rgb(189, 223, 194);");
score.verifyRubricSummaryIcon("Beginning", "height: 18px; width: 50%; background-color: rgb(49, 102, 57);");
score.selectRubricScore(2, 3, 3);
score.selectRubricScore(2, 4, 3);
score.verifyRubricSummaryIcon("Proficient", "height: 12px; width: 50%; background-color: rgb(189, 223, 194);");
score.verifyRubricSummaryIcon("Beginning", "height: 12px; width: 50%; background-color: rgb(49, 102, 57);");
score.getRubricSummaryIcon().click();
score.getRubricSummaryDetailsDialog().should("exist");
score.verifyRubricSummaryDetailsDialog("Proficient", "50%");
Expand All @@ -229,6 +237,8 @@ context("Portal Dashboard Anonymous Mode",() =>{
it('verify score display in rubric summary details',()=>{
score.selectRubricScore(1, 1, 1);
score.selectRubricScore(1, 2, 1);
score.selectRubricScore(1, 3, 1);
score.selectRubricScore(1, 4, 1);
score.getRubricSummaryIcon().click();
score.getRubricSummaryDetailsDialog().should("exist");
score.verifyScoreDisplayedInRubricSummaryDetailsDialogHeader();
Expand Down Expand Up @@ -320,6 +330,8 @@ context("Portal Dashboard Anonymous Mode",() =>{
cy.get('[data-cy=item-number]').should("contain", "4");
score.selectRubricScore(1, 1, 1);
score.selectRubricScore(1, 2, 1);
score.selectRubricScore(1, 3, 1);
score.selectRubricScore(1, 4, 1);
cy.get('[data-cy=feedback-badge] circle').eq(0).invoke("attr", "fill").should("contain", "#4EA15A");
cy.get('[data-cy=item-number]').should("contain", "3");
cy.get('[data-cy=feedback-badge] circle').eq(1).invoke("attr", "fill").should("contain", "#FFF");
Expand All @@ -333,6 +345,8 @@ context("Portal Dashboard Anonymous Mode",() =>{
cy.get('[data-cy=item-number]').should("contain", "2");
score.selectRubricScore(3, 1, 1);
score.selectRubricScore(3, 2, 1);
score.selectRubricScore(3, 3, 1);
score.selectRubricScore(3, 4, 1);
cy.get('[data-cy=feedback-badge] circle').eq(2).invoke("attr", "fill").should("contain", "#4EA15A");
cy.get('[data-cy=item-number]').should("contain", "1");
cy.get('[data-cy=feedback-badge] circle').eq(3).invoke("attr", "fill").should("contain", "#FFF");
Expand All @@ -348,11 +362,15 @@ context("Portal Dashboard Anonymous Mode",() =>{
cy.get('[data-cy=item-number]').should("contain", "4");
score.selectRubricScore(1, 1, 1);
score.selectRubricScore(1, 2, 1);
score.selectRubricScore(1, 3, 1);
score.selectRubricScore(1, 4, 1);
cy.get('[data-cy=feedback-badge] circle').eq(0).invoke("attr", "fill").should("contain", "#4EA15A");
cy.get('[data-cy=item-number]').should("contain", "3");
cy.get('[data-cy=feedback-badge] circle').eq(1).invoke("attr", "fill").should("contain", "#FFF");
score.selectRubricScore(2, 1, 1);
score.selectRubricScore(2, 2, 1);
score.selectRubricScore(2, 3, 1);
score.selectRubricScore(2, 4, 1);
cy.get('[data-cy=feedback-badge] circle').eq(1).invoke("attr", "fill").should("contain", "#4EA15A");
cy.get('[data-cy=item-number]').should("contain", "2");
cy.get('[data-cy=feedback-settings-toggle-button]').click();
Expand All @@ -364,6 +382,8 @@ context("Portal Dashboard Anonymous Mode",() =>{
cy.get('[data-cy=item-number]').should("contain", "4");
score.selectRubricScore(3, 1, 1);
score.selectRubricScore(3, 2, 1);
score.selectRubricScore(3, 3, 1);
score.selectRubricScore(3, 4, 1);
cy.get('[data-cy=feedback-badge] circle').eq(2).invoke("attr", "fill").should("contain", "#FFF");
cy.get('[data-cy=item-number]').should("contain", "4");
cy.get('[data-cy=feedback-textarea]').eq(2).click().type("Feedback");
Expand All @@ -376,10 +396,12 @@ context("Portal Dashboard Anonymous Mode",() =>{
it('verify previous activity info is not displayed in the activity level feedback',()=>{
score.selectRubricScore(1, 1, 1);
score.selectRubricScore(1, 2, 1);
cy.get("[class^='feedback-legend--feedbackBadgeLegend__rubric_score_avg--']").should("contain", "6 / 6");
score.selectRubricScore(1, 3, 1);
score.selectRubricScore(1, 4, 1);
cy.get("[class^='feedback-legend--feedbackBadgeLegend__rubric_score_avg--']").should("contain", "12 / 12");
cy.get('[data-cy=activity-navigator-next-button] [class^=activity-navigator--icon--]').click();
cy.get('[data-cy=activity-title]').should("contain", "Activity #2");
cy.get("[class^='feedback-legend--feedbackBadgeLegend__rubric_score_avg--']").should("contain", "0 / 6");
cy.get("[class^='feedback-legend--feedbackBadgeLegend__rubric_score_avg--']").should("contain", "0 / 12");
cy.get('[data-cy=feedback-settings-toggle-button]').click();
score.selectActivityScoreSettingsOption("Manual");
score.getSaveButton().click();
Expand All @@ -392,7 +414,7 @@ context("Portal Dashboard Anonymous Mode",() =>{
score.getContinueButton().click();
cy.get('[data-cy=activity-navigator-previous-button] [class^=activity-navigator--icon--]').click();
cy.get('[data-cy=activity-title]').should("contain", "Activity #1");
cy.get("[class^='feedback-legend--feedbackBadgeLegend__rubric_score_avg--']").should("contain", "6 / 6");
cy.get("[class^='feedback-legend--feedbackBadgeLegend__rubric_score_avg--']").should("contain", "12 / 12");
cy.get('[data-cy=feedback-settings-toggle-button]').click();
score.selectActivityScoreSettingsOption("Manual");
score.getSaveButton().click();
Expand Down
7 changes: 5 additions & 2 deletions cypress/integration/portal-dashboard/portal-dashboard-feedback.spec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,15 +118,18 @@ context("Portal Dashboard Feedback Panel", () => {
cy.get('[data-cy=rating-radio-button] div').eq(0)
.should('have.css', 'background-color')
.and('eq', 'rgb(78, 161, 90)');
// selecting only 1 of the 2 criteria does not trigger feedback complete
// selecting only 1 of the 4 criteria does not trigger feedback complete
cy.get('[data-cy=feedback-badge]').eq(2).find('circle')
.should('have.attr', 'fill')
.and('not.include', '#4EA15A');
cy.get('[data-cy=rating-radio-button]').eq(2).click();
cy.get('[data-cy=rating-radio-button] div').eq(2)
.should('have.css', 'background-color')
.and('eq', 'rgb(78, 161, 90)');
// selecting both criteria does trigger feedback complete
// select all the other feedback
cy.get('[data-cy=rating-radio-button]').eq(5).click();
cy.get('[data-cy=rating-radio-button]').eq(8).click();
// selecting all criteria does trigger feedback complete
cy.get('[data-cy=feedback-badge]').eq(2).find('circle')
.should('have.attr', 'fill')
.and('include', '#4EA15A');
Expand Down
1 change: 1 addition & 0 deletions js/components/portal-dashboard/feedback/rubric-summary-modal.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ export class RubricSummaryModal extends PureComponent<IProps> {
{criteriaGroup.criteria.map(criterion =>
<div className={tableCss.rubricTableRow} key={criterion.id} id={criterion.id}>
<div className={tableCss.rubricDescription}>
{criterion.iconUrl && <img src={criterion.iconUrl} title={criterion.iconPhrase} />}
<Markdown>{criterion.description}</Markdown>
</div>
{this.renderRatings(criterion)}
Expand Down

0 comments on commit 0de1fd4

Please sign in to comment.