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
7ddd8df1
Commit
7ddd8df1
authored
Mar 17, 2020
by
Gladys Forte
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
{devbugfix} counts ams list
parent
0d85f7af
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
4 deletions
+21
-4
app/applicationlayer/ams/asset_group/serializers.py
app/applicationlayer/ams/asset_group/serializers.py
+11
-2
app/applicationlayer/ams/asset_type/serializers.py
app/applicationlayer/ams/asset_type/serializers.py
+9
-2
app/entities/models.py
app/entities/models.py
+1
-0
No files found.
app/applicationlayer/ams/asset_group/serializers.py
View file @
7ddd8df1
...
...
@@ -7,8 +7,17 @@ class AssetGroupSerializer(serializers.ModelSerializer):
def
to_representation
(
self
,
instance
):
ret
=
super
()
.
to_representation
(
instance
)
ret
[
'asset_type_count'
]
=
0
ret
[
'asset_count'
]
=
0
asset_stocks
=
models
.
AMSAssetStock
.
objects
.
filter
(
asset_group
=
instance
.
code
)
asset_counter
=
0
asset_type_counter
=
0
for
asset_stock
in
asset_stocks
:
asset_counter
=
asset_counter
+
models
.
AMSAsset
.
objects
.
filter
(
code
=
asset_stock
.
asset
.
code
)
.
count
()
asset_type_counter
=
asset_type_counter
+
1
ret
[
'asset_type_count'
]
=
asset_type_counter
ret
[
'asset_count'
]
=
asset_counter
ret
[
'asset_stock_count'
]
=
instance
.
ams_asset_to_assetgroup
.
count
()
return
ret
...
...
app/applicationlayer/ams/asset_type/serializers.py
View file @
7ddd8df1
...
...
@@ -7,8 +7,15 @@ class AssetTypeSerializer(serializers.ModelSerializer):
def
to_representation
(
self
,
instance
):
ret
=
super
()
.
to_representation
(
instance
)
ret
[
'asset_count'
]
=
instance
.
ams_asset_type
.
count
()
ret
[
'asset_stock_count'
]
=
0
assets
=
instance
.
ams_asset_type
.
select_related
()
ams_stock_counter
=
0
for
asset
in
assets
:
ams_stock_counter
=
ams_stock_counter
+
models
.
AMSAsset
.
objects
.
get
(
code
=
asset
.
code
)
.
ams_asset_to_assetdetail
.
count
()
ret
[
'asset_count'
]
=
assets
.
count
()
ret
[
'asset_stock_count'
]
=
ams_stock_counter
return
ret
...
...
app/entities/models.py
View file @
7ddd8df1
...
...
@@ -1358,6 +1358,7 @@ class AMSAsset(models.Model):
to_field
=
'code'
,
related_name
=
'ams_asset_type'
)
# asset_type = models.ManyToManyField(AMSAssetType)
description
=
models
.
CharField
(
blank
=
True
,
null
=
True
,
...
...
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