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.

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

Slice: Opiskelijan tietoihin uusia kenttia #1549

Closed
wants to merge 9 commits into from
Closed

Slice: Opiskelijan tietoihin uusia kenttia #1549

wants to merge 9 commits into from

Conversation

saaralepisto
Copy link
Contributor

closes #1541

@otavia-board otavia-board bot added the NEEDS REVIEW Needs Review column in our board. label Feb 22, 2024
aviljakaine
aviljakaine requested changes Feb 23, 2024
View reviewed changes
Copy link
Contributor

@aviljakaine aviljakaine left a comment

Choose a reason for hiding this comment

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

Paljon pohdintaa ja jotain korjattavaa

persistence/src/main/java/fi/otavanopisto/pyramus/domainmodel/students/StudentCard.java Outdated Show resolved Hide resolved
persistence/src/main/java/fi/otavanopisto/pyramus/domainmodel/students/StudentCard.java Outdated Show resolved Hide resolved
persistence/src/main/java/fi/otavanopisto/pyramus/domainmodel/students/StudentCard.java Show resolved Hide resolved
persistence/src/main/java/fi/otavanopisto/pyramus/domainmodel/students/StudentCardType.java Outdated Show resolved Hide resolved
persistence/src/main/java/fi/otavanopisto/pyramus/dao/students/StudentCardDAO.java Outdated Show resolved Hide resolved
pyramus/src/main/webapp/templates/students/editstudent.jsp Outdated Show resolved Hide resolved
...us/src/main/java/fi/otavanopisto/pyramus/json/students/EditStudentJSONRequestController.java Outdated Show resolved Hide resolved
...us/src/main/java/fi/otavanopisto/pyramus/json/students/EditStudentJSONRequestController.java Outdated
Date expiryDate = null;

// Set expiry date automatically same as study end date or study time end
if (student.getStudyEndDate() != null) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Tämä voisi olla ihan validi lähestymistapa, en nyt äkkisältään osaa ajatella miten kaikki tulkinnat tulisi toimimaan, jos päättymispäivä tallennettaisiin näin.

Itse ajattelin alunperin, että päättely tehtäisiin vasta listaamisvaiheessa, jolloin tässä tallennettaisiin aina vain tämä "kovakoodattu" aikaraja. Sen huono puoli on siinä, että tulkinta tulee olemaan vähän hankalaa, mutta hyvä puoli siinä, että nämä eri päivämäärät olisi aina erikseen tallessa. Mutta joo, en nyt osaa ajatella kaikkia vaikutuksia tähän päättelylogiikkaan niin voinee olla näinkin.. :D

pyramus/src/main/resources/fi/otavanopisto/pyramus/I18N/pyramuslocale_fi_FI.properties Outdated Show resolved Hide resolved
...us/src/main/java/fi/otavanopisto/pyramus/json/students/EditStudentJSONRequestController.java Outdated Show resolved Hide resolved
@otavia-board otavia-board bot added IN PROGRESS In Progress column in our board. and removed NEEDS REVIEW Needs Review column in our board. labels Feb 23, 2024
@otavia-board otavia-board bot added NEEDS REVIEW Needs Review column in our board. and removed IN PROGRESS In Progress column in our board. labels Mar 4, 2024
aviljakaine
aviljakaine requested changes Mar 5, 2024
View reviewed changes
Copy link
Contributor

@aviljakaine aviljakaine left a comment

Choose a reason for hiding this comment

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

Foreign keyn skripti ja pientä säätöä

pyramus/updates/126.001/220224_studentcard.xml
active bit not null,
expiryDate date not null,
type varchar(255) not null,
student_id bigint,
Copy link
Contributor

Choose a reason for hiding this comment

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

Tältä puuttuu foreign key, generoidusta sql:stä se löytyy erillisenä lauseena - taulun nimellä etsimällä pitäisi löytyä kaikki siihen tauluun kohdistuvat skriptit.

persistence/src/main/java/fi/otavanopisto/pyramus/dao/students/StudentCardDAO.java Outdated
return studentCard;
}

public StudentCard findByStudent(Long studentId) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Vaihtaisin Long studentId:n Student student:ksi, jolloin on aina selvää, mitä parametria odotetaan (Long:ja kun löytyy kaikista id-kentistä).

En ole ihan varma toimiiko tuo where-ehdossa oleva

criteriaBuilder.equal(root.get(StudentCard_.student), studentId)

(StudentCard_.student on tyyppiä Student, studentId tyyppiä Long) mutta jos parametrityypin muuttaa, niin

criteriaBuilder.equal(root.get(StudentCard_.student), student)

ainakin pitäisi toimia (molemmat tyyppiä Student).

pyramus/src/main/resources/fi/otavanopisto/pyramus/I18N/pyramuslocale_fi_FI.properties Outdated
@@ -1810,10 +1825,10 @@ students.editStudent.studyPeriodsTable.removeTooltip = Poista t
students.editStudent.addStudyPeriodLink = Lis�� opiskelujakso
students.editStudent.selectUserVariablePresetDialog.title = Valitse esiasetettu muuttujan arvo
students.editStudent.selectUserVariablePresetDialog.tabLabel = Esiasetukset

Copy link
Contributor

Choose a reason for hiding this comment

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

Tämän tyhjän rivin voisi lisätä takaisin jotta rivinumerot mätsää toisen lokaalin kanssa :D (taitaa olla rivi 1828 tässä branchissä)

@otavia-board otavia-board bot added IN PROGRESS In Progress column in our board. and removed NEEDS REVIEW Needs Review column in our board. labels Mar 5, 2024
@otavia-board otavia-board bot added NEEDS REVIEW Needs Review column in our board. and removed IN PROGRESS In Progress column in our board. labels Mar 6, 2024
aviljakaine
aviljakaine previously approved these changes Mar 8, 2024
View reviewed changes
pkukkon
pkukkon requested changes Mar 12, 2024
View reviewed changes
Copy link
Contributor

@pkukkon pkukkon left a comment

Choose a reason for hiding this comment

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

Minor optimization and readability changes.

...us/src/main/java/fi/otavanopisto/pyramus/json/students/EditStudentJSONRequestController.java Outdated Show resolved Hide resolved
pyramus/src/main/webapp/templates/students/editstudent.jsp Show resolved Hide resolved
pyramus/src/main/webapp/templates/students/viewstudent.jsp Outdated Show resolved Hide resolved
pyramus/src/main/webapp/templates/students/viewstudent.jsp Outdated Show resolved Hide resolved
@otavia-board otavia-board bot added IN PROGRESS In Progress column in our board. and removed NEEDS REVIEW Needs Review column in our board. labels Mar 12, 2024
@otavia-board otavia-board bot added the NEEDS REVIEW Needs Review column in our board. label Mar 14, 2024
@otavia-board otavia-board bot removed the IN PROGRESS In Progress column in our board. label Mar 14, 2024
@otavia-board otavia-board bot removed the NEEDS REVIEW Needs Review column in our board. label May 15, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pkukkon pkukkon pkukkon approved these changes

@aviljakaine aviljakaine Awaiting requested review from aviljakaine

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Opiskelijan tietoihin uusia kenttiä
3 participants
@saaralepisto @pkukkon @aviljakaine