+
+
+
Add new activities or modify existing ones
| Name | -
- @if (!editing(activityType)) {
-
- {{ activityType.name }}
-
- } @else {
+ @if (loadingActivities) {
+
+
diff --git a/src/app/admin/institution-settings/activity-type-list/activity-type-list.component.ts b/src/app/admin/institution-settings/activity-type-list/activity-type-list.component.ts
index 39c4c83d07..87f9b7e71c 100644
--- a/src/app/admin/institution-settings/activity-type-list/activity-type-list.component.ts
+++ b/src/app/admin/institution-settings/activity-type-list/activity-type-list.component.ts
@@ -1,24 +1,32 @@
-import {Component, ViewChild} from '@angular/core';
-import {MatTableDataSource, MatTable} from '@angular/material/table';
-import {ActivityType, ActivityTypeService} from 'src/app/api/models/doubtfire-model';
-import {EntityFormComponent} from 'src/app/common/entity-form/entity-form.component';
+import {AfterViewInit, ChangeDetectionStrategy, Component, ViewChild} from '@angular/core';
import {UntypedFormControl, Validators} from '@angular/forms';
import {MatSort, Sort} from '@angular/material/sort';
+import {MatTable, MatTableDataSource} from '@angular/material/table';
+import {finalize} from 'rxjs';
+import {ActivityType, ActivityTypeService} from 'src/app/api/models/doubtfire-model';
+import {EntityFormComponent} from 'src/app/common/entity-form/entity-form.component';
import {AlertService} from 'src/app/common/services/alert.service';
@Component({
selector: 'activity-type-list',
templateUrl: 'activity-type-list.component.html',
styleUrls: ['activity-type-list.component.scss'],
+ changeDetection: ChangeDetectionStrategy.Eager,
+ standalone: false,
})
-export class ActivityTypeListComponent extends EntityFormComponent
+ @for (width of ['30%', '22%', '4%']; track $index) {
+
-
-
-
-
-
-
+ @for (row of skeletonRows; track row) {
+
+ }
- }
-
+
+ }
+
-
-
- Campuses+
+
CampusesAdd new campuses or modify existing ones
-
diff --git a/src/app/admin/institution-settings/institution-settings.component.scss b/src/app/admin/institution-settings/institution-settings.component.scss
index 8681f6dbfa..7017d84036 100644
--- a/src/app/admin/institution-settings/institution-settings.component.scss
+++ b/src/app/admin/institution-settings/institution-settings.component.scss
@@ -1,3 +1,16 @@
.institution-settings-container {
padding: 0 5rem 0 5rem;
}
+.learning-outcomes-container {
+ padding: 0 1rem 1rem 1rem;
+}
+table {
+ width: 100%;
+}
+.header {
+ display: flex;
+ .interactions {
+ margin-left: auto;
+ margin-top: auto;
+ }
+}
diff --git a/src/app/admin/institution-settings/institution-settings.component.ts b/src/app/admin/institution-settings/institution-settings.component.ts
index c4fd2d78af..49035ea4ca 100644
--- a/src/app/admin/institution-settings/institution-settings.component.ts
+++ b/src/app/admin/institution-settings/institution-settings.component.ts
@@ -1,22 +1,93 @@
-import { Component } from '@angular/core';
-import { DoubtfireConstants } from 'src/app/config/constants/doubtfire-constants';
+import {ChangeDetectionStrategy, Component, OnDestroy, OnInit} from '@angular/core';
+import {MatTabChangeEvent} from '@angular/material/tabs';
+import {ActivatedRoute, Router} from '@angular/router';
+import {Subscription} from 'rxjs';
+import {DoubtfireConstants} from 'src/app/config/constants/doubtfire-constants';
+
+type InstitutionSettingsTabKey =
+ | 'campuses'
+ | 'activities'
+ | 'teaching-periods'
+ | 'learning-outcomes'
+ | 'overseer-images'
+ | 'turnitin';
+
+interface InstitutionSettingsTab {
+ label: string;
+ routeSegment: InstitutionSettingsTabKey;
+ enabled: boolean;
+}
@Component({
selector: 'institution-settings',
templateUrl: 'institution-settings.component.html',
- styleUrls: ['institution-settings.component.scss']
+ styleUrls: ['institution-settings.component.scss'],
+ changeDetection: ChangeDetectionStrategy.Eager,
+ standalone: false,
})
-export class InstitutionSettingsComponent {
+export class InstitutionSettingsComponent implements OnInit, OnDestroy {
+ public currentTab: InstitutionSettingsTab = {
+ label: 'Campuses',
+ routeSegment: 'campuses',
+ enabled: true,
+ };
+
+ private subscriptions: Subscription[] = [];
constructor(
private constants: DoubtfireConstants,
- ) { }
+ private route: ActivatedRoute,
+ private router: Router,
+ ) {}
+
+ public ngOnInit(): void {
+ this.updateCurrentTabFromState(this.route.snapshot.paramMap.get('tab'));
+
+ this.subscriptions.push(
+ this.route.paramMap.subscribe((params) => this.updateCurrentTabFromState(params.get('tab'))),
+ );
+ }
+
+ public ngOnDestroy(): void {
+ this.subscriptions.forEach((subscription) => subscription.unsubscribe());
+ }
- public get overseerEnabled() : boolean {
+ public get tabs(): InstitutionSettingsTab[] {
+ const tabs: InstitutionSettingsTab[] = [
+ {label: 'Campuses', routeSegment: 'campuses', enabled: true},
+ {label: 'Activities', routeSegment: 'activities', enabled: true},
+ {label: 'Teaching Periods', routeSegment: 'teaching-periods', enabled: true},
+ {label: 'Learning Outcomes', routeSegment: 'learning-outcomes', enabled: true},
+ {label: 'Overseer Images', routeSegment: 'overseer-images', enabled: this.overseerEnabled},
+ {label: 'TurnItIn', routeSegment: 'turnitin', enabled: this.tiiEnabled},
+ ];
+
+ return tabs.filter((tab) => tab.enabled);
+ }
+
+ public get currentIndex(): number {
+ const index = this.tabs.findIndex((tab) => tab.routeSegment === this.currentTab.routeSegment);
+ return index >= 0 ? index : 0;
+ }
+
+ public get overseerEnabled(): boolean {
return this.constants.IsOverseerEnabled.value;
}
- public get tiiEnabled() : boolean {
+ public get tiiEnabled(): boolean {
return this.constants.IsTiiEnabled.value;
}
+
+ public onTabChange(event: MatTabChangeEvent): void {
+ const nextTab = this.tabs[event.index] ?? this.tabs[0];
+ this.currentTab = nextTab;
+ this.router.navigate(['/admin/institution-settings', nextTab.routeSegment], {replaceUrl: true});
+ }
+
+ private updateCurrentTabFromState(tabParam?: string | null): void {
+ this.currentTab =
+ this.tabs.find((tab) => tab.routeSegment === tabParam) ??
+ this.tabs.find((tab) => tab.routeSegment === 'campuses') ??
+ this.tabs[0];
+ }
}
diff --git a/src/app/admin/institution-settings/overseer-images/overseer-image-list.component.html b/src/app/admin/institution-settings/overseer-images/overseer-image-list.component.html
index d2e70e730d..c9b0d15df4 100644
--- a/src/app/admin/institution-settings/overseer-images/overseer-image-list.component.html
+++ b/src/app/admin/institution-settings/overseer-images/overseer-image-list.component.html
@@ -1,145 +1,218 @@
+
+ @switch (currentTab.routeSegment) {
+ @case ('campuses') {
+
+
+ }
+ @case ('overseer-images') {
+
+
+
+
+ Learning Outcomes+Manage global learning outcomes for the institution +{{ data.text }}
+
-
Overseer Images++ Overseer Images + @if (diskSpace !== null) { + ({{ diskSpace ?? 'N/A' }} GB available) + } +Add new image or modify existing ones used for automated task analysis
|
|---|