Revision 35382
Added by Nikon Gasparis over 9 years ago
| ValidatorWebApiImpl.java | ||
|---|---|---|
| 67 | 67 |
} |
| 68 | 68 |
|
| 69 | 69 |
@Override |
| 70 |
public Map<String, List<StoredJob>> getJobsOfUser(String user) throws ValidatorWebException {
|
|
| 70 |
public List<StoredJob> getJobsOfUser(String user, String jobType, Integer offset, Integer limit) throws ValidatorWebException {
|
|
| 71 | 71 |
try {
|
| 72 | 72 |
logger.debug("getting jobs of user " + user);
|
| 73 |
List<StoredJob> jobs; |
|
| 74 |
if (this.userOverridesRepoRegistration(user)) |
|
| 75 |
jobs = validatorService.getService().getStoredJobs(null, jobType, offset, limit); |
|
| 76 |
else |
|
| 77 |
jobs = validatorService.getService().getStoredJobs(user, jobType, offset, limit); |
|
| 78 |
return jobs; |
|
| 79 |
} catch (Exception e) {
|
|
| 80 |
logger.error("Error getting jobs of user " + user, e);
|
|
| 81 |
throw new ValidatorWebException(e); |
|
| 82 |
} |
|
| 83 |
} |
|
| 84 |
|
|
| 85 |
@Override |
|
| 86 |
public int getJobsTotalNumberOfUser(String user, String jobType) throws ValidatorWebException {
|
|
| 87 |
try {
|
|
| 88 |
logger.debug("getting jobs of user " + user);
|
|
| 89 |
int sum; |
|
| 90 |
if (this.userOverridesRepoRegistration(user)) |
|
| 91 |
sum = validatorService.getService().getStoredJobsTotalNumber(null, jobType); |
|
| 92 |
else |
|
| 93 |
sum = validatorService.getService().getStoredJobsTotalNumber(user, jobType); |
|
| 94 |
return sum; |
|
| 95 |
} catch (Exception e) {
|
|
| 96 |
logger.error("Error getting jobs of user " + user, e);
|
|
| 97 |
throw new ValidatorWebException(e); |
|
| 98 |
} |
|
| 99 |
} |
|
| 100 |
|
|
| 101 |
@Deprecated |
|
| 102 |
public Map<String, List<StoredJob>> getJobsOfUserSplitted(String user) throws ValidatorWebException {
|
|
| 103 |
try {
|
|
| 104 |
logger.debug("getting jobs of user " + user);
|
|
| 73 | 105 |
Map< String, List<StoredJob>> jobsSplitted = new HashMap< String, List<StoredJob>>(); |
| 74 | 106 |
List<StoredJob> jobs = null; |
| 107 |
// userMail,jobType, offset, limit |
|
| 75 | 108 |
if (this.userOverridesRepoRegistration(user)) |
| 76 |
jobs = validatorService.getService().getStoredJobs(null); |
|
| 109 |
jobs = validatorService.getService().getStoredJobs(null, null, 0, 5);
|
|
| 77 | 110 |
else |
| 78 |
jobs = validatorService.getService().getStoredJobs(user); |
|
| 111 |
jobs = validatorService.getService().getStoredJobs(user, null, 0, 5);
|
|
| 79 | 112 |
|
| 80 | 113 |
List<StoredJob> regList, compList, workflowList; |
| 81 | 114 |
regList = new ArrayList<StoredJob>(); |
| ... | ... | |
| 1334 | 1367 |
this.secondaryAdmins.add(recp); |
| 1335 | 1368 |
} |
| 1336 | 1369 |
} |
| 1370 |
|
|
| 1337 | 1371 |
} |
| 1338 | 1372 |
|
Also available in: Unified diff
*performance improvements: jobs are now loaded using pagination and only jobs of active tab are loaded.
*updated ui to support pagination while browsing jobs.