Skip to content
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

Add student-, staff-, and admin-facing test descriptions #520

Merged
merged 8 commits into from
Aug 23, 2024
Merged

Add student-, staff-, and admin-facing test descriptions #520

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7bae2e2
Updated API client version.
james-perretta Aug 7, 2024
0808234
Added markdown-rendered test descriptions.
Aug 9, 2024
a8e1be9
Added styling for description component.
Aug 22, 2024
50170c4
Added tests for displaying descriptions in test results.
james-perretta Aug 23, 2024
b69e6d9
Update API client to 2.8.0
james-perretta Aug 23, 2024
ac8c619
Working on fixing a test case.
james-perretta Aug 23, 2024
290b353
Fixed test by adding missing awaits
james-perretta Aug 23, 2024
4bcf7f7
Wrap lines
james-perretta Aug 23, 2024
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
61 changes: 57 additions & 4 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,18 @@
"dependencies": {
"@fortawesome/fontawesome-free": "^5.15.4",
"@types/minimatch": "^3.0.5",
"ag-client-typescript": "2.6.0",
"ag-client-typescript": "2.8.0",
"chart.js": "^3.9.1",
"chartjs-adapter-moment": "^1.0.1",
"chartjs-plugin-zoom": "^1.2.1",
"dompurify": "^3.1.6",
"file-saver": "^2.0.5",
"highlight.js": "^11.9.0",
"lodash": "^4.17.21",
"minimatch": "^3.1.2",
"moment": "^2.29.4",
"moment-timezone": "^0.5.43",
"showdown": "^2.1.0",
"vue": "^2.7.14",
"vue-class-component": "^7.2.6",
"vue-property-decorator": "^8.5.1",
Expand All @@ -29,9 +31,11 @@
},
"devDependencies": {
"@testing-library/jest-dom": "^5.11.9",
"@types/dompurify": "^3.0.5",
"@types/file-saver": "^2.0.1",
"@types/jest": "^25.2.3",
"@types/lodash": "^4.14.168",
"@types/showdown": "^2.0.6",
"@types/sinon": "^7.5.2",
"@vue/cli-plugin-typescript": "^4.5.11",
"@vue/cli-plugin-unit-jest": "^4.5.11",
Expand Down
11 changes: 11 additions & 0 deletions src/components/project_admin/ag_tests/ag_test_case_fdbk_config_panel.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,17 @@
</label>
</div>

<div class="checkbox-input-container">
<label class="label">
<input data-testid="show_student_description"
type="checkbox"
@change="$emit('input', d_feedback_config)"
class="checkbox"
v-model="d_feedback_config.show_student_description">
Show Student-Facing Description
</label>
</div>

<div class="checkbox-input-container">
<label class="label">
<input data-testid="show_individual_commands"
Expand Down
147 changes: 87 additions & 60 deletions src/components/project_admin/ag_tests/ag_test_case_settings.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,67 +5,94 @@
@submit="save_ag_test_case_settings"
@form_validity_changed="d_settings_form_is_valid = $event">

<div class="form-field-wrapper">
<label class="label"> Test name </label>
<validated-input ref="name"
v-model="d_ag_test_case.name"
:validators="[is_not_empty]">
</validated-input>
</div>

<div class="form-field-wrapper">
<label class="label"> Internal Admin Notes </label>
<validated-input ref="internal_admin_notes"
v-model="d_ag_test_case.internal_admin_notes"
:num_rows=3
:validators="[]">
</validated-input>
</div>

<div class="form-field-wrapper">
<label class="label"> Staff-only description </label>
<validated-input ref="staff_description"
v-model="d_ag_test_case.staff_description"
:num_rows=3
:validators="[]">
</validated-input>
</div>

<div class="form-field-wrapper">
<label class="label"> Test name </label>
<validated-input ref="name"
v-model="d_ag_test_case.name"
:validators="[is_not_empty]">
</validated-input>
</div>

<div ref="fdbk_panels">
<AGTestCaseFdbkConfigPanel ref="normal"
v-model="d_ag_test_case.normal_fdbk_config"
:config_name="FeedbackConfigLabel.normal">
<template slot="header">
<div class="config-name">
{{FeedbackConfigLabel.normal}}
<tooltip width="large" placement="top">
{{FeedbackDescriptions.normal}}
</tooltip>
</div>
</template>
</AGTestCaseFdbkConfigPanel>

<AGTestCaseFdbkConfigPanel ref="final_graded"
v-model="d_ag_test_case.ultimate_submission_fdbk_config"
:config_name="FeedbackConfigLabel.ultimate_submission">
<template slot="header">
<div class="config-name">
{{FeedbackConfigLabel.ultimate_submission}}
<tooltip width="large" placement="top">
{{FeedbackDescriptions.ultimate_submission}}
</tooltip>
</div>
</template>
</AGTestCaseFdbkConfigPanel>

<AGTestCaseFdbkConfigPanel ref="past_limit"
v-model="d_ag_test_case.past_limit_submission_fdbk_config"
:config_name="FeedbackConfigLabel.past_limit">
<template slot="header">
<div class="config-name">
{{FeedbackConfigLabel.past_limit}}
<tooltip width="large" placement="top">
{{FeedbackDescriptions.past_limit}}
</tooltip>
</div>
</template>
</AGTestCaseFdbkConfigPanel>

<AGTestCaseFdbkConfigPanel ref="student_lookup"
v-model="d_ag_test_case.staff_viewer_fdbk_config"
:config_name="FeedbackConfigLabel.staff_viewer">
<template slot="header">
<div class="config-name">
{{FeedbackConfigLabel.staff_viewer}}
<tooltip width="large" placement="top">
{{FeedbackDescriptions.staff_viewer}}
</tooltip>
</div>
</template>
</AGTestCaseFdbkConfigPanel>
</div>
<label class="label"> Student-Facing Description </label>
<validated-input ref="student_description"
v-model="d_ag_test_case.student_description"
:num_rows=3
:validators="[]">
</validated-input>
</div>

<div ref="fdbk_panels">
<AGTestCaseFdbkConfigPanel ref="normal"
v-model="d_ag_test_case.normal_fdbk_config"
:config_name="FeedbackConfigLabel.normal">
<template slot="header">
<div class="config-name">
{{FeedbackConfigLabel.normal}}
<tooltip width="large" placement="top">
{{FeedbackDescriptions.normal}}
</tooltip>
</div>
</template>
</AGTestCaseFdbkConfigPanel>

<AGTestCaseFdbkConfigPanel ref="final_graded"
v-model="d_ag_test_case.ultimate_submission_fdbk_config"
:config_name="FeedbackConfigLabel.ultimate_submission">
<template slot="header">
<div class="config-name">
{{FeedbackConfigLabel.ultimate_submission}}
<tooltip width="large" placement="top">
{{FeedbackDescriptions.ultimate_submission}}
</tooltip>
</div>
</template>
</AGTestCaseFdbkConfigPanel>

<AGTestCaseFdbkConfigPanel ref="past_limit"
v-model="d_ag_test_case.past_limit_submission_fdbk_config"
:config_name="FeedbackConfigLabel.past_limit">
<template slot="header">
<div class="config-name">
{{FeedbackConfigLabel.past_limit}}
<tooltip width="large" placement="top">
{{FeedbackDescriptions.past_limit}}
</tooltip>
</div>
</template>
</AGTestCaseFdbkConfigPanel>

<AGTestCaseFdbkConfigPanel ref="student_lookup"
v-model="d_ag_test_case.staff_viewer_fdbk_config"
:config_name="FeedbackConfigLabel.staff_viewer">
<template slot="header">
<div class="config-name">
{{FeedbackConfigLabel.staff_viewer}}
<tooltip width="large" placement="top">
{{FeedbackDescriptions.staff_viewer}}
</tooltip>
</div>
</template>
</AGTestCaseFdbkConfigPanel>
</div>

<APIErrors ref="api_errors"></APIErrors>

Expand Down
11 changes: 11 additions & 0 deletions src/components/project_admin/ag_tests/ag_test_command_advanced_fdbk_settings.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,17 @@
</label>
</div>

<div class="checkbox-input-container">
<label class="checkbox-label">
<input data-testid="show_student_description"
type="checkbox"
class="checkbox"
@change="$emit('input', d_feedback_config)"
v-model="d_feedback_config.show_student_description">
Show Student-Facing Descriptions
</label>
</div>

<div class="advanced-settings-label" @click="toggle_is_open">
<i v-if="d_is_open" class="fas fa-caret-down caret-down"></i>
<i v-else class="fas fa-caret-right caret-right"></i>
Expand Down
Loading
Loading