Skip to content

Commit

Permalink
Merge branch 'master' into #12508-reset-rubric-question-submission
Browse files Browse the repository at this point in the history
  • Loading branch information
Mex7180 authored Sep 17, 2023
2 parents 71ce84c + 4a39df1 commit 5d09c45
Show file tree
Hide file tree
Showing 7 changed files with 613 additions and 564 deletions.
30 changes: 30 additions & 0 deletions .github/workflows/comment-goodfirstissue.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: Comment on Good First Issue

on:
issues:
types:
- labeled

jobs:
comment:
if: github.event.label.name == 'good first issue'
runs-on: ubuntu-latest

steps:
- name: Add comment
uses: actions/github-script@v6
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
script: |
let body = `**Good First Issue - Notes for Contributors**
This issue is for **first-time contributors only**. If you are new to TEAMMATES, feel free to submit a PR for this issue.\n\n`
body += "*Please note that we allow only one `good first issue` per contributor.* If you have already made a prior contribution to TEAMMATES, you may wish to take a look at issues with the `help wanted` tag instead.\n\n"
body += "**We do not assign issues to contributors**. If you would like to pick up this issue, do post a comment below to express your interest and check if there is anyone else who is already working on the issue. We will do our best to reply and give you the go-ahead, but if we don't, feel free to submit a PR as long as there is no one else working on it.\n\n"
body += "**To get started**, do read through our [contributing guidelines](https://teammates.github.io/teammates/contributing-doc.html) carefully, and [set up a development environment on your local machine](https://teammates.github.io/teammates/setting-up.html) before making a PR.\n\n"
body += "If you need any clarifications on our [developer guide](https://teammates.github.io/teammates/index.html), or are facing issues that are not found in our [troubleshooting guide](https://teammates.github.io/teammates/troubleshooting-guide.html), please [post a message in our discussion forum](https://github.com/TEAMMATES/teammates/discussions)."
await github.rest.issues.createComment({
issue_number: context.issue.number,
owner: context.repo.owner,
repo: context.repo.repo,
body,
})
Original file line number Diff line number Diff line change
Expand Up @@ -407,6 +407,10 @@ exports[`QuestionEditFormComponent should snap with default view 1`] = `
</li>
</ul>
</div>
<div
class="table-responsive"
>
</div>
<div
class="margin-top-15px visibility-message"
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ export class QuestionResponsePanelComponent {
next: (sessionResults: SessionResults) => {
const responses: QuestionOutput = sessionResults.questions[0];
if (responses) {
question.hasResponse = true;
question.feedbackQuestion = responses.feedbackQuestion;
question.allResponses = responses.allResponses;
question.otherResponses = responses.otherResponses;
Expand All @@ -104,7 +105,7 @@ export class QuestionResponsePanelComponent {
question.responsesToSelf = responses.responsesToSelf;
question.hasResponseButNotVisibleForPreview = responses.hasResponseButNotVisibleForPreview;
question.hasCommentNotVisibleForPreview = responses.hasCommentNotVisibleForPreview;
} else {
} else {
question.hasResponse = false;
if (question.errorMessage) {
this.statusMessageService.showSuccessToast('Question '
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,28 +24,30 @@
</li>
</ul>
</div>
<table class="table margin-top-15px background-color-white table-striped" *ngIf="model.isUsingOtherVisibilitySetting" aria-label="Custom Visibility Options Table">
<thead>
<tr>
<th scope="col" class="text-start">User/Group</th>
<th scope="col" class="text-center" *ngFor="let visibilityControl of VisibilityControl | enumToArray">{{ visibilityControl | visibilityControlName }}</th>
</tr>
</thead>
<tbody id="custom-visibility-table">
<ng-container *ngFor="let visibilityType of FeedbackVisibilityType | enumToArray">
<tr *ngIf="visibilityStateMachine.isVisibilityTypeApplicable(visibilityType)">
<td><span class="ngb-tooltip-class" [ngbTooltip]="visibilityType | visibilityTypeDescription" container="body">{{ visibilityType | visibilityTypeName }}</span></td>
<td *ngFor="let visibilityControl of VisibilityControl | enumToArray" class="text-center">
<input type="checkbox"
(click)="modifyVisibilityControl($event.target.checked, visibilityType, visibilityControl)"
[checked]="visibilityStateMachine.isVisible(visibilityType, visibilityControl)"
[disabled]="!visibilityStateMachine.isCellEditable(visibilityType, visibilityControl) || !model.isEditable"
[attr.aria-label]="getCheckboxAriaLabel(visibilityType, visibilityControl)">
</td>
<div class="table-responsive">
<table class="table margin-top-15px background-color-white table-striped" *ngIf="model.isUsingOtherVisibilitySetting" aria-label="Custom Visibility Options Table">
<thead>
<tr>
<th scope="col" class="text-start">User/Group</th>
<th scope="col" class="text-center" *ngFor="let visibilityControl of VisibilityControl | enumToArray">{{ visibilityControl | visibilityControlName }}</th>
</tr>
</ng-container>
</tbody>
</table>
</thead>
<tbody id="custom-visibility-table">
<ng-container *ngFor="let visibilityType of FeedbackVisibilityType | enumToArray">
<tr *ngIf="visibilityStateMachine.isVisibilityTypeApplicable(visibilityType)">
<td><span class="ngb-tooltip-class" [ngbTooltip]="visibilityType | visibilityTypeDescription" container="body">{{ visibilityType | visibilityTypeName }}</span></td>
<td *ngFor="let visibilityControl of VisibilityControl | enumToArray" class="text-center">
<input type="checkbox"
(click)="modifyVisibilityControl($event.target.checked, visibilityType, visibilityControl)"
[checked]="visibilityStateMachine.isVisible(visibilityType, visibilityControl)"
[disabled]="!visibilityStateMachine.isCellEditable(visibilityType, visibilityControl) || !model.isEditable"
[attr.aria-label]="getCheckboxAriaLabel(visibilityType, visibilityControl)">
</td>
</tr>
</ng-container>
</tbody>
</table>
</div>
<div class="margin-top-15px visibility-message">
This is the visibility hint as seen by the feedback giver:
<ul class="text-muted background-color-warning">
Expand Down
Loading

0 comments on commit 5d09c45

Please sign in to comment.