Skip to content

R
red-ci-cd
Commit 5a659f74 authored by Gladys Forte's avatar Gladys Forte
Browse files
Options

Merge pull request #435 in RMS/api-main-service from gladys-dev2 to RMSv2 

* commit 'c59efaf5':
  try file delete
  clean code action
parents 28896518 c59efaf5
Hide whitespace changes
Inline Side-by-side
Showing with 53 additions and 249 deletions
app/applicationlayer/cms/form/header/views.py
View file @ 5a659f74
...@@ -641,251 +641,7 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet): ...@@ -641,251 +641,7 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
) )
change_request.cr_routing_actions(new_instance, current_user) change_request.cr_routing_actions(new_instance, current_user)
# ---------------- removed code
# if action.lower() == 'approved':
# the_next_vendor = models.ChangeRequestFormApprovers.objects.filter(
# form_code=form_code, level=int(next_level),
# delegation='Vendor/Implementor'
# ).first()
# if the_next_vendor:
# the_last_vendor = models.ChangeRequestFormApprovers.objects.filter(
# form_code=form_code, delegation='Vendor/Implementor'
# ).order_by('level').last()
# if the_next_vendor == the_last_vendor:
# models.ChangeRequestFormHeader.objects.filter(
# form_code=form_code
# ).update(status='Approved')
# # NOTIF MSG FOR REQUESTOR
# requestor_notification_msg = REQUESTOR_MESSAGE.split(';')[0]
# # NOTIF MSG FOR NEXT APPROVER
# notification_msg = APPROVER_MESSAGE.split(';')[0]
# # SEND EMAIL AND NOTIF TO REQUESTOR
# send_mail_requestor(
# current_user, form_code, delegation,
# requestor_notification_msg, action,
# remarks, level
# )
# next_approver_email(form_code, next_level)
# date_now = datetime.now()
# # update next approver details
# models.ChangeRequestFormApprovers.objects.filter(
# Q(form_code=form_code) & Q(level=int(next_level))
# ).update(
# date_sent=date_now,
# is_action=True
# )
# # update current approver details
# models.ChangeRequestFormApprovers.objects.filter(
# Q(form_code=form_code) & Q(level=int(level))
# ).update(
# is_action=False
# )
# reminder_trigger_save(form_code, date_now,
# approver_instance.date_sent)
# elif action.lower() == 'rejected':
# # send email to vendor
# if delegation.lower() == 'requestor':
# notification_msg = VENDOR_REJECT_MESSAGE.split(';')[0]
# send_mail_vendor(
# current_user, form_code, delegation,
# notification_msg, action,
# remarks, level
# )
# prev_level = int(level) - 1
# # reset last vendor details
# models.ChangeRequestFormApprovers.objects.filter(
# Q(form_code=form_code) &
# Q(level=int(prev_level))
# ).update(
# is_action=True,
# action='Acknowledged',
# action_date=datetime.now(),
# date_sent=datetime.now()
# )
# else:
# prev_vendor = models.ChangeRequestFormApprovers.objects.filter(
# Q(form_code=form_code) &
# Q(action='Completed') &
# Q(delegation='Vendor/Implementor') &
# Q(level__lte=int(level))
# )
# if not prev_vendor.count() > 0:
# models.ChangeRequestFormHeader.objects.filter(
# form_code=form_code
# ).update(status='Rejected')
# # EMAIL CODE FOR REQUESTOR
# requestor_notification_msg = REQUESTOR_REJECT_MESSAGE.split(';')[0]
# # SEND EMAIL AND NOTIF TO REQUESTOR
# send_mail_requestor(
# current_user, form_code, delegation,
# requestor_notification_msg, action,
# remarks, level
# )
# else:
# # EMAIL CODE FOR REQUESTOR
# requestor_notification_msg = REQUESTOR_REJECT_MESSAGE.split(';')[0]
# # SEND EMAIL AND NOTIF TO REQUESTOR
# send_mail_requestor(
# current_user, form_code, delegation,
# requestor_notification_msg, action,
# remarks, level
# )
# notification_msg = VENDOR_REJECT_MESSAGE.split(';')[0]
# send_mail_vendor(
# current_user, form_code, 'others',
# notification_msg, action,
# remarks, level
# )
# last_action_vendor = prev_vendor.last()
# models.ChangeRequestFormApprovers.objects.filter(
# code=last_action_vendor
# ).update(
# is_action=True,
# action='Acknowledged',
# action_date=datetime.now(),
# date_sent=datetime.now()
# )
# level = last_action_vendor.level + 1
# models.ChangeRequestFormApprovers.objects.filter(
# Q(form_code=form_code) & Q(level__gte=int(level))
# ).update(
# is_action=False,
# action=None,
# remarks=None,
# action_date=None,
# date_sent=None
# )
# elif action.lower() == 'completed':
# the_last_vendor = models.ChangeRequestFormApprovers.objects.filter(
# form_code=form_code, delegation='Vendor/Implementor'
# ).order_by('level').last()
# if (current_user == the_last_vendor.user.code and
# level == the_last_vendor.level):
# models.ChangeRequestFormHeader.objects.filter(
# form_code=form_code
# ).update(status='Approved')
# else:
# the_next_vendor = models.ChangeRequestFormApprovers.objects.filter(
# form_code=form_code, level=int(next_level),
# delegation='Vendor/Implementor'
# ).first()
# if the_next_vendor:
# if the_next_vendor.user.code == the_last_vendor.user.code:
# models.ChangeRequestFormHeader.objects.filter(
# form_code=form_code
# ).update(status='Approved')
# else:
# models.ChangeRequestFormHeader.objects.filter(
# form_code=form_code
# ).update(status='Pending')
# next_approver_email(form_code, next_level)
# models.ChangeRequestFormApprovers.objects.filter(
# Q(level=int(next_level))
# ).update(
# date_sent=datetime.now(),
# is_action=True
# )
# # update current approver details
# models.ChangeRequestFormApprovers.objects.filter(
# Q(form_code=form_code) & Q(level=int(level))
# ).update(
# is_action=False
# )
# # EMAIL CODE FOR REQUESTOR
# requestor_notification_msg = REQUESTOR_COMPLETION_MESSAGE.split(';')[0]
# send_mail_requestor(
# current_user, form_code, delegation,
# requestor_notification_msg, action,
# remarks, level
# )
# elif action.lower() == 'acknowledged':
# # EMAIL CODE FOR REQUESTOR
# requestor_notification_msg = REQUESTOR_ACKNOWLEDGE_MESSAGE.split(';')[0]
# send_mail_requestor(
# current_user, form_code, delegation,
# requestor_notification_msg, action,
# remarks, level
# )
# elif action.lower() == 'accepted':
# models.ChangeRequestFormHeader.objects.filter(
# form_code=form_code
# ).update(status='Completed & Accepted')
# # EMAIL CODE FOR VENDOR
# requestor_notification_msg = VENDOR_ACCEPTANCE_MESSAGE.split(';')[0]
# send_mail_vendor(
# current_user, form_code, delegation,
# requestor_notification_msg, action,
# remarks, level
# )
# # update is_action for current level
# models.ChangeRequestFormApprovers.objects.filter(
# Q(form_code=form_code) & Q(level=int(level))
# ).update(
# is_action=False
# )
# elif action.lower() == 'cancelled':
# # changed form status to cancelled
# models.ChangeRequestFormHeader.objects.filter(
# form_code=form_code).update(status='Cancelled')
# # update is_action for current level
# models.ChangeRequestFormApprovers.objects.filter(
# Q(form_code=form_code) & Q(level=int(level))
# ).update(
# is_action=False
# )
# reset_autoemail_tables(form_code)
message = status_message_response( message = status_message_response(
200, 'success', 200, 'success',
'Action performed', 'Action performed',
......
app/businesslayer/changerequest/change_request.py
View file @ 5a659f74
...@@ -699,7 +699,7 @@ def cr_routing_actions(approver_instance, current_user): ...@@ -699,7 +699,7 @@ def cr_routing_actions(approver_instance, current_user):
) )
elif action.lower() == 'accepted': elif action.lower() == 'accepted':
update_form_header_status(form_code, 'Completed & Accepted') update_form_header_status(form_code, 'Completed & Accepted')
# EMAIL CODE FOR VENDOR # EMAIL CODE FOR VENDOR
......
app/entities/migrations/0029_auto_20191104_1228.py 0 → 100644
View file @ 5a659f74
# Generated by Django 2.2 on 2019-11-04 12:28
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('entities', '0028_auto_20191029_1513'),
]
operations = [
migrations.AlterModelTable(
name='canceltrigger',
table='trigger_cancel',
),
migrations.AlterModelTable(
name='overduetrigger',
table='trigger_overdue',
),
migrations.AlterModelTable(
name='remindertrigger',
table='trigger_reminder',
),
]
app/entities/migrations/0030_auto_20191104_1507.py 0 → 100644
View file @ 5a659f74
# Generated by Django 2.2 on 2019-11-04 15:07
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('entities', '0029_auto_20191104_1228'),
]
operations = [
migrations.AlterModelOptions(
name='assetgroup',
options={'ordering': ['-created']},
),
]
app/entities/models.py
View file @ 5a659f74
...@@ -9,6 +9,8 @@ from . import enums ...@@ -9,6 +9,8 @@ from . import enums
from django.utils.text import slugify from django.utils.text import slugify
from datetime import timedelta from datetime import timedelta
from django.db.models.signals import post_delete
from django.dispatch import receiver
# ********************* AUTH TABLES ********************* # ********************* AUTH TABLES *********************
...@@ -453,6 +455,9 @@ class MasterAttachment(models.Model): ...@@ -453,6 +455,9 @@ class MasterAttachment(models.Model):
class Meta: class Meta:
db_table = 'master_attachments' db_table = 'master_attachments'
@receiver(post_delete, sender=MasterAttachment)
def submission_delete(sender, instance, **kwargs):
instance.file.delete(False)
class BaseAttachment(models.Model): class BaseAttachment(models.Model):
attachment_type = models.CharField(max_length=255) attachment_type = models.CharField(max_length=255)
...@@ -1060,7 +1065,7 @@ class ReminderTrigger(models.Model): ...@@ -1060,7 +1065,7 @@ class ReminderTrigger(models.Model):
blank=True) blank=True)
class Meta: class Meta:
db_table = 'reminder_trigger' db_table = 'trigger_reminder'
class CancelTrigger(models.Model): class CancelTrigger(models.Model):
...@@ -1088,7 +1093,7 @@ class CancelTrigger(models.Model): ...@@ -1088,7 +1093,7 @@ class CancelTrigger(models.Model):
max_length=255) max_length=255)
class Meta: class Meta:
db_table = 'cancel_trigger' db_table = 'trigger_cancel'
class OverdueTrigger(models.Model): class OverdueTrigger(models.Model):
...@@ -1103,7 +1108,7 @@ class OverdueTrigger(models.Model): ...@@ -1103,7 +1108,7 @@ class OverdueTrigger(models.Model):
default=False) default=False)
class Meta: class Meta:
db_table = 'overdue_trigger' db_table = 'trigger_overdue'
""" """
...@@ -1128,6 +1133,7 @@ class AssetGroup(models.Model): ...@@ -1128,6 +1133,7 @@ class AssetGroup(models.Model):
class Meta: class Meta:
db_table = 'asset_groups' db_table = 'asset_groups'
ordering = ['-created']
def __str__(self): def __str__(self):
return f'{self.code}' return f'{self.code}'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment