@@ -29,10 +29,13 @@ def temperature_upload(request): |
||
| 29 | 29 |
@logit |
| 30 | 30 |
def temperature_list(request): |
| 31 | 31 |
user_id = request.POST.get('user_id', '')
|
| 32 |
+ macid = request.POST.get('macid', '')
|
|
| 32 | 33 |
page = request.POST.get('page', 1)
|
| 33 | 34 |
num = request.POST.get('num', 20)
|
| 34 | 35 |
|
| 35 | 36 |
temperatures = TemperatureInfo.objects.filter(user_id=user_id, status=True) |
| 37 |
+ if macid: |
|
| 38 |
+ temperatures = temperatures.filter(macid=macid) |
|
| 36 | 39 |
temperatures, left = pagination(temperatures, page, num) |
| 37 | 40 |
temperatures = [temperature.data for temperature in temperatures] |
| 38 | 41 |
|
@@ -3,6 +3,7 @@ |
||
| 3 | 3 |
from django.db import models |
| 4 | 4 |
from django.utils.translation import gettext_lazy as _ |
| 5 | 5 |
from django_models_ext import BaseModelMixin |
| 6 |
+from TimeConvert import TimeConvert as tc |
|
| 6 | 7 |
|
| 7 | 8 |
|
| 8 | 9 |
class TemperatureInfo(BaseModelMixin): |
@@ -25,4 +26,5 @@ class TemperatureInfo(BaseModelMixin): |
||
| 25 | 26 |
'user_id': self.user_id, |
| 26 | 27 |
'macid': self.macid, |
| 27 | 28 |
'temperature': self.temperature, |
| 29 |
+ 'created_at': tc.local_string(utc_dt=self.created_at), |
|
| 28 | 30 |
} |