From 4e9ccf3e222333f6ee58798be35f2cc0b96b70d0 2023-01-23 21:47:49 From: Renato-TUF Date: 2023-01-23 21:47:49 Subject: [PATCH] Todo actualizado y Funcional (excepto redis,celery,nginx), y sin migraciones, ahora cambiaré de usuario --- diff --git a/apps/main/views.py b/apps/main/views.py index 3b52faf..47d0ec7 100644 --- a/apps/main/views.py +++ b/apps/main/views.py @@ -1705,31 +1705,30 @@ def sidebar(**kwargs): return side_data - def get_paginator(model, page, order, filters={}, n=8): - kwargs = {} query = Q() if isinstance(filters, QueryDict): filters = filters.dict() - [filters.pop(key) for key in filters.keys() if filters[key] in ('', ' ')] + copy_filters=filters.copy() + [filters.pop(key) for key in copy_filters.keys() if copy_filters[key] in (' ', ' ')] filters.pop('page', None) fields = [f.name for f in model._meta.get_fields()] - if 'template' in filters: + if 'template' in copy_filters: filters['template'] = True - if 'historical' in filters: + if 'historical' in copy_filters: filters.pop('historical') filters['type'] = 1 elif 'type' in fields: - filters['type'] = 0 - if 'start_date' in filters: - filters['start_date__gte'] = filters.pop('start_date') - if 'end_date' in filters: - filters['start_date__lte'] = filters.pop('end_date') - if 'tags' in filters: - tags = filters.pop('tags') + filters['type'] = 0 + if 'start_date' in copy_filters: + filters['start_date__gte'] =filters.pop('start_date') + if 'end_date' in copy_filters: + filters['start_date__lte'] =filters.pop('end_date') + if 'tags' in copy_filters: + tags =filters.pop('tags') if 'tags' in fields: query = query | Q(tags__icontains=tags) if 'label' in fields: @@ -1742,9 +1741,9 @@ def get_paginator(model, page, order, filters={}, n=8): if 'device_type' in fields: query = query | Q(device_type__name__icontains=tags) - if 'mine' in filters: - filters['author_id'] = filters['mine'] - filters.pop('mine') + if 'mine' in copy_filters: + filters['author_id'] =filters['mine'] + filters.pop('mine') object_list = model.objects.filter(query, **filters).order_by(*order) paginator = Paginator(object_list, n) @@ -1760,6 +1759,59 @@ def get_paginator(model, page, order, filters={}, n=8): return kwargs +# def get_paginator(model, page, order, filters={}, n=8): +# kwargs = {} +# query = Q() +# if isinstance(filters, QueryDict): +# filters = filters.dict() +# [filters.pop(key) for key in filters.keys() if filters[key] in ('', ' ')] +# filters.pop('page', None) + +# fields = [f.name for f in model._meta.get_fields()] + +# if 'template' in filters: +# filters['template'] = True +# if 'historical' in filters: +# filters.pop('historical') +# filters['type'] = 1 +# elif 'type' in fields: +# filters['type'] = 0 +# if 'start_date' in filters: +# filters['start_date__gte'] = filters.pop('start_date') +# if 'end_date' in filters: +# filters['start_date__lte'] = filters.pop('end_date') +# if 'tags' in filters: +# tags = filters.pop('tags') +# if 'tags' in fields: +# query = query | Q(tags__icontains=tags) +# if 'label' in fields: +# query = query | Q(label__icontains=tags) +# if 'location' in fields: +# query = query | Q(location__name__icontains=tags) +# if 'device' in fields: +# query = query | Q(device__device_type__name__icontains=tags) +# query = query | Q(device__location__name__icontains=tags) +# if 'device_type' in fields: +# query = query | Q(device_type__name__icontains=tags) + +# if 'mine' in filters: +# filters['author_id'] = filters['mine'] +# filters.pop('mine') +# object_list = model.objects.filter(query, **filters).order_by(*order) +# paginator = Paginator(object_list, n) + +# try: +# objects = paginator.page(page) +# except PageNotAnInteger: +# objects = paginator.page(1) +# except EmptyPage: +# objects = paginator.page(paginator.num_pages) + +# kwargs['objects'] = objects +# kwargs['offset'] = (int(page)-1)*n if page else 0 + +# return kwargs + def operation(request, id_camp=None): diff --git a/radarsys/settings - mod.py b/radarsys/settings - mod.py deleted file mode 100644 index 7ac9f58..0000000 --- a/radarsys/settings - mod.py +++ /dev/null @@ -1,143 +0,0 @@ -""" -Django settings for radarsys project. - -Generated by 'django-admin startproject' using Django 1.8.6. - -For more information on this file, see -https://docs.djangoproject.com/en/1.8/topics/settings/ - -For the full list of settings and their values, see -https://docs.djangoproject.com/en/1.8/ref/settings/ -""" - -# Build paths inside the project like this: os.path.join(BASE_DIR, ...) -import os - -BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) - -# Quick-start development settings - unsuitable for production -# See https://docs.djangoproject.com/en/1.8/howto/deployment/checklist/ - -# SECURITY WARNING: keep the secret key used in production secret! -SECRET_KEY = 'xshb$k5fc-+j16)cvyffj&9u__0q3$l!hieh#+tbzqg)*f^km0' - -# SECURITY WARNING: don't run with debug turned on in production! -DEBUG = True - -ALLOWED_HOSTS = ['*'] - -# Application definition - -INSTALLED_APPS = [ - 'django.contrib.admin', - 'django.contrib.auth', - 'django.contrib.contenttypes', - 'django.contrib.sessions', - 'django.contrib.messages', - 'django.contrib.staticfiles', - 'django.forms', - 'bootstrap5', - 'polymorphic', - 'apps.accounts', - 'apps.main', - 'apps.misc', - 'apps.rc', - 'apps.dds', - 'apps.jars', - 'apps.usrp', - 'apps.abs', - 'apps.cgs', -] - -MIDDLEWARE = [ - 'django.middleware.security.SecurityMiddleware', - 'django.contrib.sessions.middleware.SessionMiddleware', - 'django.middleware.common.CommonMiddleware', - 'django.middleware.csrf.CsrfViewMiddleware', - 'django.contrib.auth.middleware.AuthenticationMiddleware', - 'django.contrib.messages.middleware.MessageMiddleware', - 'django.middleware.clickjacking.XFrameOptionsMiddleware', - -] - -ROOT_URLCONF = 'radarsys.urls' - -TEMPLATES = [ - { - 'BACKEND': 'django.template.backends.django.DjangoTemplates', - 'DIRS': [os.path.join(BASE_DIR, "templates")], - 'APP_DIRS': True, - 'OPTIONS': { - 'context_processors': [ - 'django.template.context_processors.debug', - 'django.template.context_processors.request', - 'django.contrib.auth.context_processors.auth', - 'django.contrib.messages.context_processors.messages', - 'apps.main.processors.radarsys_globals', - ], - }, - }, -] - -WSGI_APPLICATION = 'radarsys.wsgi.application' - - -# Database -# https://docs.djangoproject.com/en/1.8/ref/settings/#databases - -DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.sqlite3', - 'NAME': 'radarsys.sqlite', - } - # 'default': { - # 'ENGINE': 'django.db.backends.postgresql_psycopg2', - # 'NAME': os.environ.get('DB_NAME', 'radarsys'), - # 'USER': os.environ.get('DB_USER', 'docker'), - # 'PASSWORD': os.environ.get('DB_PASSWORD', 'docker'), - # 'HOST': os.environ.get('POSTGRES_PORT_5432_TCP_ADDR', 'localhost'), - # 'PORT': os.environ.get('POSTGRES_PORT_5432_TCP_PORT', '5400'), - #} -} - -# Internationalization -# https://docs.djangoproject.com/en/1.8/topics/i18n/ - -LANGUAGE_CODE = 'en-us' - -TIME_ZONE = os.environ.get('TZ', 'America/Lima') - -USE_I18N = True - -USE_L10N = True - -USE_TZ = False - -# Static files (CSS, JavaScript, Images) -# https://docs.djangoproject.com/en/1.8/howto/static-files/ - -MEDIA_URL = '/media/' -MEDIA_ROOT = os.path.join(BASE_DIR, 'media') - -STATIC_URL = '/static/' -STATIC_ROOT = os.path.join(BASE_DIR, 'static') - -STATICFILES_FINDERS = ( - 'django.contrib.staticfiles.finders.FileSystemFinder', - 'django.contrib.staticfiles.finders.AppDirectoriesFinder', -) - -# Celery stuff -REDIS_HOST = os.environ.get('REDIS_HOST', '127.0.0.1') -REDIS_PORT = os.environ.get('REDIS_PORT', 6300) - -BROKER_TRANSPORT = 'redis' -BROKER_URL = 'redis://{}:{}/0'.format(REDIS_HOST, REDIS_PORT) - -CELERY_RESULT_BACKEND = 'redis://{}:{}/0'.format(REDIS_HOST, REDIS_PORT) -CELERY_BROKER_TRANSPORT = BROKER_URL -CELERY_ACCEPT_CONTENT = ['application/json'] -CELERY_TASK_SERIALIZER = 'json' -CELERY_RESULT_SERIALIZER = 'json' -CELERY_ENABLE_UTC = False -FORM_RENDERER = 'django.forms.renderers.DjangoTemplates' diff --git a/radarsys/settings.py b/radarsys/settings.py index f889a78..9bf6ba7 100644 --- a/radarsys/settings.py +++ b/radarsys/settings.py @@ -35,8 +35,6 @@ INSTALLED_APPS = [ 'django.contrib.sessions', 'django.contrib.messages', 'django.contrib.staticfiles', - 'django_bootstrap5', - 'polymorphic', 'apps.accounts', 'apps.main', 'apps.misc', @@ -47,6 +45,8 @@ INSTALLED_APPS = [ 'apps.abs', 'apps.cgs', 'apps.dds_rest', + "django_bootstrap5", + 'polymorphic', ] MIDDLEWARE = [