Merge pull request #25 from SmartReports/fixMigrations

Fix Migrations and static files folder collect

smartreport/urls.py

@@ -16,10 +16,13 @@
 """
 from django.contrib import admin
 from django.urls import path, include
+from django.conf import settings
+from django.conf.urls.static import static
 # from django.conf import settings
 # from django.conf.urls.static import static
 
 urlpatterns = [
     path("", include("smartreport_app.urls")),
     path('admin/', admin.site.urls),
-]
+]
+urlpatterns += static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)

smartreport_app/migrations/0001_initial.py

@@ -1,7 +1,8 @@
-# Generated by Django 4.2.7 on 2023-11-11 10:08
+# Generated by Django 4.2.7 on 2023-11-11 11:42
 
 from django.db import migrations, models
 import django.db.models.deletion
+import smartreport_app.models
 
 
 class Migration(migrations.Migration):
@@ -26,6 +27,7 @@ class Migration(migrations.Migration):
                 ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('name', models.CharField(max_length=255)),
                 ('user_type', models.CharField(choices=[('doctor', 'Doctor'), ('parent', 'Parent'), ('project_manager', 'Project Manager'), ('machine_maintainer', 'Machine Maintainer')], max_length=128)),
+                ('allowed_charts', models.JSONField(default=smartreport_app.models.DEFAULT_CHART_CHOICES)),
                 ('priority', models.IntegerField(default=0)),
                 ('isNew', models.BooleanField(default=True)),
             ],
@@ -56,14 +58,6 @@ class Migration(migrations.Migration):
                 ('report_page', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='elements', to='smartreport_app.reporttemplatepage')),
             ],
         ),
-        migrations.CreateModel(
-            name='ChartType',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('plot_name', models.CharField(choices=[('line', 'line'), ('bar', 'bar'), ('pie', 'pie'), ('doughnut', 'doughnut'), ('radar', 'radar')], max_length=128)),
-                ('kpi', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='allowed_charts', to='smartreport_app.kpi')),
-            ],
-        ),
         migrations.CreateModel(
             name='ArchivedReport',
             fields=[