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
3df0fb89
Commit
3df0fb89
authored
Mar 17, 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!981
parents
951ae477
c0e9a1b9
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
91 additions
and
2 deletions
+91
-2
app/applicationlayer/ams/asset/serializers.py
app/applicationlayer/ams/asset/serializers.py
+22
-0
app/applicationlayer/ams/asset/table_filters.py
app/applicationlayer/ams/asset/table_filters.py
+9
-0
app/applicationlayer/ams/asset/views.py
app/applicationlayer/ams/asset/views.py
+56
-0
app/entities/models.py
app/entities/models.py
+4
-2
No files found.
app/applicationlayer/ams/asset/serializers.py
View file @
3df0fb89
from
app.entities.models
import
AMSAsset
from
rest_framework
import
serializers
class
AMSAssetSerializer
(
serializers
.
ModelSerializer
):
def
to_representation
(
self
,
instance
):
ret
=
super
()
.
to_representation
(
instance
)
ret
[
'asset_type'
]
=
instance
.
asset_type
.
name
return
ret
class
Meta
:
model
=
AMSAsset
fields
=
(
'code'
'name'
,
'asset_type'
,
)
read_only_fields
=
(
'created'
,
)
\ No newline at end of file
app/applicationlayer/ams/asset/table_filters.py
View file @
3df0fb89
from
django_filters
import
rest_framework
as
filters
from
app.entities.models
import
AMSAsset
class
AMSAssetFilter
(
filters
.
FilterSet
):
class
Meta
:
model
=
AMSAsset
fields
=
'__all__'
\ No newline at end of file
app/applicationlayer/ams/asset/views.py
View file @
3df0fb89
from
app.entities.models
import
AMSAsset
from
rest_framework
import
viewsets
,
status
from
rest_framework.response
import
Response
from
django_filters
import
rest_framework
as
filters
from
django_filters.rest_framework
import
DjangoFilterBackend
from
rest_framework.filters
import
SearchFilter
,
OrderingFilter
from
app.applicationlayer.ams.asset.table_filters
import
AMSAssetFilter
from
app.applicationlayer.ams.asset
import
serializers
from
app.applicationlayer.utils
import
(
CustomPagination
,
status_message_response
)
class
AMSAssetViewSet
(
viewsets
.
ModelViewSet
):
queryset
=
models
.
AMSAsset
.
objects
serializer_class
=
serializers
.
AMSAssetSerializer
pagination_class
=
CustomPagination
lookup_field
=
'code'
filter_backends
(
DjangoFilterBackend
,
SearchFilter
,
OrderingFilter
)
ordering_fields
=
'__all__'
search_filter
=
(
'code'
,
'name'
,
'asset_type__name'
)
def
list
(
self
,
request
,
*
args
,
**
kwargs
):
queryset
=
self
.
filter_queryset
(
self
.
get_queryset
())
page
=
self
.
paginate_queryset
(
queryset
)
if
page
is
not
None
:
serializer
=
self
.
get_serializer
(
page
,
many
=
True
)
message
=
status_message_response
(
200
,
'success'
,
'List of Asset found!'
,
serializer
.
data
)
return
self
.
get_paginated_response
(
message
)
serializer
=
self
.
get_serializer
(
self
.
queryset
,
many
=
True
)
return
Response
(
serializer
.
data
,
status
=
status
.
HTTP_200_OK
)
app/entities/models.py
View file @
3df0fb89
...
...
@@ -1458,12 +1458,14 @@ class AMSAssetStock(models.Model):
asset
=
models
.
ForeignKey
(
AMSAsset
,
on_delete
=
models
.
CASCADE
,
to_field
=
'code'
to_field
=
'code'
,
related_name
=
'ams_asset_to_assetdetail'
)
asset_group
=
models
.
ForeignKey
(
AMSAssetGroup
,
on_delete
=
models
.
CASCADE
,
to_field
=
'code'
to_field
=
'code'
,
related_name
=
'ams_asset_to_assetgroup'
)
created
=
models
.
DateTimeField
(
auto_now_add
=
True
)
deleted_at
=
models
.
DateTimeField
(
null
=
True
,
blank
=
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