api/maintenance_views.py

@@ -3,7 +3,6 @@

                 from __future__ import division
              

                 
              

                 import json
              

                -from datetime import datetime
              

                 
              

                 from django.conf import settings
              

                 from django.db.models.query_utils import Q
              
@@ -183,28 +182,29 @@ def maintenance_list(request):

                     user_id = request.POST.get('user_id', '')
              

                     page = request.POST.get('page', 1)
              

                     num = request.POST.get('num', 20)
              

                -    query = request.POST.get('query', '')
              

                     maintenance_status = request.POST.get('maintenance_status', 'all')
              

                +    query = request.POST.get('query', '')
              

                     start_time = request.POST.get('start_time', '')
              

                     end_time = request.POST.get('end_time', '')
              

                 
              

                     maintenances = MaintenaceInfo.objects.filter(status=True)
              

                +
              

                     if not is_admin(brand_id, admin_id):
              

                         maintenances = maintenances.filter(user_id=user_id)
              

                -    
              

                -    if start_time and end_time:
              

                -        start_time = datetime.strptime(start_time, '%Y%m%d')
              

                -        end_time = datetime.strptime(end_time + ' 23:59:59', '%Y%m%d %H:%M:%S')
              

                -        maintenances = maintenances.filter(created_at__range=(start_time, end_time))
              

                +
              

                +    if maintenance_status and maintenance_status != 'all':
              

                +        maintenances = maintenances.filter(maintenance_status=maintenance_status)
              

                 
              

                     if query:
              

                         maintenances = maintenances.filter(Q(phone=query) | Q(name__icontains=query) | Q(sn=query))
              

                -    
              

                -    if maintenance_status and not maintenance_status == 'all':
              

                -        maintenances = maintenances.filter(maintenance_status=maintenance_status)
              

                 
              

                -    maintenances = maintenances.order_by('-pk')
              

                +    if start_time and end_time:
              

                +        start_time = tc.string_to_utc_datetime(start_time, format='%Y%m%d')
              

                +        end_time = tc.string_to_utc_datetime(end_time + ' 23:59:59', format='%Y%m%d %H:%M:%S')
              

                +        maintenances = maintenances.filter(created_at__range=(start_time, end_time))
              

                +
              

                     count = maintenances.count()
              

                +    maintenances = maintenances.order_by('-pk')
              

                     maintenances = [maintenance.data for maintenance in maintenances]
              

                     maintenances, left = pagination(maintenances, page, num)