Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions lattedb/correlator/migrations/0008_auto_20200528_0855.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Generated by Django 3.0.6 on 2020-05-28 08:55

from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion


class Migration(migrations.Migration):

dependencies = [
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
('correlator', '0007_auto_20200213_2051'),
]

operations = [
migrations.AlterField(
model_name='correlator',
name='user',
field=models.ForeignKey(blank=True, help_text='User who updated this object. Set on save by connection to database. Anonymous if not found.', null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
),
]
21 changes: 21 additions & 0 deletions lattedb/current/migrations/0006_auto_20200528_0855.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Generated by Django 3.0.6 on 2020-05-28 08:55

from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion


class Migration(migrations.Migration):

dependencies = [
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
('current', '0005_auto_20200221_2341'),
]

operations = [
migrations.AlterField(
model_name='current',
name='user',
field=models.ForeignKey(blank=True, help_text='User who updated this object. Set on save by connection to database. Anonymous if not found.', null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
),
]
21 changes: 21 additions & 0 deletions lattedb/ensemble/migrations/0006_auto_20200528_0855.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Generated by Django 3.0.6 on 2020-05-28 08:55

from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion


class Migration(migrations.Migration):

dependencies = [
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
('ensemble', '0005_remove_ensemble_type'),
]

operations = [
migrations.AlterField(
model_name='ensemble',
name='user',
field=models.ForeignKey(blank=True, help_text='User who updated this object. Set on save by connection to database. Anonymous if not found.', null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
),
]
21 changes: 21 additions & 0 deletions lattedb/fermionaction/migrations/0006_auto_20200528_0855.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Generated by Django 3.0.6 on 2020-05-28 08:55

from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion


class Migration(migrations.Migration):

dependencies = [
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
('fermionaction', '0005_remove_fermionaction_type'),
]

operations = [
migrations.AlterField(
model_name='fermionaction',
name='user',
field=models.ForeignKey(blank=True, help_text='User who updated this object. Set on save by connection to database. Anonymous if not found.', null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
),
]
21 changes: 21 additions & 0 deletions lattedb/gaugeaction/migrations/0005_auto_20200528_0855.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Generated by Django 3.0.6 on 2020-05-28 08:55

from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion


class Migration(migrations.Migration):

dependencies = [
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
('gaugeaction', '0004_remove_gaugeaction_type'),
]

operations = [
migrations.AlterField(
model_name='gaugeaction',
name='user',
field=models.ForeignKey(blank=True, help_text='User who updated this object. Set on save by connection to database. Anonymous if not found.', null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
),
]
21 changes: 21 additions & 0 deletions lattedb/gaugeconfig/migrations/0006_auto_20200528_0855.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Generated by Django 3.0.6 on 2020-05-28 08:55

from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion


class Migration(migrations.Migration):

dependencies = [
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
('gaugeconfig', '0005_remove_gaugeconfig_type'),
]

operations = [
migrations.AlterField(
model_name='gaugeconfig',
name='user',
field=models.ForeignKey(blank=True, help_text='User who updated this object. Set on save by connection to database. Anonymous if not found.', null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
),
]
21 changes: 21 additions & 0 deletions lattedb/linksmear/migrations/0005_auto_20200528_0855.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Generated by Django 3.0.6 on 2020-05-28 08:55

from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion


class Migration(migrations.Migration):

dependencies = [
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
('linksmear', '0004_remove_linksmear_type'),
]

operations = [
migrations.AlterField(
model_name='linksmear',
name='user',
field=models.ForeignKey(blank=True, help_text='User who updated this object. Set on save by connection to database. Anonymous if not found.', null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
),
]
116 changes: 116 additions & 0 deletions lattedb/project/formfac/migrations/0009_auto_20200528_0855.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@
# Generated by Django 3.0.6 on 2020-05-28 08:55

from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion


class Migration(migrations.Migration):

dependencies = [
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
('project_formfac', '0008_auto_20200408_0823'),
]

operations = [
migrations.AlterField(
model_name='concatenatedformfactor4dfile',
name='user',
field=models.ForeignKey(blank=True, help_text='User who updated this object. Set on save by connection to database. Anonymous if not found.', null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
),
migrations.AlterField(
model_name='correlatormeta',
name='user',
field=models.ForeignKey(blank=True, help_text='User who updated this object. Set on save by connection to database. Anonymous if not found.', null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
),
migrations.AlterField(
model_name='diskconcatenatedformfactor4dfile',
name='user',
field=models.ForeignKey(blank=True, help_text='User who updated this object. Set on save by connection to database. Anonymous if not found.', null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
),
migrations.AlterField(
model_name='diskcorrelatorh5dset',
name='user',
field=models.ForeignKey(blank=True, help_text='User who updated this object. Set on save by connection to database. Anonymous if not found.', null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
),
migrations.AlterField(
model_name='diskformfactor4dfile',
name='user',
field=models.ForeignKey(blank=True, help_text='User who updated this object. Set on save by connection to database. Anonymous if not found.', null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
),
migrations.AlterField(
model_name='diskspectrum4dfile',
name='user',
field=models.ForeignKey(blank=True, help_text='User who updated this object. Set on save by connection to database. Anonymous if not found.', null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
),
migrations.AlterField(
model_name='disktslicedformfactor4dfile',
name='user',
field=models.ForeignKey(blank=True, help_text='User who updated this object. Set on save by connection to database. Anonymous if not found.', null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
),
migrations.AlterField(
model_name='disktslicedsaveragedformfactor4dfile',
name='user',
field=models.ForeignKey(blank=True, help_text='User who updated this object. Set on save by connection to database. Anonymous if not found.', null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
),
migrations.AlterField(
model_name='disktslicedsaveragedspectrum4dfile',
name='user',
field=models.ForeignKey(blank=True, help_text='User who updated this object. Set on save by connection to database. Anonymous if not found.', null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
),
migrations.AlterField(
model_name='disktslicedspectrum4dfile',
name='user',
field=models.ForeignKey(blank=True, help_text='User who updated this object. Set on save by connection to database. Anonymous if not found.', null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
),
migrations.AlterField(
model_name='formfactor4dfile',
name='user',
field=models.ForeignKey(blank=True, help_text='User who updated this object. Set on save by connection to database. Anonymous if not found.', null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
),
migrations.AlterField(
model_name='spectrum4dfile',
name='user',
field=models.ForeignKey(blank=True, help_text='User who updated this object. Set on save by connection to database. Anonymous if not found.', null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
),
migrations.AlterField(
model_name='tapeconcatenatedformfactor4dfile',
name='user',
field=models.ForeignKey(blank=True, help_text='User who updated this object. Set on save by connection to database. Anonymous if not found.', null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
),
migrations.AlterField(
model_name='tapecorrelatorh5dset',
name='user',
field=models.ForeignKey(blank=True, help_text='User who updated this object. Set on save by connection to database. Anonymous if not found.', null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
),
migrations.AlterField(
model_name='tapetslicedsaveragedformfactor4dfile',
name='user',
field=models.ForeignKey(blank=True, help_text='User who updated this object. Set on save by connection to database. Anonymous if not found.', null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
),
migrations.AlterField(
model_name='tapetslicedsaveragedspectrum4dfile',
name='user',
field=models.ForeignKey(blank=True, help_text='User who updated this object. Set on save by connection to database. Anonymous if not found.', null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
),
migrations.AlterField(
model_name='tslicedformfactor4dfile',
name='user',
field=models.ForeignKey(blank=True, help_text='User who updated this object. Set on save by connection to database. Anonymous if not found.', null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
),
migrations.AlterField(
model_name='tslicedsaveragedformfactor4dfile',
name='user',
field=models.ForeignKey(blank=True, help_text='User who updated this object. Set on save by connection to database. Anonymous if not found.', null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
),
migrations.AlterField(
model_name='tslicedsaveragedspectrum4dfile',
name='user',
field=models.ForeignKey(blank=True, help_text='User who updated this object. Set on save by connection to database. Anonymous if not found.', null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
),
migrations.AlterField(
model_name='tslicedspectrum4dfile',
name='user',
field=models.ForeignKey(blank=True, help_text='User who updated this object. Set on save by connection to database. Anonymous if not found.', null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
),
]
10 changes: 9 additions & 1 deletion lattedb/project/formfac/rest/pagination.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,16 @@ class Paginator(DatatablesPageNumberPagination):
def paginate_queryset(self, queryset, request, view=None):
"""Paginates queryset and sets `recordsExist`.
"""
entry = queryset.first()

pages = super().paginate_queryset(queryset, request, view=view)
self.recordsExist = queryset.filter(exists=True).count() # pylint:disable=C0103

self.recordsExist = ( # pylint:disable=C0103
queryset.filter(exists=True).count()
if entry
and "exists" in set(field.name for field in entry.get_open_fields())
else None
)
return pages

def get_paginated_response(self, data):
Expand Down
48 changes: 48 additions & 0 deletions lattedb/project/formfac/rest/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
"""
from rest_framework import routers, serializers, viewsets

from django.db.models import Q

from lattedb.project.formfac.models import ConcatenatedFormFactor4DFile
from lattedb.project.formfac.models import DiskConcatenatedFormFactor4DFile
from lattedb.project.formfac.models import TapeConcatenatedFormFactor4DFile
Expand Down Expand Up @@ -37,6 +39,11 @@

VIEWSETS = []


Q_ON_TAPE_FALSE = Q(tape__isnull=True) | (Q(tape__isnull=False) & Q(tape__exists=False))
Q_ON_DISK_FALSE = Q(disk__isnull=True) | (Q(disk__isnull=False) & Q(disk__exists=False))
Q_DOES_NOT_EXIST = Q_ON_DISK_FALSE & Q_ON_TAPE_FALSE

# -------------------------------------
# ConcatenatedFormFactor4D
# -------------------------------------
Expand Down Expand Up @@ -129,6 +136,16 @@ class TapeTSlicedSAveragedFormFactor4DFileViewSet(viewsets.ReadOnlyModelViewSet)

VIEWSETS.append(TapeTSlicedSAveragedFormFactor4DFileViewSet)


class NonExistentSlicedSAveragedFormFactor4DFileViewSet(viewsets.ReadOnlyModelViewSet):
name = "non-existent-sliced-averaged-formfactor"
exclude_from_nav = True
queryset = TSlicedSAveragedFormFactor4DFile.objects.filter(Q_DOES_NOT_EXIST)
serializer_class = TSlicedSAveragedFormFactor4DFileSerializer


VIEWSETS.append(NonExistentSlicedSAveragedFormFactor4DFileViewSet)

# -------------------------------------
# TSlicedFormFactor4D
# -------------------------------------
Expand Down Expand Up @@ -231,6 +248,17 @@ class TapeCorrelatorH5DsetFileViewSet(viewsets.ReadOnlyModelViewSet):

VIEWSETS.append(TapeCorrelatorH5DsetFileViewSet)


class NonExistentCorrelatorH5DsetFileViewSet(viewsets.ReadOnlyModelViewSet):
name = "non-existent-correlator-h5dset"
exclude_from_nav = True
queryset = CorrelatorMeta.objects.filter(Q_DOES_NOT_EXIST)
serializer_class = CorrelatorMetaSerializer


VIEWSETS.append(NonExistentCorrelatorH5DsetFileViewSet)


# -------------------------------------
# Spectrum
# -------------------------------------
Expand Down Expand Up @@ -277,6 +305,16 @@ class TapeTSlicedSAveragedSpectrum4DFileViewSet(viewsets.ReadOnlyModelViewSet):

VIEWSETS.append(TapeTSlicedSAveragedSpectrum4DFileViewSet)


class NonExistentSlicedSAveragedSpectrum4DFileViewSet(viewsets.ReadOnlyModelViewSet):
name = "non-existent-sliced-averaged-spectrum"
exclude_from_nav = True
queryset = TSlicedSAveragedSpectrum4DFile.objects.filter(Q_DOES_NOT_EXIST)
serializer_class = TSlicedSAveragedSpectrum4DFileSerializer


VIEWSETS.append(NonExistentSlicedSAveragedSpectrum4DFileViewSet)

# -------------------------------------
# TSlicedSpectrum4D
# -------------------------------------
Expand Down Expand Up @@ -305,6 +343,16 @@ class DiskTSlicedSpectrum4DFileViewSet(viewsets.ReadOnlyModelViewSet):

VIEWSETS.append(DiskTSlicedSpectrum4DFileViewSet)


class NonExistentSlicedSpectrum4DFileViewSet(viewsets.ReadOnlyModelViewSet):
name = "non-existent-sliced-spectrum"
exclude_from_nav = True
queryset = TSlicedSpectrum4DFile.objects.filter(Q_ON_DISK_FALSE)
serializer_class = TSlicedSpectrum4DFileSerializer


VIEWSETS.append(NonExistentSlicedSpectrum4DFileViewSet)

# -------------------------------------
# TSlicedSAveragedSpectrum4D
# -------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions lattedb/project/formfac/templates/table.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@

{% block content %}
<div class="jumbotron">
<h1>{{model.verbose_name}}</h1>
{% if model %}<p>{{model.get_doc}}</p>{% endif %}
<h1>{{title}}</h1>
{% if subtitle %}<p>{{subtitle}}</p>{% endif %}
</div>
<div class="w-100 px-5">
{% if status.total > 0 %}
Expand Down
Loading