Fix html

.gitignore

@@ -132,3 +132,4 @@ images/cache
 *.jpg
 *.jpeg
 *.pyc
+log_read_me

arma/settings.py

@@ -1,43 +1,25 @@
-"""
-Django settings for arma project.
-Generated by 'django-admin startproject' using Django 4.0.6.
-For more information on this file, see
-https://docs.djangoproject.com/en/4.0/topics/settings/
-For the full list of settings and their values, see
-https://docs.djangoproject.com/en/4.0/ref/settings/
-"""
-
 from pathlib import Path
 import os
 import dj_database_url
 from dotenv import load_dotenv
 load_dotenv()
 
-IS_PRODUCTION = False  # helper
-
-if os.getcwd() == "/app":
-    DEBUG = False
-    IS_PRODUCTION = True
+IS_PRODUCTION = False
 
-# DATABASES['default'] = dj_database_url.parse('postgres://username:[email protected]:5432/database')
-# DATABASES['default'] = dj_database_url.config()
-# DATABASES['default'] = dj_database_url.config('postgres://username:[email protected]:5432/database')
+ # Get the current working
+cwd = os.getcwd()
+print("Current working directory:", cwd)
 
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
 BASE_DIR = Path(__file__).resolve().parent.parent
-DATABASE_URL = os.environ['DATABASE_URL']
+
+# DATABASE_URL = os.environ['DATABASE_URL']
+DATABASE_URL = 'postgres://tubphmzekpfhbv:d901cee21a961066447a15323a0555af25cb008f35eb69b762d64c853c979e47@ec2-176-34-211-0.eu-west-1.compute.amazonaws.com:5432/djjlihih2flh9'
 db_from_env = dj_database_url.config(conn_max_age=600)
-DATABASES['default'].update(db_from_env)
 
 # Quick-start development settings - unsuitable for production
 # See https://docs.djangoproject.com/en/4.0/howto/deployment/checklist/
-
-# SECURITY WARNING: don't run with debug turned on in production!
-# DEBUG = True
-
 ALLOWED_HOSTS = ['armatournaments.herokuapp.com', '127.0.0.1']
-# ALLOWED_HOSTS = os.environ.get(ALLOWED_HOSTS)
-# ALLOWED_HOSTS = ['arma.com']
 
 INSTALLED_APPS = [
     'dal',
@@ -52,8 +34,8 @@
     'import_export',
     'crispy_forms',
     'sorl.thumbnail',
-    'whitenoise.runserver_nostatic',
-    # 'tinymce',
+    'cloudinary_storage',
+    'cloudinary',
     #arma:
     'tournaments.apps.TournamentsConfig',
     'posts.apps.PostsConfig',
@@ -76,7 +58,7 @@
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
-    'django_cprofile_middleware.middleware.ProfilerMiddleware'
+    'django_cprofile_middleware.middleware.ProfilerMiddleware',
 ]
 
 DJANGO_CPROFILE_MIDDLEWARE_REQUIRE_STAFF = False
@@ -106,14 +88,12 @@
 
     }
 }
-
 WSGI_APPLICATION = 'arma.wsgi.application'
 
 # Database
 # https://docs.djangoproject.com/en/4.0/ref/settings/#databases
 # Password validation
 # https://docs.djangoproject.com/en/4.0/ref/settings/#auth-password-validators
-
 AUTH_PASSWORD_VALIDATORS = [
     {
         'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
@@ -131,56 +111,27 @@
 
 # Internationalization
 # https://docs.djangoproject.com/en/4.0/topics/i18n/
-
 LANGUAGE_CODE = 'pl-Pl'
-
 TIME_ZONE = 'UTC'
-
 USE_I18N = True
-
 USE_TZ = True
 
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/4.0/howto/static-files/
-
-# STATIC_ROOT = os.path.join(BASE_DIR, "static")
 STATIC_URL = 'static/'
-if DEBUG:
-    STATICFILES_DIRS = [
-        os.path.join(BASE_DIR, 'static')
-    ]
-else:
-    STATIC_ROOT = os.path.join(BASE_DIR, 'static')
-
-# STATIC_ROOT =  BASE_DIR / "static"
-# STATICFILES_DIRS = [
-#     # BASE_DIR / 'static'
-#     os.path.join(BASE_DIR, 'static'),
-# ]
-STATICFILES_DIRS = [os.path.join(BASE_DIR,'arma/static')
-]
-
+# potrzebne TU do pracy na lokalnym serwerze
+STATIC_ROOT = os.path.join(BASE_DIR, 'static')
 STATICFILES_STORAGE = "whitenoise.storage.CompressedManifestStaticFilesStorage"
-
-# MEDIA_ROOT = BASE_DIR / "images"
 MEDIA_ROOT = os.path.join(BASE_DIR, "images")
 MEDIA_URL = "/images/"
 
-# LOCALE_PATHS = [str(BASE_DIR / "locale")]
 # Default primary key field type
 # https://docs.djangoproject.com/en/4.0/ref/settings/#default-auto-field
-
 DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
-
 SHELL_PLUS_PRINT_SQL = True
-
 LOGIN_REDIRECT_URL = "/home"
 LOGOUT_REDIRECT_URL = "/home"
 
-# PYDEVD_USE_CYTHON=NO
-# PYDEVD_USE_FRAME_EVAL=NO
-# DISABLE_COLLECTSTATIC = 1
-
 SECRET_KEY = os.getenv('SECRET_KEY')
 
 try:
@@ -189,17 +140,27 @@
     print("no local_settings.py file?")
 
 if IS_PRODUCTION:
-    import dj_database_url
 
+    import dj_database_url
     db_from_env = dj_database_url.config(conn_max_age=500)
-    DATABASES["default"].update(db_from_env)
 
+    DEBUG = False
+    DATABASES["default"].update(db_from_env)
     SECURE_PROXY_SSL_HEADER = ("HTTP_X_FORWARDED_PROTO", "https")
     ALLOWED_HOSTS = ["armatournaments.herokuapp.com"]
+    STATIC_ROOT = os.path.join(BASE_DIR, 'static')
+
+    CLOUDINARY_STORAGE = {
+        'CLOUD_NAME': 'dcgtoiogb',
+        'API_KEY': '327397828378715',
+        'API_SECRET': os.getenv('API_SECRET')
+    }
+    DEFAULT_FILE_STORAGE = 'cloudinary_storage.storage.MediaCloudinaryStorage'
+
     # debug heroku
     if DEBUG:
-        import logging
 
+        import logging
         LOGGING = {
             "version": 1,
             "disable_existing_loggers": False,
@@ -215,4 +176,24 @@
                 },
             },
         }
-# else:
+
+else:
+    DEBUG = True
+
+if DEBUG:
+    STATICFILES_DIRS = [
+        os.path.join(BASE_DIR, 'static')
+    ]
+else:
+    STATIC_ROOT = os.path.join(BASE_DIR, 'static')
+
+STATICFILES_DIRS = [os.path.join(BASE_DIR,'arma/static')]
+#
+# CACHES = {
+#     "default": {
+#         "BACKEND": "django.core.cache.backends.memcached.PyMemcacheCache",
+#         "LOCATION": "127.0.0.1:11211",
+#     }
+# }
+# pip install pymemcache
+

finals/templates/final.html

@@ -10,31 +10,41 @@
     <ol>
         <br class="list-group-item">
         <p>
+            uczestnicy fazy pucharowej turnieju {{ tournament.title }}:
 
-            uczestnicy fazy pucharowej:
-
-            {% for group in groups %}
+            {% for group in groups|dictsort:"number" %}
                 <ol>
-
+ grupa {{ group.number }}:
 {#                {% for p in prtcp_ls|dictsortreversed:"points_average" %}#}
-              {% for p in group.participants.all|dictsortreversed:"points_average" %}
+              {% for p in group.participants.all%}
 
+{#                  {% for p in finalists %}#}
                 <li>
-                {{  p.name }} z {{ p.school  }} {{ p.points_average }} {{ p.group_id }}
+
+                {{  p.name }} z {{ p.school  }} -
+
+                        {% for g_p in group_participants %}
+                            {% if g_p.participant_id == p.id %}
+
+                    {{ g_p.tournament_points_modified }}
+                            {% endif %}
+                            {% endfor %}
+
                  {% if p.image %}
                 {% thumbnail p.image "100x100" as im %}
                 <img src="{{ im.url }}" alt="zdj">
                 {% endthumbnail %}
                     {% endif %}
 
+
                 </li>
+{#                      {% endif %}#}
 
                   {% endfor %}
                 <hr>
                  </ol>
 
 
-
                  {% endfor %}
         </div>
         <hr>
@@ -44,12 +54,4 @@
                     <br>
 
 
-
-
-
-
-
-
-
-
                             {% endblock %}

finals/views.py

@@ -7,8 +7,8 @@
 # from django.core.paginator import Paginator
 from django.shortcuts import render
 from tournaments.models import Tournament
-from finals.models import Finalist
-from tournament_calculating.models import Group, Fight, Participant, Round
+from finals.models import Finalist, ParticipantFinalist
+from tournament_calculating.models import Group, Fight, Participant, Round,  ParticipantGroup
 # from tournament_calculating.forms import (
 #     AddParticipantForm,
 #     AddGroupForm,
@@ -20,11 +20,13 @@
 def finals(request, group_id):
     prtcp_ls = []
     group = Group.objects.get(pk=group_id)
-
+    group_participants = ParticipantGroup.objects.filter(group_id=group_id)
     tournament = group.tournament
     groups = tournament.groups.all()
     participants = group.participants.all()
-    finalists = Finalist.objects.filter(group = group)
+    # finalists = Finalist.objects.filter(group = group)
+    finalists = ParticipantFinalist.objects.all()
+    # print("TUTITU:", finalists)
     # for f in finalists:
     # for p in participants:
     #     prtcp_ls.append( Finalist.objects.get(participant_id=p.id))
@@ -40,5 +42,8 @@ def finals(request, group_id):
     return render(request, "final.html", context={
         "finalists": finalists,
         "prtcp_ls": prtcp_ls,
-        "groups": groups
+        "groups": groups,
+        "group_participants": group_participants,
+        "tournament": tournament,
+        "finalists": finalists
     })

galleries/migrations/0002_alter_photo_image.py

@@ -0,0 +1,19 @@
+# Generated by Django 3.2.12 on 2023-04-04 10:47
+
+import cloudinary.models
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('galleries', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='photo',
+            name='image',
+            field=cloudinary.models.CloudinaryField(blank=True, max_length=255, null=True),
+        ),
+    ]

galleries/migrations/0003_alter_photo_image.py

@@ -0,0 +1,19 @@
+# Generated by Django 3.2.12 on 2023-04-06 13:03
+
+from django.db import migrations, models
+import galleries.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('galleries', '0002_alter_photo_image'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='photo',
+            name='image',
+            field=models.ImageField(blank=True, null=True, upload_to=galleries.models.upload_to),
+        ),
+    ]

galleries/models.py

@@ -7,7 +7,7 @@
 import string
 from random import random
 from django.db import models
-# from django.utils.text import slugify
+from cloudinary.models import CloudinaryField
 
 
 class Gallery(Timestamped):
@@ -38,6 +38,7 @@ class Photo(Timestamped):
     title = models.CharField(max_length=100)
     short_description = models.CharField(max_length=300, null=True, blank=True)
     image = models.ImageField(upload_to=upload_to, null=True, blank=True)
+    # image = CloudinaryField(blank=True, null=True)
     gallery = models.ForeignKey("Gallery",on_delete=models.CASCADE, related_name="photos")
 
     def __str__(self):

galleries/templates/galleries/galleries.html

@@ -3,6 +3,8 @@
 {% load crispy_forms_filters %}
 {% load crispy_forms_tags %}
 {% load thumbnail %}
+{% load cloudinary %}
+
 {% block content %}
 <h3   id="delete_tournament" type="button" style="background-color:lightseagreen "  class="btn btn-primary">
     <a style="color:white; text-decoration: none;" href = "{% url 'galleries:add_gallery' %}">
@@ -44,6 +46,8 @@ <h4>
             {% thumbnail gallery.photos.first.image "300x300" crop="center" as im %}
             <img class=card-img-top" src="{{  im.url }}" alt="">
             {% endthumbnail %}
+{#             {% cloudinary gallery.photos.first.image width="100" crop="fill"%}#}
+
             <div class="card-body">
                 <h4 class="card-title text-center">
                     {{ gallery.title }}