Skip to content
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

Add Competence Document KPI matrix #202

Merged

Conversation

SaamieVincken
Copy link
Contributor

@SaamieVincken SaamieVincken commented Dec 18, 2023

Rewriting the logic for kpi matrix word generation, should correctly use the new data format.

@SaamieVincken SaamieVincken self-assigned this Dec 18, 2023
@NealGeilen NealGeilen changed the title Feat/competence document kpi matrix Add Competence Document KPI matrix Jan 8, 2024
@NealGeilen
Copy link
Member

@SaamieVincken Please fix the Unit tests according to your class changes

Copy link
Member

@NealGeilen NealGeilen left a comment

Choose a reason for hiding this comment

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

Just some stuff to help

Epsilon/Components/KpiMatrixComponent.cs Outdated Show resolved Hide resolved
Epsilon/Components/KpiMatrixComponent.cs Outdated Show resolved Hide resolved
Epsilon/Components/KpiMatrixComponent.cs Outdated Show resolved Hide resolved
Epsilon/Components/KpiMatrixComponent.cs Outdated Show resolved Hide resolved
Epsilon/Components/KpiMatrixComponent.cs Outdated Show resolved Hide resolved
Epsilon/Components/KpiMatrixComponent.cs Outdated Show resolved Hide resolved
@kallepronk kallepronk changed the base branch from develop to feat/competence-document-profile January 11, 2024 20:30
@kallepronk kallepronk marked this pull request as ready for review January 12, 2024 10:59
@NealGeilen NealGeilen merged commit bb59e9d into feat/competence-document-profile Jan 12, 2024
10 checks passed
@NealGeilen NealGeilen deleted the feat/competence-document-kpi-matrix branch January 12, 2024 11:07
NealGeilen added a commit that referenced this pull request Jan 25, 2024
* add base profile component

* add competence profile single axis table generation

* change font size and singleaxistable row height

* add base profile component

* add competence profile single axis table generation

* change font size and singleaxistable row height

* apply suggestions from code review Neal

add changes to get through validation

Co-authored-by: Neal Geilen <[email protected]>

* Small bugfix

* temporary fix for competence profile

* Add Competence Document KPI table (#201)

* Update

* Created the generation of the criteria into the KpiTable + currently all deliverd assignments are put behind each criteria, got to create a filter/check for this

* Made allOutcomes distinct

* added submission filtering based on available criteria (in CompetenceProfileComponent)

* Moved submission filtering up into the CompetenceDocumentService class from the CompetenceProfileComponent class

* Added working submission gathering foreach outcome

All submissions per outcome are currently added to the competence document when downloading.

TODO:
1. Add grades to each submission
2. Clean up all unneeded code

* Deleted commented code + added grade per submission to the competence document generation

* Run Lint and format frontend + remove '?' from KpiTable class AddToWordDocument function type

* Renamed 'KpiTable' to 'KpiTableComponent' + fixed CI errors

* Resolved requested changes

'?' behind each 'body' element.

Added RunProperties (underline) to each submission hyperlink.

Want to add a color to each hyperlink, but this makes the grading icons the same color as the text. So it makes you unable to know what each icon means.

---------

Co-authored-by: Neal Geilen <[email protected]>
Co-authored-by: Kalle Pronk <[email protected]>

* add title to kpi table

* center competence profile

* fix unit test bug

* Add Competence Document KPI matrix (#202)

* Add KpiMatrixAssignment.cs

* Add KpiMatrixOutcome.cs

* Add KpiMatrixOutcomeStatus.cs

* Add KpiMatrixCollection.cs

* Remove old repo code (incorrectly added)

* Add KpiMatrixComponent.cs

* Rewrite data format (not done)

* Add component to CompetenceDocumentService.cs

* Remove old KpiMatrixCollection.cs

* Fix naming issues in kpi matrix component

* Fix data format issues in getLegend method

* Add outcomes to components

* Implement outcomes in KpiMatrixComponent.cs

* Change get color logic

* Fix color issues in kpi matrix cells

* Fix spacing and remove comments

* Fix unit tests with new parameter

* Fix unit test issue in kpi matrix component

* Implement PR feedback

* Implement PR feedback

* Add competence profile component create table cell method

* Implement create table cell method

* Fix borders in kpi matrix

* Add "Val" parameter for shading

* Add "Val" property to shading

* Apply shading directly to TableCellProperties

* Add default color values for shading

* Fix shading and border errors

* Revert "Fix shading and border errors"

This reverts commit 27210e6.

* Change order of borders

* Add distinct filtering in criteria

* Fix error for unit tests

* Add order by functionality

* fix kpi matrix header row bug

* fix merge request bugs

---------

Co-authored-by: Neal Geilen <[email protected]>
Co-authored-by: Bas Bakens <[email protected]>
Co-authored-by: Kalle Pronk <[email protected]>

* inital version new structure

* continue abstraction of word document generation

* add correct data to competence profile

* fix merge errors

* Rewritten unittests

* Error fixes

* Optimized tests

* Load improvements

Co-authored-by: Jelle Maas <[email protected]>

* Forced nulls on DomainOutcomes from database

* Set default for title placement

* Set default for title placement

* Added Legend for KpiMatrixComponent.cs

* Removed unused using

* Style change

---------

Co-authored-by: Neal Geilen <[email protected]>
Co-authored-by: Bas Bakens <[email protected]>
Co-authored-by: SaamieVincken <[email protected]>
Co-authored-by: Bas Bakens <[email protected]>
Co-authored-by: Jelle Maas <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

As a student and teacher, I want that the KPI matrix is included in the competence document generation
4 participants