Merge branch 'master' of mmka.chem.univ.gda.pl:qcg-portal

[qcg-portal.git] / qcg / migrations / 0001_initial.py

diff --git a/qcg/migrations/0001_initial.py b/qcg/migrations/0001_initial.py
index 8b1f7ba..85f384f 100644 (file)
--- a/qcg/migrations/0001_initial.py
+++ b/qcg/migrations/0001_initial.py
@@ -4,7 +4,6 @@ from __future__ import unicode_literals
 from django.db import models, migrations
 import django.utils.timezone
 from django.conf import settings
-import timedelta.fields
 import django.core.validators
 
 
@@ -45,9 +44,10 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
                 ('host_name', models.CharField(max_length=100, verbose_name='Host')),
+                ('status', models.IntegerField(verbose_name='Status', choices=[(0, b'CANCELED'), (1, b'FAILED'), (2, b'FINISHED'), (3, b'PENDING'), (4, b'POSTPROCESSING'), (5, b'PREPROCESSING'), (6, b'RUNNING'), (7, b'STOPPED'), (8, b'SUBMISSION'), (9, b'UNCOMMITTED'), (10, b'UNSUBMITTED')])),
                 ('status_description', models.TextField(default=b'', verbose_name='Opis statusu', blank=True)),
-                ('processes_count', models.PositiveIntegerField(verbose_name='Liczba procesor\xf3w')),
-                ('slots_count', models.PositiveIntegerField(verbose_name='Liczba slot\xf3w')),
+                ('processes_count', models.PositiveIntegerField(verbose_name='Liczba proces\xf3w')),
+                ('slots_count', models.PositiveIntegerField(verbose_name='Liczba rdzeni')),
                 ('processes_group_id', models.TextField(default=b'', verbose_name='Identyfikator grupy proces\xf3w', blank=True)),
                 ('submission_time', models.DateTimeField(verbose_name='Data wys\u0142ania')),
                 ('estimated_start_time', models.DateTimeField(null=True, verbose_name='Przewidywana data rozpocz\u0119cia', blank=True)),
@@ -76,10 +76,10 @@ class Migration(migrations.Migration):
                 ('status', models.IntegerField(verbose_name='Status', choices=[(0, b'ACTIVE'), (1, b'BROKEN'), (2, b'CANCELED'), (3, b'FAILED'), (4, b'FINISHED'), (5, b'SUBMITTED'), (6, b'UNCOMMITTED')])),
                 ('note', models.TextField(default=b'', verbose_name='Notatka', blank=True)),
                 ('description', models.TextField(default=b'', verbose_name='Opis', blank=True)),
+                ('project', models.TextField(default=b'', verbose_name='Projekt', blank=True)),
                 ('submission_time', models.DateTimeField(verbose_name='Data wys\u0142ania')),
                 ('finish_time', models.DateTimeField(null=True, verbose_name='Data zako\u0144czenia', blank=True)),
-                ('proxy_lifetime', timedelta.fields.TimedeltaField(null=True, verbose_name='Czas \u017cycia proxy', blank=True)),
-                ('project', models.TextField(default=b'', verbose_name='Projekt', blank=True)),
+                ('proxy_lifetime', models.DateTimeField(null=True, verbose_name='Czas \u017cycia proxy', blank=True)),
                 ('purged', models.BooleanField(default=False, verbose_name='Usuni\u0119ty katalog roboczy?')),
                 ('created', models.DateTimeField(auto_now_add=True, verbose_name='Utworzono')),
                 ('updated', models.DateTimeField(auto_now=True, verbose_name='Uaktualniono')),
@@ -95,7 +95,7 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
                 ('name', models.CharField(max_length=32, verbose_name='Nazwa')),
-                ('count', models.PositiveSmallIntegerField(null=True, verbose_name='Liczba slot\xf3w', blank=True)),
+                ('count', models.PositiveSmallIntegerField(null=True, verbose_name='Liczba rdzeni', blank=True)),
                 ('allocation', models.ForeignKey(related_name='nodes', verbose_name='Alokacja', to='qcg.Allocation')),
             ],
             options={
@@ -120,7 +120,7 @@ class Migration(migrations.Migration):
                 ('finish_time', models.DateTimeField(null=True, verbose_name='Data zako\u0144czenia', blank=True)),
                 ('reserved_time_start', models.DateTimeField(null=True, verbose_name='Data rozpocz\u0119cia rezerwacji', blank=True)),
                 ('reserved_time_finish', models.DateTimeField(null=True, verbose_name='Data zako\u0144czenia rezerwacji', blank=True)),
-                ('proxy_lifetime', timedelta.fields.TimedeltaField(null=True, verbose_name='Czas \u017cycia proxy', blank=True)),
+                ('proxy_lifetime', models.DateTimeField(null=True, verbose_name='Czas \u017cycia proxy', blank=True)),
                 ('purged', models.BooleanField(default=False, verbose_name='Usuni\u0119ty katalog roboczy?')),
                 ('created', models.DateTimeField(auto_now_add=True, verbose_name='Utworzono')),
                 ('updated', models.DateTimeField(auto_now=True, verbose_name='Uaktualniono')),