usage unit

fasrc · Nov 16, 2023 · f53944e · f53944e
1 parent bd87984
commit f53944e
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 12 deletions.
diff --git a/coldfront/core/allocation/templates/allocation/allocation_detail.html b/coldfront/core/allocation/templates/allocation/allocation_detail.html
@@ -461,6 +461,12 @@ <h3 class="d-inline"><i class="fas fa-users" aria-hidden="true"></i> Users in Al
 
         <tbody>
           {% for user in allocation_users %}
+            {% if user.unit not "CPU Hours" %}
+              {% user.usage_bytes as userusage %}
+              {% allocation.usage_exact as allocationusage %}
+            {% else %}
+              {% user.usage_bytes as userusage %}
+            {% endif %}
             <tr status = "{{ user.status }}">
               <td>{{ user.user.first_name }} {{ user.user.last_name }}</td>
 
@@ -471,20 +477,22 @@ <h3 class="d-inline"><i class="fas fa-users" aria-hidden="true"></i> Users in Al
               {% else %}
                 <td class="text-info">{{ user.status.name }}</td>
               {% endif %}
-              {% if user.usage_bytes == 0.0 %}
-              <td data-sort = "{{user.usage_bytes}}" name = "usage_bytes"> 0 bytes</td>
-              {% else %}
-              <td data-sort = "{{user.usage_bytes}}" name = "usage_bytes">{{ user.usage|floatformat:1 }}{{ user.unit }}</td>
-              {% endif %}
-              {% if allocation.usage_exact == None or allocation.usage_exact == 0 %}
-              <td>0</td>
+              <td data-sort = "{{userusage}}" name = "usage_bytes">
+                {% if userusage is None %}
+                  0 {{ user.unit }}
+                {% else %}
+                  {{ user.usage|floatformat:1 }}{{ user.unit }}
+                {% endif %}
+                </td>
+              {% if allocationusage == None or allocationusage == 0 %}
+                <td>0</td>
               {% else %}
-              <td>{{user.usage_bytes|div:allocation.usage_exact|mul:100|floatformat:2 }}%</td>
+                <td>{{userusage|div:allocationusage|mul:100|floatformat:2 }}%</td>
               {% endif %}
-              {% if "Cluster" in allocation.get_parent_resource.resource_type.name %}
-                {% cost_cpuhours user.usage as cost %}
+              {% if if user.unit not "CPU Hours" %}
+                {% cost_cpuhours userusage as cost %}
               {% else %}
-                {% cost_bytes user.usage_bytes as cost %}
+                {% cost_bytes userusage as cost %}
               {% endif %}
               {% if cost %}
                 <td>{{ cost }}</td>

diff --git a/coldfront/plugins/slurm/management/commands/slurm_sync.py b/coldfront/plugins/slurm/management/commands/slurm_sync.py
@@ -121,5 +121,7 @@ def handle(self, *args, **options):
                         continue
                     alloc_user, _ = allocation_obj.allocationuser_set.get_or_create(
                         user = get_user_model().objects.get(username=user_name),
-                        defaults = {'status': auser_status_active}
+                        defaults = {
+                            'status': auser_status_active, "unit": "CPU Hours"
+                        }
                     )
diff --git a/coldfront/plugins/xdmod/management/commands/xdmod_usage.py b/coldfront/plugins/xdmod/management/commands/xdmod_usage.py
@@ -295,6 +295,7 @@ def process_total_cpu_hours(self):
             for user in s.allocationuser_set.all():
                 if user.user.username in usage_data:
                     user.usage = usage_data[user.user.username]
+                    user.unit = "CPU Hours"
                     user.save()
             if self.sync:
                 cpu_hours_attr = s.allocationattribute_set.get(