forked from doubtfire-lms/doubtfire-web
-
Notifications
You must be signed in to change notification settings - Fork 137
Feature/Select Multiple Students #373
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.
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
Open
JoeMacl
wants to merge
12
commits into
thoth-tech:9.x
Choose a base branch
from
JoeMacl:feature/grant-extension-form-v4
base: 9.x
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
20b07c0
feat: add Grant Extension form component
JoeMacl 7c338a6
feat: updated grant extension form with validation and styling
JoeMacl 570433a
feat: update progress on grant extension form
JoeMacl 5a629c4
feat: implement Grant Extension form as Material dialog with validati…
JoeMacl 206e271
feat: grant extension integration with backend
JoeMacl f862719
feat: grant extension integration with backend
JoeMacl 42bb815
feat: grant extension integration with backend
JoeMacl 764179b
chore: remove unnecessary changes
JoeMacl afb0dc3
chore: remove unnecessary changes
JoeMacl a3b44c7
chore: remove unnecessary changes
JoeMacl 42b2f2f
fix: prevent Cancel button from submitting form
JoeMacl 56d91e1
feat: allow multiple students to be granted an extension
JoeMacl File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Empty file.
27 changes: 27 additions & 0 deletions
27
src/app/admin/modals/grant-extension-form/grant-extension-dialog.component.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| import { Component } from '@angular/core'; | ||
| import { MatDialogRef } from '@angular/material/dialog'; | ||
| import { GrantExtensionFormComponent } from './grant-extension-form.component'; | ||
| import { MatDialogModule } from '@angular/material/dialog'; | ||
| import { CommonModule } from '@angular/common'; | ||
|
|
||
| @Component({ | ||
| selector: 'f-grant-extension-dialog', | ||
| standalone: true, | ||
| imports: [MatDialogModule, CommonModule, GrantExtensionFormComponent], | ||
| template: ` | ||
| <h2 mat-dialog-title>Grant Extension</h2> | ||
| <mat-dialog-content> | ||
| <f-grant-extension-form></f-grant-extension-form> | ||
| </mat-dialog-content> | ||
| <mat-dialog-actions align="end"> | ||
| <button mat-button (click)="close()">Close</button> | ||
| </mat-dialog-actions> | ||
| ` | ||
| }) | ||
| export class GrantExtensionDialogComponent { | ||
| constructor(private dialogRef: MatDialogRef<GrantExtensionDialogComponent>) {} | ||
|
|
||
| close(): void { | ||
| this.dialogRef.close(); | ||
| } | ||
| } |
67 changes: 67 additions & 0 deletions
67
src/app/admin/modals/grant-extension-form/grant-extension-form.component.html
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| <h2 mat-dialog-title>Grant Extension</h2> | ||
| <form [formGroup]="grantExtensionForm" (ngSubmit)="submitForm()"> | ||
|
|
||
|
|
||
| <mat-dialog-content> | ||
| <!-- Student Selection --> | ||
| <mat-form-field appearance="fill" class="w-full mb-4"> | ||
| <mat-label>Students</mat-label> | ||
| <mat-select formControlName="student_ids" multiple> | ||
| <mat-option *ngFor="let student of students" [value]="student.id"> | ||
| {{ student.name }} | ||
| </mat-option> | ||
| </mat-select> | ||
| <mat-error *ngIf="grantExtensionForm.get('student_ids')?.touched && grantExtensionForm.get('student_ids')?.invalid"> | ||
| Please select at least one student. | ||
| </mat-error> | ||
| </mat-form-field> | ||
|
|
||
|
|
||
| <!-- Extension Duration --> | ||
| <div class="mb-4"> | ||
| <label for="extension" class="block text-xl font-semibold text-gray-900"> | ||
| Extension Duration: <strong>{{ grantExtensionForm.get('extension')?.value }}</strong> day(s) | ||
| </label> | ||
|
|
||
| <mat-slider | ||
| min="1" | ||
| max="30" | ||
| step="1" | ||
| tickInterval="5" | ||
| thumbLabel | ||
| class="w-full" | ||
| style="width: 100%; max-width: 600px; min-width: 300px;" | ||
| > | ||
| <input matSliderThumb formControlName="extension" /> | ||
| </mat-slider> | ||
| </div> | ||
|
|
||
| <!-- Reason Field --> | ||
| <mat-form-field appearance="fill" class="w-full mb-4"> | ||
| <mat-label>Reason</mat-label> | ||
| <textarea | ||
| matInput | ||
| formControlName="reason" | ||
| rows="4" | ||
| required | ||
| ></textarea> | ||
| <mat-error *ngIf="grantExtensionForm.get('reason')?.touched && grantExtensionForm.get('reason')?.invalid"> | ||
| Please provide a reason for the extension. | ||
| </mat-error> | ||
| </mat-form-field> | ||
|
|
||
| <!-- Notes Field (Optional) --> | ||
| <mat-form-field appearance="fill" class="w-full mb-4"> | ||
| <mat-label>Additional Notes (optional)</mat-label> | ||
| <textarea matInput formControlName="notes" rows="3"></textarea> | ||
| </mat-form-field> | ||
| </mat-dialog-content> | ||
|
|
||
| <!-- Form Buttons --> | ||
| <mat-dialog-actions align="end"> | ||
| <button mat-button type="button" (click)="close()" [disabled]="isSubmitting">Cancel</button> | ||
| <button mat-flat-button color="primary" type="submit" [disabled]="isSubmitting"> | ||
| Grant Extension | ||
| </button> | ||
| </mat-dialog-actions> | ||
|
|
22 changes: 22 additions & 0 deletions
22
src/app/admin/modals/grant-extension-form/grant-extension-form.component.spec.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| import { ComponentFixture, TestBed } from '@angular/core/testing'; | ||
| import { GrantExtensionFormComponent } from './grant-extension-form.component'; | ||
|
|
||
| describe('GrantExtensionFormComponent', () => { | ||
| let component: GrantExtensionFormComponent; | ||
| let fixture: ComponentFixture<GrantExtensionFormComponent>; | ||
|
|
||
| beforeEach(async () => { | ||
| await TestBed.configureTestingModule({ | ||
| imports: [GrantExtensionFormComponent] | ||
| }) | ||
| .compileComponents(); | ||
|
|
||
| fixture = TestBed.createComponent(GrantExtensionFormComponent); | ||
| component = fixture.componentInstance; | ||
| fixture.detectChanges(); | ||
| }); | ||
|
|
||
| it('should create', () => { | ||
| expect(component).toBeTruthy(); | ||
| }); | ||
| }); |
106 changes: 106 additions & 0 deletions
106
src/app/admin/modals/grant-extension-form/grant-extension-form.component.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,106 @@ | ||
| import { Component, OnInit, Inject } from '@angular/core'; | ||
| import { FormGroup, FormBuilder, Validators, ReactiveFormsModule } from '@angular/forms'; | ||
| import { CommonModule } from '@angular/common'; | ||
| import { MatFormFieldModule } from '@angular/material/form-field'; | ||
| import { MatSelectModule } from '@angular/material/select'; | ||
| import { MatInputModule } from '@angular/material/input'; | ||
| import { MatSliderModule } from '@angular/material/slider'; | ||
| import { MatButtonModule } from '@angular/material/button'; | ||
| import { MatDialogModule, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; | ||
| import { MatSnackBar } from '@angular/material/snack-bar'; | ||
| import { ExtensionService } from 'src/app/api/services/extension.service'; | ||
|
|
||
| @Component({ | ||
| selector: 'f-grant-extension-form', | ||
| standalone: true, | ||
| imports: [ | ||
| ReactiveFormsModule, | ||
| CommonModule, | ||
| MatFormFieldModule, | ||
| MatSelectModule, | ||
| MatInputModule, | ||
| MatSliderModule, | ||
| MatButtonModule, | ||
| MatDialogModule | ||
| ], | ||
| templateUrl: './grant-extension-form.component.html', | ||
| }) | ||
| export class GrantExtensionFormComponent implements OnInit { | ||
| grantExtensionForm!: FormGroup; | ||
| isSubmitting = false; | ||
| // List of test students to be displayed in the dropdown | ||
| students = [ | ||
| { id: 1, name: 'Joe M' }, | ||
| { id: 2, name: 'Sahiru W' }, | ||
| { id: 3, name: 'Samindi M' }, | ||
| { id: 4, name: 'Samantha W' }, | ||
| { id: 5, name: 'Samantha M' }, | ||
| { id: 6, name: 'Samantha S' }, | ||
| { id: 7, name: 'Samantha T' }, | ||
| { id: 8, name: 'Samantha U' }, | ||
| { id: 9, name: 'Samantha V' }, | ||
| { id: 10, name: 'Samantha W' }, | ||
| { id: 11, name: 'Samantha X' }, | ||
| { id: 12, name: 'Samantha Y' }, | ||
| { id: 13, name: 'Samantha Z' } | ||
| ]; | ||
|
|
||
| constructor( | ||
| private fb: FormBuilder, | ||
| private dialogRef: MatDialogRef<GrantExtensionFormComponent>, | ||
| @Inject(MAT_DIALOG_DATA) public data: { unitId: number; taskDefinitionId: number }, | ||
| private snackBar: MatSnackBar, | ||
| private extensionService: ExtensionService | ||
| ) { | ||
| console.log('[GrantExtensionFormComponent] Constructor data:', data); | ||
| } | ||
|
|
||
| ngOnInit(): void { | ||
| this.grantExtensionForm = this.fb.group({ | ||
| student_ids: [[], Validators.required], | ||
| extension: [1, [Validators.required, Validators.min(1)]], | ||
| reason: ['', Validators.required], | ||
| notes: [''], | ||
| }); | ||
| } | ||
|
|
||
| submitForm(): void { | ||
| if (this.grantExtensionForm.invalid) { | ||
| this.grantExtensionForm.markAllAsTouched(); | ||
| return; | ||
| } | ||
|
|
||
| this.isSubmitting = true; | ||
|
|
||
| const { student_ids, extension, reason, notes } = this.grantExtensionForm.value; | ||
|
|
||
| const payload = { | ||
| student_ids, | ||
| task_definition_id: this.data.taskDefinitionId, | ||
| weeks_requested: extension, | ||
| comment: reason, | ||
| notes | ||
| }; | ||
|
|
||
|
|
||
| console.log('Sending request to grant extension:', payload); | ||
| this.extensionService.grantExtension(this.data.unitId, payload).subscribe({ | ||
| next: () => { | ||
| this.snackBar.open('Extension granted successfully!', 'Close', { duration: 3000 }); | ||
| this.dialogRef.close(true); | ||
| }, | ||
| error: (error) => { | ||
| const errorMsg = error?.error?.message || 'An unexpected error occurred. Please try again.'; | ||
| this.snackBar.open(`Failed to grant extension: ${errorMsg}`, 'Close', { duration: 5000 }); | ||
| console.error('Grant Extension Error:', error); | ||
| }, | ||
| complete: () => { | ||
| this.isSubmitting = false; | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| close(): void { | ||
| this.dialogRef.close(); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| import { Injectable } from '@angular/core'; | ||
| import { HttpClient, HttpHeaders } from '@angular/common/http'; | ||
| import { Observable } from 'rxjs'; | ||
| import { UserService } from 'src/app/api/models/doubtfire-model'; | ||
|
|
||
| interface GrantExtensionPayload { | ||
| student_ids: number[]; | ||
| task_definition_id: number; | ||
| weeks_requested: number; | ||
| comment: string; | ||
| notes?: string; | ||
| } | ||
|
|
||
| @Injectable({ | ||
| providedIn: 'root' | ||
| }) | ||
| export class ExtensionService { | ||
| constructor( | ||
| private http: HttpClient, | ||
| private userService: UserService | ||
| ) {} | ||
|
|
||
| grantExtension(unitId: number, payload: GrantExtensionPayload): Observable<any> { | ||
| const authToken = this.userService.currentUser?.authenticationToken ?? ''; | ||
| const username = this.userService.currentUser?.username ?? ''; | ||
|
|
||
| const headers = new HttpHeaders({ | ||
| 'Auth-Token': authToken, | ||
| 'Username': username | ||
| }); | ||
|
|
||
| return this.http.post( | ||
| `/api/units/${unitId}/staff-grant-extension`, | ||
| payload, | ||
| { headers } | ||
| ); | ||
| } | ||
| } |
62 changes: 29 additions & 33 deletions
62
...ard/directives/task-dashboard/directives/task-status-card/task-status-card.component.html
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,44 +1,40 @@ | ||
| <mat-card appearance="outlined"> | ||
| @if (triggers?.length > 0) { | ||
| <mat-form-field class="px-4 pt-4" appearance="outline"> | ||
| <mat-select [value]="task?.status" (selectionChange)="triggerTransition($event.value)"> | ||
| <mat-select-trigger> | ||
| <span style="display: inline-flex"> | ||
| <status-icon [status]="task?.status" style="margin-right: 10px"></status-icon> | ||
| <h2 class="mb-0">{{ task?.statusLabel() }}</h2> | ||
| </span> | ||
| </mat-select-trigger> | ||
| @for (trigger of triggers; track trigger) { | ||
| <mat-option [value]="trigger.status"> | ||
| <status-icon [status]="trigger.status" [showTooltip]="false"></status-icon> | ||
| <span style="display: inline-flex; margin-left: 10px" | ||
| ><h5>{{ trigger.label }}</h5></span | ||
| > | ||
| </mat-option> | ||
| } | ||
| </mat-select> | ||
| </mat-form-field> | ||
| } @if (triggers?.length < 0) { | ||
| <mat-card-title> | ||
| <span style="display: inline-flex"> | ||
| <status-icon [status]="task?.status" style="margin-right: 10px"></status-icon> | ||
| <h5>{{ task?.statusLabel() }}</h5> | ||
| </span> | ||
| </mat-card-title> | ||
| <mat-form-field class="px-4 pt-4" appearance="outline"> | ||
| <mat-select [value]="task?.status" (selectionChange)="triggerTransition($event.value)"> | ||
| <mat-select-trigger> | ||
| <span style="display: inline-flex"> | ||
| <status-icon [status]="task?.status" style="margin-right: 10px"></status-icon> | ||
| <h2 class="mb-0">{{ task?.statusLabel() }}</h2> | ||
| </span> | ||
| </mat-select-trigger> | ||
| @for (trigger of triggers; track trigger) { | ||
| <mat-option [value]="trigger.status"> | ||
| <status-icon [status]="trigger.status" [showTooltip]="false"></status-icon> | ||
| <span style="display: inline-flex; margin-left: 10px"> | ||
| <h5>{{ trigger.label }}</h5> | ||
| </span> | ||
| </mat-option> | ||
| } | ||
| </mat-select> | ||
| </mat-form-field> | ||
| } | ||
|
|
||
| <mat-card-content> | ||
| <p>{{ task?.statusHelp().reason }} {{ task?.statusHelp().action }}</p> | ||
| </mat-card-content> | ||
|
|
||
| @if ( task?.unit.currentUserIsStaff || task?.canApplyForExtension() || (task?.inSubmittedState() && | ||
| task?.requiresFileUpload()) ) { | ||
| <mat-card-actions class="space-x-2"> | ||
| @if (task?.canApplyForExtension()) { | ||
| <button mat-stroked-button (click)="applyForExtension()">Request extension</button> | ||
| } @if (task?.inSubmittedState() && task?.requiresFileUpload()) { | ||
| <button mat-stroked-button (click)="updateFilesInSubmission()">Upload new files</button> | ||
| <button mat-stroked-button (click)="applyForExtension()">Request extension</button> | ||
| } | ||
| </mat-card-actions> | ||
| } | ||
| </mat-card> | ||
| @if (task?.inSubmittedState() && task?.requiresFileUpload()) { | ||
| <button mat-stroked-button (click)="updateFilesInSubmission()">Upload new files</button> | ||
| } | ||
| @if (currentUser?.role === 'Admin' || currentUser?.role === 'Convenor') { | ||
| <button mat-stroked-button (click)="openGrantExtensionDialog()"> | ||
| Grant Extension | ||
| </button> | ||
|
|
||
| } | ||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Remove this file please