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

Various levels lab user #130

Open
wants to merge 11 commits into
base: development
Choose a base branch
from
Open

Various levels lab user #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
3abac50
set testresultverified to false if user is a labuser
Anthony4m Aug 15, 2022
4e2b9d2
added definition for lab supervisor and lab attendant
Anthony4m Aug 15, 2022
37f529b
added lab attendant and lab supervisor role to the userroles
Anthony4m Aug 15, 2022
b780762
added new rights to new users created
Anthony4m Aug 15, 2022
76b64b5
hiding verify test results for lab officer
Anthony4m Aug 15, 2022
01abbca
removed shipment date from lab users grid
Anthony4m Aug 15, 2022
a862ec8
added lab supervisor to entity help
Anthony4m Aug 15, 2022
93cf34f
Gave lab supervisor the name "lab supervisor"
Anthony4m Aug 15, 2022
7fd2d33
Added lab supervisor and lab attendant for user service filtering
Anthony4m Aug 15, 2022
deb4434
added lab supervisor to the taskgrid
Anthony4m Aug 15, 2022
7af1749
Added new users to web security to be able to log in
Anthony4m Aug 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions sormas-api/src/main/java/de/symeda/sormas/api/sample/PathogenTestDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,14 @@
/*
* SORMAS® - Surveillance Outbreak Response Management & Analysis System
* Copyright © 2016-2018 Helmholtz-Zentrum für Infektionsforschung GmbH (HZI)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
Expand All @@ -31,6 +28,7 @@
import de.symeda.sormas.api.sormastosormas.SormasToSormasConfig;
import de.symeda.sormas.api.user.UserDto;
import de.symeda.sormas.api.user.UserReferenceDto;
import de.symeda.sormas.api.user.UserRole;
import de.symeda.sormas.api.utils.DataHelper;
import de.symeda.sormas.api.utils.DateFormatHelper;
import de.symeda.sormas.api.utils.FieldConstraints;
Expand Down Expand Up @@ -133,6 +131,9 @@ public static PathogenTestDto build(SampleDto sample, UserDto currentUser) {
if (sample.getSamplePurpose() == SamplePurpose.INTERNAL) {
pathogenTest.setTestResultVerified(true);
}
if (currentUser.getUserRoles().contains(UserRole.LAB_USER)) {
pathogenTest.setTestResultVerified(false);
}
pathogenTest.setLab(currentUser.getLaboratory());
if (pathogenTest.getLab() == null) {
pathogenTest.setLab(sample.getLab());
Expand Down
Loading