Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
P
PERFORMA_REPLICA
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Muhammad Usman
PERFORMA_REPLICA
Commits
440f9a0c
Commit
440f9a0c
authored
Sep 26, 2017
by
Harsh Shah
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Clients page should display Job Count instead of Application count
parent
cf422df4
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
Client.java
cmsWebApp/src/performa/orm/Client.java
+2
-2
Utils.java
cmsWebApp/src/performa/utils/Utils.java
+1
-1
list_clients.jsp
cmsWebApp/webroot/extensions/adminportal/list_clients.jsp
+1
-1
No files found.
cmsWebApp/src/performa/orm/Client.java
View file @
440f9a0c
...
...
@@ -19,11 +19,11 @@ public class Client extends BaseClient
// Do not add any code to this, always put it in initialiseNewObject
}
public
int
get
Application
CountByStatus
(
JobStatus
jobStatus
)
public
int
get
Job
CountByStatus
(
JobStatus
jobStatus
)
{
Filter
<
Job
>
filter
=
Job
.
SearchByAll
().
andJobStatus
(
new
EqualsFilter
<>(
jobStatus
));
return
pipelineClient
().
toJobs
(
filter
).
toJobApplications
().
uniqueVals
().
size
();
return
pipelineClient
().
toJobs
(
filter
).
uniqueVals
().
size
();
}
...
...
cmsWebApp/src/performa/utils/Utils.java
View file @
440f9a0c
...
...
@@ -197,7 +197,7 @@ public class Utils
@Override
public
Integer
transform
(
Client
client
)
{
return
client
.
get
Application
CountByStatus
(
jobStatus
);
return
client
.
get
Job
CountByStatus
(
jobStatus
);
}
}
...
...
cmsWebApp/webroot/extensions/adminportal/list_clients.jsp
View file @
440f9a0c
...
...
@@ -75,7 +75,7 @@
<%
for (JobStatus jobStatus : Utils.getJobStatusesForClient())
{
int jobCount = client.get
Application
CountByStatus(jobStatus);
int jobCount = client.get
Job
CountByStatus(jobStatus);
%>
<div class="<%= "application-count jl-c " + (jobCount == 0 ? "opaque-jobcount" : "")%>">
<oneit:toString value="<%= jobCount %>" mode="EscapeHTML" nullValue="0"/>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment