api/point_views.py

@@ -143,6 +143,25 @@ def mp_upload_temperature(request):

                 
              

                     return response()
              

                 
              

                +@logit
              

                +def mp_temperature_list(request):
              

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

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

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

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

                +
              

                +    logs = ThermometerMeasureLogInfo.objects.filter(point_id=point_id, user_id=user_id, status=True).order_by('-created_at')
              

                +    count = logs.count()
              

                +    logs, left = pagination(logs, page, num)
              

                +
              

                +    logs = [log.userdata for log in logs]
              

                +
              

                +
              

                +    return response(data={
              

                +        'logs': logs,
              

                +        'left': left,
              

                +        'count': count,
              

                +    })
              

                 
              

                 def admin_user_results(request):
              

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

api/urls.py

@@ -72,6 +72,7 @@ urlpatterns += [

                     url(r'^mp/bind_eqpt$', point_views.bind_eqpt, name='bind_eqpt'),
              

                 
              

                     url(r'^mp/upload/temperature$', point_views.mp_upload_temperature, name='mp_upload_temperature'),
              

                +    url(r'^mp/temperature/list$', point_views.mp_temperature_list, name='mp_temperature_list'),
              

                 ]
              

                 
              

                 # Screen
              

equipment/models.py

@@ -296,6 +296,15 @@ class ThermometerMeasureLogInfo(BaseModelMixin):

                             'temperature': self.temperature,
              

                             'created_at': tc.local_string(utc_dt=self.created_at, format='%Y-%m-%d'),
              

                         }
              

                +    
              

                +    @property
              

                +    def userdata(self):
              

                +         return {
              

                +            'macid': self.macid,
              

                +            'sn': self.sn,
              

                +            'temperature': self.temperature,
              

                +            'created_at': tc.local_string(utc_dt=self.created_at, format='%Y-%m-%d %H:%M'),
              

                +        }       
              

                 
              

                 
              

                 class AepThermometerMeasureLogInfo(BaseModelMixin):