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

* commit 'e2bd8704':
  rejected and revised
  remove company_desc, dept_dec, requested_desc

app/applicationlayer/cms/form/header/serializers.py

@@ -98,14 +98,13 @@ class ChangeRequestFormHeaderSerializer(
             ret['template_object'] = "None"
 
             return ret
-    
+    # 'company_desc', 'department_desc', 'requested_desc',
     class Meta:
         model = models.ChangeRequestFormHeader
         # fields = '__all__'
         fields = ('form_code', 'requested_to_template_name', 'requested_to_objective',
                   'requested_to_target_date', 'requested_to_priority',
                   'description', 'created', 'cancel_date', 'status',
-                  'company_desc', 'department_desc', 'requested_desc',
                   'requested_to_template_id', 'requested_to_company',
                   'requested_to_department', 'requested_to_user',
                   'requested_by_user', 'requested_by_department',

app/applicationlayer/cms/form/header/views.py

@@ -1126,7 +1126,7 @@ class ChangeRequestFormPost(APIView):
                     serializer.save()
                 
             frm_id = serializer.data['form_code']
-
+            
             # create form approvers
             frm_approvers = form_header['frm_approvers']
             counter = 0

app/applicationlayer/cms/utils_cr.py

@@ -319,7 +319,6 @@ def next_approver_email(form_code, next_level):
                                                 form_code=form_code
                                                 )
     # print(next_approver.values())
-                                                
     
     # LOOP on next approver for sending email
     for n_approver in next_approver:

app/applicationlayer/management/delegation/views.py

@@ -42,8 +42,8 @@ class DelegationViewSet(viewsets.ModelViewSet):
         )
 
     def list(self, request, *args, **kwargs):
-        queryset = self.filter_queryset(self.get_queryset())
-
+        queryset = self.filter_queryset(self.get_queryset().exclude(name='Requestor'))
+        
         page = self.paginate_queryset(queryset)
 
         if page is not None:

app/businesslayer/changerequest/change_request.py

@@ -516,12 +516,12 @@ def update_form_header_status(form_code, status):
 def cr_routing_actions(approver_instance, current_user):
 
     form_code = approver_instance['form_code']
-    delegation = approver_instance['delegation']
+    delegation = approver_instance['delegation']['name']
     action = approver_instance['action'].lower()
     level = approver_instance['level']
     next_level = int(approver_instance['level']) + 1
     remarks = approver_instance['remarks']
-
+    
     if approver_instance['action'].lower() == 'approved':
         
         the_next_vendor = check_vendor_level(
@@ -559,82 +559,82 @@ def cr_routing_actions(approver_instance, current_user):
         #save details for reminder trigger
         reminder_trigger_save(form_code, date_now, date_now)
     
-    elif approver_instance['action'].lower() == 'rejected':
+    elif approver_instance['action'].lower() == 'revised':
 
         # send email to vendor
-        if delegation.name.lower() == 'requestor':
-            notification_msg = VENDOR_REJECT_MESSAGE.split(';')[0]
+        # if delegation.lower() == 'requestor':
+        #     notification_msg = VENDOR_REJECT_MESSAGE.split(';')[0]
+
+        #     # send reject email to vendor
+        #     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:
 
-            # send reject email to vendor
-            send_mail_vendor(
+        prev_vendor = check_vendor_level(
+            'prev', level, form_code)
+
+        if prev_vendor.count() > 0:
+            
+            # 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
             )
 
-            prev_level = int(level) - 1
-            # reset last vendor details
+            last_action_vendor = prev_vendor.last()
+
             models.ChangeRequestFormApprovers.objects.filter(
-                Q(form_code=form_code) &
-                Q(level=int(prev_level))
+                code=last_action_vendor
                 ).update(
                     is_action=True,
                     action='Acknowledged',
                     action_date=datetime.now(),
                     date_sent=datetime.now()
-            )
-        
-        else:
-
-            prev_vendor = check_vendor_level(
-                'prev', level, form_code)
-
-            if not prev_vendor.count() > 0:
-                
-                update_form_header_status(form_code, '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()
+            level = last_action_vendor.level + 1
+        
+        # else:
 
-                models.ChangeRequestFormApprovers.objects.filter(
-                    code=last_action_vendor
-                    ).update(
-                        is_action=True,
-                        action='Acknowledged',
-                        action_date=datetime.now(),
-                        date_sent=datetime.now()
-                    )
+        #     update_form_header_status(form_code, 'Rejected')
 
-                level = last_action_vendor.level + 1
+        #     # 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
+        #     )
 
         models.ChangeRequestFormApprovers.objects.filter(
             Q(form_code=form_code) & Q(level__gte=int(level))
@@ -645,7 +645,45 @@ def cr_routing_actions(approver_instance, current_user):
                 action_date=None,
                 date_sent=None
         )
-    
+
+    elif approver_instance['action'].lower() == 'rejected':
+        
+        # send email to vendor
+        if delegation.lower() == 'requestor':
+            notification_msg = VENDOR_REJECT_MESSAGE.split(';')[0]
+
+            # send reject email to vendor
+            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:
+            update_form_header_status(form_code, '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
+            )
+
     elif approver_instance['action'].lower() == 'completed':
 
         the_last_vendor = check_vendor_level(