Theaninova/openstapps
1
0
Fork 0
mirror of https://gitlab.com/openstapps/openstapps.git synced 2026-01-08 22:42:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: catalog semester selection

Browse Source
This commit is contained in:
Rainer Killinger
2023-02-16 15:36:19 +01:00
committed by Thea Schöbl
parent 260fbe01db
commit b2a8cba1aa
2 changed files with 45 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/app/modules/catalog/catalog.component.ts
View File

@@ -111,17 +111,22 @@ export class CatalogComponent implements OnInit, OnDestroy {
}
async fetchSemesters(): Promise<void> {
const today = moment().startOf('day').toISOString();
const semesters = await this.catalogProvider.getRelevantSemesters();
this.availableSemesters = semesters.slice(0, 3).reverse();
const currentSemester = semesters.find(
semester => semester.startDate <= today && semester.endDate > today,
);
const currentSemesterIndex = semesters.findIndex(semester => semester.uid === currentSemester?.uid);
this.availableSemesters = semesters.slice(currentSemesterIndex - 1, currentSemesterIndex + 2).reverse();
if (typeof this.activeSemester !== 'undefined') {
return;
}
const today = moment().startOf('day').toISOString();
this.activeSemester = this.availableSemesters[0];
this.activeSemester =
this.selectedSemesterUID === ''
? this.availableSemesters.find(semester => semester.startDate <= today && semester.endDate > today)
? currentSemester
: this.availableSemesters.find(semester => semester.uid === this.selectedSemesterUID);
if (this.activeSemester && this.selectedSemesterUID === '') {
this.selectedSemesterUID = this.activeSemester.uid;

42
src/app/modules/catalog/catalog.provider.ts
View File

@@ -107,14 +107,46 @@ export class CatalogProvider {
const response = await this.dataProvider.search({
filter: {
arguments: {
field: 'type',
value: SCThingType.Semester,
operation: 'and',
filters: [
{
type: 'value',
arguments: {
field: 'type',
value: SCThingType.Semester,
},
},
{
type: 'date range',
arguments: {
bounds: {
lowerBound: {
limit: `${new Date().setFullYear(new Date().getFullYear() - 1)}`,
mode: 'inclusive',
},
upperBound: {
limit: `${new Date().setFullYear(new Date().getFullYear() + 1)}`,
mode: 'inclusive',
},
},
field: 'startDate',
},
},
],
},
type: 'value',
type: 'boolean',
},
size: 10,
sort: [
{
arguments: {
field: 'startDate',
},
order: 'desc',
type: 'generic',
},
],
});
return (response.data as SCSemester[]).sort((a, b) => b.startDate.localeCompare(a.startDate, 'en'));
return response.data as SCSemester[];
}
}