More work done on dashboard

tomturner · tomturner · commit dd18479e26f8 · 2019-02-12T21:03:35.000Z
diff --git a/dashboard/admin.py b/dashboard/admin.py
@@ -0,0 +1,10 @@
+from django.contrib import admin
+
+from dashboard.models import Dashboard
+
+
+@admin.register(Dashboard)
+class DashboardAdmin(admin.ModelAdmin):
+    list_display = ['name',
+                    'slug',
+                    'user']
diff --git a/dashboard/gadgets/__init__.py b/dashboard/gadgets/__init__.py
@@ -4,12 +4,8 @@
 def find_gadgets():
     gadget_dir = os.path.dirname(os.path.abspath(__file__))
     try:
-        if True:
-            file_dict = [f[:-3] for f in os.listdir(gadget_dir)
-                    if not f.startswith('_') and f.endswith('.py')]
-        else:
-            file_dict = [f[:-4] for f in os.listdir(gadget_dir)
-                    if not f.startswith('_') and f.endswith('.pyc')]
+        file_dict = [f[:-3] for f in os.listdir(gadget_dir)
+                     if not f.startswith('_') and f.endswith('.py')]
     except OSError:
         return []
     gadgetArray = []
@@ -19,5 +15,5 @@ def find_gadgets():
 
 
 def open_gadget(gadget):
-    g = __import__("djangodashboard.dashboard.gadgets." + gadget, globals(), locals(), ["Gadget"])
+    g = __import__("django-dashboard.dashboard.gadgets." + gadget, globals(), locals(), ["Gadget"])
     return g.Gadget()
diff --git a/dashboard/migrations/0001_initial.py b/dashboard/migrations/0001_initial.py
@@ -0,0 +1,52 @@
+# Generated by Django 2.1.3 on 2019-02-12 21:01
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Dashboard',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=1024)),
+                ('slug', models.SlugField(unique=True)),
+                ('layout', models.TextField(blank=True, null=True)),
+                ('user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+                'db_table': 'dashboard',
+            },
+        ),
+        migrations.CreateModel(
+            name='DashboardItem',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('gadget', models.TextField()),
+                ('column_number', models.IntegerField()),
+                ('position', models.IntegerField()),
+                ('colour', models.TextField(null=True)),
+                ('title', models.TextField(null=True)),
+                ('collapsed', models.BooleanField()),
+                ('modifier', models.TextField(null=True)),
+                ('active', models.BooleanField()),
+                ('dashboard', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='dashboard.Dashboard')),
+            ],
+            options={
+                'db_table': 'dashboard_item',
+            },
+        ),
+        migrations.AlterUniqueTogether(
+            name='dashboard',
+            unique_together={('name', 'user')},
+        ),
+    ]
diff --git a/dashboard/migrations/__init__.py b/dashboard/migrations/__init__.py
diff --git a/dashboard/models.py b/dashboard/models.py
@@ -9,7 +9,7 @@
 
 class Dashboard(models.Model):
     name = models.CharField(max_length=1024)
-    slug = models.SlugField()
+    slug = models.SlugField(unique=True)
     layout = models.TextField(null=True, blank=True)
     user = models.ForeignKey(User, null=True, blank=True, on_delete=models.CASCADE)
 
diff --git a/dashboard/templates/layouts/base_layout.html b/dashboard/templates/layouts/base_layout.html
@@ -8,8 +8,8 @@
         <link href="{% static 'dashboard/css/dashboard.css' %}" rel="stylesheet" type="text/css" />
 </head>
 <body>
-    <script type="text/javascript" src="{% static 'dashboard/js/dashboard.js' %}></script>
-<div style="text-align:right;"><a style="color:black;" href="{% url dashboard_view_gadgets name %}">Add gadgets</a> - <a style="color:black;" href="{% url dashboard_show_layouts name %}">Change Layout</a></div>
+    <script type="text/javascript" src="{% static 'dashboard/js/dashboard.js' %}"></script>
+<div style="text-align:right;"><a style="color:black;" href="{% url 'dashboard:view_gadgets' dashboard.slug %}">Add gadgets</a> - <a style="color:black;" href="url dashboard_show_layouts name">Change Layout</a></div>
 <div style="clear:both;"/>
 {% block layout %}{% endblock %}
 
@@ -34,7 +34,7 @@
     </script>
     
     <script type="text/javascript">
-    iDashboard.init('{% url dashboard_update_ajax name %}','{{ csrf_token }}','{% static "dashboard/css/" %}');
+    iDashboard.init('url dashboard_update_ajax name','{{ csrf_token }}','{% static "dashboard/css/" %}');
     </script>
 </body>
 </html>
diff --git a/dashboard/urls.py b/dashboard/urls.py
@@ -15,9 +15,10 @@
 
 
 from django.urls import path
+from dashboard.views import ViewDashboard, ViewGadgets
 
-from dashboard.views import ViewDashboard
 app_name = 'dashboard'
 urlpatterns = [
     path('<slug:slug>/', ViewDashboard.as_view(), name='view_dashboard'),
+    path('<slug:slug>/view-gadgets/', ViewGadgets.as_view(), name='view_gadgets'),
 ]
diff --git a/dashboard/views.py b/dashboard/views.py
@@ -1,5 +1,6 @@
 from django.shortcuts import render_to_response, get_object_or_404, render
 from django.views import View
+from django.views.generic import TemplateView
 
 from dashboard.gadgets import find_gadgets, open_gadget
 from django.http import HttpResponse, HttpResponseRedirect
@@ -13,9 +14,9 @@
 class ViewDashboard(View):
     def get(self, request, slug):
         try:
-            dashboard = Dashboard.objects.get(alug=alug, user=request.user)
+            dashboard = Dashboard.objects.get(slug=slug, user=request.user)
         except Dashboard.DoesNotExist:
-            dashboard = Dashboard(alug=alug, user=request.user, layout='three')
+            dashboard = Dashboard(slug=slug, user=request.user, layout='three')
             dashboard.save()
         dashboard_data = {}
         column_data = []
@@ -33,7 +34,8 @@ def get(self, request, slug):
             dashboard_data[column_number] = column_data
 
         return render_to_response('layouts/%s.html' % dashboard.layout,
-                                  {'name': name,
+                                  {'name': dashboard.name,
+                                   'dashboard': dashboard,
                                    'dashboard_data': dashboard_data,
                                    'dashboard_items': dashboard_items})
 #
@@ -81,7 +83,19 @@ def get(self, request, slug):
 #     w = open_gadget(dashboard_item.gadget)
 #     return w.view(request, dashboard_item)
 #
-#
+
+
+class ViewGadgets(TemplateView):
+    template_name = 'view_gadgets.html'
+
+    def get_context_data(self, **kwargs):
+        context = super(ViewGadgets, self).get_context_data(**kwargs)
+        dashboard = get_object_or_404(Dashboard, slug=self.kwargs['slug'])
+        context['dashboard'] = dashboard
+        context['gadgets'] = find_gadgets()
+        return context
+
+
 # # noinspection PyUnusedLocal
 # def view_gadgets(request, name):
 #     return render_to_response('view_gadgets.html', {'name': name, 'gadgets': find_gadgets()})

Original file line number	Diff line number	Diff line change
`@@ -15,9 +15,10 @@`
`15`	`15`
`16`	`16`
`17`	`17`	`from django.urls import path`
	`18`	`+from dashboard.views import ViewDashboard, ViewGadgets`
`18`	`19`
`19`		`-from dashboard.views import ViewDashboard`
`20`	`20`	`app_name = 'dashboard'`
`21`	`21`	`urlpatterns = [`
`22`	`22`	`path('<slug:slug>/', ViewDashboard.as_view(), name='view_dashboard'),`
	`23`	`+ path('<slug:slug>/view-gadgets/', ViewGadgets.as_view(), name='view_gadgets'),`
`23`	`24`	`]`