Skip to content

CSCEXAM-1159 Move Collab search to Regular search as a tab #1245

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

Jump to bottom
Merged
merged 13 commits into from
Nov 3, 2025
Merged

CSCEXAM-1159 Move Collab search to Regular search as a tab #1245

merged 13 commits into from
Nov 3, 2025

Conversation

@VirmasaloA
Copy link
Collaborator

@VirmasaloA VirmasaloA commented Sep 3, 2025

  • Consolidate collaborative exam search into the main exam search component.
  • Introduce tab navigation for regular and collaborative exams.
  • Remove deprecated collaborative exam search component.
  • Update routing to reflect changes in exam search structure.
  • Enhance loading and error handling for exam searches.

@VirmasaloA VirmasaloA requested a review from lupari September 4, 2025 11:36
lupari
lupari reviewed Sep 8, 2025
View reviewed changes
Copy link
Collaborator

@lupari lupari left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Onko näiden toimintojen pakko olla yhdessä komponentissa? Nyt tuo hoitaa mielestäni vähän liian montaa asiaa.

Mielestäni olisi selkeämpi jos olisi yleinen hakukomponentti, joka lähinnä näyttäisi tabit ja hanskaisi niiden vaihtumista. Sitten olisi kaksi varsinaista toteutuskomponenttia: perustenttien haku ja yhteistenttien haku.

Esimerkkiä voi katsoa esimerkiksi statistics.component.html-tiedostosta.

ui/src/app/enrolment/search/exam-search.component.ts

@Component({
selector: 'xm-exam-search',
template: `
Copy link
Collaborator

@lupari lupari Sep 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Templaatin voisi siirtää omaan tiedostoonsa, koska se on melko iso.

@VirmasaloA VirmasaloA force-pushed the CSCEXAM-1159 branch 3 times, most recently from 3c1fea1 to 908a655 Compare September 24, 2025 15:17
@VirmasaloA VirmasaloA force-pushed the CSCEXAM-1159 branch 2 times, most recently from 9ea23e2 to 973d82a Compare October 1, 2025 07:25
VirmasaloA
VirmasaloA commented Oct 2, 2025
View reviewed changes
ui/src/app/enrolment/search/collaborative-exam-search.component.ts
<div class="col-12">
<img src="/assets/images/icon_info.png" alt="" /> &nbsp;
<span>{{ 'i18n_collaborative_exam_search_description' | translate }}</span>
<div class="row">
Copy link
Collaborator Author

@VirmasaloA VirmasaloA Oct 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Search komponentit lakkas olemasta templaatteja tabi-järjestelyn takii

lupari
lupari reviewed Oct 2, 2025
View reviewed changes
ui/src/app/enrolment/search/collaborative-exam-search.component.ts Outdated
}}
}
@case ('periodStart') {
Tenttiperiodi alkaa (nouseva)
Copy link
Collaborator

@lupari lupari Oct 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Käännöksiä puuttuu?

@VirmasaloA VirmasaloA requested a review from lupari October 21, 2025 05:25
lupari
lupari approved these changes Oct 21, 2025
View reviewed changes
ui/src/app/enrolment/search/collaborative-exam-search.component.ts Outdated
@case ('periodEnd') {
Tenttiperiodi päättyy (nouseva)
}
@default {
Copy link
Collaborator

@lupari lupari Oct 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tämä lienee turha blokki

Copy link
Collaborator Author

@VirmasaloA VirmasaloA Oct 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nii ku nykyään ei tarvii tota default blockii 👍

ui/src/app/enrolment/exams/exam-enrolment-details.component.html
}
{{ exam.course?.name }}
<div class="mt-3">
<div class="row mb-2">
Copy link
Collaborator

@lupari lupari Oct 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Onko testattu mobiiliilaitteilla?

Huomasin vaan, että jäljellä on ainoastaan col-md-määrittely. Muut näyttökoot ei määritelty.

Copy link
Collaborator Author

@VirmasaloA VirmasaloA Oct 31, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ymmärtääkseni se toimii niin että jos näyttö on midiä isompi, se pysyy, ja jos se on midiä pienempi (mobiili) nii se määrittely poistuu. Testasin, hyvin toimii.

ui/src/styles.scss Outdated
text-decoration: none;
cursor: pointer;
}
.exam-title-button {
Copy link
Collaborator

@lupari lupari Oct 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Onko tämän pakko olla täällä ja tarviiko tämä luokka oikeasti noin monta ominaisuutta?

Copy link
Collaborator Author

@VirmasaloA VirmasaloA Oct 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sain karsittua osan, mut suurin osa on pakollisii yliajoja.

Copy link
Collaborator

@lupari lupari Nov 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, mutta eikö tämän paikka olisi enrolment.shared.scss jos tätä määritystä ei käytetä enrolment-koodin ulkopuolella?

Copy link
Collaborator Author

@VirmasaloA VirmasaloA Nov 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Vaihan sen paikkaa 👍

@VirmasaloA
CSCEXAM-1159 Move Collab search to Regular search as a tab
2bc287f 
- Consolidate collaborative exam search into the main exam search component.
- Introduce tab navigation for regular and collaborative exams.
- Remove deprecated collaborative exam search component.
- Update routing to reflect changes in exam search structure.
- Enhance loading and error handling for exam searches.
@VirmasaloA
CSCEXAM-1159 Implement two-column layout for exam search results and …
cda3456 
…dashboard

- Convert exam search results to title:information column format
- Update active enrolment component with consistent two-column layout
- Move shared exam-title-button styles to global styles.scss
- Simplify CSS classes and consolidate duplicate styling
- Add mb-2 spacing between information rows for better readability
- Maintain 24px font size for dashboard titles, 16px for search results
@VirmasaloA
Enhance exam search component with sorting functionality
7022d74 
- Introduced dropdown menus for sorting regular and collaborative exam results by name and period start/end.
- Updated filters to include ordering and reverse properties for both regular and collaborative exams.
- Implemented methods to update sorting criteria and store filters accordingly.
- Ensured that the exam results are displayed in the selected order using the OrderByPipe.

This update improves user experience by allowing dynamic sorting of exam results.
@VirmasaloA
Reform exam search tabs
fe5499b
@VirmasaloA
Restore comments
837811c
@VirmasaloA
Add margin to exam search tabs
8aa9b2d
@VirmasaloA
Refine exam-title-button styles
700c39a
@VirmasaloA
Remove unnecessary files
fd3ebe9
@VirmasaloA
Restore build.yml codeql.yml
1cfd73d
@VirmasaloA
Refactor exam search components and services
4817de9
@VirmasaloA
Refactor styles to use shared color definitions for exam components
ac12f45 
- Updated various SCSS files to replace hardcoded color values with the new shared color variable .
- Enhanced consistency across the application by utilizing the shared definitions for exam-related styles.
- Fix translation mismanagement
VirmasaloA
VirmasaloA commented Oct 31, 2025
View reviewed changes
Copy link
Collaborator Author

@VirmasaloA VirmasaloA left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Josko nyt

@VirmasaloA VirmasaloA requested a review from lupari October 31, 2025 17:17
@VirmasaloA VirmasaloA merged commit 677a22b into dev Nov 3, 2025
6 checks passed
@VirmasaloA VirmasaloA deleted the CSCEXAM-1159 branch November 3, 2025 12:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@lupari lupari Awaiting requested review from lupari

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@VirmasaloA @lupari