filter proband list by department - web tier

phoenixctms · Jun 16, 2024 · 35b8b4f · 35b8b4f
1 parent b363f7e
commit 35b8b4f
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 13 deletions.
diff --git a/...c/main/java/org/phoenixctms/ctsms/web/jersey/resource/trial/ProbandListEntryResource.java b/...c/main/java/org/phoenixctms/ctsms/web/jersey/resource/trial/ProbandListEntryResource.java
@@ -30,7 +30,7 @@
 
 import io.swagger.annotations.Api;
 
-@Api(value="trial")
+@Api(value = "trial")
 @Path("/probandlistentry")
 public class ProbandListEntryResource {
 
@@ -72,7 +72,8 @@ public ProbandListEntryOutVO getProbandListEntry(@PathParam("id") Long id) throw
 	@Produces({ MediaType.APPLICATION_JSON })
 	public Page<ProbandListEntryOutVO> getProbandListEntryList(@Context UriInfo uriInfo) throws AuthenticationException, AuthorisationException, ServiceException {
 		PSFUriPart psf;
-		return new Page<ProbandListEntryOutVO>(WebUtil.getServiceLocator().getTrialService().getProbandListEntryList(auth, null, null, null, true, psf = new PSFUriPart(uriInfo)),
+		return new Page<ProbandListEntryOutVO>(
+				WebUtil.getServiceLocator().getTrialService().getProbandListEntryList(auth, null, null, null, null, true, psf = new PSFUriPart(uriInfo)),
 				psf);
 	}
 

diff --git a/...c/main/java/org/phoenixctms/ctsms/web/model/shared/EcrfFieldStatusEntryLogEagerModel.java b/...c/main/java/org/phoenixctms/ctsms/web/model/shared/EcrfFieldStatusEntryLogEagerModel.java
@@ -108,7 +108,7 @@ protected Collection<ECRFFieldStatusEntryOutVO> getEagerResult(PSFVO psf) {
 		if (listEntryId != null) {
 			try {
 				return WebUtil.getServiceLocator().getTrialService()
-						.getEcrfFieldStatusEntryLog(WebUtil.getAuthentication(), queue, null, listEntryId, ecrfId, visitId, true, false, new PSFVO(INITIAL_PSF));
+						.getEcrfFieldStatusEntryLog(WebUtil.getAuthentication(), queue, null, null, listEntryId, ecrfId, visitId, true, false, new PSFVO(INITIAL_PSF));
 			} catch (ServiceException | AuthorisationException | IllegalArgumentException e) {
 			} catch (AuthenticationException e) {
 				WebUtil.publishException(e);

diff --git a/web/src/main/java/org/phoenixctms/ctsms/web/model/shared/ProbandListEntryModel.java b/web/src/main/java/org/phoenixctms/ctsms/web/model/shared/ProbandListEntryModel.java
@@ -349,9 +349,9 @@ protected Collection<ProbandListEntryOutVO> getLazyResult(PSFVO psf) {
 		if (trialId != null || probandGroup != null || probandId != null) {
 			try {
 				if (probandGroup != null) {
-					return WebUtil.getServiceLocator().getTrialService().getProbandListEntryList(WebUtil.getAuthentication(), null, probandGroup.getId(), null, total, psf);
+					return WebUtil.getServiceLocator().getTrialService().getProbandListEntryList(WebUtil.getAuthentication(), null, null, probandGroup.getId(), null, total, psf);
 				} else {
-					return WebUtil.getServiceLocator().getTrialService().getProbandListEntryList(WebUtil.getAuthentication(), trialId, null, probandId, total, psf);
+					return WebUtil.getServiceLocator().getTrialService().getProbandListEntryList(WebUtil.getAuthentication(), trialId, null, null, probandId, total, psf);
 				}
 			} catch (ServiceException | AuthorisationException | IllegalArgumentException e) {
 			} catch (AuthenticationException e) {

diff --git a/...src/main/java/org/phoenixctms/ctsms/web/model/trial/EcrfFieldStatusEntryLogLazyModel.java b/...src/main/java/org/phoenixctms/ctsms/web/model/trial/EcrfFieldStatusEntryLogLazyModel.java
@@ -29,7 +29,7 @@ protected Collection<ECRFFieldStatusEntryOutVO> getLazyResult(PSFVO psf) {
 				return WebUtil
 						.getServiceLocator()
 						.getTrialService()
-						.getEcrfFieldStatusEntryLog(WebUtil.getAuthentication(), queue, trialId, null, null, null, true,
+						.getEcrfFieldStatusEntryLog(WebUtil.getAuthentication(), queue, trialId, null, null, null, null, true,
 								psf == null || CommonUtil.isEmptyString(psf.getSortField()),
 								psf);
 			} catch (ServiceException | AuthorisationException | IllegalArgumentException e) {

diff --git a/...hoenixctms/ctsms/web/model/trial/ProbandMoneyTransferNoParticipationSummaryLazyModel.java b/...hoenixctms/ctsms/web/model/trial/ProbandMoneyTransferNoParticipationSummaryLazyModel.java
@@ -24,8 +24,8 @@ protected Collection<MoneyTransferSummaryVO> getLazyResult(PSFVO psf) {
 		if (trialId != null) {
 			try {
 				return WebUtil.getServiceLocator().getTrialService()
-						.getProbandMoneyTransferNoParticipationSummaryList(WebUtil.getAuthentication(), trialId, null, null, paid, total, psf);
-			} catch (ServiceException|AuthorisationException|IllegalArgumentException e) {
+						.getProbandMoneyTransferNoParticipationSummaryList(WebUtil.getAuthentication(), trialId, null, null, null, paid, total, psf);
+			} catch (ServiceException | AuthorisationException | IllegalArgumentException e) {
 			} catch (AuthenticationException e) {
 				WebUtil.publishException(e);
 			}
@@ -37,7 +37,7 @@ protected Collection<MoneyTransferSummaryVO> getLazyResult(PSFVO psf) {
 	protected MoneyTransferSummaryVO getRowElement(Long id) {
 		try {
 			return WebUtil.getServiceLocator().getTrialService().getProbandMoneyTransferNoParticipationSummary(WebUtil.getAuthentication(), id, trialId, null, null, paid);
-		} catch (ServiceException|AuthorisationException|IllegalArgumentException e) {
+		} catch (ServiceException | AuthorisationException | IllegalArgumentException e) {
 		} catch (AuthenticationException e) {
 			WebUtil.publishException(e);
 		}

diff --git a/...main/java/org/phoenixctms/ctsms/web/model/trial/ProbandMoneyTransferSummaryLazyModel.java b/...main/java/org/phoenixctms/ctsms/web/model/trial/ProbandMoneyTransferSummaryLazyModel.java
@@ -23,8 +23,8 @@ public ProbandMoneyTransferSummaryLazyModel(boolean total) {
 	protected Collection<MoneyTransferSummaryVO> getLazyResult(PSFVO psf) {
 		if (trialId != null) {
 			try {
-				return WebUtil.getServiceLocator().getTrialService().getProbandMoneyTransferSummaryList(WebUtil.getAuthentication(), trialId, null, null, paid, total, psf);
-			} catch (ServiceException|AuthorisationException|IllegalArgumentException e) {
+				return WebUtil.getServiceLocator().getTrialService().getProbandMoneyTransferSummaryList(WebUtil.getAuthentication(), trialId, null, null, null, paid, total, psf);
+			} catch (ServiceException | AuthorisationException | IllegalArgumentException e) {
 			} catch (AuthenticationException e) {
 				WebUtil.publishException(e);
 			}
@@ -36,7 +36,7 @@ protected Collection<MoneyTransferSummaryVO> getLazyResult(PSFVO psf) {
 	protected MoneyTransferSummaryVO getRowElement(Long id) {
 		try {
 			return WebUtil.getServiceLocator().getTrialService().getProbandMoneyTransferSummary(WebUtil.getAuthentication(), id, null, null, paid);
-		} catch (ServiceException|AuthorisationException|IllegalArgumentException e) {
+		} catch (ServiceException | AuthorisationException | IllegalArgumentException e) {
 		} catch (AuthenticationException e) {
 			WebUtil.publishException(e);
 		}

diff --git a/web/src/main/java/org/phoenixctms/ctsms/web/util/WebUtil.java b/web/src/main/java/org/phoenixctms/ctsms/web/util/WebUtil.java
@@ -3291,7 +3291,7 @@ public static ProbandListEntryOutVO getProbandListEntry(Long probandListEntryId)
 	public static Long getProbandListEntryCount(Long trialId, Long probandId, boolean total) {
 		if (trialId != null || probandId != null) {
 			try {
-				return getServiceLocator().getTrialService().getProbandListEntryCount(getAuthentication(), trialId, null, probandId, total);
+				return getServiceLocator().getTrialService().getProbandListEntryCount(getAuthentication(), trialId, null, null, probandId, total);
 			} catch (ServiceException | AuthorisationException | IllegalArgumentException e) {
 			} catch (AuthenticationException e) {
 				publishException(e);