Merge branch 'dev' into 'master'

Dev

See merge request !81

access/views.py

@@ -144,8 +144,11 @@ class DetailUserView(APIView):
         acc = request.JSON.get('account', None)
 
         if not acc['b_day'] is None:
-            b_date = datetime.datetime.strptime(acc['b_day'], '%d.%m.%Y')  # TODO вынести форматы в настройки
-            acc['b_day'] = b_date.strftime('%Y-%m-%d')
+            try:
+                b_day = datetime.datetime.strptime(acc['b_day'], '%d.%m.%Y')  # TODO вынести форматы в настройки
+            except ValueError:
+                b_day = datetime.datetime.strptime(acc['b_day'], '%d-%m-%Y')
+            acc['b_day'] = b_day.strftime('%Y-%m-%d')
 
         acc['gender'] = 0 if acc['gender'] == "undefined" else 1 if acc['gender'] == "male" else 2