api/admin_views.py

@@ -338,13 +338,13 @@ def statistic_distributor(request):

                             daily_logs[i]['has_scan_num'] = daily_hasScan_logs[j]['has_scan_num']
              

                             j += 1
              

                 
              

                -    model_logs = list(logs.values('model_name').annotate(num=Count('pk')).order_by('model_name'))
              

                -    model_hasScan_logs = list(logs.filter(has_scan=True).values('model_name').annotate(has_scan_num=Count('pk')).order_by('model_name'))
              

                +    model_logs = list(logs.values('model_uni_name').annotate(num=Count('pk')).order_by('model_uni_name'))
              

                +    model_hasScan_logs = list(logs.filter(has_scan=True).values('model_uni_name').annotate(has_scan_num=Count('pk')).order_by('model_uni_name'))
              

                 
              

                     j = 0
              

                     for i in range(0, len(model_logs)):
              

                         model_logs[i]['has_scan_num'] = 0
              

                -        if j < len(model_hasScan_logs) and model_logs[i]['model_name'] == model_hasScan_logs[j]['model_name']:
              

                +        if j < len(model_hasScan_logs) and model_logs[i]['model_uni_name'] == model_hasScan_logs[j]['model_uni_name']:
              

                             model_logs[i]['has_scan_num'] = model_hasScan_logs[j]['has_scan_num']
              

                             j += 1