attributes tweaks

diff --git a/qcg/models.py b/qcg/models.py
index e2fd198..7205932 100644 (file)
--- a/qcg/models.py
+++ b/qcg/models.py
@@ -177,8 +177,8 @@ class Allocation(models.Model):
 
     host_name = models.CharField(u"Host", max_length=100)
     status_description = models.TextField(u"Opis statusu", blank=True, default='')
-    processes_count = models.PositiveIntegerField(u"Liczba procesorów")
-    slots_count = models.PositiveIntegerField(u"Liczba slotów")
+    processes_count = models.PositiveIntegerField(u"Liczba procesów")
+    slots_count = models.PositiveIntegerField(u"Liczba rdzeni")
     processes_group_id = models.TextField(u"Identyfikator grupy procesów", blank=True, default='')
     submission_time = models.DateTimeField(u"Data wysłania")
     estimated_start_time = models.DateTimeField(u"Przewidywana data rozpoczęcia", blank=True, null=True)
@@ -211,7 +211,7 @@ class NodeInfo(models.Model):
     allocation = models.ForeignKey(Allocation, verbose_name=u"Alokacja", related_name='nodes')
 
     name = models.CharField(u"Nazwa", max_length=32)
-    count = models.PositiveSmallIntegerField(u"Liczba slotów", blank=True, null=True)
+    count = models.PositiveSmallIntegerField(u"Liczba rdzeni", blank=True, null=True)
 
     class Meta:
         verbose_name = u"Węzeł"

diff --git a/qcg/templates/qcg/job.html b/qcg/templates/qcg/job.html
index 6a2a466..c5a3d59 100644 (file)
--- a/qcg/templates/qcg/job.html
+++ b/qcg/templates/qcg/job.html
@@ -37,6 +37,7 @@
                     <ul class="list-group">
                         {% for task in job.tasks.all %}
                             <li class="list-group-item">
+                                {% display_attribute 'Identyfikator' task.task_id %}
                                 {% display_attribute 'Status' task.get_status_display %}
                                 {% display_attribute 'Opis statusu' task.status_description %}
                                 {% display_attribute 'Data rozpoczęcia' task.start_time %}

diff --git a/qcg/templates/qcg/task.html b/qcg/templates/qcg/task.html
index 305c801..c1278e3 100644 (file)
--- a/qcg/templates/qcg/task.html
+++ b/qcg/templates/qcg/task.html
@@ -44,8 +44,8 @@
                                 {% display_attribute 'Komentarz' alloc.comment %}
                                 {% display_attribute 'Host' alloc.host_name %}
                                 {% display_attribute 'Opis statusu' alloc.status_description %}
-                                {% display_attribute 'Liczba procesorów' alloc.processes_count %}
-                                {% display_attribute 'Liczba slotów' alloc.slots_count %}
+                                {% display_attribute 'Liczba procesów' alloc.processes_count %}
+                                {% display_attribute 'Liczba rdzeni' alloc.slots_count %}
                                 {% display_attribute 'Identyfikator grupy procesów' alloc.processes_group_id %}
                                 {% display_attribute 'Data zlecenia' task.submission_time %}
                                 {% display_attribute 'Przewidywana data rozpoczęcia' alloc.estimated_start_time %}