diff --git a/myproject/debug.log b/myproject/debug.log
index 3e46aa6baf526c0043882a227bff4b43e19dacfa..caada60d2ad6233f5706607bebeea4cecb404c72 100644
--- a/myproject/debug.log
+++ b/myproject/debug.log
@@ -1161,3 +1161,179 @@ django.template.exceptions.TemplateSyntaxError: Invalid block tag on line 262: '
Watching for file changes with StatReloader
Not Found: /favicon.ico
Watching for file changes with StatReloader
+Watching for file changes with StatReloader
+Watching for file changes with StatReloader
+Not Found: /favicon.ico
+Not Found: /favicon.ico
+Watching for file changes with StatReloader
+/usr/src/app/myapp/models.py changed, reloading.
+Watching for file changes with StatReloader
+Watching for file changes with StatReloader
+Internal Server Error: /user/
+Traceback (most recent call last):
+ File "/usr/local/lib/python3.11/site-packages/django/template/smartif.py", line 179, in translate_token
+ op = OPERATORS[token]
+ ~~~~~~~~~^^^^^^^
+KeyError: '||'
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+ File "/usr/local/lib/python3.11/site-packages/django/core/handlers/exception.py", line 55, in inner
+ response = get_response(request)
+ ^^^^^^^^^^^^^^^^^^^^^
+ File "/usr/local/lib/python3.11/site-packages/django/core/handlers/base.py", line 197, in _get_response
+ response = wrapped_callback(request, *callback_args, **callback_kwargs)
+ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ File "/usr/src/app/myapp/views.py", line 187, in users
+ return render(request, 'user_page.html', context)
+ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ File "/usr/local/lib/python3.11/site-packages/django/shortcuts.py", line 24, in render
+ content = loader.render_to_string(template_name, context, request, using=using)
+ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ File "/usr/local/lib/python3.11/site-packages/django/template/loader.py", line 61, in render_to_string
+ template = get_template(template_name, using=using)
+ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ File "/usr/local/lib/python3.11/site-packages/django/template/loader.py", line 15, in get_template
+ return engine.get_template(template_name)
+ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ File "/usr/local/lib/python3.11/site-packages/django/template/backends/django.py", line 33, in get_template
+ return Template(self.engine.get_template(template_name), self)
+ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ File "/usr/local/lib/python3.11/site-packages/django/template/engine.py", line 175, in get_template
+ template, origin = self.find_template(template_name)
+ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ File "/usr/local/lib/python3.11/site-packages/django/template/engine.py", line 157, in find_template
+ template = loader.get_template(name, skip=skip)
+ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ File "/usr/local/lib/python3.11/site-packages/django/template/loaders/cached.py", line 57, in get_template
+ template = super().get_template(template_name, skip)
+ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ File "/usr/local/lib/python3.11/site-packages/django/template/loaders/base.py", line 28, in get_template
+ return Template(
+ ^^^^^^^^^
+ File "/usr/local/lib/python3.11/site-packages/django/template/base.py", line 154, in __init__
+ self.nodelist = self.compile_nodelist()
+ ^^^^^^^^^^^^^^^^^^^^^^^
+ File "/usr/local/lib/python3.11/site-packages/django/template/base.py", line 196, in compile_nodelist
+ return parser.parse()
+ ^^^^^^^^^^^^^^
+ File "/usr/local/lib/python3.11/site-packages/django/template/base.py", line 510, in parse
+ raise self.error(token, e)
+ File "/usr/local/lib/python3.11/site-packages/django/template/base.py", line 508, in parse
+ compiled_result = compile_func(self, token)
+ ^^^^^^^^^^^^^^^^^^^^^^^^^
+ File "/usr/local/lib/python3.11/site-packages/django/template/loader_tags.py", line 295, in do_extends
+ nodelist = parser.parse()
+ ^^^^^^^^^^^^^^
+ File "/usr/local/lib/python3.11/site-packages/django/template/base.py", line 510, in parse
+ raise self.error(token, e)
+ File "/usr/local/lib/python3.11/site-packages/django/template/base.py", line 508, in parse
+ compiled_result = compile_func(self, token)
+ ^^^^^^^^^^^^^^^^^^^^^^^^^
+ File "/usr/local/lib/python3.11/site-packages/django/template/loader_tags.py", line 234, in do_block
+ nodelist = parser.parse(("endblock",))
+ ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ File "/usr/local/lib/python3.11/site-packages/django/template/base.py", line 510, in parse
+ raise self.error(token, e)
+ File "/usr/local/lib/python3.11/site-packages/django/template/base.py", line 508, in parse
+ compiled_result = compile_func(self, token)
+ ^^^^^^^^^^^^^^^^^^^^^^^^^
+ File "/usr/local/lib/python3.11/site-packages/django/template/defaulttags.py", line 959, in do_if
+ condition = TemplateIfParser(parser, bits).parse()
+ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ File "/usr/local/lib/python3.11/site-packages/django/template/defaulttags.py", line 892, in __init__
+ super().__init__(*args, **kwargs)
+ File "/usr/local/lib/python3.11/site-packages/django/template/smartif.py", line 170, in __init__
+ mapped_tokens.append(self.translate_token(token))
+ ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ File "/usr/local/lib/python3.11/site-packages/django/template/smartif.py", line 181, in translate_token
+ return self.create_var(token)
+ ^^^^^^^^^^^^^^^^^^^^^^
+ File "/usr/local/lib/python3.11/site-packages/django/template/defaulttags.py", line 895, in create_var
+ return TemplateLiteral(self.template_parser.compile_filter(value), value)
+ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ File "/usr/local/lib/python3.11/site-packages/django/template/base.py", line 597, in compile_filter
+ return FilterExpression(token, self)
+ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ File "/usr/local/lib/python3.11/site-packages/django/template/base.py", line 698, in __init__
+ raise TemplateSyntaxError(
+django.template.exceptions.TemplateSyntaxError: Could not parse the remainder: '||' from '||'
+Internal Server Error: /user/
+Traceback (most recent call last):
+ File "/usr/local/lib/python3.11/site-packages/django/template/base.py", line 502, in parse
+ compile_func = self.tags[command]
+ ~~~~~~~~~^^^^^^^^^
+KeyError: 'endblock'
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+ File "/usr/local/lib/python3.11/site-packages/django/core/handlers/exception.py", line 55, in inner
+ response = get_response(request)
+ ^^^^^^^^^^^^^^^^^^^^^
+ File "/usr/local/lib/python3.11/site-packages/django/core/handlers/base.py", line 197, in _get_response
+ response = wrapped_callback(request, *callback_args, **callback_kwargs)
+ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ File "/usr/src/app/myapp/views.py", line 187, in users
+ return render(request, 'user_page.html', context)
+ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ File "/usr/local/lib/python3.11/site-packages/django/shortcuts.py", line 24, in render
+ content = loader.render_to_string(template_name, context, request, using=using)
+ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ File "/usr/local/lib/python3.11/site-packages/django/template/loader.py", line 61, in render_to_string
+ template = get_template(template_name, using=using)
+ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ File "/usr/local/lib/python3.11/site-packages/django/template/loader.py", line 15, in get_template
+ return engine.get_template(template_name)
+ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ File "/usr/local/lib/python3.11/site-packages/django/template/backends/django.py", line 33, in get_template
+ return Template(self.engine.get_template(template_name), self)
+ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ File "/usr/local/lib/python3.11/site-packages/django/template/engine.py", line 175, in get_template
+ template, origin = self.find_template(template_name)
+ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ File "/usr/local/lib/python3.11/site-packages/django/template/engine.py", line 157, in find_template
+ template = loader.get_template(name, skip=skip)
+ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ File "/usr/local/lib/python3.11/site-packages/django/template/loaders/cached.py", line 57, in get_template
+ template = super().get_template(template_name, skip)
+ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ File "/usr/local/lib/python3.11/site-packages/django/template/loaders/base.py", line 28, in get_template
+ return Template(
+ ^^^^^^^^^
+ File "/usr/local/lib/python3.11/site-packages/django/template/base.py", line 154, in __init__
+ self.nodelist = self.compile_nodelist()
+ ^^^^^^^^^^^^^^^^^^^^^^^
+ File "/usr/local/lib/python3.11/site-packages/django/template/base.py", line 196, in compile_nodelist
+ return parser.parse()
+ ^^^^^^^^^^^^^^
+ File "/usr/local/lib/python3.11/site-packages/django/template/base.py", line 510, in parse
+ raise self.error(token, e)
+ File "/usr/local/lib/python3.11/site-packages/django/template/base.py", line 508, in parse
+ compiled_result = compile_func(self, token)
+ ^^^^^^^^^^^^^^^^^^^^^^^^^
+ File "/usr/local/lib/python3.11/site-packages/django/template/loader_tags.py", line 295, in do_extends
+ nodelist = parser.parse()
+ ^^^^^^^^^^^^^^
+ File "/usr/local/lib/python3.11/site-packages/django/template/base.py", line 510, in parse
+ raise self.error(token, e)
+ File "/usr/local/lib/python3.11/site-packages/django/template/base.py", line 508, in parse
+ compiled_result = compile_func(self, token)
+ ^^^^^^^^^^^^^^^^^^^^^^^^^
+ File "/usr/local/lib/python3.11/site-packages/django/template/loader_tags.py", line 234, in do_block
+ nodelist = parser.parse(("endblock",))
+ ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ File "/usr/local/lib/python3.11/site-packages/django/template/base.py", line 510, in parse
+ raise self.error(token, e)
+ File "/usr/local/lib/python3.11/site-packages/django/template/base.py", line 508, in parse
+ compiled_result = compile_func(self, token)
+ ^^^^^^^^^^^^^^^^^^^^^^^^^
+ File "/usr/local/lib/python3.11/site-packages/django/template/defaulttags.py", line 960, in do_if
+ nodelist = parser.parse(("elif", "else", "endif"))
+ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ File "/usr/local/lib/python3.11/site-packages/django/template/base.py", line 504, in parse
+ self.invalid_block_tag(token, command, parse_until)
+ File "/usr/local/lib/python3.11/site-packages/django/template/base.py", line 555, in invalid_block_tag
+ raise self.error(
+django.template.exceptions.TemplateSyntaxError: Invalid block tag on line 268: 'endblock', expected 'elif', 'else' or 'endif'. Did you forget to register or load this tag?
diff --git a/myproject/myapp/management/commands/make_users.py b/myproject/myapp/management/commands/make_users.py
index 8ab8b98cff9bf462822d7a2a5e7501d81ddbfaf0..de2416f43489e905f1401bb17528774b6f601a68 100644
--- a/myproject/myapp/management/commands/make_users.py
+++ b/myproject/myapp/management/commands/make_users.py
@@ -12,8 +12,8 @@ class Command(BaseCommand):
if not Profile.objects.filter(username="admin").exists():
Profile.objects.create_user("admin", password="placeholder")
- if not Profile.objects.filter(username="base_user").exists():
- Profile.objects.create_user("base_user", password="placeholder")
+ # if not Profile.objects.filter(username="base_user").exists():
+ # Profile.objects.create_user("base_user", password="placeholder")
if not Profile.objects.filter(username="ml_engineer").exists():
Profile.objects.create_user("ml_engineer", password="placeholder")
diff --git a/myproject/myapp/models.py b/myproject/myapp/models.py
index f6d4d5a4be0565350196ddfc818eac196dbc4ef8..070d28b8b8afe60e2a2b4d1b88d41d0a3e1b32a2 100644
--- a/myproject/myapp/models.py
+++ b/myproject/myapp/models.py
@@ -6,33 +6,6 @@ from enum import Enum
from django.dispatch import receiver
from django.db.models.signals import post_save
-# class UserTypes(User):
-# USER_TYPE_CHOICES = (
-# 0, 'Basic User',
-# 1, 'Admin',
-# 2, 'ML Engineer',
-# 3, 'Accountant'
-# )
-
-# usertype = models.PositiveSmallIntegerField(choices=USER_TYPE_CHOICES) # should we declare default=0 here?
-
-# group_names = ['Basic User', 'Admin', 'ML Engineer', 'Accountant']
-# for group_name in group_names:
-# Group.objects.get_or_create(name=group_name)
-
-# # assign group permissions
-# content_type = ContentType.objects.get_for_model(UserTypes)
-# permission = Permission.objects.create(codename='can_view_user',
-# name='Can View User',
-# content_type=content_type)
-# group = Group.objects.get(name='Admin')
-# group.permissions.add(permission)
-
-
-# User = get_user_model()
-
-# user = User.objects.create_user('username', 'email', 'password')
-# # names are not necessary - reduces gdpr concerns aswell
class Profile(models.Model):
USER_TYPES = (
diff --git a/myproject/myapp/templates/user_page.html b/myproject/myapp/templates/user_page.html
index dffc797078bc996353cbfb8d449b0a24c8708bda..8dc69803fa4f31ef0bf75d85fbd8f1459cfeea56 100644
--- a/myproject/myapp/templates/user_page.html
+++ b/myproject/myapp/templates/user_page.html
@@ -86,7 +86,7 @@
{% comment %} REPLACE WITH LOGIC TO CHECK PROPER USER {% endcomment %}
</div>
{% endif %}
- {% if 1 %}
+ {% if user_profile.user_type == 2 %}
<div
class="p-4 mb-4 bg-white border border-gray-200 rounded-lg shadow-sm 2xl:col-span-2 dark:border-gray-700 sm:p-6 dark:bg-gray-800"
@@ -123,7 +123,8 @@
</button>
</form>
</div>
- {% comment %} AI content {% endcomment %} {% endif%}
+ {% comment %} AI content {% endcomment %}
+ {% endif %}
</div>
<div class="col-span-2">
@@ -172,6 +173,7 @@
</div>
</div>
</div>
+ {% if user_profile.user_type == 1 or user_profile.user_type == 2 %}
<div
class="p-4 mb-4 bg-white border border-gray-200 rounded-lg shadow-sm 2xl:col-span-2 dark:border-gray-700 sm:p-6 dark:bg-gray-800"
>
@@ -212,9 +214,11 @@
</tbody>
</table>
</div>
+
+ {% endif %}
{% if 1 %} {% comment %} REPLACE WITH LOGIC TO CHECK PROPER USER
{%endcomment %}
- {% if user_profile.user_type == 2 %}
+ {% comment %} {% if user_profile.user_type == 2 %}
<div
class="p-4 mb-4 bg-white border border-gray-200 rounded-lg shadow-sm 2xl:col-span-2 dark:border-gray-700 sm:p-6 dark:bg-gray-800"
>
@@ -259,7 +263,7 @@
</tbody>
</table>
</div>
- {% endif %}
+ {% endif %} {% endcomment %}
{% endif %} {% comment %} Admin page functionality end {% endcomment %}
</div>
</div>