diff --git a/jparty-app/app/src/main/java/com/example/jparty/EditEventActivity.java b/jparty-app/app/src/main/java/com/example/jparty/EditEventActivity.java index 372d481..ed63551 100644 --- a/jparty-app/app/src/main/java/com/example/jparty/EditEventActivity.java +++ b/jparty-app/app/src/main/java/com/example/jparty/EditEventActivity.java @@ -32,7 +32,7 @@ public class EditEventActivity extends AppCompatActivity { private Spinner eventProvince, eventMusicGenre; private EditText eventName, eventLocation, eventDate, eventPrice, eventTime, eventLink, eventImage, eventDescription; - private TextView access_text; + private TextView accessText; private ImageButton circle_button, back_arrow; private boolean isGetDone = false; private RequestQueue requestQueue; @@ -45,7 +45,7 @@ protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); requestQueue = Volley.newRequestQueue(this); setContentView(R.layout.activity_addevent); - access_text = findViewById(R.id.access_text); + accessText = findViewById(R.id.access_text); eventName = findViewById(R.id.event); eventLocation = findViewById(R.id.location); eventProvince = findViewById(R.id.province); @@ -66,7 +66,7 @@ protected void onCreate(Bundle savedInstanceState) { if (eventId != -1) { getEventDetails(eventId); isGetDone = true; - access_text.setText("Editar evento"); + accessText.setText("Editar evento"); } else { isGetDone = false; } diff --git a/jparty-backend/jpartyapp/event_endpoints.py b/jparty-backend/jpartyapp/event_endpoints.py index 24f6c84..74f75dc 100644 --- a/jparty-backend/jpartyapp/event_endpoints.py +++ b/jparty-backend/jpartyapp/event_endpoints.py @@ -73,15 +73,15 @@ def events(request): assistants = UserAssist.objects.filter(event=event).count() manager = User.objects.get(id=event.manager.id) try: - userLiked = UserLikes.objects.get(user=user_session.user, event=event) - userLiked = True + user_liked = UserLikes.objects.get(user=user_session.user, event=event) + user_liked = True except UserLikes.DoesNotExist: - userLiked = False + user_liked = False try: - userAssist = UserAssist.objects.get(user=user_session.user, event=event) - userAssist = True + user_assist = UserAssist.objects.get(user=user_session.user, event=event) + user_assist = True except UserAssist.DoesNotExist: - userAssist = False + user_assist = False music_genre = MusicGenre.objects.get(id=event.music_genre.id) json_response.append({ "id": event.id, @@ -94,8 +94,8 @@ def events(request): "date": event.date.strftime('%d-%m-%Y'), "image": event.image, "description": event.description, - "userLiked": userLiked, - "userAssist": userAssist, + "userLiked": user_liked, + "userAssist": user_assist, "assistants": assistants }) return JsonResponse(json_response, safe=False, status=200) @@ -154,15 +154,15 @@ def event_id(request, id): return JsonResponse({'error': 'Event not found'}, status=404) assistants = UserAssist.objects.filter(event=event).count() try: - userLiked = UserLikes.objects.get(user=user_session.user, event=event) - userLiked = True + user_liked = UserLikes.objects.get(user=user_session.user, event=event) + user_liked = True except UserLikes.DoesNotExist: - userLiked = False + user_liked = False try: - userAssist = UserAssist.objects.get(user=user_session.user, event=event) - userAssist = True + user_assist = UserAssist.objects.get(user=user_session.user, event=event) + user_assist = True except UserAssist.DoesNotExist: - userAssist = False + user_assist = False music_genre = MusicGenre.objects.get(id=event.music_genre.id) json_response = [] json_response.append({ @@ -178,8 +178,8 @@ def event_id(request, id): "time": event.date.strftime('%H:%M'), "image": event.image, "description": event.description, - "userLiked": userLiked, - "userAssist": userAssist, + "userLiked": user_liked, + "userAssist": user_assist, "assistants": assistants }) return JsonResponse(json_response, safe=False, status=200) @@ -273,10 +273,10 @@ def userAssistEvents(request): event = Events.objects.get(id=assist.event.id, date__gte=timezone.now()) assistants = UserAssist.objects.filter(event=event).count() try: - userLiked = UserLikes.objects.get(user=user_session.user, event=event) - userLiked = True + user_liked = UserLikes.objects.get(user=user_session.user, event=event) + user_liked = True except UserLikes.DoesNotExist: - userLiked = False + user_liked = False json_response.append({ "id": event.id, "manager": event.manager.email, @@ -287,7 +287,7 @@ def userAssistEvents(request): "date": event.date.strftime('%d-%m-%Y %H:%M'), "link": event.link, "secretkey": event.secretkey, - "userLiked": userLiked, + "userLiked": user_liked, }) return JsonResponse(json_response, safe=False, status=200) else: @@ -341,15 +341,15 @@ def userLikedEvents(request): event = Events.objects.get(id=eventliked.event.id, date__gte=timezone.now()) assistants = UserAssist.objects.filter(event=event).count() try: - userLiked = UserLikes.objects.get(user=user_session.user, event=event) - userLiked = True + user_liked = UserLikes.objects.get(user=user_session.user, event=event) + user_liked = True except UserLikes.DoesNotExist: - userLiked = False + user_liked = False try: - userAssist = UserAssist.objects.get(user=user_session.user, event=event) - userAssist = True + user_assist = UserAssist.objects.get(user=user_session.user, event=event) + user_assist = True except UserAssist.DoesNotExist: - userAssist = False + user_assist = False music_genre = MusicGenre.objects.get(id=event.music_genre.id) json_response.append({ "id": event.id, @@ -362,8 +362,8 @@ def userLikedEvents(request): "date": event.date.strftime('%d-%m-%Y'), "image": event.image, "description": event.description, - "userLiked": userLiked, - "userAssist": userAssist, + "userLiked": user_liked, + "userAssist": user_assist, "assistants": assistants }) return JsonResponse(json_response, safe=False, status=200) diff --git a/jparty-backend/jpartyapp/user_endpoints.py b/jparty-backend/jpartyapp/user_endpoints.py index e8afc3a..bb5b62a 100644 --- a/jparty-backend/jpartyapp/user_endpoints.py +++ b/jparty-backend/jpartyapp/user_endpoints.py @@ -155,10 +155,10 @@ def userPreferences(request): except PermissionDenied: return JsonResponse({'error': 'Unauthorized'}, status=401) #COGEMOS LOS GENEROS Y PASAMOS A LISTA LOS SELECCIONADOS POR ID - musicGenre = MusicGenre.objects.all() + music_genre = MusicGenre.objects.all() preferences = UserPreferences.objects.filter(user=user_session.user).values_list('music_genre__id', flat=True) json_response = [] - for music in musicGenre: + for music in music_genre: json_response.append({ "id": music.id, "name": music.name,