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
81195119
Commit
81195119
authored
Oct 28, 2019
by
Gladys Forte
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cron
parent
857fceef
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
17 additions
and
13 deletions
+17
-13
app/applicationlayer/cms/auto_email/reminder.py
app/applicationlayer/cms/auto_email/reminder.py
+3
-0
app/applicationlayer/cms/form/header/views.py
app/applicationlayer/cms/form/header/views.py
+1
-1
app/applicationlayer/cms/template/header/views.py
app/applicationlayer/cms/template/header/views.py
+6
-0
app/applicationlayer/cms/utils_cr.py
app/applicationlayer/cms/utils_cr.py
+3
-3
app/applicationlayer/utils.py
app/applicationlayer/utils.py
+3
-8
app/entities/models.py
app/entities/models.py
+1
-1
No files found.
app/applicationlayer/cms/auto_email/reminder.py
View file @
81195119
...
@@ -10,11 +10,14 @@ from django.conf import settings
...
@@ -10,11 +10,14 @@ from django.conf import settings
from
datetime
import
timedelta
from
datetime
import
timedelta
from
app.helper.email_service
import
sender
from
app.helper.email_service
import
sender
from
app.applicationlayer.utils
import
main_threading
from
app.applicationlayer.utils
import
main_threading
from
rest_framework.permissions
import
AllowAny
CR_FRONT_LINK
=
settings
.
CR_FRONT_LINK
CR_FRONT_LINK
=
settings
.
CR_FRONT_LINK
class
ReminderTriggerAPIView
(
views
.
APIView
):
class
ReminderTriggerAPIView
(
views
.
APIView
):
permission_classes
=
(
AllowAny
,)
def
get
(
self
,
request
):
def
get
(
self
,
request
):
date_now
=
datetime
.
now
()
date_now
=
datetime
.
now
()
next_day
=
date_now
+
timedelta
(
days
=
1
)
next_day
=
date_now
+
timedelta
(
days
=
1
)
...
...
app/applicationlayer/cms/form/header/views.py
View file @
81195119
...
@@ -1155,7 +1155,7 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
...
@@ -1155,7 +1155,7 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
new_instance
=
model_to_dict
(
form_header
)
new_instance
=
model_to_dict
(
form_header
)
print
(
serializer
.
errors
)
#
print(serializer.errors)
# save history in form header
# save history in form header
crhistory_create_save
(
crhistory_create_save
(
...
...
app/applicationlayer/cms/template/header/views.py
View file @
81195119
...
@@ -361,6 +361,12 @@ class ChangeRequestTemplatePost(APIView):
...
@@ -361,6 +361,12 @@ class ChangeRequestTemplatePost(APIView):
}
}
sp1
=
transaction
.
savepoint
()
# nothing will save to db
sp1
=
transaction
.
savepoint
()
# nothing will save to db
# cr_prefix = request.data['requested_to_template_id'])
# models.ChangeRequestTemplateHeader.objects.filter(
# requested_to_template_id=cr_prefix
# )
serializer
=
ChangeRequestTemplatesSerializer
(
serializer
=
ChangeRequestTemplatesSerializer
(
data
=
template_header_data
)
data
=
template_header_data
)
...
...
app/applicationlayer/cms/utils_cr.py
View file @
81195119
...
@@ -219,7 +219,7 @@ def send_mail_vendor(requestor,
...
@@ -219,7 +219,7 @@ def send_mail_vendor(requestor,
# create notification
# create notification
notification_create
(
form_code
,
message
,
vendor_code
,
notification_create
(
form_code
,
message
,
vendor_code
,
sender_code
)
sender_code
,
'cms'
)
def
send_mail_requestor
(
current_user
,
def
send_mail_requestor
(
current_user
,
...
@@ -287,7 +287,7 @@ def send_mail_requestor(current_user,
...
@@ -287,7 +287,7 @@ def send_mail_requestor(current_user,
# create notification
# create notification
notification_create
(
form_code
,
message
,
requestor_code
,
notification_create
(
form_code
,
message
,
requestor_code
,
current_user
)
current_user
,
'cms'
)
def
next_approver_email
(
form_code
,
next_level
):
def
next_approver_email
(
form_code
,
next_level
):
...
@@ -361,7 +361,7 @@ def next_approver_email(form_code, next_level):
...
@@ -361,7 +361,7 @@ def next_approver_email(form_code, next_level):
# create notification
# create notification
notification_create
(
form_code
,
message
,
receiver_code
,
notification_create
(
form_code
,
message
,
receiver_code
,
sender_code
)
sender_code
,
'cms'
)
def
cancel_overdue
(
request
):
def
cancel_overdue
(
request
):
...
...
app/applicationlayer/utils.py
View file @
81195119
...
@@ -161,7 +161,8 @@ def send_broadcast_message(room_name, sender, message):
...
@@ -161,7 +161,8 @@ def send_broadcast_message(room_name, sender, message):
ws
.
close
()
ws
.
close
()
def
notification_create
(
form_code
,
message
,
account_no
,
sender_account_no
):
def
notification_create
(
form_code
,
message
,
account_no
,
sender_account_no
,
app
):
try
:
try
:
...
@@ -170,7 +171,7 @@ def notification_create(form_code, message, account_no, sender_account_no):
...
@@ -170,7 +171,7 @@ def notification_create(form_code, message, account_no, sender_account_no):
notif_type
=
'TASK'
,
notif_type
=
'TASK'
,
message
=
message
,
message
=
message
,
is_read
=
False
,
is_read
=
False
,
app
=
'APP-20190909-0000002'
,
app
=
app
,
account_no
=
account_no
,
account_no
=
account_no
,
sender_account_no
=
sender_account_no
sender_account_no
=
sender_account_no
)
)
...
@@ -184,12 +185,6 @@ def notification_create(form_code, message, account_no, sender_account_no):
...
@@ -184,12 +185,6 @@ def notification_create(form_code, message, account_no, sender_account_no):
'NEW NOTIFICATIONS'
'NEW NOTIFICATIONS'
)
)
# message = {
# 'code': 200,
# 'status': 'success',
# 'message': 'Notification successfully created!',
# }
# return Response(message, status=status.HTTP_200_OK)
return
True
return
True
except
Exception
as
e
:
except
Exception
as
e
:
...
...
app/entities/models.py
View file @
81195119
...
@@ -523,7 +523,7 @@ class ChangeRequestTemplateHeader(BaseHeader):
...
@@ -523,7 +523,7 @@ class ChangeRequestTemplateHeader(BaseHeader):
on_delete
=
models
.
PROTECT
,
on_delete
=
models
.
PROTECT
,
to_field
=
'code'
,
to_field
=
'code'
,
related_name
=
'created_by_user'
)
related_name
=
'created_by_user'
)
created_by_department
=
models
.
ForeignKey
(
created_by_department
=
models
.
ForeignKey
(
Department
,
Department
,
on_delete
=
models
.
PROTECT
,
on_delete
=
models
.
PROTECT
,
...
...
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