dash adjustmens

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

@@ -201,6 +201,21 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
         overdue_filtered = change_request.filter_overdue(self.queryset)
 
         overdue = overdue_filtered.count()
+
+        status_total = pending + approved + rejected + cancelled + completed
+        
+        close = rejected + cancelled + completed
+
+        opened = pending + approved
+
+        open_percent = (opened/status_total) * 100
+
+        close_percent = (close/status_total) * 100
+
+        priority_total = high + normal
+
+        high_percent = (high/priority_total) * 100
+        normal_percent = (normal/priority_total) * 100
         
         message = {
             'account_no': id_number,
@@ -213,6 +228,10 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
             'normal': normal,
             'awaiting': awaiting,
             'overdue': overdue,
+            'open_percent': open_percent,
+            'close_percent': close_percent,
+            'high_percent': high_percent,
+            'normal_percent': normal_percent,
             'code': 200,
             'status': 'success',
             'message': 'Dashboard Summary'

app/businesslayer/changerequest/change_request.py

@@ -719,7 +719,6 @@ def cr_routing_actions(approver_instance, current_user):
         # update is_action for current level
         update_form_approver(form_code, level, 'current', date_now)
         
-        
         reset_autoemail_tables(form_code)
         
     return True