Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Sign in
Toggle navigation
R
red-ci-cd
Project overview
Project overview
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
red-group-test
red-ci-cd
Commits
c961b6ee
Commit
c961b6ee
authored
Mar 19, 2020
by
John Red Medrano
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'red-develop' into 'feature/RMS.v2.1-AMS'
Red develop See merge request rms/Backend/api-main-service!1009
parents
e63c7383
920fa1a7
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
app/applicationlayer/ams/asset/serializers.py
app/applicationlayer/ams/asset/serializers.py
+1
-1
No files found.
app/applicationlayer/ams/asset/serializers.py
View file @
c961b6ee
...
...
@@ -9,7 +9,7 @@ class AMSAssetSerializer(serializers.ModelSerializer):
ret
[
'asset_type'
]
=
instance
.
asset_type
.
name
ret
[
'in_qty'
]
=
instance
.
ams_asset_to_assetdetail
.
filter
(
status
=
'In-Store'
)
.
count
()
ret
[
'out_qty'
]
=
instance
.
ams_asset_to_assetdetail
.
filter
(
status
=
'Deployed'
)
.
count
()
ret
[
'unavailable'
]
=
instance
.
ams_asset_to_asset
group
.
filter
(
ret
[
'unavailable'
]
=
instance
.
ams_asset_to_asset
detail
.
filter
(
status__in
=
[
'Faulty'
,
'Returned'
,
'Written Off'
]
)
.
count
()
ret
[
'created_by'
]
=
instance
.
created_by
.
name
...
...
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