-
Couldn't load subscription status.
- Fork 2
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.
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
base: dev
Are you sure you want to change the base?
Conversation
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.
- 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.
dea7ee4 to
bab0227
Compare
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.
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.
|
|
||
| @Component({ | ||
| selector: 'xm-exam-search', | ||
| template: ` |
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.
Templaatin voisi siirtää omaan tiedostoonsa, koska se on melko iso.
e8988b2 to
ddf2fc8
Compare
…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
6e3d01e to
9ea23e2
Compare
- 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.
9ea23e2 to
973d82a
Compare
| <div class="col-12"> | ||
| <img src="/assets/images/icon_info.png" alt="" /> | ||
| <span>{{ 'i18n_collaborative_exam_search_description' | translate }}</span> | ||
| <div class="row"> |
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.
Search komponentit lakkas olemasta templaatteja tabi-järjestelyn takii
| }} | ||
| } | ||
| @case ('periodStart') { | ||
| Tenttiperiodi alkaa (nouseva) |
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.
Käännöksiä puuttuu?
| @case ('periodEnd') { | ||
| Tenttiperiodi päättyy (nouseva) | ||
| } | ||
| @default { |
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.
Tämä lienee turha blokki
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.
Nii ku nykyään ei tarvii tota default blockii 👍
| } | ||
| {{ exam.course?.name }} | ||
| <div class="mt-3"> | ||
| <div class="row mb-2"> |
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.
Onko testattu mobiiliilaitteilla?
Huomasin vaan, että jäljellä on ainoastaan col-md-määrittely. Muut näyttökoot ei määritelty.
| text-decoration: none; | ||
| cursor: pointer; | ||
| } | ||
| .exam-title-button { |
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.
Onko tämän pakko olla täällä ja tarviiko tämä luokka oikeasti noin monta ominaisuutta?
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.
Sain karsittua osan, mut suurin osa on pakollisii yliajoja.
Resolved conflicts in: - ui/src/app/enrolment/active/helpers/active-enrolment-menu.component.html - ui/src/assets/i18n/en.json - ui/src/assets/i18n/fi.json - ui/src/assets/i18n/sv.json All conflicts resolved by keeping dev branch changes.