Skip to content

Commit

Permalink
Merge pull request #963 from linea-it/develop
Browse files Browse the repository at this point in the history
v0.16
  • Loading branch information
glaubervila authored Dec 13, 2017
2 parents 2ed4afc + d317d5a commit 5bf489d
Show file tree
Hide file tree
Showing 263 changed files with 2,456 additions and 5,582 deletions.
10 changes: 9 additions & 1 deletion api/activity_statistic/migrations/0001_initial.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.9.4 on 2017-09-13 20:29
# Generated by Django 1.9.4 on 2017-12-06 18:43
from __future__ import unicode_literals

import current_user
Expand Down Expand Up @@ -29,4 +29,12 @@ class Migration(migrations.Migration):
'verbose_name_plural': 'Activities',
},
),
migrations.CreateModel(
name='Visit',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('date', models.DateTimeField(auto_now_add=True, help_text='Creation Date', null=True, verbose_name='Date')),
('owner', models.ForeignKey(default=current_user.get_current_user, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Owner')),
],
),
]
27 changes: 0 additions & 27 deletions api/activity_statistic/migrations/0002_visit.py

This file was deleted.

76 changes: 8 additions & 68 deletions api/activity_statistic/reports.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from django.core.mail import EmailMessage
from django.template.loader import render_to_string
from smtplib import SMTPException

from common.notify import Notify

class ActivityReports:
def __init__(self):
Expand Down Expand Up @@ -190,7 +190,7 @@ def report_email_unique_visits(self, report_date):

# subject
subject = (
"portal @ NCSA status %s - %s - %s" % (report_date.year, report_date.month, report_date.day))
"NCSA Status %s - %s - %s" % (report_date.year, report_date.month, report_date.day))

# Recuperar as visitas unicas do dia.
visits = self.unique_visits_by_date(
Expand All @@ -213,7 +213,7 @@ def report_email_unique_visits(self, report_date):
if len(visits) == 0:
visits = False

d = date.today()

body = render_to_string("unique_hits_on_day.html", {
"today": report_date.strftime('%d/%m/%Y'),
"visits": visits,
Expand All @@ -223,68 +223,8 @@ def report_email_unique_visits(self, report_date):
"sum_users": sum_users
})

try:
msg = EmailMessage(
subject=subject,
body=body,
from_email=from_email,
to=[email_admin],
)

msg.content_subtype = "html"
msg.send(fail_silently=False)

except SMTPException as e:
raise (e)

except Exception as e:
raise (e)


# TODO Codigo gerado pelo Felipe, que precisa ser alterado para o novo app.
# def visits_and_recent_login(self):
# users = User.objects.all()
# results = []
# for user in users:
# statistics = Statistics.objects.filter(owner=user).order_by('-date')
# if len(statistics) != 0:
# results.append(dict({
# "user": user.email,
# "visits": len(statistics),
# "last_visit": str(statistics[0].date.date())
# }))
# return results
#
# def total_visits(self):
# users = User.objects.all()
# visits = []
# for user in users:
# statistics = Statistics.objects.filter(owner=user).order_by('-date')
# if len(statistics) != 0:
# visits.append(dict({
# "user": user.email,
# "visits": len(statistics),
# }))
#
# sorted_list = sorted(visits, key=lambda k: k['visits'])
# number_of_visits = 0
# result = dict()
# result[str(number_of_visits) + '-' + str(number_of_visits + 4)] = 0
# for visit in sorted_list:
# if visit['visits'] <= number_of_visits + 4:
# result[str(number_of_visits) + '-' + str(number_of_visits + 4)] += 1
# else:
# number_of_visits += 4
# result[str(number_of_visits) + '-' + str(number_of_visits + 4)] = 1
# total_visits = len(Statistics.objects.all())
# return {"Total of users grouped by number of visits": result, "Total Visits": total_visits}
#
# def visits_per_month(self):
# results = dict()
# statistics = Statistics.objects.all().order_by('-date')
# for statistic in statistics:
# if statistic.date.strftime("%Y-%m") not in results.keys():
# results[statistic.date.strftime("%Y-%m")] = 1
# else:
# results[statistic.date.strftime("%Y-%m")] += 1
# return {"Visits Per Month": results}
Notify.send_email(
subject=subject,
body=body,
to=[email_admin],
)
4 changes: 2 additions & 2 deletions api/aladin/migrations/0001_initial.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.9.4 on 2017-08-03 17:35
# Generated by Django 1.9.4 on 2017-12-06 18:43
from __future__ import unicode_literals

from django.db import migrations, models
Expand All @@ -11,7 +11,7 @@ class Migration(migrations.Migration):
initial = True

dependencies = [
('product', '0076_auto_20170721_1442'),
('product', '0001_initial'),
]

operations = [
Expand Down
10 changes: 5 additions & 5 deletions api/catalog/migrations/0001_initial.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.9.4 on 2016-07-15 14:16
# Generated by Django 1.9.4 on 2017-12-06 18:43
from __future__ import unicode_literals

from django.db import migrations, models
Expand All @@ -19,8 +19,8 @@ class Migration(migrations.Migration):
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('catalog_id', models.IntegerField(verbose_name='Catalog')),
('owner', models.IntegerField(verbose_name='Owner')),
('object_id', models.IntegerField(verbose_name='Object Id')),
('date', models.DateTimeField(verbose_name='Date')),
('object_id', models.CharField(max_length=255, verbose_name='Object Id')),
('date', models.DateTimeField(auto_now_add=True, help_text='Creation Date', null=True, verbose_name='Date')),
('comments', models.TextField(verbose_name='Comments')),
],
),
Expand All @@ -30,7 +30,7 @@ class Migration(migrations.Migration):
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('catalog_id', models.IntegerField(verbose_name='Catalog')),
('owner', models.IntegerField(verbose_name='Owner')),
('object_id', models.IntegerField(verbose_name='Object Id')),
('object_id', models.CharField(max_length=255, verbose_name='Object Id')),
('rating', models.IntegerField(verbose_name='Rating')),
],
),
Expand All @@ -40,7 +40,7 @@ class Migration(migrations.Migration):
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('catalog_id', models.IntegerField(verbose_name='Catalog')),
('owner', models.IntegerField(verbose_name='Owner')),
('object_id', models.IntegerField(verbose_name='Object Id')),
('object_id', models.CharField(max_length=255, verbose_name='Object Id')),
('reject', models.BooleanField(default=False, verbose_name='Reject')),
],
),
Expand Down
20 changes: 0 additions & 20 deletions api/catalog/migrations/0002_auto_20170503_1938.py

This file was deleted.

25 changes: 0 additions & 25 deletions api/catalog/migrations/0003_auto_20170602_1356.py

This file was deleted.

20 changes: 0 additions & 20 deletions api/catalog/migrations/0004_auto_20170602_1405.py

This file was deleted.

Binary file added api/celerybeat-schedule
Binary file not shown.
1 change: 1 addition & 0 deletions api/celerybeat.pid
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
23457
92 changes: 88 additions & 4 deletions api/coadd/migrations/0001_initial.py
Original file line number Diff line number Diff line change
@@ -1,28 +1,112 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.9.4 on 2016-03-07 18:20
# Generated by Django 1.9.4 on 2017-12-06 18:43
from __future__ import unicode_literals

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


class Migration(migrations.Migration):

initial = True

dependencies = [
('common', '0001_initial'),
]

operations = [
migrations.CreateModel(
name='Dataset',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('run', models.CharField(blank=True, max_length=30, null=True, verbose_name='Run')),
('date', models.DateField(blank=True, null=True, verbose_name='Created Date')),
('archive_path', models.TextField(blank=True, help_text='Original file path', null=True, verbose_name='Archive Path')),
('image_src_thumbnails', models.URLField(blank=True, default=None, help_text='Full URL to image including the host and directory. Example: http://{host}/data/releases/{release_name}/images/thumb', null=True, verbose_name='Thumbnails PNG')),
('image_src_ptif', models.URLField(blank=True, default=None, help_text='Full URL for visiomatic ptif image, including the host and directory. Use the release name and tilename to create the path. Example: http://{host}/visiomatic?FIF=data/releases/{release_name}/images/visiomatic/{tilename}.ptif', null=True, verbose_name='Visiomatic PTIF')),
],
),
migrations.CreateModel(
name='Release',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('rls_name', models.CharField(max_length=60, verbose_name='Name')),
('rls_name', models.CharField(max_length=60, verbose_name='Internal Name')),
('rls_display_name', models.CharField(blank=True, max_length=60, null=True, verbose_name='Display Name')),
('rls_version', models.CharField(blank=True, max_length=60, null=True, verbose_name='Version')),
('rls_date', models.DateField(blank=True, null=True, verbose_name='Date')),
('rls_description', models.TextField(blank=True, null=True, verbose_name='Description')),
('rls_doc_url', models.URLField(blank=True, null=True, verbose_name='Doc Url')),
('rls_display_name',
models.CharField(blank=True, max_length=60, null=True, verbose_name='Display Name')),
('rls_default', models.BooleanField(default=False, help_text='Mark this release as Default so that the interfaces can select this release previously.', verbose_name='Default')),
],
),
migrations.CreateModel(
name='Survey',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('srv_project', models.CharField(blank=True, max_length=20, null=True, verbose_name='Project')),
('srv_display_name', models.CharField(max_length=80, verbose_name='Display Name')),
('srv_url', models.URLField(help_text='Full URL to the aladin images path, including the host and directory. Example: http://{host}/data/releases/{release_name}/images/aladin/{band}', verbose_name='URL')),
('srv_target', models.CharField(blank=True, help_text='Initial position for this survey must be hours or degrees. Example: 02 21 36.957 -05 31 10.26 or 35.4832, -5.4800.', max_length=25, null=True, verbose_name='Target')),
('srv_fov', models.FloatField(blank=True, help_text='Initial Zoom in degrees.', max_length=10, null=True, verbose_name='FoV')),
('srv_filter', models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.CASCADE, to='common.Filter', verbose_name='Filter')),
('srv_release', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='surveys', to='coadd.Release', verbose_name='Release')),
],
),
migrations.CreateModel(
name='Tag',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('tag_name', models.CharField(max_length=60, verbose_name='Internal Name')),
('tag_display_name', models.CharField(blank=True, max_length=80, null=True, verbose_name='Display Name')),
('tag_install_date', models.DateField(blank=True, null=True, verbose_name='Install Date')),
('tag_release_date', models.DateField(blank=True, null=True, verbose_name='Release Date')),
('tag_status', models.BooleanField(default=False, verbose_name='Status')),
('tag_start_date', models.DateField(blank=True, null=True, verbose_name='Start Date')),
('tag_discovery_date', models.DateField(blank=True, null=True, verbose_name='Discovery Date')),
('tag_release', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='tags', to='coadd.Release', verbose_name='Release')),
],
),
migrations.CreateModel(
name='Tile',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('tli_tilename', models.CharField(max_length=20, unique=True, verbose_name='Tilename')),
('tli_project', models.CharField(blank=True, max_length=80, null=True, verbose_name='Project')),
('tli_ra', models.FloatField(blank=True, default=0, null=True, verbose_name='RA')),
('tli_dec', models.FloatField(blank=True, default=0, null=True, verbose_name='Dec')),
('tli_equinox', models.FloatField(blank=True, default=0, null=True, verbose_name='equinox')),
('tli_pixelsize', models.FloatField(blank=True, default=0, null=True, verbose_name='pixelsize')),
('tli_npix_ra', models.SmallIntegerField(blank=True, default=0, null=True, verbose_name='npix_ra')),
('tli_npix_dec', models.SmallIntegerField(blank=True, default=0, null=True, verbose_name='npix_dec')),
('tli_rall', models.FloatField(blank=True, default=0, null=True, verbose_name='RAll')),
('tli_decll', models.FloatField(blank=True, default=0, null=True, verbose_name='Decll')),
('tli_raul', models.FloatField(blank=True, default=0, null=True, verbose_name='RAul')),
('tli_decul', models.FloatField(blank=True, default=0, null=True, verbose_name='Decul')),
('tli_raur', models.FloatField(blank=True, default=0, null=True, verbose_name='RAur')),
('tli_decur', models.FloatField(blank=True, default=0, null=True, verbose_name='Decur')),
('tli_ralr', models.FloatField(blank=True, default=0, null=True, verbose_name='RAlr')),
('tli_declr', models.FloatField(blank=True, default=0, null=True, verbose_name='Declr')),
('tli_urall', models.FloatField(blank=True, default=0, null=True, verbose_name='urall')),
('tli_udecll', models.FloatField(blank=True, default=0, null=True, verbose_name='udecll')),
('tli_uraur', models.FloatField(blank=True, default=0, null=True, verbose_name='uraur')),
('tli_udecur', models.FloatField(blank=True, default=0, null=True, verbose_name='udecur')),
('tli_urall_180', models.FloatField(blank=True, default=0, help_text='urall in -180 a 180 degrees', null=True, verbose_name='urall 180')),
('tli_uraur_180', models.FloatField(blank=True, default=0, help_text='uraur in -180 a 180 degrees', null=True, verbose_name='uraur 180')),
],
),
migrations.AddField(
model_name='tag',
name='tiles',
field=models.ManyToManyField(through='coadd.Dataset', to='coadd.Tile'),
),
migrations.AddField(
model_name='dataset',
name='tag',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='coadd.Tag'),
),
migrations.AddField(
model_name='dataset',
name='tile',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='coadd.Tile'),
),
]
Loading

0 comments on commit 5bf489d

Please sign in to comment.