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
6fc9861f
Commit
6fc9861f
authored
Sep 24, 2019
by
Gladys Forte
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Template Edit
parent
b5cab699
Changes
7
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
200 additions
and
138 deletions
+200
-138
app/applicationlayer/cms/form/views.py
app/applicationlayer/cms/form/views.py
+2
-2
app/applicationlayer/cms/template/serializers.py
app/applicationlayer/cms/template/serializers.py
+11
-11
app/applicationlayer/cms/template/views.py
app/applicationlayer/cms/template/views.py
+63
-86
app/applicationlayer/cms/utils_cr.py
app/applicationlayer/cms/utils_cr.py
+1
-1
app/businesslayer/changerequest/change_request_template.py
app/businesslayer/changerequest/change_request_template.py
+87
-0
app/entities/migrations/0007_auto_20190924_1206.py
app/entities/migrations/0007_auto_20190924_1206.py
+33
-0
app/entities/models.py
app/entities/models.py
+3
-38
No files found.
app/applicationlayer/cms/form/views.py
View file @
6fc9861f
...
@@ -610,14 +610,14 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
...
@@ -610,14 +610,14 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
# get pk
# get pk
frm_id
=
models
.
ChangeRequestFormHeader
.
objects
.
get
(
form_code
=
form_code
)
frm_id
=
models
.
ChangeRequestFormHeader
.
objects
.
get
(
form_code
=
form_code
)
# generate batchno history
# generate batchno history
batchno
=
get_max_batchno
(
"batch"
)
batchno
=
get_max_batchno
(
"batch"
)
# get old data
# get old data
old_instance
=
models
.
ChangeRequestFormHeader
.
objects
.
filter
(
old_instance
=
models
.
ChangeRequestFormHeader
.
objects
.
filter
(
form_code
=
form_code
)
.
values
()
form_code
=
form_code
)
.
values
()
old_instance
=
list
(
old_instance
)
old_instance
=
list
(
old_instance
)
# get data CR Form Header
# get data CR Form Header
...
...
app/applicationlayer/cms/template/serializers.py
View file @
6fc9861f
...
@@ -10,7 +10,7 @@ class ChangeRequestTemplateApproversSerializer(
...
@@ -10,7 +10,7 @@ class ChangeRequestTemplateApproversSerializer(
class
Meta
:
class
Meta
:
model
=
models
.
ChangeRequestTemplateApprovers
model
=
models
.
ChangeRequestTemplateApprovers
fields
=
'__all__'
fields
=
'__all__'
read_only_fields
=
[
'created'
,
'
archived_at'
,
'
code'
]
read_only_fields
=
[
'created'
,
'code'
]
class
ChangeRequestTemplateStakeHoldersSerializer
(
class
ChangeRequestTemplateStakeHoldersSerializer
(
...
@@ -19,7 +19,7 @@ class ChangeRequestTemplateStakeHoldersSerializer(
...
@@ -19,7 +19,7 @@ class ChangeRequestTemplateStakeHoldersSerializer(
class
Meta
:
class
Meta
:
model
=
models
.
ChangeRequestTemplateStakeHolders
model
=
models
.
ChangeRequestTemplateStakeHolders
fields
=
'__all__'
fields
=
'__all__'
read_only_fields
=
[
'created'
,
'
archived_at'
,
'
code'
]
read_only_fields
=
[
'created'
,
'code'
]
class
ChangeRequestTemplateAttachmentsSerializer
(
class
ChangeRequestTemplateAttachmentsSerializer
(
...
@@ -28,7 +28,7 @@ class ChangeRequestTemplateAttachmentsSerializer(
...
@@ -28,7 +28,7 @@ class ChangeRequestTemplateAttachmentsSerializer(
class
Meta
:
class
Meta
:
model
=
models
.
ChangeRequestTemplateAttachments
model
=
models
.
ChangeRequestTemplateAttachments
fields
=
'__all__'
fields
=
'__all__'
read_only_fields
=
[
'created'
,
'
archived_at'
,
'
code'
]
read_only_fields
=
[
'created'
,
'code'
]
class
ChangeRequestTemplateDetailsSerializer
(
class
ChangeRequestTemplateDetailsSerializer
(
...
@@ -37,20 +37,20 @@ class ChangeRequestTemplateDetailsSerializer(
...
@@ -37,20 +37,20 @@ class ChangeRequestTemplateDetailsSerializer(
class
Meta
:
class
Meta
:
model
=
models
.
ChangeRequestTemplateDetails
model
=
models
.
ChangeRequestTemplateDetails
fields
=
'__all__'
fields
=
'__all__'
read_only_fields
=
[
'created'
,
'archived_at'
,
'code'
]
read_only_fields
=
[
'created'
,
'code'
]
# comment
class
ChangeRequestTemplatesSerializer
(
class
ChangeRequestTemplatesSerializer
(
WritableNested
ModelSerializer
serializers
.
ModelSerializer
):
):
tmp_approvers
=
ChangeRequestTemplateApproversSerializer
(
tmp_approvers
=
ChangeRequestTemplateApproversSerializer
(
many
=
True
,
re
quired
=
Fals
e
)
many
=
True
,
re
ad_only
=
Tru
e
)
tmp_stakes
=
ChangeRequestTemplateStakeHoldersSerializer
(
tmp_stakes
=
ChangeRequestTemplateStakeHoldersSerializer
(
many
=
True
,
re
quired
=
Fals
e
)
many
=
True
,
re
ad_only
=
Tru
e
)
tmp_attachments
=
ChangeRequestTemplateAttachmentsSerializer
(
tmp_attachments
=
ChangeRequestTemplateAttachmentsSerializer
(
many
=
True
,
re
quired
=
Fals
e
)
many
=
True
,
re
ad_only
=
Tru
e
)
tmp_details
=
ChangeRequestTemplateDetailsSerializer
(
tmp_details
=
ChangeRequestTemplateDetailsSerializer
(
many
=
True
,
re
quired
=
Fals
e
)
many
=
True
,
re
ad_only
=
Tru
e
)
class
Meta
:
class
Meta
:
model
=
models
.
ChangeRequestTemplateHeader
model
=
models
.
ChangeRequestTemplateHeader
...
@@ -63,4 +63,4 @@ class ChangeRequestTemplatesSerializer(
...
@@ -63,4 +63,4 @@ class ChangeRequestTemplatesSerializer(
'created_by_user'
,
'created_by_department'
,
'tmp_approvers'
,
'created_by_user'
,
'created_by_department'
,
'tmp_approvers'
,
'tmp_stakes'
,
'tmp_attachments'
,
'tmp_details'
)
'tmp_stakes'
,
'tmp_attachments'
,
'tmp_details'
)
read_only_fields
=
[
'created'
,
'archived_at'
,
'template_no'
]
read_only_fields
=
[
'created'
,
'template_no'
]
\ No newline at end of file
\ No newline at end of file
app/applicationlayer/cms/template/views.py
View file @
6fc9861f
This diff is collapsed.
Click to expand it.
app/applicationlayer/cms/utils_cr.py
View file @
6fc9861f
...
@@ -22,7 +22,7 @@ CR_FRONT_LINK = settings.CR_FRONT_LINK
...
@@ -22,7 +22,7 @@ CR_FRONT_LINK = settings.CR_FRONT_LINK
def
entity_log_bulk
(
queryset
,
entity
,
tbl
):
def
entity_log_bulk
(
queryset
,
entity
,
tbl
):
try
:
try
:
print
(
entity
)
#
print(entity)
for
data
in
queryset
:
for
data
in
queryset
:
test
=
model_to_dict
(
data
)
test
=
model_to_dict
(
data
)
log_save
(
log_save
(
...
...
app/businesslayer/changerequest/change_request_template.py
0 → 100644
View file @
6fc9861f
from
django.shortcuts
import
render
from
app.entities
import
models
from
app.applicationlayer
import
paginators
from
datetime
import
datetime
from
rest_framework.response
import
Response
from
rest_framework
import
status
,
views
from
rest_framework.decorators
import
action
from
django.http
import
Http404
from
django.db.models
import
Q
from
app.applicationlayer.cms.utils_cr
import
(
number_generator
,
crhistory_save
,
entity_log_bulk
)
from
django.forms.models
import
model_to_dict
from
app.entities
import
enums
,
models
from
app.applicationlayer.utils
import
log_save
,
CustomPagination
from
app.applicationlayer.cms.template
import
serializers
def
tmp_add_edit_delete
(
tmp_request_body
,
queryset
,
enum_type
,
serializer_data
,
partial
,
self
,
template_no
):
# delete ids not in request body
request_ids
=
[
i
[
'id'
]
for
i
in
tmp_request_body
if
"id"
in
i
]
delete_query
=
queryset
.
objects
.
filter
(
template_no
=
template_no
)
.
exclude
(
id__in
=
request_ids
)
if
delete_query
.
count
()
>
0
:
entity_log_bulk
(
delete_query
,
enum_type
,
queryset
)
# update or create
for
i
in
tmp_request_body
:
if
"id"
in
i
:
tmp_instance
=
queryset
.
objects
.
get
(
pk
=
i
[
'id'
]
)
serializer
=
serializer_data
(
tmp_instance
,
data
=
i
,
partial
=
partial
)
serializer
.
is_valid
(
raise_exception
=
True
)
old_instance
=
model_to_dict
(
tmp_instance
)
self
.
perform_update
(
serializer
)
new_instance
=
serializer
.
data
log_save
(
enums
.
LogEnum
.
UPDATE
.
value
,
enum_type
,
i
[
'id'
],
old_instance
,
new_instance
)
else
:
serializer
=
serializer_data
(
data
=
i
)
serializer
.
is_valid
(
raise_exception
=
True
)
self
.
perform_create
(
serializer
)
new_instance
=
serializer
.
data
log_save
(
enums
.
LogEnum
.
ADD
.
value
,
enum_type
,
new_instance
[
'id'
],
''
,
new_instance
)
return
True
app/entities/migrations/0007_auto_20190924_1206.py
0 → 100644
View file @
6fc9861f
# Generated by Django 2.2 on 2019-09-24 12:06
from
django.db
import
migrations
class
Migration
(
migrations
.
Migration
):
dependencies
=
[
(
'entities'
,
'0006_auto_20190920_1623'
),
]
operations
=
[
migrations
.
RemoveField
(
model_name
=
'changerequesttemplateapprovers'
,
name
=
'archived_at'
,
),
migrations
.
RemoveField
(
model_name
=
'changerequesttemplateattachments'
,
name
=
'archived_at'
,
),
migrations
.
RemoveField
(
model_name
=
'changerequesttemplatedetails'
,
name
=
'archived_at'
,
),
migrations
.
RemoveField
(
model_name
=
'changerequesttemplateheader'
,
name
=
'archived_at'
,
),
migrations
.
RemoveField
(
model_name
=
'changerequesttemplatestakeholders'
,
name
=
'archived_at'
,
),
]
app/entities/models.py
View file @
6fc9861f
...
@@ -504,10 +504,6 @@ class ChangeRequestTemplateHeader(BaseHeader):
...
@@ -504,10 +504,6 @@ class ChangeRequestTemplateHeader(BaseHeader):
blank
=
True
,
blank
=
True
,
null
=
True
)
null
=
True
)
archived_at
=
models
.
DateTimeField
(
blank
=
True
,
null
=
True
)
class
Meta
:
class
Meta
:
db_table
=
'change_request_template_headers'
db_table
=
'change_request_template_headers'
...
@@ -522,10 +518,6 @@ class ChangeRequestTemplateHeader(BaseHeader):
...
@@ -522,10 +518,6 @@ class ChangeRequestTemplateHeader(BaseHeader):
self
.
template_no
=
code
self
.
template_no
=
code
self
.
save
()
self
.
save
()
def
delete
(
self
):
self
.
archived_at
=
datetime
.
utcnow
self
.
save
()
class
ChangeRequestTemplateApprovers
(
BaseApprover
):
class
ChangeRequestTemplateApprovers
(
BaseApprover
):
code
=
models
.
CharField
(
code
=
models
.
CharField
(
...
@@ -536,10 +528,7 @@ class ChangeRequestTemplateApprovers(BaseApprover):
...
@@ -536,10 +528,7 @@ class ChangeRequestTemplateApprovers(BaseApprover):
on_delete
=
models
.
DO_NOTHING
,
on_delete
=
models
.
DO_NOTHING
,
to_field
=
'template_no'
,
to_field
=
'template_no'
,
related_name
=
'tmp_approvers'
)
related_name
=
'tmp_approvers'
)
archived_at
=
models
.
DateTimeField
(
blank
=
True
,
null
=
True
)
class
Meta
:
class
Meta
:
db_table
=
'change_request_template_approvers'
db_table
=
'change_request_template_approvers'
...
@@ -555,9 +544,6 @@ class ChangeRequestTemplateApprovers(BaseApprover):
...
@@ -555,9 +544,6 @@ class ChangeRequestTemplateApprovers(BaseApprover):
self
.
created
=
datetime
.
now
()
self
.
created
=
datetime
.
now
()
self
.
save
()
self
.
save
()
def
delete
(
self
):
self
.
archived_at
=
datetime
.
utcnow
self
.
save
()
class
ChangeRequestTemplateStakeHolders
(
BaseStakeholder
):
class
ChangeRequestTemplateStakeHolders
(
BaseStakeholder
):
code
=
models
.
CharField
(
code
=
models
.
CharField
(
...
@@ -568,10 +554,7 @@ class ChangeRequestTemplateStakeHolders(BaseStakeholder):
...
@@ -568,10 +554,7 @@ class ChangeRequestTemplateStakeHolders(BaseStakeholder):
on_delete
=
models
.
DO_NOTHING
,
on_delete
=
models
.
DO_NOTHING
,
to_field
=
'template_no'
,
to_field
=
'template_no'
,
related_name
=
'tmp_stakes'
)
related_name
=
'tmp_stakes'
)
archived_at
=
models
.
DateTimeField
(
blank
=
True
,
null
=
True
)
class
Meta
:
class
Meta
:
db_table
=
'change_request_template_stakeholders'
db_table
=
'change_request_template_stakeholders'
...
@@ -586,10 +569,6 @@ class ChangeRequestTemplateStakeHolders(BaseStakeholder):
...
@@ -586,10 +569,6 @@ class ChangeRequestTemplateStakeHolders(BaseStakeholder):
self
.
code
=
code
self
.
code
=
code
self
.
created
=
datetime
.
now
()
self
.
created
=
datetime
.
now
()
self
.
save
()
self
.
save
()
def
delete
(
self
):
self
.
archived_at
=
datetime
.
utcnow
self
.
save
()
class
ChangeRequestTemplateAttachments
(
BaseAttachment
):
class
ChangeRequestTemplateAttachments
(
BaseAttachment
):
...
@@ -601,9 +580,6 @@ class ChangeRequestTemplateAttachments(BaseAttachment):
...
@@ -601,9 +580,6 @@ class ChangeRequestTemplateAttachments(BaseAttachment):
on_delete
=
models
.
DO_NOTHING
,
on_delete
=
models
.
DO_NOTHING
,
to_field
=
'template_no'
,
to_field
=
'template_no'
,
related_name
=
'tmp_attachments'
)
related_name
=
'tmp_attachments'
)
archived_at
=
models
.
DateTimeField
(
blank
=
True
,
null
=
True
)
class
Meta
:
class
Meta
:
db_table
=
'change_request_template_attachments'
db_table
=
'change_request_template_attachments'
...
@@ -620,10 +596,6 @@ class ChangeRequestTemplateAttachments(BaseAttachment):
...
@@ -620,10 +596,6 @@ class ChangeRequestTemplateAttachments(BaseAttachment):
self
.
created
=
datetime
.
now
()
self
.
created
=
datetime
.
now
()
self
.
save
()
self
.
save
()
def
delete
(
self
):
self
.
archived_at
=
datetime
.
utcnow
self
.
save
()
class
ChangeRequestTemplateDetails
(
BaseDetails
):
class
ChangeRequestTemplateDetails
(
BaseDetails
):
code
=
models
.
CharField
(
code
=
models
.
CharField
(
...
@@ -634,10 +606,7 @@ class ChangeRequestTemplateDetails(BaseDetails):
...
@@ -634,10 +606,7 @@ class ChangeRequestTemplateDetails(BaseDetails):
on_delete
=
models
.
DO_NOTHING
,
on_delete
=
models
.
DO_NOTHING
,
to_field
=
'template_no'
,
to_field
=
'template_no'
,
related_name
=
'tmp_details'
)
related_name
=
'tmp_details'
)
archived_at
=
models
.
DateTimeField
(
blank
=
True
,
null
=
True
)
class
Meta
:
class
Meta
:
db_table
=
'change_request_template_details'
db_table
=
'change_request_template_details'
...
@@ -653,10 +622,6 @@ class ChangeRequestTemplateDetails(BaseDetails):
...
@@ -653,10 +622,6 @@ class ChangeRequestTemplateDetails(BaseDetails):
self
.
created
=
datetime
.
now
()
self
.
created
=
datetime
.
now
()
self
.
save
()
self
.
save
()
def
delete
(
self
):
self
.
archived_at
=
datetime
.
utcnow
self
.
save
()
'''
'''
*****
*****
FORMS
FORMS
...
...
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