updated cluster_string datattype ACG

Author: DanShinde

ACGen/models.py

@@ -20,7 +20,8 @@ class ClusterTemplate(models.Model):
     id = models.AutoField(primary_key=True)
     cluster_name = models.CharField(max_length=255, unique=True)
     cluster_config = models.TextField(null=True,blank=True)
-    cluster_string = models.CharField(null=True, blank=True)
+    cluster_string = models.TextField(null=True, blank=True)
+    cluster_version = models.CharField(max_length=255, null=True, blank=True)
     block_type = models.CharField(max_length=255)
     uploaded_by = models.CharField(max_length=255)
     uploaded_at = models.DateTimeField(auto_now_add=True)

IOLGen/admin.py

@@ -33,9 +33,9 @@ class ProjectAdmin(ImportExportModelAdmin, admin.ModelAdmin):
 
 @admin.register(Module)
 class ModuleAdmin(ImportExportModelAdmin, admin.ModelAdmin):
-    list_display = ('id', 'module', 'created_by', 'created_at')
-    search_fields = ('module', 'created_by')
-    list_filter = ('created_at',)
+    list_display = ('id', 'module', 'segment', 'created_by', 'created_at')
+    search_fields = ('module', 'created_by', 'segment')
+    list_filter = ('segment','module')
 
 @admin.register(IOList)
 class IOListAdmin(ImportExportModelAdmin, admin.ModelAdmin):

IOLGen/views.py

@@ -51,7 +51,7 @@ class ProjectsView(TemplateView):
 
 @login_required
 def get_project_list(request):
-    projects = Project.objects.all()
+    projects = Project.objects.all().order_by('created_at').reverse()
     context = {}
     context['projects'] = projects # type: ignore
     return render(request, 'IOLGen/partials/projectTable.html', {'projects': projects})

templates/IOLGen/partials/projectTable.html

@@ -11,11 +11,25 @@
             <tr>
                 <td>{{ project.name }}</td>
                 <td>{{ project.description }}</td>
-                <td>{{ project.segments }}</td>
+                <td>
+                    {% for segment in project.segments.all %}
+                      {{ segment.name }}{% if not forloop.last %}, {% endif %}
+                    {% empty %}
+                      <em>No segments</em>
+                    {% endfor %}
+                  </td>
                 <td>{{ project.created_by }}</td>
                 <td>{{ project.created_at }}</td>
-                <td><button class='btn'><svg class="bi bi-pencil" width="32" height="32"><use xlink:href="#pencil"></svg></button></td>
-                <td><button class='btn'><svg class="bi bi-trash3" width="32" height="32"><use xlink:href="#trash3"></svg></button></td>
+                <td>
+                    <button class='btn'>
+                        <i class="bi bi-pencil" style="font-size: 32px;"></i>
+                    </button>
+                </td>
+                <td>
+                    <button class='btn'>
+                        <i class="bi bi-trash3" style="font-size: 32px;"></i>
+                    </button>
+                </td>
             </tr>
         {% endfor %}
     </tbody>

templates/base.html

@@ -10,6 +10,7 @@
 
     <link rel="stylesheet" href="{% static 'base/base.css' %}">
     <!-- Bootstrap CDN for CSS -->
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.3/font/bootstrap-icons.min.css">
     <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.5/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-SgOJa3DmI69IUzQ2PVdRZhwQ+dy64/BUtbMJw1MZ8t5HZApcHrRKUc4W0kG879m7" crossorigin="anonymous">
     {% block styles %}{% endblock %} 
 </head>