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
601ffb7e
Commit
601ffb7e
authored
Oct 03, 2019
by
John Red Medrano
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
replace values of column header at download of form, replace the return of history:
parent
23cb7d79
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
85 additions
and
29 deletions
+85
-29
app/applicationlayer/cms/form/download/serializers.py
app/applicationlayer/cms/form/download/serializers.py
+41
-8
app/applicationlayer/cms/form/download/views.py
app/applicationlayer/cms/form/download/views.py
+1
-0
app/applicationlayer/cms/form/header/views.py
app/applicationlayer/cms/form/header/views.py
+43
-21
No files found.
app/applicationlayer/cms/form/download/serializers.py
View file @
601ffb7e
...
...
@@ -3,19 +3,52 @@ from rest_framework import serializers
class
headers
(
serializers
.
ModelSerializer
):
def
to_representation
(
self
,
instance
):
setattr
(
instance
,
'created'
,
instance
.
created
.
strftime
(
'
%
Y-
%
m-
%
d-
%
H:
%
M:
%
S'
)
)
setattr
(
instance
,
'requested_to_target_date'
,
instance
.
requested_to_target_date
.
strftime
(
'
%
Y-
%
m-
%
d-
%
H:
%
M:
%
S'
)
)
return
super
()
.
to_representation
(
instance
)
ret
=
super
()
.
to_representation
(
instance
)
try
:
user
=
self
.
context
[
'request'
]
.
user
id_number
=
user
.
code
current_level
=
models
.
ChangeRequestFormApprovers
.
objects
.
filter
(
Q
(
form_code
=
ret
[
'form_code'
])
&
(
Q
(
action
=
''
)
|
Q
(
action
=
None
))
)
.
order_by
(
'level'
)
if
current_level
.
count
()
>
0
and
current_level
[
0
]
.
user
.
code
==
id_number
:
if
instance
.
status
.
lower
()
==
'rejected'
:
approver
=
'No'
elif
instance
.
status
.
lower
()
==
'cancelled'
:
approver
=
'No'
elif
instance
.
status
.
lower
()
==
'closed'
:
approver
=
'No'
else
:
approver
=
'Yes'
else
:
approver
=
'No'
ret
[
'action_required'
]
=
approver
ret
[
'company'
]
=
instance
.
requested_to_company
.
name
ret
[
'department'
]
=
instance
.
requested_to_department
.
name
ret
[
'requested_by'
]
=
instance
.
requested_by_user
.
name
ret
[
'requested_to_target_date'
]
=
instance
.
requested_to_target_date
.
strftime
(
'
%
Y-
%
m-
%
d-
%
H:
%
M:
%
S'
)
ret
[
'created'
]
=
instance
.
created
.
strftime
(
'
%
Y-
%
m-
%
d-
%
H:
%
M:
%
S'
)
return
ret
except
Exception
as
e
:
ret
[
'action_required'
]
=
"No"
ret
[
'company'
]
=
"None"
ret
[
'department'
]
=
"None"
ret
[
'requested_by'
]
=
"None"
return
ret
class
Meta
:
model
=
models
.
ChangeRequestFormHeader
fields
=
(
'requested_to_template_id'
,
'requested_to_template_name'
,
'company_desc'
,
'department_desc'
,
...
...
app/applicationlayer/cms/form/download/views.py
View file @
601ffb7e
...
...
@@ -70,6 +70,7 @@ class DownloadRequest(XLSXFileMixin, ReadOnlyModelViewSet):
column_header
=
{
'titles'
:
[
"Cr Number"
,
"Name"
,
"Company Request To"
,
"Department Requested To"
,
...
...
app/applicationlayer/cms/form/header/views.py
View file @
601ffb7e
...
...
@@ -1120,31 +1120,53 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
# list_his.append()
x
=
data
[
'toValue'
]
.
replace
(
"'"
,
'"'
)
.
replace
(
'None'
,
'""'
)
convert
=
json
.
loads
(
x
)
print
(
convert
)
user_id
=
convert
[
'user'
]
user_instance
=
models
.
User
.
objects
.
get
(
code
=
str
(
user_id
)
)
name
=
user_instance
.
name
department
=
user_instance
.
department
.
name
company
=
user_instance
.
department
.
company
.
name
date_sent
=
convert
[
'action_date'
]
delegation
=
convert
[
'delegation'
]
action
=
convert
[
'action'
]
remarks
=
convert
[
'remarks'
]
#
print(convert)
#
user_id = convert['user']
#
user_instance = models.User.objects.get(
#
code=str(user_id)
#
)
#
name = user_instance.name
#
department = user_instance.department.name
#
company = user_instance.department.company.name
#
date_sent = convert['action_date']
#
delegation = convert['delegation']
#
action = convert['action']
#
remarks = convert['remarks']
history_dict
=
{
"name"
:
name
,
"department"
:
department
,
"company"
:
co
mpany
,
"date_sent"
:
date_sent
,
"delegation"
:
delegation
,
"action"
:
action
,
"remarks"
:
remarks
,
"name"
:
convert
[
'user'
][
'name'
]
,
"department"
:
convert
[
'department'
][
'name'
]
,
"company"
:
co
nvert
[
'company'
][
'name'
]
,
"date_sent"
:
convert
[
'date_sent'
]
,
"delegation"
:
convert
[
'delegation'
]
,
"action"
:
convert
[
'action'
]
,
"remarks"
:
convert
[
'remarks'
]
}
list_his
.
append
(
history_dict
)
# self.serializer_class =
test
=
ChangeRequestFormApproversSerializer
(
list_his
)
# test.is_valid(raise_exception=False)
# page = self.paginate_queryset(test)
# serializer = self.get_serializer(page, many=True)
# id_number = self.request.user.code
# self.queryset = change_request.list_by_user(id_number)
# self.queryset = change_request.filter_base(
# self.queryset,
# request.query_params.get('company_requested_to'),
# request.query_params.get('department_requested_to'),
# request.query_params.get('date_modified_from'),
# request.query_params.get('date_modified_to'),
# request.query_params.get('date_required_from'),
# request.query_params.get('date_required_to'),
# request.query_params.get('form_type'),
# )
# queryset = self.filter_queryset(self.queryset)
return
Response
(
...
...
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