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
00934f9c
Commit
00934f9c
authored
Nov 13, 2019
by
Gladys Forte
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mr. clean
parent
e558a2e2
Changes
12
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
7 additions
and
50 deletions
+7
-50
app/applicationlayer/cms/allowed_company/views.py
app/applicationlayer/cms/allowed_company/views.py
+0
-3
app/applicationlayer/cms/auto_email/reminder.py
app/applicationlayer/cms/auto_email/reminder.py
+1
-1
app/applicationlayer/cms/form/download/serializers.py
app/applicationlayer/cms/form/download/serializers.py
+0
-1
app/applicationlayer/cms/form/header/views.py
app/applicationlayer/cms/form/header/views.py
+2
-5
app/applicationlayer/cms/form/views.py
app/applicationlayer/cms/form/views.py
+2
-5
app/applicationlayer/cms/master/form/account/views.py
app/applicationlayer/cms/master/form/account/views.py
+1
-7
app/applicationlayer/cms/master/form/company/views.py
app/applicationlayer/cms/master/form/company/views.py
+1
-3
app/applicationlayer/cms/utils_cr.py
app/applicationlayer/cms/utils_cr.py
+0
-2
app/applicationlayer/download/accounts/serializers.py
app/applicationlayer/download/accounts/serializers.py
+0
-3
app/applicationlayer/management/company/views.py
app/applicationlayer/management/company/views.py
+0
-1
app/applicationlayer/management/notification/views.py
app/applicationlayer/management/notification/views.py
+0
-1
app/entities/models.py
app/entities/models.py
+0
-18
No files found.
app/applicationlayer/cms/allowed_company/views.py
View file @
00934f9c
...
...
@@ -85,7 +85,6 @@ class AllowedCompanyViewSet(viewsets.ModelViewSet):
return
Response
(
message
,
status
=
status
.
HTTP_400_BAD_REQUEST
)
except
IntegrityError
as
e
:
print
(
str
(
e
))
error
=
'Adding the same Department under the same Company is not allowed'
message
=
{
'code'
:
400
,
...
...
@@ -96,8 +95,6 @@ class AllowedCompanyViewSet(viewsets.ModelViewSet):
status
=
status
.
HTTP_400_BAD_REQUEST
)
except
Exception
as
e
:
# print(str(e))
# error = 'adding the same departments under same Company is not allowed'
message
=
{
'code'
:
500
,
'status'
:
'failed'
,
...
...
app/applicationlayer/cms/auto_email/reminder.py
View file @
00934f9c
...
...
@@ -26,7 +26,7 @@ class ReminderTriggerAPIView(views.APIView):
Q
(
date_to__lte
=
date_now
.
strftime
(
'
%
Y-
%
m-
%
d 00:00:00.000'
))
&
Q
(
date_to_send
=
date_now
.
strftime
(
'
%
Y-
%
m-
%
d 00:00:00.000'
))
)
# print(today_mail)
list_of_emails
=
[]
for
data
in
today_mail
:
if
data
.
frm_approver
.
is_action
==
True
and
data
.
form_code
.
status
==
'Pending'
:
...
...
app/applicationlayer/cms/form/download/serializers.py
View file @
00934f9c
...
...
@@ -38,7 +38,6 @@ class headers(serializers.ModelSerializer):
ret
[
'created'
]
=
instance
.
created
.
strftime
(
'
%
Y-
%
m-
%
d-
%
H:
%
M:
%
S'
)
ret
[
'action'
]
=
approver
# ret['requested_to_target_date'] = instance.requested_to_target_date.strftime('%Y-%m-%d-%H:%M:%S')
print
(
ret
)
return
ret
# except Exception as e:
# ret['action_required'] = "No"
...
...
app/applicationlayer/cms/form/header/views.py
View file @
00934f9c
...
...
@@ -693,8 +693,7 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
self
.
perform_update
(
serializer
)
new_instance
=
serializer
.
data
print
(
serializer
.
errors
)
# save history in form header
crhistory_save
(
batchno
,
...
...
@@ -818,9 +817,7 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
pk
=
instance
.
id
)
new_instance
=
model_to_dict
(
form_header
)
# print(serializer.errors)
# save history in form header
crhistory_create_save
(
batchno
,
...
...
app/applicationlayer/cms/form/views.py
View file @
00934f9c
...
...
@@ -688,8 +688,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
old_instance
=
model_to_dict
(
instance
)
self
.
perform_update
(
serializer
)
new_instance
=
serializer
.
data
print
(
serializer
.
errors
)
# save history in form header
crhistory_save
(
batchno
,
...
...
@@ -802,9 +801,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
pk
=
instance
.
id
)
new_instance
=
model_to_dict
(
form_header
)
print
(
serializer
.
errors
)
# save history in form header
crhistory_create_save
(
batchno
,
...
...
app/applicationlayer/cms/master/form/account/views.py
View file @
00934f9c
...
...
@@ -17,16 +17,10 @@ class UserListForm(APIView):
try
:
serializer
=
ChangeRequestList
dept
=
self
.
request
.
query_params
[
'department_code'
]
# company = self.request.query_params['company_code']
# allowed = models.AllowedCompany.objects.filter(
# Q(group_pivots=dept) &
# Q()
# )
user_list
=
models
.
User
.
objects
.
filter
(
department
=
dept
)
.
exclude
(
id
=
1
)
# user_list = user_list.exclude(id=request.user.id)
print
(
user_list
.
query
)
page
=
self
.
paginate_queryset
(
user_list
)
if
page
is
not
None
:
...
...
app/applicationlayer/cms/master/form/company/views.py
View file @
00934f9c
...
...
@@ -72,9 +72,7 @@ class ChangeRequestCompanyFormViewSet(viewsets.ModelViewSet):
Q
(
requested_by_user
=
id_number
)
|
Q
(
frm_stakes__user__code
=
id_number
)
)
.
values
()
# print(id_number)
# print(forms)
allowed
=
AllowedCompany
.
objects
.
filter
(
id_number
=
id_number
)
.
values
()
.
distinct
()
...
...
app/applicationlayer/cms/utils_cr.py
View file @
00934f9c
...
...
@@ -30,7 +30,6 @@ VENDOR_REJECT_MESSAGE = settings.VENDOR_REJECT_MESSAGE
def
entity_log_bulk
(
queryset
,
entity
,
tbl
):
try
:
# print(entity)
for
data
in
queryset
:
test
=
model_to_dict
(
data
)
log_save
(
...
...
@@ -461,7 +460,6 @@ def crhistory_save(batch_no, main_action,
def
crhistory_log_bulk_delete
(
queryset
,
entity
,
tbl
,
form_code
,
batch_no
,
main_action
):
try
:
# print(entity)
for
data
in
queryset
:
test
=
model_to_dict
(
data
)
crhistory_save
(
batch_no
,
...
...
app/applicationlayer/download/accounts/serializers.py
View file @
00934f9c
...
...
@@ -5,7 +5,6 @@ from django.db.models import Q
class
headers
(
serializers
.
ModelSerializer
):
def
to_representation
(
self
,
instance
):
ret
=
super
()
.
to_representation
(
instance
)
ret
[
'deparment'
]
=
instance
.
department
.
name
...
...
@@ -13,8 +12,6 @@ class headers(serializers.ModelSerializer):
return
ret
class
Meta
:
model
=
models
.
User
fields
=
(
...
...
app/applicationlayer/management/company/views.py
View file @
00934f9c
...
...
@@ -88,7 +88,6 @@ class CompanyViewSet(viewsets.ModelViewSet):
partial
=
kwargs
.
pop
(
'partial'
,
False
)
instance
=
self
.
get_object
()
print
(
request
.
data
)
serializer
=
self
.
get_serializer
(
instance
,
data
=
request
.
data
,
partial
=
partial
)
serializer
.
is_valid
(
raise_exception
=
True
)
...
...
app/applicationlayer/management/notification/views.py
View file @
00934f9c
...
...
@@ -89,7 +89,6 @@ class NotificationsViewset(meviewsets.ModelViewSet):
def
seen
(
self
,
request
,
account_no
=
None
,
**
kwargs
):
try
:
account_no
=
self
.
kwargs
[
'account_no'
]
print
(
account_no
)
models
.
Notification
.
objects
.
filter
(
account_no
=
account_no
,
id__in
=
request
.
data
[
'ids'
])
.
update
(
...
...
app/entities/models.py
View file @
00934f9c
...
...
@@ -451,33 +451,25 @@ class BaseHeader(models.Model):
Company
,
on_delete
=
models
.
PROTECT
,
to_field
=
'code'
)
requested_to_department
=
models
.
ForeignKey
(
Department
,
on_delete
=
models
.
PROTECT
,
to_field
=
'code'
)
requested_to_user
=
models
.
ForeignKey
(
User
,
on_delete
=
models
.
PROTECT
,
to_field
=
'code'
)
requested_to_template_name
=
models
.
CharField
(
max_length
=
255
)
requested_to_objective
=
models
.
CharField
(
max_length
=
255
,
blank
=
True
,
null
=
True
)
requested_to_priority
=
models
.
CharField
(
max_length
=
255
)
description
=
models
.
CharField
(
max_length
=
255
,
blank
=
True
,
null
=
True
)
created
=
models
.
DateTimeField
(
auto_now_add
=
True
)
is_active
=
models
.
BooleanField
(
default
=
True
)
class
Meta
:
...
...
@@ -486,15 +478,12 @@ class BaseHeader(models.Model):
class
BaseApprover
(
models
.
Model
):
level
=
models
.
IntegerField
()
user
=
models
.
ForeignKey
(
User
,
blank
=
True
,
null
=
True
,
on_delete
=
models
.
PROTECT
,
to_field
=
'code'
)
# delegation = models.CharField(max_length=50, blank=True, null=True)
delegation
=
models
.
ForeignKey
(
Delegation
,
blank
=
True
,
...
...
@@ -542,7 +531,6 @@ class MasterAttachment(models.Model):
class
BaseAttachment
(
models
.
Model
):
attachment_type
=
models
.
CharField
(
max_length
=
255
)
attachment_name
=
models
.
CharField
(
max_length
=
255
)
file_name
=
models
.
CharField
(
max_length
=
255
,
blank
=
True
,
...
...
@@ -579,7 +567,6 @@ class BaseDetails(models.Model):
blank
=
True
,
null
=
True
)
created
=
models
.
DateTimeField
(
blank
=
True
,
null
=
True
)
...
...
@@ -598,23 +585,19 @@ class ChangeRequestTemplateHeader(BaseHeader):
template_no
=
models
.
CharField
(
unique
=
True
,
max_length
=
255
)
requested_to_template_id
=
models
.
CharField
(
max_length
=
255
,
unique
=
True
)
created_by_user
=
models
.
ForeignKey
(
User
,
on_delete
=
models
.
PROTECT
,
to_field
=
'code'
,
related_name
=
'created_by_user'
)
created_by_department
=
models
.
ForeignKey
(
Department
,
on_delete
=
models
.
PROTECT
,
to_field
=
'code'
,
related_name
=
'created_by_department'
)
requested_to_target_date
=
models
.
IntegerField
()
class
Meta
:
...
...
@@ -787,7 +770,6 @@ class ChangeRequestFormHeader(BaseHeader):
on_delete
=
models
.
PROTECT
,
to_field
=
'template_no'
)
status
=
models
.
CharField
(
max_length
=
50
)
company_desc
=
models
.
CharField
(
max_length
=
255
,
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