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

* commit 'c59efaf5':
  try file delete
  clean code action

app/businesslayer/changerequest/change_request.py

@@ -699,7 +699,7 @@ def cr_routing_actions(approver_instance, current_user):
         )
 
     elif action.lower() == 'accepted':
-
+        
         update_form_header_status(form_code, 'Completed & Accepted')
         
         # EMAIL CODE FOR VENDOR

app/entities/migrations/0029_auto_20191104_1228.py

+# 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

+# 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

@@ -9,6 +9,8 @@ from . import enums
 from django.utils.text import slugify
 from datetime import timedelta
 
+from django.db.models.signals import post_delete
+from django.dispatch import receiver
 
 # ********************* AUTH TABLES *********************
 
@@ -453,6 +455,9 @@ class MasterAttachment(models.Model):
     class Meta:
         db_table = 'master_attachments'
 
+@receiver(post_delete, sender=MasterAttachment)
+def submission_delete(sender, instance, **kwargs):
+    instance.file.delete(False)
 
 class BaseAttachment(models.Model):
     attachment_type = models.CharField(max_length=255)
@@ -1060,7 +1065,7 @@ class ReminderTrigger(models.Model):
         blank=True)
 
     class Meta:
-        db_table = 'reminder_trigger'
+        db_table = 'trigger_reminder'
 
 
 class CancelTrigger(models.Model):
@@ -1088,7 +1093,7 @@ class CancelTrigger(models.Model):
         max_length=255)
     
     class Meta:
-        db_table = 'cancel_trigger'
+        db_table = 'trigger_cancel'
 
 
 class OverdueTrigger(models.Model):
@@ -1103,7 +1108,7 @@ class OverdueTrigger(models.Model):
         default=False)
     
     class Meta:
-        db_table = 'overdue_trigger'
+        db_table = 'trigger_overdue'
 
 
 """
@@ -1128,6 +1133,7 @@ class AssetGroup(models.Model):
     
     class Meta:
         db_table = 'asset_groups'
+        ordering = ['-created']
     
     def __str__(self):
         return f'{self.code}'