22/09

WalkingPatternRecognition/WalkingPatternRecognition/settings.py

@@ -28,7 +28,7 @@ SECRET_KEY = '^^46u_fc$#)x5ji*s#l3p6igr9*6fwknxevip$ozw8#-m=*#f0'
 DEBUG = True
 
 
-ALLOWED_HOSTS = ['192.168.1.2', 'localhost', '127.0.0.1']
+ALLOWED_HOSTS = ['192.168.1.49', 'localhost', '127.0.0.1']
 
 
 CORS_ORIGIN_ALLOW_ALL = False

WalkingPatternRecognition/mobileapp/views.py

@@ -307,8 +307,15 @@ def highlightsPerDay(request):
                                                             date=yesterday)
     serializer1 = MotionActivityPerDaySerializer(todayActivity, many=True)
     serializer2 = MotionActivityPerDaySerializer(yesterdayActivity, many=True)
-    print(serializer1.data[0]['timePeriod'])
-    print(serializer2.data[0]['timePeriod'])
+
+    if len(serializer1.data) == 0:
+        yesterday = 0
+    if len(serializer2.data) == 0:
+        today = 0
+        return JsonResponse(
+                       [{'TODAY': today, 'YESTERDAY': yesterday, 'Highlights':
+                           'time is lower than yesterday'}], safe=False,
+                       status=status.HTTP_200_OK)
     if serializer1.data[0]['timePeriod'] > serializer2.data[0]['timePeriod']:
         return JsonResponse(
             [{'TODAY': serializer1.data[0]['timePeriod'], 'YESTERDAY': serializer2.data[0]['timePeriod'], 'Highlights':
@@ -324,6 +331,11 @@ def highlightsPerDay(request):
             [{'TODAY': serializer1.data[0]['timePeriod'], 'YESTERDAY': serializer2.data[0]['timePeriod'], 'Highlights':
                 'time is equal to yesterday'}], safe=False,
             status=status.HTTP_200_OK)
+    elif serializer1.data[0]['timePeriod'] == serializer2.data[0]['timePeriod']:
+        return JsonResponse(
+            [{'TODAY': serializer1.data[0]['timePeriod'], 'YESTERDAY': serializer2.data[0]['timePeriod'], 'Highlights':
+                'time is equal to yesterday'}], safe=False,
+            status=status.HTTP_200_OK)
 
 
 # WEEKLY