Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
I
inspect_report
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
zhengjinlei
inspect_report
Commits
433870b2
Commit
433870b2
authored
Apr 24, 2020
by
lvshibao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
scores页面修改
parent
a77bb5e9
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
+3
-2
tasksapi.py
src/inspect_report/api/tasksapi.py
+3
-2
No files found.
src/inspect_report/api/tasksapi.py
View file @
433870b2
...
@@ -54,7 +54,7 @@ class TasksApi(viewsets.ViewSet):
...
@@ -54,7 +54,7 @@ class TasksApi(viewsets.ViewSet):
seat_ids
=
SeatStat
.
objects
.
filter
(
**
session_condition
)
.
values_list
(
'agentName'
,
flat
=
True
)
seat_ids
=
SeatStat
.
objects
.
filter
(
**
session_condition
)
.
values_list
(
'agentName'
,
flat
=
True
)
seat_id_names
=
Seat
.
objects
.
filter
(
code__in
=
seat_ids
)
.
values
(
'code'
,
'name'
)
seat_id_names
=
Seat
.
objects
.
filter
(
code__in
=
seat_ids
)
.
values
(
'code'
,
'name'
)
seat_ids_with_name
=
[
x
[
'code'
]
for
x
in
seat_id_names
]
seat_ids_with_name
=
[
x
[
'code'
]
for
x
in
seat_id_names
]
extra
=
[
({
'code'
:
seat_id
,
'name'
:
seat_id
}
for
seat_id
in
seat_ids
if
seat_id
not
in
seat_ids_with_name
)
]
extra
=
[
{
'code'
:
seat_id
,
'name'
:
seat_id
}
for
seat_id
in
seat_ids
if
seat_id
not
in
seat_ids_with_name
]
return
Response
({
'code'
:
0
,
'msg'
:
'success'
,
'data'
:
list
(
seat_id_names
)
+
extra
})
return
Response
({
'code'
:
0
,
'msg'
:
'success'
,
'data'
:
list
(
seat_id_names
)
+
extra
})
@
action
([
'post'
],
detail
=
False
)
@
action
([
'post'
],
detail
=
False
)
...
@@ -463,7 +463,8 @@ class TasksApi(viewsets.ViewSet):
...
@@ -463,7 +463,8 @@ class TasksApi(viewsets.ViewSet):
task_condition
[
'task__in'
]
=
team_names
task_condition
[
'task__in'
]
=
team_names
call_count
=
SeatStat
.
objects
.
filter
(
**
task_condition
)
.
aggregate
(
Sum
(
"validate_session"
))[
'validate_session__sum'
]
call_count
=
SeatStat
.
objects
.
filter
(
**
task_condition
)
.
aggregate
(
Sum
(
"validate_session"
))[
'validate_session__sum'
]
# tasks = RulesStat.objects.filter(**task_condition).values('rule', 'sessionCollectionId', 'rule_num')
# tasks = RulesStat.objects.filter(**task_condition).values('rule', 'sessionCollectionId', 'rule_num')
tasks
=
RulesStat
.
objects
.
all
()
.
filter
(
**
task_condition
)
\
tasks
=
RulesStat
.
objects
.
all
()
.
filter
(
**
task_condition
)
\
...
...
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