chore: add Merge/Pull request template

#226

.github/pull_request_template.md

@@ -0,0 +1,39 @@
+### :books: Summary
+<!-- your summary here emojis ref: https://github.com/yodamad/gitlab-emoji -->
+
+
+
+### :link: Links / References
+<!-- 
+
+    using a list as any links to other references or links as required. if relevant, describe the link/reference
+
+    Include any issues or related merge requests. Note: dependent MR's also to be added to "Merge request dependencies"
+
+-->
+
+
+
+### :construction_worker: Tasks
+
+ - [ ] Add your tasks here if required (delete)
+
+<!-- dont remove tasks below strike through including the checkbox by enclosing in double tidle '~~' -->
+
+- [ ] :firecracker: Contains breaking-change Any Breaking change(s)?
+
+    _Breaking Change must also be notated in the commit that introduces it and in [Conventional Commit Format](https://www.conventionalcommits.org/en/v1.0.0/)._
+
+    - [ ] :notebook: Release notes updated
+
+- [ ] :blue_book: Documentation written
+
+    _All features to be documented within the correct section(s). Administration, Development and/or User_
+
+- [ ] :checkered_flag: Milestone assigned
+
+- [ ] :test_tube: [Unit Test(s) Written](https://nofusscomputing.com/projects/centurion_erp/development/testing/)
+
+    _ensure test coverage delta is not less than zero_
+
+- [ ] :page_facing_up: Roadmap updated

.gitlab/merge_request_templates/default.md

@@ -35,3 +35,5 @@
 - [ ] [Unit Test(s) Written](https://nofusscomputing.com/projects/centurion_erp/development/testing/)
 
     _ensure test coverage delta is not less than zero_
+
+- [ ] :page_facing_up: Roadmap updated

CONTRIBUTING.md

@@ -30,6 +30,9 @@ python3 manage.py createsuperuser
 # If model changes
 python3 manage.py makemigrations --noinput
 
+# To update code highlight run
+pygmentize -S default -f html -a .codehilite > project-static/code.css
+
 ```
 
 Updates to python modules will need to be captured with SCM. This can be done by running `pip freeze > requirements.txt` from the running virtual environment.

app/access/forms/team.py

@@ -68,6 +68,7 @@ class TeamForm(CommonModelForm):
 
         apps = [
             'access',
+            'assistance',
             'config_management',
             'core',
             'django_celery_results',

app/access/models.py

@@ -15,9 +15,6 @@ class Organization(SaveHistory):
         verbose_name_plural = "Organizations"
         ordering = ['name']
 
-    def __str__(self):
-        return self.name
-
     def save(self, *args, **kwargs):
 
         if self.slug == '_':
@@ -62,6 +59,9 @@ class Organization(SaveHistory):
     def get_organization(self):
         return self
 
+    def __str__(self):
+        return self.name
+
 
 
 class TenancyManager(models.Manager):
@@ -196,9 +196,6 @@ class Team(Group, TenancyObject):
         verbose_name_plural = "Teams"
         ordering = ['team_name']
 
-    def __str__(self):
-        return self.name
-
 
     def save(self, force_insert=False, force_update=False, using=None, update_fields=None):
 
@@ -241,6 +238,10 @@ class Team(Group, TenancyObject):
         return [permission_list, self.permissions.all()]
 
 
+    def __str__(self):
+        return self.team_name
+
+
 
 class TeamUsers(SaveHistory):
 
@@ -318,3 +319,6 @@ class TeamUsers(SaveHistory):
         
         return self.team
 
+    def __str__(self):
+        return self.user.username
+

app/app/settings.py

@@ -113,6 +113,8 @@ INSTALLED_APPS = [
     'core.apps.CoreConfig',
     'access.apps.AccessConfig',
     'itam.apps.ItamConfig',
+    'itim.apps.ItimConfig',
+    'assistance.apps.AssistanceConfig',
     'settings.apps.SettingsConfig',
     'drf_spectacular',
     'drf_spectacular_sidecar',
@@ -357,7 +359,6 @@ if DEBUG:
 
     # Apps Under Development
     INSTALLED_APPS += [
-        'information.apps.InformationConfig',
         'project_management.apps.ProjectManagementConfig',
     ]
 

app/app/tests/abstract/views.py

@@ -563,3 +563,33 @@ class AllViews(
     index_view: str = None
     """ Index Class name to test """
 
+
+    @pytest.mark.skip(reason='write test')
+    def test_view_index_attribute_missing_permission_required(self):
+        """ Attribute missing Test
+        
+        Ensure that `permission_required` attribute is not defined within the view.
+
+        this can be done by mocking the inherited class with the `permission_required` attribute
+        set to a value that if it changed would be considered defined in the created view.
+
+        ## Why?
+
+        This attribute can be dynamically added based of of the view name along with attributes
+        `model._meta.model_name` and `str(__class__.__name__).lower()`. 
+
+        Additional test:
+        - ensure that the attribute does get automagically created.
+        - ensure that the classes name is one of add, change, delete, display or index.
+        """
+
+
+    @pytest.mark.skip(reason='write test')
+    def test_view_index_attribute_missing_template_name(self):
+        """ Attribute missing Test
+        
+        Ensure that `template_name` attribute is not defined within the view if the value
+        is `form.html.j2`
+
+        this valuse is already defined in the base form
+        """

app/app/urls.py

@@ -42,7 +42,9 @@ urlpatterns = [
     path("account/", include("django.contrib.auth.urls")),
 
     path("organization/", include("access.urls")),
+    path("assistance/", include("assistance.urls")),
     path("itam/", include("itam.urls")),
+    path("itim/", include("itim.urls")),
     path("config_management/", include("config_management.urls")),
 
     path("history/<str:model_name>/<int:model_pk>", history.View.as_view(), name='_history'),
@@ -72,9 +74,6 @@ if settings.DEBUG:
     urlpatterns += [
 
         path("__debug__/", include("debug_toolbar.urls"), name='_debug'),
-        # Apps Under Development
-        path("itim/", include("itim.urls")),
-        path("information/", include("information.urls")),
         path("project_management/", include("project_management.urls")),
     ]
 

app/assistance/apps.py

@@ -1,6 +1,6 @@
 from django.apps import AppConfig
 
 
-class InformationConfig(AppConfig):
+class AssistanceConfig(AppConfig):
     default_auto_field = 'django.db.models.BigAutoField'
-    name = 'information'
+    name = 'assistance'

app/assistance/forms/knowledge_base.py

@@ -0,0 +1,65 @@
+
+from django import forms
+from django.forms import ValidationError
+
+from app import settings
+
+from assistance.models.knowledge_base import KnowledgeBase
+
+from core.forms.common import CommonModelForm
+
+
+
+class KnowledgeBaseForm(CommonModelForm):
+
+    __name__ = 'asdsa'
+
+    class Meta:
+
+        fields = '__all__'
+
+        model = KnowledgeBase
+
+    prefix = 'knowledgebase'
+
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        self.fields['expiry_date'].widget = forms.widgets.DateTimeInput(attrs={'type': 'datetime-local', 'format': "%Y-%m-%dT%H:%M"})
+        self.fields['expiry_date'].input_formats = settings.DATETIME_FORMAT
+        self.fields['expiry_date'].format="%Y-%m-%dT%H:%M"
+
+        self.fields['release_date'].widget = forms.widgets.DateTimeInput(attrs={'type': 'datetime-local', 'format': "%Y-%m-%dT%H:%M"})
+        self.fields['release_date'].input_formats = settings.DATETIME_FORMAT
+        self.fields['release_date'].format="%Y-%m-%dT%H:%M"
+
+
+    def clean(self):
+        
+        cleaned_data = super().clean()
+
+        responsible_user = cleaned_data.get("responsible_user")
+        responsible_teams = cleaned_data.get("responsible_teams")
+
+
+        if not responsible_user and not responsible_teams:
+
+            raise ValidationError('A Responsible User or Team must be assigned.')
+
+
+        target_team = cleaned_data.get("target_team")
+        target_user = cleaned_data.get("target_user")
+
+
+        if not target_team and not target_user:
+
+            raise ValidationError('A Target Team or Target User must be assigned.')
+
+
+        if target_team and target_user:
+
+            raise ValidationError('Both a Target Team or Target User Cant be assigned at the same time. Use one or the other')
+
+
+        return cleaned_data

app/assistance/forms/knowledge_base_category.py

@@ -0,0 +1,36 @@
+from django.forms import ValidationError
+
+from assistance.models.knowledge_base import KnowledgeBaseCategory
+
+from core.forms.common import CommonModelForm
+
+
+
+class KnowledgeBaseCategoryForm(CommonModelForm):
+
+    __name__ = 'asdsa'
+
+    class Meta:
+
+        fields = '__all__'
+
+        model = KnowledgeBaseCategory
+
+    prefix = 'knowledgebase_category'
+
+
+    def clean(self):
+        
+        cleaned_data = super().clean()
+
+        target_team = cleaned_data.get("target_team")
+        target_user = cleaned_data.get("target_user")
+
+
+        if target_team and target_user:
+
+            raise ValidationError('Both a Target Team or Target User Cant be assigned at the same time. Use one or the other or None')
+
+
+        return cleaned_data
+

app/assistance/migrations/0001_initial.py

@@ -0,0 +1,68 @@
+# Generated by Django 5.0.7 on 2024-07-20 14:37
+
+import access.fields
+import access.models
+import django.db.models.deletion
+import django.utils.timezone
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('access', '0001_initial'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='KnowledgeBaseCategory',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('is_global', models.BooleanField(default=False)),
+                ('model_notes', models.TextField(blank=True, default=None, null=True, verbose_name='Notes')),
+                ('name', models.CharField(help_text='Name/Title of the Category', max_length=50, verbose_name='Title')),
+                ('slug', access.fields.AutoSlugField()),
+                ('created', access.fields.AutoCreatedField(default=django.utils.timezone.now, editable=False)),
+                ('modified', access.fields.AutoLastModifiedField(default=django.utils.timezone.now, editable=False)),
+                ('organization', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='access.organization', validators=[access.models.TenancyObject.validatate_organization_exists])),
+                ('parent_category', models.ForeignKey(blank=True, default=None, help_text='Category this category belongs to', null=True, on_delete=django.db.models.deletion.SET_NULL, to='assistance.knowledgebasecategory', verbose_name='Parent Category')),
+                ('target_team', models.ManyToManyField(blank=True, default=None, help_text='Team(s) to grant access to the article', to='access.team', verbose_name='Target Team(s)')),
+                ('target_user', models.ForeignKey(blank=True, default=None, help_text='User(s) to grant access to the article', null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL, verbose_name='Target Users(s)')),
+            ],
+            options={
+                'verbose_name': 'Category',
+                'verbose_name_plural': 'Categorys',
+                'ordering': ['name'],
+            },
+        ),
+        migrations.CreateModel(
+            name='KnowledgeBase',
+            fields=[
+                ('is_global', models.BooleanField(default=False)),
+                ('id', models.AutoField(primary_key=True, serialize=False, unique=True)),
+                ('title', models.CharField(help_text='Title of the article', max_length=50, verbose_name='Title')),
+                ('summary', models.TextField(blank=True, default=None, help_text='Short Summary of the article', null=True, verbose_name='Summary')),
+                ('content', models.TextField(blank=True, default=None, help_text='Content of the article. Markdown is supported', null=True, verbose_name='Article Content')),
+                ('release_date', models.DateTimeField(blank=True, default=None, help_text='Date the article will be published', null=True, verbose_name='Publish Date')),
+                ('expiry_date', models.DateTimeField(blank=True, default=None, help_text='Date the article will be removed from published articles', null=True, verbose_name='End Date')),
+                ('public', models.BooleanField(default=False, help_text='Is this article to be made available publically', verbose_name='Public Article')),
+                ('created', access.fields.AutoCreatedField(default=django.utils.timezone.now, editable=False)),
+                ('modified', access.fields.AutoLastModifiedField(default=django.utils.timezone.now, editable=False)),
+                ('organization', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='access.organization', validators=[access.models.TenancyObject.validatate_organization_exists])),
+                ('responsible_teams', models.ManyToManyField(blank=True, default=None, help_text='Team(s) whom is considered the articles owner.', related_name='responsible_teams', to='access.team', verbose_name='Responsible Team(s)')),
+                ('responsible_user', models.ForeignKey(default=None, help_text='User(s) whom is considered the articles owner.', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='responsible_user', to=settings.AUTH_USER_MODEL, verbose_name='Responsible User')),
+                ('target_team', models.ManyToManyField(blank=True, default=None, help_text='Team(s) to grant access to the article', to='access.team', verbose_name='Target Team(s)')),
+                ('target_user', models.ForeignKey(blank=True, default=None, help_text='User(s) to grant access to the article', null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL, verbose_name='Target Users(s)')),
+                ('category', models.ForeignKey(default=None, help_text='Article Category', max_length=50, null=True, on_delete=django.db.models.deletion.SET_NULL, to='assistance.knowledgebasecategory', verbose_name='Category')),
+            ],
+            options={
+                'verbose_name': 'Article',
+                'verbose_name_plural': 'Articles',
+                'ordering': ['title'],
+            },
+        ),
+    ]

app/assistance/models/knowledge_base.py

@@ -0,0 +1,219 @@
+from django.contrib.auth.models import User
+from django.db import models
+from django.forms import ValidationError
+
+from access.fields import *
+from access.models import Team, TenancyObject
+
+
+
+class KnowledgeBaseCategory(TenancyObject):
+
+
+    class Meta:
+
+        ordering = [
+            'name',
+        ]
+
+        verbose_name = "Category"
+
+        verbose_name_plural = "Categorys"
+
+
+    parent_category = models.ForeignKey(
+        'self',
+        blank = True,
+        default = None,
+        help_text = 'Category this category belongs to',
+        null = True,
+        on_delete = models.SET_NULL,
+        verbose_name = 'Parent Category',
+    )
+
+
+    name = models.CharField(
+        blank = False,
+        help_text = 'Name/Title of the Category',
+        max_length = 50,
+        unique = False,
+        verbose_name = 'Title',
+    )
+
+
+    slug = AutoSlugField()
+
+
+    target_team = models.ManyToManyField(
+        Team,
+        blank = True,
+        default = None,
+        help_text = 'Team(s) to grant access to the article',
+        verbose_name = 'Target Team(s)',
+    )
+
+
+    target_user = models.ForeignKey(
+        User,
+        blank = True,
+        default = None,
+        help_text = 'User(s) to grant access to the article',
+        null = True,
+        on_delete = models.SET_NULL,
+        verbose_name = 'Target Users(s)',
+    )
+
+
+    created = AutoCreatedField()
+
+
+    modified = AutoLastModifiedField()
+
+
+    def __str__(self):
+
+        return self.name
+
+
+
+class KnowledgeBase(TenancyObject):
+
+
+    class Meta:
+
+        ordering = [
+            'title',
+        ]
+
+        verbose_name = "Article"
+
+        verbose_name_plural = "Articles"
+
+
+    model_notes = None
+
+
+    id = models.AutoField(
+        primary_key=True,
+        unique=True,
+        blank=False
+    )
+
+
+    title = models.CharField(
+        blank = False,
+        help_text = 'Title of the article',
+        max_length = 50,
+        unique = False,
+        verbose_name = 'Title',
+    )
+
+
+    summary = models.TextField(
+        blank = True,
+        default = None,
+        help_text = 'Short Summary of the article',
+        null = True,
+        verbose_name = 'Summary',
+    )
+
+
+    content = models.TextField(
+        blank = True,
+        default = None,
+        help_text = 'Content of the article. Markdown is supported',
+        null = True,
+        verbose_name = 'Article Content',
+    )
+
+
+    category = models.ForeignKey(
+        KnowledgeBaseCategory,
+        blank = False,
+        default = None,
+        help_text = 'Article Category',
+        max_length = 50,
+        null = True,
+        on_delete = models.SET_NULL,
+        unique = False,
+        verbose_name = 'Category',
+    )
+
+
+    release_date = models.DateTimeField(
+        blank = True,
+        default = None,
+        help_text = 'Date the article will be published',
+        null = True,
+        verbose_name = 'Publish Date',
+    )
+
+
+    expiry_date = models.DateTimeField(
+        blank = True,
+        default = None,
+        help_text = 'Date the article will be removed from published articles',
+        null = True,
+        verbose_name = 'End Date',
+    )
+
+
+    target_team = models.ManyToManyField(
+        Team,
+        blank = True,
+        default = None,
+        help_text = 'Team(s) to grant access to the article',
+        verbose_name = 'Target Team(s)',
+    )
+
+
+    target_user = models.ForeignKey(
+        User,
+        blank = True,
+        default = None,
+        help_text = 'User(s) to grant access to the article',
+        null = True,
+        on_delete = models.SET_NULL,
+        verbose_name = 'Target Users(s)',
+    )
+
+
+    responsible_user = models.ForeignKey(
+        User,
+        blank = False,
+        default = None,
+        help_text = 'User(s) whom is considered the articles owner.',
+        null = True,
+        on_delete = models.SET_NULL,
+        related_name = 'responsible_user',
+        verbose_name = 'Responsible User',
+    )
+
+
+    responsible_teams = models.ManyToManyField(
+        Team,
+        blank = True,
+        default = None,
+        help_text = 'Team(s) whom is considered the articles owner.',
+        related_name = 'responsible_teams',
+        verbose_name = 'Responsible Team(s)',
+    )
+
+
+    public = models.BooleanField(
+        blank = False,
+        default = False,
+        help_text = 'Is this article to be made available publically',
+        verbose_name = 'Public Article',
+    )
+
+
+    created = AutoCreatedField()
+
+
+    modified = AutoLastModifiedField()
+
+
+    def __str__(self):
+
+        return self.title

app/assistance/templates/assistance/kb_article.html.j2

@@ -0,0 +1,232 @@
+{% extends 'base.html.j2' %}
+
+{% load markdown %}
+
+{% block content %}
+
+<script>
+
+    function openCity(evt, cityName) {
+        var i, tabcontent, tablinks;
+
+        tabcontent = document.getElementsByClassName("tabcontent");
+        for (i = 0; i < tabcontent.length; i++) {
+            tabcontent[i].style.display = "none";
+        }
+
+        tablinks = document.getElementsByClassName("tablinks");
+        for (i = 0; i < tablinks.length; i++) {
+            tablinks[i].className = tablinks[i].className.replace(" active", "");
+        }
+
+        document.getElementById(cityName).style.display = "block";
+        evt.currentTarget.className += " active";
+    }
+
+</script>
+
+<style>
+
+.detail-view-field {
+  display:unset;
+  height: 30px;
+  line-height: 30px;
+  padding: 0px 20px 40px 20px;
+
+}
+
+.detail-view-field label {
+  display: inline-block;
+  font-weight: bold;
+  width: 200px;
+  margin: 10px;
+  height: 30px;
+  line-height: 30px;
+
+}
+
+.detail-view-field span {
+  display: inline-block;
+  width: 340px;
+  margin: 10px;
+  border-bottom: 1px solid #ccc;
+  height: 30px;
+  line-height: 30px;
+
+}
+
+pre {
+  word-wrap: break-word;
+  white-space: pre-wrap;
+}
+
+</style>
+<div class="tab">
+    <button
+        onclick="window.location='{% url 'Assistance:Knowledge Base' %}';"
+        style="vertical-align: middle; padding: auto; margin: 0px">
+        <svg xmlns="http://www.w3.org/2000/svg" height="25px" viewBox="0 -960 960 960" width="25px"
+            style="vertical-align: middle; margin: 0px; padding: 0px border: none; " fill="#6a6e73">
+            <path
+                d="m313-480 155 156q11 11 11.5 27.5T468-268q-11 11-28 11t-28-11L228-452q-6-6-8.5-13t-2.5-15q0-8 2.5-15t8.5-13l184-184q11-11 27.5-11.5T468-692q11 11 11 28t-11 28L313-480Zm264 0 155 156q11 11 11.5 27.5T732-268q-11 11-28 11t-28-11L492-452q-6-6-8.5-13t-2.5-15q0-8 2.5-15t8.5-13l184-184q11-11 27.5-11.5T732-692q11 11 11 28t-11 28L577-480Z" />
+        </svg>Back to Articles</button>
+
+    <button id="defaultOpen" class="tablinks" onclick="openCity(event, 'Details')">Details</button>
+    {% if perms.assistance.change_knowledgebase %}
+    <button class="tablinks" onclick="openCity(event, 'Notes')">Notes</button>
+    {% endif %}
+</div>
+
+<form method="post">
+    <div id="Details" class="tabcontent">
+    {% if perms.assistance.change_knowledgebase %}
+        <h3>Details</h3>
+
+        {% csrf_token %}
+        
+        
+    <div style="align-items:flex-start; align-content: center; display: flexbox; width: 100%">
+
+      <div style="display: inline; width: 40%; margin: 30px;">
+
+        <div class="detail-view-field">
+          <label>{{ form.title.label }}</label>
+          <span>{{ form.title.value }}</span>
+        </div>
+
+        <div class="detail-view-field">
+          <label>{{ form.category.label }}</label>
+          <span>
+          {% if kb.category %}
+            <a href="{% url 'Settings:_knowledge_base_category_view' kb.category.id %}">{{ kb.category }}</a>
+          {% else %}
+            &nbsp;
+          {% endif %}
+          </span>
+        </div>
+
+        <div class="detail-view-field">
+          <label>{{ form.responsible_user.label }}</label>
+          <span>
+          {% if form.responsible_user.value %}
+            {{ kb.responsible_user }}
+          {% else %}
+            &nbsp;
+          {% endif %}
+          </span>
+        </div>
+
+        <div class="detail-view-field">
+          <label>{{ form.organization.label }}</label>
+          <span>
+          {% if form.organization.value %}
+            {{ kb.organization }}
+          {% else %}
+            &nbsp;
+          {% endif %}
+          </span>
+        </div>
+
+
+      </div>
+
+      <div style="display: inline; width: 40%; margin: 30px; text-align: left;">
+
+        <div class="detail-view-field">
+          <label>{{ form.release_date.label }}</label>
+          <span>
+          {% if form.release_date.value %}
+            {{ form.release_date.value }}
+          {% else %}
+            &nbsp;
+          {% endif %}
+          </span>
+        </div>
+
+        <div class="detail-view-field">
+          <label>{{ form.expiry_date.label }}</label>
+          <span>
+          {% if form.expiry_date.value %}
+            {{ form.expiry_date.value }}
+          {% else %}
+            &nbsp;
+          {% endif %}
+          </span>
+        </div>
+
+        <div class="detail-view-field">
+          <label>{{ form.target_user.label }}</label>
+          <span>
+          {% if form.target_user.value %}
+            {{ kb.target_user }}
+          {% else %}
+            &nbsp;
+          {% endif %}
+          </span>
+        </div>
+
+        <div class="detail-view-field">
+          <label>{{ form.target_team.label }}</label>
+          <span>
+          {% if form.target_team.value %}
+            {{ form.target_team.value }} {{ kb.target_team }}
+          {% else %}
+            &nbsp;
+          {% endif %}
+          </span>
+        </div>
+
+
+      </div>
+    </div>
+
+
+    <input type="button" value="Edit" onclick="window.location='{% url 'Assistance:_knowledge_base_change' kb.id %}';">
+    {% endif %}
+
+    {% if form.summary.value %}
+    <div style="display: block; width: 100%;">
+      <h3>Summary</h3>
+      {{ form.summary.value | safe }}
+      <br>
+      <hr />
+    </div>
+    {% endif %}
+
+    <div style="display: block; width: 100%;">
+      <h3>Content</h3>
+      <hr />
+      <br>
+      {{ form.content.value | markdown | safe }}
+      <br>
+    </div>
+
+        <br>
+
+        <script>
+            document.getElementById("defaultOpen").click();
+        </script>
+
+    </div>
+
+    {% if perms.assistance.change_knowledgebase %}
+    <div id="Notes" class="tabcontent">
+        <h3>
+            Notes
+        </h3>
+        {{ notes_form }}
+        <input type="submit" name="{{notes_form.prefix}}" value="Submit" />
+        <div class="comments">
+            {% if notes %}
+            {% for note in notes %}
+            {% include 'note.html.j2' %}
+            {% endfor %}
+            {% endif %}
+        </div>
+
+    </div>
+    {% endif %}
+
+</form>
+
+{% endblock %}

app/assistance/templates/assistance/kb_category.html.j2

@@ -0,0 +1,213 @@
+{% extends 'base.html.j2' %}
+
+{% load markdown %}
+
+{% block content %}
+
+<script>
+
+    function openCity(evt, cityName) {
+        var i, tabcontent, tablinks;
+
+        tabcontent = document.getElementsByClassName("tabcontent");
+        for (i = 0; i < tabcontent.length; i++) {
+            tabcontent[i].style.display = "none";
+        }
+
+        tablinks = document.getElementsByClassName("tablinks");
+        for (i = 0; i < tablinks.length; i++) {
+            tablinks[i].className = tablinks[i].className.replace(" active", "");
+        }
+
+        document.getElementById(cityName).style.display = "block";
+        evt.currentTarget.className += " active";
+    }
+
+</script>
+
+<style>
+
+.detail-view-field {
+  display:unset;
+  height: 30px;
+  line-height: 30px;
+  padding: 0px 20px 40px 20px;
+
+}
+
+.detail-view-field label {
+  display: inline-block;
+  font-weight: bold;
+  width: 200px;
+  margin: 10px;
+  /*padding: 10px;*/
+  height: 30px;
+  line-height: 30px;
+
+}
+
+.detail-view-field span {
+  display: inline-block;
+  width: 340px;
+  margin: 10px;
+  /*padding: 10px;*/
+  border-bottom: 1px solid #ccc;
+  height: 30px;
+  line-height: 30px;
+
+}
+
+pre {
+  word-wrap: break-word;
+  white-space: pre-wrap;
+}
+
+</style>
+<div class="tab">
+    <button
+        onclick="window.location='{% url 'Settings:KB Categories' %}';"
+        style="vertical-align: middle; padding: auto; margin: 0px">
+        <svg xmlns="http://www.w3.org/2000/svg" height="25px" viewBox="0 -960 960 960" width="25px"
+            style="vertical-align: middle; margin: 0px; padding: 0px border: none; " fill="#6a6e73">
+            <path
+                d="m313-480 155 156q11 11 11.5 27.5T468-268q-11 11-28 11t-28-11L228-452q-6-6-8.5-13t-2.5-15q0-8 2.5-15t8.5-13l184-184q11-11 27.5-11.5T468-692q11 11 11 28t-11 28L313-480Zm264 0 155 156q11 11 11.5 27.5T732-268q-11 11-28 11t-28-11L492-452q-6-6-8.5-13t-2.5-15q0-8 2.5-15t8.5-13l184-184q11-11 27.5-11.5T732-692q11 11 11 28t-11 28L577-480Z" />
+        </svg>Back to Articles</button>
+
+    <button id="defaultOpen" class="tablinks" onclick="openCity(event, 'Details')">Details</button>
+    <button class="tablinks" onclick="openCity(event, 'Articles')">Articles</button>
+    {% if perms.assistance.change_knowledgebase %}
+    <button class="tablinks" onclick="openCity(event, 'Notes')">Notes</button>
+    {% endif %}
+</div>
+
+<form method="post">
+    <div id="Details" class="tabcontent">
+
+        <h3>Details</h3>
+
+        {% csrf_token %}
+        
+        
+      <div style="align-items:flex-start; align-content: center; display: flexbox; width: 100%">
+
+        <div style="display: inline; width: 40%; margin: 30px;">
+
+          <div class="detail-view-field">
+            <label>{{ form.name.label }}</label>
+            <span>{{ form.name.value }}</span>
+          </div>
+
+          <div class="detail-view-field">
+            <label>{{ form.parent_category.label }}</label>
+            <span>
+            {% if item.parent_category %}
+              {{ item.parent_category }}
+            {% else %}
+              &nbsp;
+            {% endif %}
+            </span>
+          </div>
+
+          <div class="detail-view-field">
+            <label>Created</label>
+            <span>{{ item.created }}</span>
+          </div>
+
+          <div class="detail-view-field">
+            <label>Modified</label>
+            <span>{{ item.modified }}</span>
+          </div>
+
+
+        </div>
+
+        <div style="display: inline; width: 40%; margin: 30px; text-align: left;">
+
+          <div class="detail-view-field">
+            <label>{{ form.organization.label }}</label>
+            <span>
+            {% if form.organization.value %}
+              {{ item.organization }}
+            {% else %}
+              &nbsp;
+            {% endif %}
+            </span>
+          </div>
+
+          <div class="detail-view-field">
+            <label>{{ form.target_user.label }}</label>
+            <span>
+            {% if form.target_user.value %}
+              {{ form.target_user.value }}
+            {% else %}
+              &nbsp;
+            {% endif %}
+            </span>
+          </div>
+
+          <div class="detail-view-field">
+            <label>{{ form.target_team.label }}</label>
+            <span>
+            {% if form.target_team.value %}
+              {{ form.target_team.value }}
+            {% else %}
+              &nbsp;
+            {% endif %}
+            </span>
+          </div>
+
+
+        </div>
+      </div>
+
+
+      <input type="button" value="Edit" onclick="window.location='{% url 'Settings:_knowledge_base_category_change' item.id %}';">
+
+      <br>
+
+      <script>
+          document.getElementById("defaultOpen").click();
+      </script>
+
+    </div>
+
+        <div id="Articles" class="tabcontent">
+        <h3>
+            Articles
+        </h3>
+        <table>
+          <tr>
+            <th>Title</th>
+            <th>Organization</th>
+          </tr>
+          {% for article in articles %}
+          <tr>
+            <td><a href="{% url 'Assistance:_knowledge_base_view' article.id %}">{{ article.title }}</a></td>
+            <td>{{ article.organization }}</td>
+          </tr>
+          {% endfor %}
+        </table>
+
+    </div>
+
+    {% if perms.assistance.change_knowledgebase %}
+    <div id="Notes" class="tabcontent">
+        <h3>
+            Notes
+        </h3>
+        {{ notes_form }}
+        <input type="submit" name="{{notes_form.prefix}}" value="Submit" />
+        <div class="comments">
+            {% if notes %}
+            {% for note in notes %}
+            {% include 'note.html.j2' %}
+            {% endfor %}
+            {% endif %}
+        </div>
+
+    </div>
+    {% endif %}
+
+</form>
+
+{% endblock %}

app/assistance/templates/assistance/kb_category_index.html.j2

@@ -0,0 +1,47 @@
+{% extends 'base.html.j2' %}
+
+{% block content %}
+
+<input type="button" value="New Article" onclick="window.location='{% url 'Settings:_knowledge_base_category_add' %}';">
+<table class="data">
+    <tr>
+        <th>Title</th>
+        <th>Parent</th>
+        <th>Organization</th>
+        <th>&nbsp;</th>
+    </tr>
+    {% if items %}
+    {% for item in items %}
+    <tr>
+        <td><a href="{% url 'Settings:_knowledge_base_category_view' pk=item.id %}">{{ item.name }}</a></td>
+        <td>{{ item.parent_category }}</td>
+        <td>{{ item.organization }}</td>
+        <td>&nbsp;</td>
+    </tr>
+    {% endfor %}
+    {% else %}
+    <tr>
+        <td colspan="4">Nothing Found</td>
+    </tr>
+    {% endif %}
+</table>
+<br>
+<div class="pagination">
+    <span class="step-links">
+        {% if page_obj.has_previous %}
+        <a href="?page=1">&laquo; first</a>
+        <a href="?page={{ page_obj.previous_page_number }}">previous</a>
+        {% endif %}
+
+        <span class="current">
+            Page {{ page_obj.number }} of {{ page_obj.paginator.num_pages }}.
+        </span>
+
+        {% if page_obj.has_next %}
+        <a href="?page={{ page_obj.next_page_number }}">next</a>
+        <a href="?page={{ page_obj.paginator.num_pages }}">last &raquo;</a>
+        {% endif %}
+    </span>
+</div>
+
+{% endblock %}

app/assistance/templates/assistance/kb_index.html.j2

@@ -0,0 +1,47 @@
+{% extends 'base.html.j2' %}
+
+{% block content %}
+
+<input type="button" value="New Article" onclick="window.location='{% url 'Assistance:_knowledge_base_add' %}';">
+<table class="data">
+    <tr>
+        <th>Title</th>
+        <th>Category</th>
+        <th>Organization</th>
+        <th>&nbsp;</th>
+    </tr>
+    {% if items %}
+    {% for item in items %}
+    <tr>
+        <td><a href="{% url 'Assistance:_knowledge_base_view' pk=item.id %}">{{ item.title }}</a></td>
+        <td><a href="{% url 'Settings:_knowledge_base_category_view' pk=item.category.id %}">{{ item.category }}</a></td>
+        <td>{{ item.organization }}</td>
+        <td>&nbsp;</td>
+    </tr>
+    {% endfor %}
+    {% else %}
+    <tr>
+        <td colspan="4">Nothing Found</td>
+    </tr>
+    {% endif %}
+</table>
+<br>
+<div class="pagination">
+    <span class="step-links">
+        {% if page_obj.has_previous %}
+        <a href="?page=1">&laquo; first</a>
+        <a href="?page={{ page_obj.previous_page_number }}">previous</a>
+        {% endif %}
+
+        <span class="current">
+            Page {{ page_obj.number }} of {{ page_obj.paginator.num_pages }}.
+        </span>
+
+        {% if page_obj.has_next %}
+        <a href="?page={{ page_obj.next_page_number }}">next</a>
+        <a href="?page={{ page_obj.paginator.num_pages }}">last &raquo;</a>
+        {% endif %}
+    </span>
+</div>
+
+{% endblock %}

app/assistance/tests/unit/knowledge_base/test_knowledge_base.py

@@ -0,0 +1,44 @@
+import pytest
+import unittest
+
+from django.test import TestCase
+
+from access.models import Organization
+
+from app.tests.abstract.models import TenancyModel
+
+from assistance.models.knowledge_base import KnowledgeBase
+
+
+
+@pytest.mark.django_db
+class KnowledgeBaseModel(
+    TestCase,
+    TenancyModel
+):
+
+    model = KnowledgeBase
+
+    @classmethod
+    def setUpTestData(self):
+        """Setup Test
+
+        1. Create an organization for user and item
+        2. Create an item
+
+        """
+
+        self.organization = Organization.objects.create(name='test_org')
+
+
+        self.item = self.model.objects.create(
+            organization = self.organization,
+            title = 'one',
+            content = 'dict({"key": "one", "existing": "dont_over_write"})'
+        )
+
+        self.second_item = self.model.objects.create(
+            organization = self.organization,
+            title = 'one_two',
+            content = 'dict({"key": "two"})',
+        )

app/assistance/tests/unit/knowledge_base/test_knowledge_base_core_history.py

@@ -0,0 +1,78 @@
+
+import pytest
+import unittest
+import requests
+
+from django.test import TestCase, Client
+
+from access.models import Organization
+
+from core.models.history import History
+from core.tests.abstract.history_entry import HistoryEntry
+from core.tests.abstract.history_entry_parent_model import HistoryEntryParentItem
+
+from assistance.models.knowledge_base import KnowledgeBase
+
+
+
+class KnowledgeBaseHistory(TestCase, HistoryEntry, HistoryEntryParentItem):
+
+
+    model = KnowledgeBase
+
+
+    @classmethod
+    def setUpTestData(self):
+        """ Setup Test """
+
+        organization = Organization.objects.create(name='test_org')
+
+        self.organization = organization
+
+        self.item_parent = self.model.objects.create(
+            title = 'test_item_parent_' + self.model._meta.model_name,
+            organization = self.organization
+        )
+
+        self.item_create = self.model.objects.create(
+            title = 'test_item_' + self.model._meta.model_name,
+            organization = self.organization,
+        )
+
+
+        self.history_create = History.objects.get(
+            action = History.Actions.ADD[0],
+            item_pk = self.item_create.pk,
+            item_class = self.model._meta.model_name,
+        )
+
+        self.item_change = self.item_create
+        self.item_change.title = 'test_item_' + self.model._meta.model_name + '_changed'
+        self.item_change.save()
+
+        self.field_after_expected_value = '{"title": "' + self.item_change.title + '"}'
+
+        self.history_change = History.objects.get(
+            action = History.Actions.UPDATE[0],
+            item_pk = self.item_change.pk,
+            item_class = self.model._meta.model_name,
+        )
+
+        self.item_delete = self.model.objects.create(
+            title = 'test_item_delete_' + self.model._meta.model_name,
+            organization = self.organization,
+        )
+
+        self.deleted_pk = self.item_delete.pk
+
+        self.item_delete.delete()
+
+        self.history_delete = History.objects.filter(
+            item_pk = self.deleted_pk,
+            item_class = self.model._meta.model_name,
+        )
+
+        self.history_delete_children = History.objects.filter(
+            item_parent_pk = self.deleted_pk,
+            item_parent_class = self.item_parent._meta.model_name,
+        )

app/assistance/tests/unit/knowledge_base/test_knowledge_base_history_permission.py

@@ -0,0 +1,95 @@
+# from django.conf import settings
+from django.contrib.auth import get_user_model
+from django.contrib.auth.models import AnonymousUser, User
+from django.contrib.contenttypes.models import ContentType
+from django.shortcuts import reverse
+from django.test import TestCase, Client
+
+import pytest
+import unittest
+import requests
+
+from access.models import Organization, Team, TeamUsers, Permission
+
+from assistance.models.knowledge_base import KnowledgeBase
+
+from core.tests.abstract.history_permissions import HistoryPermissions
+
+
+
+class KnowledgeBaseHistoryPermissions(TestCase, HistoryPermissions):
+
+
+    item_model = KnowledgeBase
+
+
+    @classmethod
+    def setUpTestData(self):
+        """Setup Test
+
+        1. Create an organization for user and item
+        2. create an organization that is different to item
+        3. Create a device
+        4. Add history device history entry as item
+        5. create a user
+        6. create user in different organization (with the required permission)
+        """
+
+        organization = Organization.objects.create(name='test_org')
+
+        self.organization = organization
+
+        different_organization = Organization.objects.create(name='test_different_organization')
+
+        self.item = self.item_model.objects.create(
+            organization=organization,
+            title = 'deviceone'
+        )
+
+        self.history = self.model.objects.get(
+            item_pk = self.item.id,
+            item_class = self.item._meta.model_name,
+            action = self.model.Actions.ADD,
+        )
+
+        view_permissions = Permission.objects.get(
+                codename = 'view_' + self.model._meta.model_name,
+                content_type = ContentType.objects.get(
+                    app_label = self.model._meta.app_label,
+                    model = self.model._meta.model_name,
+                )
+            )
+
+        view_team = Team.objects.create(
+            team_name = 'view_team',
+            organization = organization,
+        )
+
+        view_team.permissions.set([view_permissions])
+
+
+        self.no_permissions_user = User.objects.create_user(username="test_no_permissions", password="password")
+
+
+        self.view_user = User.objects.create_user(username="test_user_view", password="password")
+        teamuser = TeamUsers.objects.create(
+            team = view_team,
+            user = self.view_user
+        )
+
+        self.different_organization_user = User.objects.create_user(username="test_different_organization_user", password="password")
+
+
+        different_organization_team = Team.objects.create(
+            team_name = 'different_organization_team',
+            organization = different_organization,
+        )
+
+        different_organization_team.permissions.set([
+            view_permissions,
+        ])
+
+        TeamUsers.objects.create(
+            team = different_organization_team,
+            user = self.different_organization_user
+        )

app/assistance/tests/unit/knowledge_base/test_knowledge_base_permission.py

@@ -0,0 +1,189 @@
+# from django.conf import settings
+from django.contrib.auth import get_user_model
+from django.contrib.auth.models import AnonymousUser, User
+from django.contrib.contenttypes.models import ContentType
+from django.shortcuts import reverse
+from django.test import TestCase, Client
+
+import pytest
+import unittest
+import requests
+
+from access.models import Organization, Team, TeamUsers, Permission
+
+from app.tests.abstract.model_permissions import ModelPermissions
+
+from assistance.models.knowledge_base import KnowledgeBase
+
+
+class KnowledgeBasePermissions(TestCase, ModelPermissions):
+
+
+    model = KnowledgeBase
+
+    app_namespace = 'Assistance'
+
+    url_name_view = '_knowledge_base_view'
+
+    url_name_add = '_knowledge_base_add'
+
+    url_name_change = '_knowledge_base_change'
+
+    url_name_delete = '_knowledge_base_delete'
+
+    url_delete_response = reverse('Assistance:Knowledge Base')
+
+
+    @classmethod
+    def setUpTestData(self):
+        """Setup Test
+
+        1. Create an organization for user and item
+        . create an organization that is different to item
+        2. Create a device
+        3. create teams with each permission: view, add, change, delete
+        4. create a user per team
+        """
+
+        organization = Organization.objects.create(name='test_org')
+
+        self.organization = organization
+
+        different_organization = Organization.objects.create(name='test_different_organization')
+
+
+        self.item = self.model.objects.create(
+            organization=organization,
+            title = 'deviceone'
+        )
+
+
+        self.url_view_kwargs = {'pk': self.item.id}
+
+        # self.url_add_kwargs = {'pk': self.item.id}
+
+        self.add_data = {'device': 'device', 'organization': self.organization.id}
+
+        self.url_change_kwargs = {'pk': self.item.id}
+
+        self.change_data = {'device': 'device', 'organization': self.organization.id}
+
+        self.url_delete_kwargs = {'pk': self.item.id}
+
+        self.delete_data = {'device': 'device', 'organization': self.organization.id}
+
+
+        view_permissions = Permission.objects.get(
+                codename = 'view_' + self.model._meta.model_name,
+                content_type = ContentType.objects.get(
+                    app_label = self.model._meta.app_label,
+                    model = self.model._meta.model_name,
+                )
+            )
+
+        view_team = Team.objects.create(
+            team_name = 'view_team',
+            organization = organization,
+        )
+
+        view_team.permissions.set([view_permissions])
+
+
+
+        add_permissions = Permission.objects.get(
+                codename = 'add_' + self.model._meta.model_name,
+                content_type = ContentType.objects.get(
+                    app_label = self.model._meta.app_label,
+                    model = self.model._meta.model_name,
+                )
+            )
+
+        add_team = Team.objects.create(
+            team_name = 'add_team',
+            organization = organization,
+        )
+
+        add_team.permissions.set([add_permissions])
+
+
+
+        change_permissions = Permission.objects.get(
+                codename = 'change_' + self.model._meta.model_name,
+                content_type = ContentType.objects.get(
+                    app_label = self.model._meta.app_label,
+                    model = self.model._meta.model_name,
+                )
+            )
+
+        change_team = Team.objects.create(
+            team_name = 'change_team',
+            organization = organization,
+        )
+
+        change_team.permissions.set([change_permissions])
+
+
+
+        delete_permissions = Permission.objects.get(
+                codename = 'delete_' + self.model._meta.model_name,
+                content_type = ContentType.objects.get(
+                    app_label = self.model._meta.app_label,
+                    model = self.model._meta.model_name,
+                )
+            )
+
+        delete_team = Team.objects.create(
+            team_name = 'delete_team',
+            organization = organization,
+        )
+
+        delete_team.permissions.set([delete_permissions])
+
+
+        self.no_permissions_user = User.objects.create_user(username="test_no_permissions", password="password")
+
+
+        self.view_user = User.objects.create_user(username="test_user_view", password="password")
+        teamuser = TeamUsers.objects.create(
+            team = view_team,
+            user = self.view_user
+        )
+
+        self.add_user = User.objects.create_user(username="test_user_add", password="password")
+        teamuser = TeamUsers.objects.create(
+            team = add_team,
+            user = self.add_user
+        )
+
+        self.change_user = User.objects.create_user(username="test_user_change", password="password")
+        teamuser = TeamUsers.objects.create(
+            team = change_team,
+            user = self.change_user
+        )
+
+        self.delete_user = User.objects.create_user(username="test_user_delete", password="password")
+        teamuser = TeamUsers.objects.create(
+            team = delete_team,
+            user = self.delete_user
+        )
+
+
+        self.different_organization_user = User.objects.create_user(username="test_different_organization_user", password="password")
+
+
+        different_organization_team = Team.objects.create(
+            team_name = 'different_organization_team',
+            organization = different_organization,
+        )
+
+        different_organization_team.permissions.set([
+            view_permissions,
+            add_permissions,
+            change_permissions,
+            delete_permissions,
+        ])
+
+        TeamUsers.objects.create(
+            team = different_organization_team,
+            user = self.different_organization_user
+        )

app/assistance/tests/unit/knowledge_base/test_knowledge_base_views.py

@@ -0,0 +1,29 @@
+import pytest
+import unittest
+import requests
+
+from django.test import TestCase
+
+from app.tests.abstract.models import PrimaryModel
+
+
+
+class KnowledgeBaseViews(
+    TestCase,
+    PrimaryModel
+):
+
+    add_module = 'assistance.views.knowledge_base'
+    add_view = 'Add'
+
+    change_module = add_module
+    change_view = 'Change'
+
+    delete_module = add_module
+    delete_view = 'Delete'
+
+    display_module = add_module
+    display_view = 'View'
+
+    index_module = add_module
+    index_view = 'Index'

app/assistance/tests/unit/knowledge_base_category/test_knowledge_base_category.py

@@ -0,0 +1,42 @@
+import pytest
+import unittest
+
+from django.test import TestCase
+
+from access.models import Organization
+
+from app.tests.abstract.models import TenancyModel
+
+from assistance.models.knowledge_base import KnowledgeBaseCategory
+
+
+
+@pytest.mark.django_db
+class KnowledgeBaseModel(
+    TestCase,
+    TenancyModel
+):
+
+    model = KnowledgeBaseCategory
+
+    @classmethod
+    def setUpTestData(self):
+        """Setup Test
+
+        1. Create an organization for user and item
+        2. Create an item
+
+        """
+
+        self.organization = Organization.objects.create(name='test_org')
+
+
+        self.item = self.model.objects.create(
+            organization = self.organization,
+            name = 'one',
+        )
+
+        self.second_item = self.model.objects.create(
+            organization = self.organization,
+            name = 'one_two',
+        )

app/assistance/tests/unit/knowledge_base_category/test_knowledge_base_category_core_history.py

@@ -0,0 +1,75 @@
+
+import pytest
+import unittest
+import requests
+
+from django.test import TestCase, Client
+
+from access.models import Organization
+
+from core.models.history import History
+from core.tests.abstract.history_entry import HistoryEntry
+from core.tests.abstract.history_entry_parent_model import HistoryEntryParentItem
+
+from assistance.models.knowledge_base import KnowledgeBaseCategory
+
+
+
+class KnowledgeBaseHistory(TestCase, HistoryEntry, HistoryEntryParentItem):
+
+
+    model = KnowledgeBaseCategory
+
+
+    @classmethod
+    def setUpTestData(self):
+        """ Setup Test """
+
+        organization = Organization.objects.create(name='test_org')
+
+        self.organization = organization
+
+
+        self.item_create = self.model.objects.create(
+            name = 'test_item_' + self.model._meta.model_name,
+            organization = self.organization,
+        )
+
+
+        self.history_create = History.objects.get(
+            action = History.Actions.ADD[0],
+            item_pk = self.item_create.pk,
+            item_class = self.model._meta.model_name,
+        )
+
+        self.item_change = self.item_create
+        self.item_change.name = 'test_item_' + self.model._meta.model_name + '_changed'
+        self.item_change.save()
+
+        self.field_after_expected_value = '{"name": "' + self.item_change.name + '"}'
+
+        self.history_change = History.objects.get(
+            action = History.Actions.UPDATE[0],
+            item_pk = self.item_change.pk,
+            item_class = self.model._meta.model_name,
+        )
+
+        self.item_delete = self.model.objects.create(
+            name = 'test_item_delete_' + self.model._meta.model_name,
+            organization = self.organization,
+        )
+
+        self.deleted_pk = self.item_delete.pk
+
+        self.item_delete.delete()
+
+        self.history_delete = History.objects.filter(
+            item_pk = self.deleted_pk,
+            item_class = self.model._meta.model_name,
+        )
+
+
+    def test_history_entry_children_delete(self):
+        """ Model has no child items """
+        pass
+

app/assistance/tests/unit/knowledge_base_category/test_knowledge_base_category_history_permission.py

@@ -0,0 +1,95 @@
+# from django.conf import settings
+from django.contrib.auth import get_user_model
+from django.contrib.auth.models import AnonymousUser, User
+from django.contrib.contenttypes.models import ContentType
+from django.shortcuts import reverse
+from django.test import TestCase, Client
+
+import pytest
+import unittest
+import requests
+
+from access.models import Organization, Team, TeamUsers, Permission
+
+from assistance.models.knowledge_base import KnowledgeBaseCategory
+
+from core.tests.abstract.history_permissions import HistoryPermissions
+
+
+
+class KnowledgeBaseHistoryPermissions(TestCase, HistoryPermissions):
+
+
+    item_model = KnowledgeBaseCategory
+
+
+    @classmethod
+    def setUpTestData(self):
+        """Setup Test
+
+        1. Create an organization for user and item
+        2. create an organization that is different to item
+        3. Create a device
+        4. Add history device history entry as item
+        5. create a user
+        6. create user in different organization (with the required permission)
+        """
+
+        organization = Organization.objects.create(name='test_org')
+
+        self.organization = organization
+
+        different_organization = Organization.objects.create(name='test_different_organization')
+
+        self.item = self.item_model.objects.create(
+            organization=organization,
+            name = 'deviceone'
+        )
+
+        self.history = self.model.objects.get(
+            item_pk = self.item.id,
+            item_class = self.item._meta.model_name,
+            action = self.model.Actions.ADD,
+        )
+
+        view_permissions = Permission.objects.get(
+                codename = 'view_' + self.model._meta.model_name,
+                content_type = ContentType.objects.get(
+                    app_label = self.model._meta.app_label,
+                    model = self.model._meta.model_name,
+                )
+            )
+
+        view_team = Team.objects.create(
+            team_name = 'view_team',
+            organization = organization,
+        )
+
+        view_team.permissions.set([view_permissions])
+
+
+        self.no_permissions_user = User.objects.create_user(username="test_no_permissions", password="password")
+
+
+        self.view_user = User.objects.create_user(username="test_user_view", password="password")
+        teamuser = TeamUsers.objects.create(
+            team = view_team,
+            user = self.view_user
+        )
+
+        self.different_organization_user = User.objects.create_user(username="test_different_organization_user", password="password")
+
+
+        different_organization_team = Team.objects.create(
+            team_name = 'different_organization_team',
+            organization = different_organization,
+        )
+
+        different_organization_team.permissions.set([
+            view_permissions,
+        ])
+
+        TeamUsers.objects.create(
+            team = different_organization_team,
+            user = self.different_organization_user
+        )

app/assistance/tests/unit/knowledge_base_category/test_knowledge_base_category_permission.py

@@ -0,0 +1,189 @@
+# from django.conf import settings
+from django.contrib.auth import get_user_model
+from django.contrib.auth.models import AnonymousUser, User
+from django.contrib.contenttypes.models import ContentType
+from django.shortcuts import reverse
+from django.test import TestCase, Client
+
+import pytest
+import unittest
+import requests
+
+from access.models import Organization, Team, TeamUsers, Permission
+
+from app.tests.abstract.model_permissions import ModelPermissions
+
+from assistance.models.knowledge_base import KnowledgeBaseCategory
+
+
+class KnowledgeBasePermissions(TestCase, ModelPermissions):
+
+
+    model = KnowledgeBaseCategory
+
+    app_namespace = 'Settings'
+
+    url_name_view = '_knowledge_base_category_view'
+
+    url_name_add = '_knowledge_base_category_add'
+
+    url_name_change = '_knowledge_base_category_change'
+
+    url_name_delete = '_knowledge_base_category_delete'
+
+    url_delete_response = reverse('Settings:KB Categories')
+
+
+    @classmethod
+    def setUpTestData(self):
+        """Setup Test
+
+        1. Create an organization for user and item
+        . create an organization that is different to item
+        2. Create a device
+        3. create teams with each permission: view, add, change, delete
+        4. create a user per team
+        """
+
+        organization = Organization.objects.create(name='test_org')
+
+        self.organization = organization
+
+        different_organization = Organization.objects.create(name='test_different_organization')
+
+
+        self.item = self.model.objects.create(
+            organization=organization,
+            name = 'deviceone'
+        )
+
+
+        self.url_view_kwargs = {'pk': self.item.id}
+
+        # self.url_add_kwargs = {'pk': self.item.id}
+
+        self.add_data = {'device': 'device', 'organization': self.organization.id}
+
+        self.url_change_kwargs = {'pk': self.item.id}
+
+        self.change_data = {'device': 'device', 'organization': self.organization.id}
+
+        self.url_delete_kwargs = {'pk': self.item.id}
+
+        self.delete_data = {'device': 'device', 'organization': self.organization.id}
+
+
+        view_permissions = Permission.objects.get(
+                codename = 'view_' + self.model._meta.model_name,
+                content_type = ContentType.objects.get(
+                    app_label = self.model._meta.app_label,
+                    model = self.model._meta.model_name,
+                )
+            )
+
+        view_team = Team.objects.create(
+            team_name = 'view_team',
+            organization = organization,
+        )
+
+        view_team.permissions.set([view_permissions])
+
+
+
+        add_permissions = Permission.objects.get(
+                codename = 'add_' + self.model._meta.model_name,
+                content_type = ContentType.objects.get(
+                    app_label = self.model._meta.app_label,
+                    model = self.model._meta.model_name,
+                )
+            )
+
+        add_team = Team.objects.create(
+            team_name = 'add_team',
+            organization = organization,
+        )
+
+        add_team.permissions.set([add_permissions])
+
+
+
+        change_permissions = Permission.objects.get(
+                codename = 'change_' + self.model._meta.model_name,
+                content_type = ContentType.objects.get(
+                    app_label = self.model._meta.app_label,
+                    model = self.model._meta.model_name,
+                )
+            )
+
+        change_team = Team.objects.create(
+            team_name = 'change_team',
+            organization = organization,
+        )
+
+        change_team.permissions.set([change_permissions])
+
+
+
+        delete_permissions = Permission.objects.get(
+                codename = 'delete_' + self.model._meta.model_name,
+                content_type = ContentType.objects.get(
+                    app_label = self.model._meta.app_label,
+                    model = self.model._meta.model_name,
+                )
+            )
+
+        delete_team = Team.objects.create(
+            team_name = 'delete_team',
+            organization = organization,
+        )
+
+        delete_team.permissions.set([delete_permissions])
+
+
+        self.no_permissions_user = User.objects.create_user(username="test_no_permissions", password="password")
+
+
+        self.view_user = User.objects.create_user(username="test_user_view", password="password")
+        teamuser = TeamUsers.objects.create(
+            team = view_team,
+            user = self.view_user
+        )
+
+        self.add_user = User.objects.create_user(username="test_user_add", password="password")
+        teamuser = TeamUsers.objects.create(
+            team = add_team,
+            user = self.add_user
+        )
+
+        self.change_user = User.objects.create_user(username="test_user_change", password="password")
+        teamuser = TeamUsers.objects.create(
+            team = change_team,
+            user = self.change_user
+        )
+
+        self.delete_user = User.objects.create_user(username="test_user_delete", password="password")
+        teamuser = TeamUsers.objects.create(
+            team = delete_team,
+            user = self.delete_user
+        )
+
+
+        self.different_organization_user = User.objects.create_user(username="test_different_organization_user", password="password")
+
+
+        different_organization_team = Team.objects.create(
+            team_name = 'different_organization_team',
+            organization = different_organization,
+        )
+
+        different_organization_team.permissions.set([
+            view_permissions,
+            add_permissions,
+            change_permissions,
+            delete_permissions,
+        ])
+
+        TeamUsers.objects.create(
+            team = different_organization_team,
+            user = self.different_organization_user
+        )

app/assistance/tests/unit/knowledge_base_category/test_knowledge_base_category_views.py

@@ -0,0 +1,29 @@
+import pytest
+import unittest
+import requests
+
+from django.test import TestCase
+
+from app.tests.abstract.models import PrimaryModel
+
+
+
+class ConfigManagementViews(
+    TestCase,
+    PrimaryModel
+):
+
+    add_module = 'assistance.views.knowledge_base_category'
+    add_view = 'Add'
+
+    change_module = add_module
+    change_view = 'Change'
+
+    delete_module = add_module
+    delete_view = 'Delete'
+
+    display_module = add_module
+    display_view = 'View'
+
+    index_module = add_module
+    index_view = 'Index'

app/assistance/urls.py

@@ -0,0 +1,15 @@
+from django.urls import path
+
+from assistance.views import knowledge_base
+
+app_name = "Assistance"
+
+urlpatterns = [
+
+    path("information", knowledge_base.Index.as_view(), name="Knowledge Base"),
+    path("information/add", knowledge_base.Add.as_view(), name="_knowledge_base_add"),
+    path("information/<int:pk>/edit", knowledge_base.Change.as_view(), name="_knowledge_base_change"),
+    path("information/<int:pk>/delete", knowledge_base.Delete.as_view(), name="_knowledge_base_delete"),
+    path("information/<int:pk>", knowledge_base.View.as_view(), name="_knowledge_base_view"),
+
+]

app/assistance/views/knowledge_base.py

@@ -0,0 +1,215 @@
+from datetime import datetime
+
+from django.contrib.auth import decorators as auth_decorator
+from django.db.models import Q
+from django.urls import reverse
+from django.utils.decorators import method_decorator
+
+from access.models import TeamUsers
+
+from assistance.forms.knowledge_base import KnowledgeBaseForm
+from assistance.models.knowledge_base import KnowledgeBase
+
+from core.forms.comment import AddNoteForm
+from core.models.notes import Notes
+from core.views.common import AddView, ChangeView, DeleteView, DisplayView, IndexView
+
+from settings.models.user_settings import UserSettings
+
+
+
+class Index(IndexView):
+
+    context_object_name = "items"
+
+    model = KnowledgeBase
+
+    paginate_by = 10
+
+    permission_required = [
+        'assistance.view_knowledgebase'
+    ]
+
+    template_name = 'assistance/kb_index.html.j2'
+
+
+    def get_context_data(self, **kwargs):
+
+        context = super().get_context_data(**kwargs)
+
+        if not self.request.user.has_perm('assistance.change_knowledgebase') and not self.request.user.is_superuser:
+
+            user_teams = []
+            for team_user in TeamUsers.objects.filter(user=self.request.user):
+
+                if team_user.team.id not in user_teams:
+
+                    user_teams += [ team_user.team.id ]
+
+
+            context['items'] = self.get_queryset().filter(
+                Q(expiry_date__lte=datetime.now())
+                  |
+                Q(expiry_date=None)
+            ).filter(
+                Q(target_team__in=user_teams)
+                  |
+                Q(target_user=self.request.user.id)
+            ).distinct()
+
+        context['model_docs_path'] = self.model._meta.app_label + '/knowledge_base/'
+
+        context['content_title'] = 'Knowledge Base Articles'
+
+        return context
+
+
+
+class Add(AddView):
+
+    form_class = KnowledgeBaseForm
+
+    model = KnowledgeBase
+
+    permission_required = [
+        'assistance.add_knowledgebase',
+    ]
+
+
+    def get_initial(self):
+
+        initial: dict = {
+            'organization': UserSettings.objects.get(user = self.request.user).default_organization
+        }
+
+        if 'pk' in self.kwargs:
+
+            if self.kwargs['pk']:
+
+                initial.update({'parent': self.kwargs['pk']})
+
+                self.model.parent.field.hidden = True
+
+        return initial
+
+
+    def get_success_url(self, **kwargs):
+
+        return reverse('Assistance:Knowledge Base')
+
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+
+        context['content_title'] = 'New Group'
+
+        return context
+
+
+
+class Change(ChangeView):
+
+    context_object_name = "group"
+
+    form_class = KnowledgeBaseForm
+
+    model = KnowledgeBase
+
+    permission_required = [
+        'assistance.change_knowledgebase',
+    ]
+
+
+    def get_context_data(self, **kwargs):
+
+        context = super().get_context_data(**kwargs)
+
+        context['content_title'] = self.object.title
+
+        return context
+
+
+    def get_success_url(self, **kwargs):
+
+        return reverse('Assistance:_knowledge_base_view', args=(self.kwargs['pk'],))
+
+
+
+class View(ChangeView):
+
+    context_object_name = "kb"
+
+    form_class = KnowledgeBaseForm
+
+    model = KnowledgeBase
+
+    permission_required = [
+        'assistance.view_knowledgebase',
+    ]
+
+    template_name = 'assistance/kb_article.html.j2'
+
+
+    def get_context_data(self, **kwargs):
+
+        context = super().get_context_data(**kwargs)
+
+        context['notes_form'] = AddNoteForm(prefix='note')
+        context['notes'] = Notes.objects.filter(config_group=self.kwargs['pk'])
+
+        context['model_pk'] = self.kwargs['pk']
+        context['model_name'] = self.model._meta.model_name
+
+        context['model_delete_url'] = reverse('Assistance:_knowledge_base_delete', args=(self.kwargs['pk'],))
+
+
+        context['content_title'] = self.object.title
+
+        return context
+
+
+    @method_decorator(auth_decorator.permission_required("assistance.change_knowledgebase", raise_exception=True))
+    def post(self, request, *args, **kwargs):
+
+        item = KnowledgeBase.objects.get(pk=self.kwargs['pk'])
+
+        notes = AddNoteForm(request.POST, prefix='note')
+
+        if notes.is_bound and notes.is_valid() and notes.instance.note != '':
+
+            notes.instance.organization = item.organization
+
+            notes.save()
+
+        # dont allow saving any post data outside notes.
+        # todo: figure out what needs to be returned
+        # return super().post(request, *args, **kwargs)
+
+
+    def get_success_url(self, **kwargs):
+
+        return reverse('Assistance:_knowledge_base_view', args=(self.kwargs['pk'],))
+
+
+
+class Delete(DeleteView):
+
+    model = KnowledgeBase
+
+    permission_required = [
+        'assistance.delete_knowledgebase',
+    ]
+
+
+    def get_context_data(self, **kwargs):
+
+        context = super().get_context_data(**kwargs)
+
+        context['content_title'] = 'Delete ' + self.object.title
+
+        return context
+
+
+    def get_success_url(self, **kwargs):
+
+        return reverse('Assistance:Knowledge Base')

app/assistance/views/knowledge_base_category.py

@@ -0,0 +1,191 @@
+from django.contrib.auth import decorators as auth_decorator
+from django.urls import reverse
+from django.utils.decorators import method_decorator
+
+from assistance.forms.knowledge_base_category import KnowledgeBaseCategoryForm
+from assistance.models.knowledge_base import KnowledgeBase, KnowledgeBaseCategory
+
+from core.forms.comment import AddNoteForm
+from core.models.notes import Notes
+from core.views.common import AddView, ChangeView, DeleteView, DisplayView, IndexView
+
+from settings.models.user_settings import UserSettings
+
+
+
+class Index(IndexView):
+
+    context_object_name = "items"
+
+    model = KnowledgeBaseCategory
+
+    paginate_by = 10
+
+    permission_required = [
+        'assistance.view_knowledgebasecategory'
+    ]
+
+    template_name = 'assistance/kb_category_index.html.j2'
+
+
+    def get_context_data(self, **kwargs):
+
+        context = super().get_context_data(**kwargs)
+
+        context['model_docs_path'] = self.model._meta.app_label + '/knowledge_base/'
+
+        context['content_title'] = 'Knowledge Base Categories'
+
+        return context
+
+
+class Add(AddView):
+
+    form_class = KnowledgeBaseCategoryForm
+
+    model = KnowledgeBaseCategory
+
+    permission_required = [
+        'assistance.add_knowledgebasecategory',
+    ]
+
+
+    def get_initial(self):
+
+        initial: dict = {
+            'organization': UserSettings.objects.get(user = self.request.user).default_organization
+        }
+
+        if 'pk' in self.kwargs:
+
+            if self.kwargs['pk']:
+
+                initial.update({'parent': self.kwargs['pk']})
+
+                self.model.parent.field.hidden = True
+
+        return initial
+
+
+    def get_success_url(self, **kwargs):
+
+        return reverse('Settings:KB Categories')
+
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+
+        context['content_title'] = 'New Group'
+
+        return context
+
+
+
+class Change(ChangeView):
+
+    context_object_name = "group"
+
+    form_class = KnowledgeBaseCategoryForm
+
+    model = KnowledgeBaseCategory
+
+    permission_required = [
+        'assistance.change_knowledgebasecategory',
+    ]
+
+
+    def get_context_data(self, **kwargs):
+
+        context = super().get_context_data(**kwargs)
+
+        context['content_title'] = self.object.name
+
+        return context
+
+
+    def get_success_url(self, **kwargs):
+
+        return reverse('Settings:_knowledge_base_category_view', args=(self.kwargs['pk'],))
+
+
+
+class View(ChangeView):
+
+    context_object_name = "item"
+
+    form_class = KnowledgeBaseCategoryForm
+
+    model = KnowledgeBaseCategory
+
+    permission_required = [
+        'assistance.view_knowledgebasecategory',
+    ]
+
+    template_name = 'assistance/kb_category.html.j2'
+
+
+    def get_context_data(self, **kwargs):
+
+        context = super().get_context_data(**kwargs)
+
+        context['articles'] = KnowledgeBase.objects.filter(category=self.kwargs['pk'])
+
+        context['notes_form'] = AddNoteForm(prefix='note')
+        context['notes'] = Notes.objects.filter(config_group=self.kwargs['pk'])
+
+        context['model_pk'] = self.kwargs['pk']
+        context['model_name'] = self.model._meta.model_name
+
+        context['model_delete_url'] = reverse('Settings:_knowledge_base_category_delete', args=(self.kwargs['pk'],))
+
+
+        context['content_title'] = self.object.name
+
+        return context
+
+
+    @method_decorator(auth_decorator.permission_required("assistance.change_knowledgebasecategory", raise_exception=True))
+    def post(self, request, *args, **kwargs):
+
+        item = KnowledgeBase.objects.get(pk=self.kwargs['pk'])
+
+        notes = AddNoteForm(request.POST, prefix='note')
+
+        if notes.is_bound and notes.is_valid() and notes.instance.note != '':
+
+            notes.instance.organization = item.organization
+
+            notes.save()
+
+        # dont allow saving any post data outside notes.
+        # todo: figure out what needs to be returned
+        # return super().post(request, *args, **kwargs)
+
+
+    def get_success_url(self, **kwargs):
+
+        return reverse('Settings:_knowledge_base_category_view', args=(self.kwargs['pk'],))
+
+
+
+class Delete(DeleteView):
+
+    model = KnowledgeBaseCategory
+
+    permission_required = [
+        'assistance.delete_knowledgebasecategory',
+    ]
+
+
+    def get_context_data(self, **kwargs):
+
+        context = super().get_context_data(**kwargs)
+
+        context['content_title'] = 'Delete ' + self.object.name
+
+        return context
+
+
+    def get_success_url(self, **kwargs):
+
+        return reverse('Settings:KB Categories')

app/core/migrations/0003_notes_service.py

@@ -0,0 +1,20 @@
+# Generated by Django 5.0.7 on 2024-07-21 02:35
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0002_notes'),
+        ('itim', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='notes',
+            name='service',
+            field=models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.CASCADE, to='itim.service'),
+        ),
+    ]

app/core/models/notes.py

@@ -10,6 +10,9 @@ from itam.models.device import Device
 from itam.models.software import Software
 from itam.models.operating_system import OperatingSystem
 
+from itim.models.services import Service
+
+
 
 class NotesCommonFields(TenancyObject, models.Model):
 
@@ -88,6 +91,14 @@ class Notes(NotesCommonFields):
         blank= True
     )
 
+    service = models.ForeignKey(
+        Service,
+        on_delete=models.CASCADE,
+        default = None,
+        null = True,
+        blank= True
+    )
+
     software = models.ForeignKey(
         Software,
         on_delete=models.CASCADE,

app/core/templatetags/json.py

@@ -14,4 +14,4 @@ def json_pretty(value):
 
         return str('{}')
 
-    return json.dumps(json.loads(value), indent=4, sort_keys=True)
+    return json.dumps(json.loads(value.replace("'", '"')), indent=4, sort_keys=True)

app/core/templatetags/markdown.py

@@ -9,4 +9,4 @@ register = template.Library()
 @register.filter()
 @stringfilter
 def markdown(value):
-    return md.markdown(value, extensions=['markdown.extensions.fenced_code'])
+    return md.markdown(value, extensions=['markdown.extensions.fenced_code', 'codehilite'])

app/core/tests/abstract/history_permissions.py

@@ -12,7 +12,12 @@ from itam.models.device import Device
 
 
 class HistoryPermissions:
-    """Test cases for accessing History """    
+    """Test cases for accessing History
+    
+    For this test to function properly you must add the history items model to
+    `app.core.views.history.View.get_object()`. specifically an entry to the switch in the middle
+    of the function.
+    """
 
 
     item: object

app/core/views/common.py

@@ -1,9 +1,12 @@
+from django.template import Template, Context
+from django.utils.html import escape
 from django.views import generic
 
 from access.mixin import OrganizationPermission
 
 from core.exceptions import MissingAttribute
 
+from settings.models.external_link import ExternalLink
 from settings.models.user_settings import UserSettings
 
 
@@ -50,6 +53,68 @@ class ChangeView(View, generic.UpdateView):
 
     template_name:str  = 'form.html.j2'
 
+    # ToDo: on migrating all views to seperate display and change views, external_links will not be required in `ChangView`
+    def get_context_data(self, **kwargs):
+        """ Get template context
+
+        For items that have the ability to have external links, this function
+        adds the external link details to the context.
+
+        !!! Danger "Requirement"
+            This function may be overridden with the caveat that this function is still called.
+            by the overriding function. i.e. `super().get_context_data(skwargs)`
+
+        !!! note
+            The adding of `external_links` within this view is scheduled to be removed.
+
+        Returns:
+            (dict): Context for the template to use inclusive of 'external_links'
+        """
+
+        context = super().get_context_data(**kwargs)
+
+        external_links_query = None
+
+        if 'tab' in self.request.GET:
+
+            context['open_tab'] = str(self.request.GET.get("tab")).lower()
+
+        else:
+             context['open_tab'] = None
+
+
+        if self.model._meta.model_name == 'device':
+
+            external_links_query = ExternalLink.objects.filter(devices=True)
+
+        elif self.model._meta.model_name == 'software':
+
+            external_links_query = ExternalLink.objects.filter(software=True)
+
+
+        if external_links_query:
+
+            external_links: list = []
+
+            user_context = Context(context)
+
+            for external_link in external_links_query:
+
+                user_string = Template(external_link)
+                external_link_context: dict = {
+                        'name': escape(external_link.name),
+                        'link': escape(user_string.render(user_context)),
+                    }
+
+                if external_link.colour:
+
+                    external_link_context.update({'colour': external_link.colour })
+                external_links += [ external_link_context ]
+
+            context['external_links'] = external_links
+
+
+        return context
 
 
 class DeleteView(OrganizationPermission, generic.DeleteView):
@@ -64,6 +129,60 @@ class DisplayView(OrganizationPermission, generic.DetailView):
     template_name:str  = 'form.html.j2'
 
 
+    # ToDo: on migrating all views to seperate display and change views, external_links will not be required in `ChangView`
+    def get_context_data(self, **kwargs):
+        """ Get template context
+
+        For items that have the ability to have external links, this function
+        adds the external link details to the context.
+
+        !!! Danger "Requirement"
+            This function may be overridden with the caveat that this function is still called.
+            by the overriding function. i.e. `super().get_context_data(skwargs)`
+
+        Returns:
+            (dict): Context for the template to use inclusive of 'external_links'
+        """
+
+        context = super().get_context_data(**kwargs)
+
+        external_links_query = None
+
+
+        if self.model._meta.model_name == 'device':
+
+            external_links_query = ExternalLink.objects.filter(devices=True)
+
+        elif self.model._meta.model_name == 'software':
+
+            external_links_query = ExternalLink.objects.filter(software=True)
+
+
+        if external_links_query:
+
+            external_links: list = []
+
+            user_context = Context(context)
+
+            for external_link in external_links_query:
+
+                user_string = Template(external_link)
+                external_link_context: dict = {
+                        'name': escape(external_link.name),
+                        'link': escape(user_string.render(user_context)),
+                    }
+
+                if external_link.colour:
+
+                    external_link_context.update({'colour': external_link.colour })
+                external_links += [ external_link_context ]
+
+            context['external_links'] = external_links
+
+
+        return context
+
+
 
 class IndexView(View, generic.ListView):
 

app/core/views/history.py

@@ -41,6 +41,8 @@ class View(OrganizationPermission, generic.View):
 
         from config_management.models.groups import ConfigGroups
 
+        from settings.models.external_link import ExternalLink
+
         if not hasattr(self, 'model'):
 
             match self.kwargs['model_name']:
@@ -61,6 +63,22 @@ class View(OrganizationPermission, generic.View):
 
                     self.model = DeviceType
 
+                case 'externallink':
+
+                    self.model = ExternalLink
+
+                case 'knowledgebase':
+
+                    from assistance.models.knowledge_base import KnowledgeBase
+
+                    self.model = KnowledgeBase
+
+                case 'knowledgebasecategory':
+
+                    from assistance.models.knowledge_base import KnowledgeBaseCategory
+
+                    self.model = KnowledgeBaseCategory
+
                 case 'manufacturer':
 
                     self.model = Manufacturer
@@ -81,10 +99,22 @@ class View(OrganizationPermission, generic.View):
 
                     self.model = Organization
 
+                case 'port':
+
+                    from itim.models.services import Port
+
+                    self.model = Port
+
                 case 'team':
 
                     self.model = Team
 
+                case 'service':
+
+                    from itim.models.services import Service
+
+                    self.model = Service
+
                 case _:
                     raise Exception('Unable to determine history items model')
 

app/information/urls.py

@@ -1,13 +0,0 @@
-from django.urls import path
-
-from . import views
-from .views import knowledge_base, playbooks
-
-app_name = "Information"
-
-urlpatterns = [
-
-    path("kb/", knowledge_base.Index.as_view(), name="Knowledge Base"),
-    path("playbook/", playbooks.Index.as_view(), name="Playbooks"),
-
-]

app/information/views/knowledge_base.py

@@ -1,31 +0,0 @@
-import json
-
-from django.db.models import Q
-from django.shortcuts import render
-from django.template import Template, Context
-from django.views import generic
-
-from access.mixin import OrganizationPermission
-
-
-
-class Index(generic.View):
-
-    # permission_required = [
-    #     'itil.view_knowledge_base'
-    # ]
-
-    template_name = 'form.html.j2'
-
-
-    def get(self, request):
-        context = {}
-
-        user_string = Template("{% include 'icons/issue_link.html.j2' with issue=10 %}")
-        user_context = Context(context)
-        context['form'] = user_string.render(user_context)
-
-
-        context['content_title'] = 'Knowledge Base'
-
-        return render(request, self.template_name, context)

app/information/views/playbooks.py

@@ -1,29 +0,0 @@
-import json
-
-from django.db.models import Q
-from django.shortcuts import render
-from django.template import Template, Context
-from django.views import generic
-
-from access.mixin import OrganizationPermission
-
-
-
-class Index(generic.View):
-
-    # permission_required = [
-    #     'itil.view_playbook'
-    # ]
-
-    template_name = 'form.html.j2'
-
-    def get(self, request):
-        context = {}
-
-        user_string = Template("{% include 'icons/issue_link.html.j2' with issue=11 %}")
-        user_context = Context(context)
-        context['form'] = user_string.render(user_context)
-
-        context['content_title'] = 'Playbooks'
-
-        return render(request, self.template_name, context)

app/itam/forms/device/device.py

@@ -23,6 +23,7 @@ class DeviceForm(CommonModelForm):
             'device_type',
             'organization',
             'model_notes',
+            'config',
         ]
 
 

app/itam/migrations/0002_device_config.py

@@ -0,0 +1,19 @@
+# Generated by Django 5.0.7 on 2024-07-17 07:17
+
+import itam.models.device
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('itam', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='device',
+            name='config',
+            field=models.JSONField(blank=True, default=None, help_text='Configuration for this device', null=True, validators=[itam.models.device.Device.validate_config_keys_not_reserved], verbose_name='Host Configuration'),
+        ),
+    ]

app/itam/models/device.py

@@ -44,6 +44,20 @@ class DeviceType(DeviceCommonFieldsName, SaveHistory):
 class Device(DeviceCommonFieldsName, SaveHistory):
 
 
+    reserved_config_keys: list = [
+        'software'
+    ]
+
+    def validate_config_keys_not_reserved(self):
+
+        value: dict = self
+
+        for invalid_key in Device.reserved_config_keys:
+
+            if invalid_key in value.keys():
+                raise ValidationError(f'json key "{invalid_key}" is a reserved configuration key')
+
+
     def validate_uuid_format(self):
 
         pattern = r'[0-9|a-f]{8}\-[0-9|a-f]{4}\-[0-9|a-f]{4}\-[0-9|a-f]{4}\-[0-9|a-f]{12}'
@@ -113,6 +127,15 @@ class Device(DeviceCommonFieldsName, SaveHistory):
     )
 
 
+    config = models.JSONField(
+        blank = True,
+        default = None,
+        null = True,
+        validators=[ validate_config_keys_not_reserved ],
+        verbose_name = 'Host Configuration',
+        help_text = 'Configuration for this device'
+    )
+
     inventorydate = models.DateTimeField(
         verbose_name = 'Last Inventory Date',
         null = True,
@@ -254,6 +277,25 @@ class Device(DeviceCommonFieldsName, SaveHistory):
 
             config['software'] = merge_software(group_software, host_software)
 
+            if self.config:
+
+                config.update(self.config)
+
+            from itim.models.services import Service
+            services = Service.objects.filter(
+                device = self.pk
+            )
+
+            for service in services:
+
+                if service.config_variables:
+
+                    service_config:dict = {
+                        service.config_key_variable: service.config_variables
+                    }
+
+                    config.update(service_config)
+
         return config
 
 

app/itam/templates/itam/device.html.j2

@@ -83,7 +83,9 @@
   <div id="Details" class="tabcontent">
     <h3>
       Details
-      <span style="font-weight: normal; float: right;">{% include 'icons/issue_link.html.j2' with issue=6 %}</span>
+      {% for external_link in external_links %}
+        <span style="font-weight: normal; float: right;">{% include 'icons/external_link.html.j2' with external_link=external_link %}</span>
+      {% endfor %}
     </h3>
     <div style="align-items:flex-start; align-content: center; display: flexbox; width: 100%">
 
@@ -182,6 +184,35 @@
       <input type="submit" name="{{operating_system.prefix}}" value="Submit" />
     </div>
 
+    <div style="display: block; width: 100%;">
+      <h3>Dependent Services</h3>
+      <table>
+          <tr>
+              <th>Name</th>
+              <th>Ports</th>
+          </tr>
+          {% if services %}
+          {% for service in services %}
+          <tr>
+              <td><a href="{% url 'ITIM:_service_view' service.pk %}">{{ service }}</a></td>
+              <td>{% for port in service.port.all %}{{ port }} ({{ port.description}}), {% endfor %}</td>
+          </tr>
+          {% endfor%}
+          {% else %}
+          <tr>
+          <td colspan="2"> Nothing Found</td>
+          </tr>
+          {% endif %}
+      </table>
+        </div>
+
+    <div style="display: block; width: 100%;">
+      <h3>Device Config</h3>
+      <br>
+      <textarea cols="90" rows="30" readonly>{{ device.config }}</textarea>
+    </div>
+
+    <input type="button" value="Edit" onclick="window.location='{% url 'ITAM:_device_change' device.id %}';">
     {% if not tab %}
     <script>
       // Get the element with id="defaultOpen" and click on it

app/itam/templates/itam/software.html.j2

@@ -43,8 +43,12 @@
 
 <form method="post">
 <div id="Details" class="tabcontent">
-  <h3>Details</h3>
-  
+  <h3>
+    Details
+    {% for external_link in external_links %}
+      <span style="font-weight: normal; float: right;">{% include 'icons/external_link.html.j2' with external_link=external_link %}</span>
+    {% endfor %}
+  </h3>
     {% csrf_token %}
     {{ form }}
     <br>

app/itam/views/device.py

@@ -21,10 +21,11 @@ from core.views.common import AddView, ChangeView, DeleteView, IndexView
 
 from itam.forms.device_softwareadd import SoftwareAdd
 from itam.forms.device_softwareupdate import SoftwareUpdate
-
 from itam.forms.device.device import DeviceForm
 from itam.forms.device.operating_system import Update as OperatingSystemForm
 
+from itim.models.services import Service
+
 from settings.models.user_settings import UserSettings
 
 
@@ -104,6 +105,8 @@ class View(ChangeView):
 
             context['operating_system'] = OperatingSystemForm(prefix='operating_system')
 
+        context['services'] = Service.objects.filter(device=self.kwargs['pk'])
+
 
         softwares = DeviceSoftware.objects.filter(device=self.kwargs['pk'])
         softwares = Paginator(softwares, 10)

app/itim/forms/ports.py

@@ -0,0 +1,24 @@
+
+# from django import forms
+# from django.forms import ValidationError
+
+# from app import settings
+
+from itim.models.services import Port
+
+from core.forms.common import CommonModelForm
+
+from settings.models.user_settings import UserSettings
+
+
+
+class PortForm(CommonModelForm):
+
+
+    class Meta:
+
+        fields = '__all__'
+
+        model = Port
+
+    prefix = 'port'

app/itim/forms/services.py

@@ -0,0 +1,162 @@
+from django import forms
+from django.forms import ValidationError
+from django.urls import reverse
+
+from itim.models.services import Service
+
+from app import settings
+
+from core.forms.common import CommonModelForm
+
+
+
+class ServiceForm(CommonModelForm):
+
+
+    class Meta:
+
+        fields = '__all__'
+
+        model = Service
+
+    prefix = 'service'
+
+    def __init__(self, *args, **kwargs):
+
+        super().__init__(*args, **kwargs)
+
+        self.fields['dependent_service'].queryset = self.fields['dependent_service'].queryset.exclude(
+            id=self.instance.pk
+        ).exclude(
+            is_template=True
+        )
+
+        self.fields['template'].queryset = self.fields['template'].queryset.exclude(
+            id=self.instance.pk
+        )
+
+
+    def clean(self):
+        
+        cleaned_data = super().clean()
+
+        pk = self.instance.id
+        dependent_service = cleaned_data.get("dependent_service")
+        device = cleaned_data.get("device")
+        cluster = cleaned_data.get("cluster")
+        is_template = cleaned_data.get("is_template")
+        template = cleaned_data.get("template")
+        port = cleaned_data.get("port")
+
+
+        if not is_template and not template:
+
+            if not device and not cluster:
+
+                raise ValidationError('A Service must be assigned to either a "Cluster" or a "Device".')
+
+
+            if device and cluster:
+
+                raise ValidationError('A Service must only be assigned to either a "Cluster" or a "Device". Not both.')
+
+
+            if not port:
+
+                raise ValidationError('Port(s) must be assigned to a service.')
+
+        if dependent_service:
+
+            for dependency in dependent_service:
+
+                query = Service.objects.filter(
+                    dependent_service = pk,
+                    id = dependency.id,
+                )
+
+                if query.exists():
+
+                    raise ValidationError('A dependent service already depends upon this service. Circular dependencies are not allowed.')
+
+            
+
+
+        return cleaned_data
+
+
+
+class DetailForm(ServiceForm):
+
+
+    tabs: dict = {
+        "details": {
+            "name": "Details",
+            "slug": "details",
+            "sections": [
+                {
+                    "layout": "double",
+                    "left": [
+                        'name',
+                        'config_key_variable',
+                        'template',
+                        'organization',
+                        'c_created',
+                        'c_modified'
+                    ],
+                    "right": [
+                        'model_notes',
+                    ]
+                }
+            ]
+        },
+        "rendered_config": {
+            "name": "Rendered Config",
+            "slug": "rendered_config",
+            "sections": [
+                {
+                    "layout": "single",
+                    "fields": [
+                        'config_variables',
+                    ],
+                    "json": [
+                        'config_variables'
+                    ]
+                }
+            ]
+        }
+    }
+
+
+    def __init__(self, *args, **kwargs):
+
+        super().__init__(*args, **kwargs)
+
+
+        self.fields['config_variables'] = forms.fields.JSONField(
+            widget = forms.Textarea(
+                attrs = {
+                    "cols": "80",
+                    "rows": "100"
+                }
+            ),
+            label = 'Rendered Configuration',
+            initial = self.instance.config_variables,
+        )
+
+        self.fields['c_created'] = forms.DateTimeField(
+            label = 'Created',
+            input_formats=settings.DATETIME_FORMAT,
+            disabled = True,
+            initial = self.instance.created,
+        )
+
+        self.fields['c_modified'] = forms.DateTimeField(
+            label = 'Modified',
+            input_formats=settings.DATETIME_FORMAT,
+            disabled = True,
+            initial = self.instance.modified,
+        )
+
+        self.tabs['details'].update({
+            "edit_url": reverse('ITIM:_service_change', args=(self.instance.pk,))
+        })

app/itim/migrations/0001_initial.py

@@ -0,0 +1,102 @@
+# Generated by Django 5.0.7 on 2024-07-21 02:35
+
+import access.fields
+import access.models
+import django.db.models.deletion
+import django.utils.timezone
+import itim.models.services
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('access', '0001_initial'),
+        ('itam', '0002_device_config'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='ClusterType',
+            fields=[
+                ('is_global', models.BooleanField(default=False)),
+                ('model_notes', models.TextField(blank=True, default=None, null=True, verbose_name='Notes')),
+                ('id', models.AutoField(primary_key=True, serialize=False, unique=True)),
+                ('name', models.CharField(help_text='Name of the Cluster Type', max_length=50, verbose_name='Name')),
+                ('slug', access.fields.AutoSlugField()),
+                ('organization', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='access.organization', validators=[access.models.TenancyObject.validatate_organization_exists])),
+            ],
+            options={
+                'verbose_name': 'ClusterType',
+                'verbose_name_plural': 'ClusterTypes',
+                'ordering': ['name'],
+            },
+        ),
+        migrations.CreateModel(
+            name='Cluster',
+            fields=[
+                ('is_global', models.BooleanField(default=False)),
+                ('model_notes', models.TextField(blank=True, default=None, null=True, verbose_name='Notes')),
+                ('id', models.AutoField(primary_key=True, serialize=False, unique=True)),
+                ('name', models.CharField(help_text='Name of the Cluster', max_length=50, verbose_name='Name')),
+                ('slug', access.fields.AutoSlugField()),
+                ('config', models.JSONField(blank=True, default=None, help_text='Cluster Configuration', null=True, verbose_name='Configuration')),
+                ('devices', models.ManyToManyField(blank=True, default=None, help_text='Devices that are deployed upon the cluster.', related_name='cluster_device', to='itam.device', verbose_name='Devices')),
+                ('node', models.ManyToManyField(blank=True, default=None, help_text='Hosts for resource consumption that the cluster is deployed upon', related_name='cluster_node', to='itam.device', verbose_name='Nodes')),
+                ('organization', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='access.organization', validators=[access.models.TenancyObject.validatate_organization_exists])),
+                ('parent_cluster', models.ForeignKey(blank=True, default=None, help_text='Parent Cluster for this cluster', null=True, on_delete=django.db.models.deletion.CASCADE, to='itim.cluster', verbose_name='Parent Cluster')),
+                ('cluster_type', models.ForeignKey(blank=True, default=None, help_text='Parent Cluster for this cluster', null=True, on_delete=django.db.models.deletion.CASCADE, to='itim.clustertype', verbose_name='Parent Cluster')),
+            ],
+            options={
+                'verbose_name': 'Cluster',
+                'verbose_name_plural': 'Clusters',
+                'ordering': ['name'],
+            },
+        ),
+        migrations.CreateModel(
+            name='Port',
+            fields=[
+                ('is_global', models.BooleanField(default=False)),
+                ('model_notes', models.TextField(blank=True, default=None, null=True, verbose_name='Notes')),
+                ('id', models.AutoField(primary_key=True, serialize=False, unique=True)),
+                ('number', models.IntegerField(help_text='The port number', validators=[itim.models.services.Port.validation_port_number], verbose_name='Port Number')),
+                ('description', models.CharField(blank=True, default=None, help_text='Short description of port', max_length=80, null=True, verbose_name='Description')),
+                ('protocol', models.CharField(choices=[('TCP', 'TCP'), ('UDP', 'UDP')], default='TCP', help_text='Layer 4 Network Protocol', max_length=3, verbose_name='Protocol')),
+                ('created', access.fields.AutoCreatedField(default=django.utils.timezone.now, editable=False)),
+                ('modified', access.fields.AutoLastModifiedField(default=django.utils.timezone.now, editable=False)),
+                ('organization', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='access.organization', validators=[access.models.TenancyObject.validatate_organization_exists])),
+            ],
+            options={
+                'verbose_name': 'Protocol',
+                'verbose_name_plural': 'Protocols',
+                'ordering': ['number', 'protocol'],
+            },
+        ),
+        migrations.CreateModel(
+            name='Service',
+            fields=[
+                ('is_global', models.BooleanField(default=False)),
+                ('model_notes', models.TextField(blank=True, default=None, null=True, verbose_name='Notes')),
+                ('id', models.AutoField(primary_key=True, serialize=False, unique=True)),
+                ('is_template', models.BooleanField(default=False, help_text='Is this service to be used as a template', verbose_name='Template')),
+                ('name', models.CharField(help_text='Name of the Service', max_length=50, verbose_name='Name')),
+                ('config', models.JSONField(blank=True, default=None, help_text='Cluster Configuration', null=True, verbose_name='Configuration')),
+                ('config_key_variable', models.CharField(help_text='Key name to use when merging with cluster/device config.', max_length=50, null=True, validators=[itim.models.services.Service.validate_config_key_variable], verbose_name='Configuration Key')),
+                ('created', access.fields.AutoCreatedField(default=django.utils.timezone.now, editable=False)),
+                ('modified', access.fields.AutoLastModifiedField(default=django.utils.timezone.now, editable=False)),
+                ('cluster', models.ForeignKey(blank=True, default=None, help_text='Cluster the service is assigned to', null=True, on_delete=django.db.models.deletion.CASCADE, to='itim.cluster', verbose_name='Cluster')),
+                ('dependent_service', models.ManyToManyField(blank=True, default=None, help_text='Services that this service depends upon', related_name='dependentservice', to='itim.service', verbose_name='Dependent Services')),
+                ('device', models.ForeignKey(blank=True, default=None, help_text='Device the service is assigned to', null=True, on_delete=django.db.models.deletion.CASCADE, to='itam.device', verbose_name='Device')),
+                ('organization', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='access.organization', validators=[access.models.TenancyObject.validatate_organization_exists])),
+                ('port', models.ManyToManyField(blank=True, help_text='Port the service is available on', to='itim.port', verbose_name='Port')),
+                ('template', models.ForeignKey(blank=True, default=None, help_text='Template this service uses', null=True, on_delete=django.db.models.deletion.CASCADE, to='itim.service', verbose_name='Template Name')),
+            ],
+            options={
+                'verbose_name': 'Service',
+                'verbose_name_plural': 'Services',
+                'ordering': ['name'],
+            },
+        ),
+    ]

app/itim/models/clusters.py

@@ -0,0 +1,123 @@
+from django.contrib.auth.models import User
+from django.db import models
+from django.forms import ValidationError
+
+from access.fields import *
+from access.models import Team, TenancyObject
+
+from itam.models.device import Device
+
+
+
+class ClusterType(TenancyObject):
+
+
+    class Meta:
+
+        ordering = [
+            'name',
+        ]
+
+        verbose_name = "ClusterType"
+
+        verbose_name_plural = "ClusterTypes"
+
+
+    id = models.AutoField(
+        primary_key=True,
+        unique=True,
+        blank=False
+    )
+
+    name = models.CharField(
+        blank = False,
+        help_text = 'Name of the Cluster Type',
+        max_length = 50,
+        unique = False,
+        verbose_name = 'Name',
+    )
+
+    slug = AutoSlugField()
+
+
+
+class Cluster(TenancyObject):
+
+
+    class Meta:
+
+        ordering = [
+            'name',
+        ]
+
+        verbose_name = "Cluster"
+
+        verbose_name_plural = "Clusters"
+
+
+    id = models.AutoField(
+        primary_key=True,
+        unique=True,
+        blank=False
+    )
+
+    parent_cluster = models.ForeignKey(
+        'self',
+        blank = True,
+        default = None,
+        help_text = 'Parent Cluster for this cluster',
+        null = True,
+        on_delete = models.CASCADE,
+        verbose_name = 'Parent Cluster',
+    )
+
+    cluster_type = models.ForeignKey(
+        ClusterType,
+        blank = True,
+        default = None,
+        help_text = 'Parent Cluster for this cluster',
+        null = True,
+        on_delete = models.CASCADE,
+        verbose_name = 'Parent Cluster',
+    )
+
+    name = models.CharField(
+        blank = False,
+        help_text = 'Name of the Cluster',
+        max_length = 50,
+        unique = False,
+        verbose_name = 'Name',
+    )
+
+    slug = AutoSlugField()
+
+    config = models.JSONField(
+        blank = True,
+        default = None,
+        help_text = 'Cluster Configuration',
+        null = True,
+        verbose_name = 'Configuration',
+    )
+
+    node = models.ManyToManyField(
+        Device,
+        blank = True,
+        default = None,
+        help_text = 'Hosts for resource consumption that the cluster is deployed upon',
+        related_name = 'cluster_node',
+        verbose_name = 'Nodes',
+    )
+
+    devices = models.ManyToManyField(
+        Device,
+        blank = True,
+        default = None,
+        help_text = 'Devices that are deployed upon the cluster.',
+        related_name = 'cluster_device',
+        verbose_name = 'Devices',
+    )
+
+
+    def __str__(self):
+
+        return self.name

app/itim/models/services.py

@@ -0,0 +1,235 @@
+import re
+
+from django.contrib.auth.models import User
+from django.db import models
+from django.forms import ValidationError
+
+from access.fields import *
+from access.models import Team, TenancyObject
+
+from itam.models.device import Device
+
+from itim.models.clusters import Cluster
+
+
+
+class Port(TenancyObject):
+
+
+    class Meta:
+
+        ordering = [
+            'number',
+            'protocol',
+        ]
+
+        verbose_name = "Protocol"
+
+        verbose_name_plural = "Protocols"
+
+
+    class Protocol(models.TextChoices):
+        TCP = 'TCP', 'TCP'
+        UDP = 'UDP', 'UDP'
+
+    def validation_port_number(number: int):
+
+        if number < 1 or number > 65535:
+
+            raise ValidationError('A Valid port number is between 1-65535')
+
+
+    id = models.AutoField(
+        primary_key=True,
+        unique=True,
+        blank=False
+    )
+
+    number = models.IntegerField(
+        blank = False,
+        help_text = 'The port number',
+        unique = False,
+        validators = [ validation_port_number ],
+        verbose_name = 'Port Number',
+    )
+
+    description = models.CharField(
+        blank = True,
+        default = None,
+        help_text = 'Short description of port',
+        max_length = 80,
+        null = True,
+        verbose_name = 'Description',
+    )
+
+    protocol = models.CharField(
+        blank = False,
+        choices=Protocol.choices,
+        default = Protocol.TCP,
+        help_text = 'Layer 4 Network Protocol',
+        max_length = 3,
+        verbose_name = 'Protocol',
+    )
+
+    created = AutoCreatedField()
+
+    modified = AutoLastModifiedField()
+
+
+    def __str__(self):
+
+        return str(self.protocol) + '/' + str(self.number)
+
+
+
+class Service(TenancyObject):
+
+
+    class Meta:
+
+        ordering = [
+            'name',
+        ]
+
+        verbose_name = "Service"
+
+        verbose_name_plural = "Services"
+
+    def validate_config_key_variable(value):
+
+        if not value:
+
+            raise ValidationError('You must enter a config key.')
+
+        valid_chars = search=re.compile(r'[^a-z_]').search
+
+        if bool(valid_chars(value)):
+
+            raise ValidationError('config key must only contain [a-z_].')
+
+
+    id = models.AutoField(
+        primary_key=True,
+        unique=True,
+        blank=False
+    )
+
+    is_template = models.BooleanField(
+        blank = False,
+        default = False,
+        help_text = 'Is this service to be used as a template',
+        verbose_name = 'Template',
+    )
+
+    template = models.ForeignKey(
+        'self',
+        blank = True,
+        default = None,
+        help_text = 'Template this service uses',
+        null = True,
+        on_delete = models.CASCADE,
+        verbose_name = 'Template Name',
+    )
+
+    name = models.CharField(
+        blank = False,
+        help_text = 'Name of the Service',
+        max_length = 50,
+        unique = False,
+        verbose_name = 'Name',
+    )
+
+    device = models.ForeignKey(
+        Device,
+        blank = True,
+        default = None,
+        help_text = 'Device the service is assigned to',
+        null = True,
+        on_delete = models.CASCADE,
+        verbose_name = 'Device',
+    )
+
+    cluster = models.ForeignKey(
+        'Cluster',
+        blank = True,
+        default = None,
+        help_text = 'Cluster the service is assigned to',
+        null = True,
+        on_delete = models.CASCADE,
+        unique = False,
+        verbose_name = 'Cluster',
+    )
+
+    config = models.JSONField(
+        blank = True,
+        default = None,
+        help_text = 'Cluster Configuration',
+        null = True,
+        verbose_name = 'Configuration',
+    )
+
+    config_key_variable = models.CharField(
+        blank = False,
+        help_text = 'Key name to use when merging with cluster/device config.',
+        max_length = 50,
+        null = True,
+        unique = False,
+        validators = [ validate_config_key_variable ],
+        verbose_name = 'Configuration Key',
+    )
+
+    port = models.ManyToManyField(
+        Port,
+        blank = True,
+        help_text = 'Port the service is available on',
+        verbose_name = 'Port',
+    )
+
+    dependent_service = models.ManyToManyField(
+        'self',
+        blank = True,
+        default = None,
+        help_text = 'Services that this service depends upon',
+        related_name = 'dependentservice',
+        symmetrical = False,
+        verbose_name = 'Dependent Services',
+    )
+
+    created = AutoCreatedField()
+
+    modified = AutoLastModifiedField()
+
+    @property
+    def config_variables(self):
+
+        if self.is_template:
+
+            return self.config
+
+        if self.template:
+
+            template_config: dict = Service.objects.get(id=self.template.id).config
+
+            template_config.update(self.config)
+
+            return template_config
+
+        else:
+
+            return self.config
+
+        return None
+
+
+    def save(self, force_insert=False, force_update=False, using=None, update_fields=None):
+
+        if self.config_key_variable:
+
+            self.config_key_variable = self.config_key_variable.lower()
+
+        super().save(force_insert=force_insert, force_update=force_update, using=using, update_fields=update_fields)
+
+
+    def __str__(self):
+
+        return self.name

app/itim/templates/itim/port.html.j2

@@ -0,0 +1,196 @@
+{% extends 'base.html.j2' %}
+
+{% load markdown %}
+
+{% block content %}
+
+<script>
+
+    function openCity(evt, cityName) {
+        var i, tabcontent, tablinks;
+
+        tabcontent = document.getElementsByClassName("tabcontent");
+        for (i = 0; i < tabcontent.length; i++) {
+            tabcontent[i].style.display = "none";
+        }
+
+        tablinks = document.getElementsByClassName("tablinks");
+        for (i = 0; i < tablinks.length; i++) {
+            tablinks[i].className = tablinks[i].className.replace(" active", "");
+        }
+
+        document.getElementById(cityName).style.display = "block";
+        evt.currentTarget.className += " active";
+    }
+
+</script>
+
+<style>
+    .detail-view-field {
+        display: unset;
+        height: 30px;
+        line-height: 30px;
+        padding: 0px 20px 40px 20px;
+
+    }
+
+    .detail-view-field label {
+        display: inline-block;
+        font-weight: bold;
+        width: 200px;
+        margin: 10px;
+        height: 30px;
+        line-height: 30px;
+
+    }
+
+    .detail-view-field span {
+        display: inline-block;
+        width: 340px;
+        margin: 10px;
+        border-bottom: 1px solid #ccc;
+        height: 30px;
+        line-height: 30px;
+
+    }
+
+    pre {
+        word-wrap: break-word;
+        white-space: pre-wrap;
+    }
+</style>
+<div class="tab">
+    <button onclick="window.location='{% url 'Settings:_ports' %}';"
+        style="vertical-align: middle; padding: auto; margin: 0px">
+        <svg xmlns="http://www.w3.org/2000/svg" height="25px" viewBox="0 -960 960 960" width="25px"
+            style="vertical-align: middle; margin: 0px; padding: 0px border: none; " fill="#6a6e73">
+            <path d="m313-480 155 156q11 11 11.5 27.5T468-268q-11 11-28 11t-28-11L228-452q-6-6-8.5-13t-2.5-15q0-8 2.5-15t8.5-13l184-184q11-11 27.5-11.5T468-692q11 11 11 28t-11 28L313-480Zm264 0 155 156q11 11 11.5 27.5T732-268q-11 11-28 11t-28-11L492-452q-6-6-8.5-13t-2.5-15q0-8 2.5-15t8.5-13l184-184q11-11 27.5-11.5T732-692q11 11 11 28t-11 28L577-480Z" />
+        </svg>Back to Ports</button>
+
+    <button id="defaultOpen" class="tablinks" onclick="openCity(event, 'Details')">Details</button>
+    <button class="tablinks" onclick="openCity(event, 'Services')">Services</button>
+    {% if perms.assistance.change_service %}
+    <button class="tablinks" onclick="openCity(event, 'Notes')">Notes</button>
+    {% endif %}
+</div>
+
+<form method="post">
+    <div id="Details" class="tabcontent">
+        <h3>Details</h3>
+
+        {% csrf_token %}
+
+
+        <div style="align-items:flex-start; align-content: center; display: flexbox; width: 100%">
+
+            <div style="display: inline; width: 40%; margin: 30px;">
+
+                <div class="detail-view-field">
+                    <label>{{ form.number.label }}</label>
+                    <span>{{ form.number.value }}</span>
+                </div>
+
+                <div class="detail-view-field">
+                    <label>{{ form.description.label }}</label>
+                    <span>
+                        {% if form.description.value %}
+                        {{ form.description.value }}
+                        {% else %}
+                        &nbsp;
+                        {% endif %}
+                    </span>
+                </div>
+
+                <div class="detail-view-field">
+                    <label>{{ form.protocol.label }}</label>
+                    <span>{{ form.protocol.value }}</span>
+                </div>
+
+                <div class="detail-view-field">
+                    <label>{{ form.organization.label }}</label>
+                    <span>{{ item.organization }}</span>
+                </div>
+
+                <div class="detail-view-field">
+                    <label>Created</label>
+                    <span>{{ item.created }}</span>
+                </div>
+
+                <div class="detail-view-field">
+                    <label>Modified</label>
+                    <span>{{ item.modified }}</span>
+                </div>
+
+
+            </div>
+
+            <div style="display: inline; width: 40%; margin: 30px; text-align: left;">
+                <div>
+                    <label
+                        style="font-weight: bold; width: 100%; border-bottom: 1px solid #ccc; display: block; text-align: inherit;">{{ form.model_notes.label }}</label>
+
+                    <div style="display: inline-block; text-align: left;">
+                        {% if form.model_notes.value %}
+                        {{ form.model_notes.value | markdown | safe }}
+                        {% else %}
+                        &nbsp;
+                        {% endif %}
+                    </div>
+                </div>
+            </div>
+
+        </div>
+
+
+        <input type="button" value="Edit" onclick="window.location='{% url 'Settings:_port_change' item.pk %}';">
+
+        <br>
+
+        <script>
+            document.getElementById("defaultOpen").click();
+        </script>
+
+    </div>
+
+    <div id="Services" class="tabcontent">
+        <h3>
+            Services
+        </h3>
+
+        <table>
+            <tr>
+                <th>Name</th>
+                <th>Organization</th>
+            </tr>
+            {% for service in services %}
+            <tr>
+                <td><a href="{% url 'ITIM:_service_view' service.pk %}">{{ service.name }}</a></td>
+                <td>{{ service.organization }}</td>
+            </tr>
+            {% endfor%}
+        </table>
+    </div>
+
+    </div>
+
+    {% if perms.assistance.change_knowledgebase %}
+    <div id="Notes" class="tabcontent">
+        <h3>
+            Notes
+        </h3>
+        {{ notes_form }}
+        <input type="submit" name="{{ notes_form.prefix }}" value="Submit" />
+        <div class="comments">
+            {% if notes %}
+            {% for note in notes %}
+            {% include 'note.html.j2' %}
+            {% endfor %}
+            {% endif %}
+        </div>
+
+    </div>
+    {% endif %}
+
+</form>
+
+{% endblock %}

app/itim/templates/itim/port_index.html.j2

@@ -0,0 +1,53 @@
+{% extends 'base.html.j2' %}
+
+{% block content %}
+
+<input type="button" value="New Port" onclick="window.location='{% url 'Settings:_port_add' %}';">
+<table class="data">
+    <tr>
+        <th>Title</th>
+        <th>Cluster / Device</th>
+        <th>Organization</th>
+        <th>&nbsp;</th>
+    </tr>
+    {% if items %}
+    {% for item in items %}
+    <tr>
+        <td><a href="{% url 'Settings:_port_view' pk=item.id %}">{{ item.protocol }}/{{ item.number }}</a></td>
+        <td>
+        {% if item.device %}
+          {{ item.device }}
+        {% else %}
+          {{ item.cluster }}
+        {% endif %}
+        </td>
+        <td>{{ item.organization }}</td>
+        <td>&nbsp;</td>
+    </tr>
+    {% endfor %}
+    {% else %}
+    <tr>
+        <td colspan="4">Nothing Found</td>
+    </tr>
+    {% endif %}
+</table>
+<br>
+<div class="pagination">
+    <span class="step-links">
+        {% if page_obj.has_previous %}
+        <a href="?page=1">&laquo; first</a>
+        <a href="?page={{ page_obj.previous_page_number }}">previous</a>
+        {% endif %}
+
+        <span class="current">
+            Page {{ page_obj.number }} of {{ page_obj.paginator.num_pages }}.
+        </span>
+
+        {% if page_obj.has_next %}
+        <a href="?page={{ page_obj.next_page_number }}">next</a>
+        <a href="?page={{ page_obj.paginator.num_pages }}">last &raquo;</a>
+        {% endif %}
+    </span>
+</div>
+
+{% endblock %}

app/itim/templates/itim/service.html.j2

@@ -0,0 +1,75 @@
+{% extends 'detail.html.j2' %}
+
+{% load json %}
+{% load markdown %}
+
+
+{% block tabs %}
+
+<div id="details" class="content-tab">
+
+    {% include 'content/section.html.j2' with tab=form.tabs.details %}
+
+    <hr />
+
+    <div style="display: block; width: 100%;">
+        <h3>Ports</h3>
+        <table>
+            <tr>
+                <th>Name</th>
+                <th>Description</th>
+            </tr>
+            {% if item.port.all and not item.template %}
+            {% for port in item.port.all %}
+            <tr>
+                <td><a href="{% url 'Settings:_port_view' item.pk %}">{{ port }}</a></td>
+                <td>{{ port.description }}</td>
+            </tr>
+            {% endfor %}
+            {% elif not item.port.all and item.template %}
+            {% for port in item.template.port.all %}
+            <tr>
+                <td><a href="{% url 'Settings:_port_view' item.pk %}">{{ port }}</a></td>
+                <td>{{ port.description }}</td>
+            </tr>
+            {% endfor%}
+            {% else %}
+            <tr>
+            <td colspan="2"> Nothing Found</td>
+            </tr>
+            {% endif %}
+        </table>
+    </div>
+
+    <div style="display: block; width: 100%;">
+        <h3>Dependent Services</h3>
+        <table>
+            <tr>
+                <th>Name</th>
+                <th>Organization</th>
+            </tr>
+            {% if item.dependent_service.all %}
+            {% for service in item.dependent_service.all %}
+            <tr>
+                <td><a href="{% url 'ITIM:_service_view' service.pk %}">{{ service }}</a></td>
+                <td>{{ service.organization }}</td>
+            </tr>
+            {% endfor%}
+            {% else %}
+            <tr>
+            <td colspan="2"> Nothing Found</td>
+            </tr>
+            {% endif %}
+        </table>
+    </div>
+
+</div>
+
+
+<div id="rendered_config" class="content-tab">
+
+    {% include 'content/section.html.j2' with tab=form.tabs.rendered_config %}
+
+</div>
+
+{% endblock %}

app/itim/templates/itim/service_index.html.j2

@@ -0,0 +1,53 @@
+{% extends 'base.html.j2' %}
+
+{% block content %}
+
+<input type="button" value="New Article" onclick="window.location='{% url 'ITIM:_service_add' %}';">
+<table class="data">
+    <tr>
+        <th>Title</th>
+        <th>Cluster / Device</th>
+        <th>Organization</th>
+        <th>&nbsp;</th>
+    </tr>
+    {% if items %}
+    {% for item in items %}
+    <tr>
+        <td><a href="{% url 'ITIM:_service_view' pk=item.id %}">{{ item.name }}</a></td>
+        <td>
+        {% if item.device %}
+          {{ item.device }}
+        {% else %}
+          {{ item.cluster }}
+        {% endif %}
+        </td>
+        <td>{{ item.organization }}</td>
+        <td>&nbsp;</td>
+    </tr>
+    {% endfor %}
+    {% else %}
+    <tr>
+        <td colspan="4">Nothing Found</td>
+    </tr>
+    {% endif %}
+</table>
+<br>
+<div class="pagination">
+    <span class="step-links">
+        {% if page_obj.has_previous %}
+        <a href="?page=1">&laquo; first</a>
+        <a href="?page={{ page_obj.previous_page_number }}">previous</a>
+        {% endif %}
+
+        <span class="current">
+            Page {{ page_obj.number }} of {{ page_obj.paginator.num_pages }}.
+        </span>
+
+        {% if page_obj.has_next %}
+        <a href="?page={{ page_obj.next_page_number }}">next</a>
+        <a href="?page={{ page_obj.paginator.num_pages }}">last &raquo;</a>
+        {% endif %}
+    </span>
+</div>
+
+{% endblock %}

app/itim/tests/unit/port/test_port.py

@@ -0,0 +1,42 @@
+import pytest
+import unittest
+
+from django.test import TestCase
+
+from access.models import Organization
+
+from app.tests.abstract.models import TenancyModel
+
+from itim.models.services import Port
+
+
+
+@pytest.mark.django_db
+class PortModel(
+    TestCase,
+    TenancyModel
+):
+
+    model = Port
+
+    @classmethod
+    def setUpTestData(self):
+        """Setup Test
+
+        1. Create an organization for user and item
+        2. Create an item
+
+        """
+
+        self.organization = Organization.objects.create(name='test_org')
+
+
+        self.item = self.model.objects.create(
+            organization = self.organization,
+            number = 1,
+        )
+
+        self.second_item = self.model.objects.create(
+            organization = self.organization,
+            number = 2,
+        )

app/itim/tests/unit/port/test_port_core_history.py

@@ -0,0 +1,78 @@
+
+import pytest
+import unittest
+import requests
+
+from django.test import TestCase, Client
+
+from access.models import Organization
+
+from core.models.history import History
+from core.tests.abstract.history_entry import HistoryEntry
+from core.tests.abstract.history_entry_parent_model import HistoryEntryParentItem
+
+from itim.models.services import Port
+
+
+
+class PortHistory(TestCase, HistoryEntry, HistoryEntryParentItem):
+
+
+    model = Port
+
+
+    @classmethod
+    def setUpTestData(self):
+        """ Setup Test """
+
+        organization = Organization.objects.create(name='test_org')
+
+        self.organization = organization
+
+        self.item_parent = self.model.objects.create(
+            number = 1,
+            organization = self.organization
+        )
+
+        self.item_create = self.model.objects.create(
+            number = 2,
+            organization = self.organization,
+        )
+
+
+        self.history_create = History.objects.get(
+            action = History.Actions.ADD[0],
+            item_pk = self.item_create.pk,
+            item_class = self.model._meta.model_name,
+        )
+
+        self.item_change = self.item_create
+        self.item_change.number = 3
+        self.item_change.save()
+
+        self.field_after_expected_value = '{"number": ' + str(self.item_change.number) + '}'
+
+        self.history_change = History.objects.get(
+            action = History.Actions.UPDATE[0],
+            item_pk = self.item_change.pk,
+            item_class = self.model._meta.model_name,
+        )
+
+        self.item_delete = self.model.objects.create(
+            number = 4,
+            organization = self.organization,
+        )
+
+        self.deleted_pk = self.item_delete.pk
+
+        self.item_delete.delete()
+
+        self.history_delete = History.objects.filter(
+            item_pk = self.deleted_pk,
+            item_class = self.model._meta.model_name,
+        )
+
+        self.history_delete_children = History.objects.filter(
+            item_parent_pk = self.deleted_pk,
+            item_parent_class = self.item_parent._meta.model_name,
+        )

app/itim/tests/unit/port/test_port_history_permission.py

@@ -0,0 +1,95 @@
+# from django.conf import settings
+from django.contrib.auth import get_user_model
+from django.contrib.auth.models import AnonymousUser, User
+from django.contrib.contenttypes.models import ContentType
+from django.shortcuts import reverse
+from django.test import TestCase, Client
+
+import pytest
+import unittest
+import requests
+
+from access.models import Organization, Team, TeamUsers, Permission
+
+from itim.models.services import Port
+
+from core.tests.abstract.history_permissions import HistoryPermissions
+
+
+
+class PortHistoryPermissions(TestCase, HistoryPermissions):
+
+
+    item_model = Port
+
+
+    @classmethod
+    def setUpTestData(self):
+        """Setup Test
+
+        1. Create an organization for user and item
+        2. create an organization that is different to item
+        3. Create a device
+        4. Add history device history entry as item
+        5. create a user
+        6. create user in different organization (with the required permission)
+        """
+
+        organization = Organization.objects.create(name='test_org')
+
+        self.organization = organization
+
+        different_organization = Organization.objects.create(name='test_different_organization')
+
+        self.item = self.item_model.objects.create(
+            organization=organization,
+            number = 1
+        )
+
+        self.history = self.model.objects.get(
+            item_pk = self.item.id,
+            item_class = self.item._meta.model_name,
+            action = self.model.Actions.ADD,
+        )
+
+        view_permissions = Permission.objects.get(
+                codename = 'view_' + self.model._meta.model_name,
+                content_type = ContentType.objects.get(
+                    app_label = self.model._meta.app_label,
+                    model = self.model._meta.model_name,
+                )
+            )
+
+        view_team = Team.objects.create(
+            team_name = 'view_team',
+            organization = organization,
+        )
+
+        view_team.permissions.set([view_permissions])
+
+
+        self.no_permissions_user = User.objects.create_user(username="test_no_permissions", password="password")
+
+
+        self.view_user = User.objects.create_user(username="test_user_view", password="password")
+        teamuser = TeamUsers.objects.create(
+            team = view_team,
+            user = self.view_user
+        )
+
+        self.different_organization_user = User.objects.create_user(username="test_different_organization_user", password="password")
+
+
+        different_organization_team = Team.objects.create(
+            team_name = 'different_organization_team',
+            organization = different_organization,
+        )
+
+        different_organization_team.permissions.set([
+            view_permissions,
+        ])
+
+        TeamUsers.objects.create(
+            team = different_organization_team,
+            user = self.different_organization_user
+        )

app/itim/tests/unit/port/test_port_permission.py

@@ -0,0 +1,189 @@
+# from django.conf import settings
+from django.contrib.auth import get_user_model
+from django.contrib.auth.models import AnonymousUser, User
+from django.contrib.contenttypes.models import ContentType
+from django.shortcuts import reverse
+from django.test import TestCase, Client
+
+import pytest
+import unittest
+import requests
+
+from access.models import Organization, Team, TeamUsers, Permission
+
+from app.tests.abstract.model_permissions import ModelPermissions
+
+from itim.models.services import Port
+
+
+class PortPermissions(TestCase, ModelPermissions):
+
+
+    model = Port
+
+    app_namespace = 'Settings'
+
+    url_name_view = '_port_view'
+
+    url_name_add = '_port_add'
+
+    url_name_change = '_port_change'
+
+    url_name_delete = '_port_delete'
+
+    url_delete_response = reverse('Settings:_ports')
+
+
+    @classmethod
+    def setUpTestData(self):
+        """Setup Test
+
+        1. Create an organization for user and item
+        . create an organization that is different to item
+        2. Create a device
+        3. create teams with each permission: view, add, change, delete
+        4. create a user per team
+        """
+
+        organization = Organization.objects.create(name='test_org')
+
+        self.organization = organization
+
+        different_organization = Organization.objects.create(name='test_different_organization')
+
+
+        self.item = self.model.objects.create(
+            organization=organization,
+            number = 1
+        )
+
+
+        self.url_view_kwargs = {'pk': self.item.id}
+
+        # self.url_add_kwargs = {'pk': self.item.id}
+
+        self.add_data = {'device': 'device', 'organization': self.organization.id}
+
+        self.url_change_kwargs = {'pk': self.item.id}
+
+        self.change_data = {'device': 'device', 'organization': self.organization.id}
+
+        self.url_delete_kwargs = {'pk': self.item.id}
+
+        self.delete_data = {'device': 'device', 'organization': self.organization.id}
+
+
+        view_permissions = Permission.objects.get(
+                codename = 'view_' + self.model._meta.model_name,
+                content_type = ContentType.objects.get(
+                    app_label = self.model._meta.app_label,
+                    model = self.model._meta.model_name,
+                )
+            )
+
+        view_team = Team.objects.create(
+            team_name = 'view_team',
+            organization = organization,
+        )
+
+        view_team.permissions.set([view_permissions])
+
+
+
+        add_permissions = Permission.objects.get(
+                codename = 'add_' + self.model._meta.model_name,
+                content_type = ContentType.objects.get(
+                    app_label = self.model._meta.app_label,
+                    model = self.model._meta.model_name,
+                )
+            )
+
+        add_team = Team.objects.create(
+            team_name = 'add_team',
+            organization = organization,
+        )
+
+        add_team.permissions.set([add_permissions])
+
+
+
+        change_permissions = Permission.objects.get(
+                codename = 'change_' + self.model._meta.model_name,
+                content_type = ContentType.objects.get(
+                    app_label = self.model._meta.app_label,
+                    model = self.model._meta.model_name,
+                )
+            )
+
+        change_team = Team.objects.create(
+            team_name = 'change_team',
+            organization = organization,
+        )
+
+        change_team.permissions.set([change_permissions])
+
+
+
+        delete_permissions = Permission.objects.get(
+                codename = 'delete_' + self.model._meta.model_name,
+                content_type = ContentType.objects.get(
+                    app_label = self.model._meta.app_label,
+                    model = self.model._meta.model_name,
+                )
+            )
+
+        delete_team = Team.objects.create(
+            team_name = 'delete_team',
+            organization = organization,
+        )
+
+        delete_team.permissions.set([delete_permissions])
+
+
+        self.no_permissions_user = User.objects.create_user(username="test_no_permissions", password="password")
+
+
+        self.view_user = User.objects.create_user(username="test_user_view", password="password")
+        teamuser = TeamUsers.objects.create(
+            team = view_team,
+            user = self.view_user
+        )
+
+        self.add_user = User.objects.create_user(username="test_user_add", password="password")
+        teamuser = TeamUsers.objects.create(
+            team = add_team,
+            user = self.add_user
+        )
+
+        self.change_user = User.objects.create_user(username="test_user_change", password="password")
+        teamuser = TeamUsers.objects.create(
+            team = change_team,
+            user = self.change_user
+        )
+
+        self.delete_user = User.objects.create_user(username="test_user_delete", password="password")
+        teamuser = TeamUsers.objects.create(
+            team = delete_team,
+            user = self.delete_user
+        )
+
+
+        self.different_organization_user = User.objects.create_user(username="test_different_organization_user", password="password")
+
+
+        different_organization_team = Team.objects.create(
+            team_name = 'different_organization_team',
+            organization = different_organization,
+        )
+
+        different_organization_team.permissions.set([
+            view_permissions,
+            add_permissions,
+            change_permissions,
+            delete_permissions,
+        ])
+
+        TeamUsers.objects.create(
+            team = different_organization_team,
+            user = self.different_organization_user
+        )

app/itim/tests/unit/port/test_port_views.py

@@ -0,0 +1,29 @@
+import pytest
+import unittest
+import requests
+
+from django.test import TestCase
+
+from app.tests.abstract.models import PrimaryModel
+
+
+
+class ServiceViews(
+    TestCase,
+    PrimaryModel
+):
+
+    add_module = 'itim.views.ports'
+    add_view = 'Add'
+
+    change_module = add_module
+    change_view = 'Change'
+
+    delete_module = add_module
+    delete_view = 'Delete'
+
+    display_module = add_module
+    display_view = 'View'
+
+    index_module = add_module
+    index_view = 'Index'

app/itim/tests/unit/service/test_service.py

@@ -0,0 +1,42 @@
+import pytest
+import unittest
+
+from django.test import TestCase
+
+from access.models import Organization
+
+from app.tests.abstract.models import TenancyModel
+
+from itim.models.services import Service
+
+
+
+@pytest.mark.django_db
+class ServiceModel(
+    TestCase,
+    TenancyModel
+):
+
+    model = Service
+
+    @classmethod
+    def setUpTestData(self):
+        """Setup Test
+
+        1. Create an organization for user and item
+        2. Create an item
+
+        """
+
+        self.organization = Organization.objects.create(name='test_org')
+
+
+        self.item = self.model.objects.create(
+            organization = self.organization,
+            name = 'one',
+        )
+
+        self.second_item = self.model.objects.create(
+            organization = self.organization,
+            name = 'one_two',
+        )

app/itim/tests/unit/service/test_service_core_history.py

@@ -0,0 +1,78 @@
+
+import pytest
+import unittest
+import requests
+
+from django.test import TestCase, Client
+
+from access.models import Organization
+
+from core.models.history import History
+from core.tests.abstract.history_entry import HistoryEntry
+from core.tests.abstract.history_entry_parent_model import HistoryEntryParentItem
+
+from itim.models.services import Service
+
+
+
+class ServiceHistory(TestCase, HistoryEntry, HistoryEntryParentItem):
+
+
+    model = Service
+
+
+    @classmethod
+    def setUpTestData(self):
+        """ Setup Test """
+
+        organization = Organization.objects.create(name='test_org')
+
+        self.organization = organization
+
+        self.item_parent = self.model.objects.create(
+            name = 'test_item_parent_' + self.model._meta.model_name,
+            organization = self.organization
+        )
+
+        self.item_create = self.model.objects.create(
+            name = 'test_item_' + self.model._meta.model_name,
+            organization = self.organization,
+        )
+
+
+        self.history_create = History.objects.get(
+            action = History.Actions.ADD[0],
+            item_pk = self.item_create.pk,
+            item_class = self.model._meta.model_name,
+        )
+
+        self.item_change = self.item_create
+        self.item_change.name = 'test_item_' + self.model._meta.model_name + '_changed'
+        self.item_change.save()
+
+        self.field_after_expected_value = '{"name": "' + self.item_change.name + '"}'
+
+        self.history_change = History.objects.get(
+            action = History.Actions.UPDATE[0],
+            item_pk = self.item_change.pk,
+            item_class = self.model._meta.model_name,
+        )
+
+        self.item_delete = self.model.objects.create(
+            name = 'test_item_delete_' + self.model._meta.model_name,
+            organization = self.organization,
+        )
+
+        self.deleted_pk = self.item_delete.pk
+
+        self.item_delete.delete()
+
+        self.history_delete = History.objects.filter(
+            item_pk = self.deleted_pk,
+            item_class = self.model._meta.model_name,
+        )
+
+        self.history_delete_children = History.objects.filter(
+            item_parent_pk = self.deleted_pk,
+            item_parent_class = self.item_parent._meta.model_name,
+        )

app/itim/tests/unit/service/test_service_history_permission.py

@@ -0,0 +1,95 @@
+# from django.conf import settings
+from django.contrib.auth import get_user_model
+from django.contrib.auth.models import AnonymousUser, User
+from django.contrib.contenttypes.models import ContentType
+from django.shortcuts import reverse
+from django.test import TestCase, Client
+
+import pytest
+import unittest
+import requests
+
+from access.models import Organization, Team, TeamUsers, Permission
+
+from itim.models.services import Service
+
+from core.tests.abstract.history_permissions import HistoryPermissions
+
+
+
+class ServiceHistoryPermissions(TestCase, HistoryPermissions):
+
+
+    item_model = Service
+
+
+    @classmethod
+    def setUpTestData(self):
+        """Setup Test
+
+        1. Create an organization for user and item
+        2. create an organization that is different to item
+        3. Create a device
+        4. Add history device history entry as item
+        5. create a user
+        6. create user in different organization (with the required permission)
+        """
+
+        organization = Organization.objects.create(name='test_org')
+
+        self.organization = organization
+
+        different_organization = Organization.objects.create(name='test_different_organization')
+
+        self.item = self.item_model.objects.create(
+            organization=organization,
+            name = 'deviceone'
+        )
+
+        self.history = self.model.objects.get(
+            item_pk = self.item.id,
+            item_class = self.item._meta.model_name,
+            action = self.model.Actions.ADD,
+        )
+
+        view_permissions = Permission.objects.get(
+                codename = 'view_' + self.model._meta.model_name,
+                content_type = ContentType.objects.get(
+                    app_label = self.model._meta.app_label,
+                    model = self.model._meta.model_name,
+                )
+            )
+
+        view_team = Team.objects.create(
+            team_name = 'view_team',
+            organization = organization,
+        )
+
+        view_team.permissions.set([view_permissions])
+
+
+        self.no_permissions_user = User.objects.create_user(username="test_no_permissions", password="password")
+
+
+        self.view_user = User.objects.create_user(username="test_user_view", password="password")
+        teamuser = TeamUsers.objects.create(
+            team = view_team,
+            user = self.view_user
+        )
+
+        self.different_organization_user = User.objects.create_user(username="test_different_organization_user", password="password")
+
+
+        different_organization_team = Team.objects.create(
+            team_name = 'different_organization_team',
+            organization = different_organization,
+        )
+
+        different_organization_team.permissions.set([
+            view_permissions,
+        ])
+
+        TeamUsers.objects.create(
+            team = different_organization_team,
+            user = self.different_organization_user
+        )

app/itim/tests/unit/service/test_service_permission.py

@@ -0,0 +1,189 @@
+# from django.conf import settings
+from django.contrib.auth import get_user_model
+from django.contrib.auth.models import AnonymousUser, User
+from django.contrib.contenttypes.models import ContentType
+from django.shortcuts import reverse
+from django.test import TestCase, Client
+
+import pytest
+import unittest
+import requests
+
+from access.models import Organization, Team, TeamUsers, Permission
+
+from app.tests.abstract.model_permissions import ModelPermissions
+
+from itim.models.services import Service
+
+
+class ServicePermissions(TestCase, ModelPermissions):
+
+
+    model = Service
+
+    app_namespace = 'ITIM'
+
+    url_name_view = '_service_view'
+
+    url_name_add = '_service_add'
+
+    url_name_change = '_service_change'
+
+    url_name_delete = '_service_delete'
+
+    url_delete_response = reverse('ITIM:Services')
+
+
+    @classmethod
+    def setUpTestData(self):
+        """Setup Test
+
+        1. Create an organization for user and item
+        . create an organization that is different to item
+        2. Create a device
+        3. create teams with each permission: view, add, change, delete
+        4. create a user per team
+        """
+
+        organization = Organization.objects.create(name='test_org')
+
+        self.organization = organization
+
+        different_organization = Organization.objects.create(name='test_different_organization')
+
+
+        self.item = self.model.objects.create(
+            organization=organization,
+            name = 'deviceone'
+        )
+
+
+        self.url_view_kwargs = {'pk': self.item.id}
+
+        # self.url_add_kwargs = {'pk': self.item.id}
+
+        self.add_data = {'device': 'device', 'organization': self.organization.id}
+
+        self.url_change_kwargs = {'pk': self.item.id}
+
+        self.change_data = {'device': 'device', 'organization': self.organization.id}
+
+        self.url_delete_kwargs = {'pk': self.item.id}
+
+        self.delete_data = {'device': 'device', 'organization': self.organization.id}
+
+
+        view_permissions = Permission.objects.get(
+                codename = 'view_' + self.model._meta.model_name,
+                content_type = ContentType.objects.get(
+                    app_label = self.model._meta.app_label,
+                    model = self.model._meta.model_name,
+                )
+            )
+
+        view_team = Team.objects.create(
+            team_name = 'view_team',
+            organization = organization,
+        )
+
+        view_team.permissions.set([view_permissions])
+
+
+
+        add_permissions = Permission.objects.get(
+                codename = 'add_' + self.model._meta.model_name,
+                content_type = ContentType.objects.get(
+                    app_label = self.model._meta.app_label,
+                    model = self.model._meta.model_name,
+                )
+            )
+
+        add_team = Team.objects.create(
+            team_name = 'add_team',
+            organization = organization,
+        )
+
+        add_team.permissions.set([add_permissions])
+
+
+
+        change_permissions = Permission.objects.get(
+                codename = 'change_' + self.model._meta.model_name,
+                content_type = ContentType.objects.get(
+                    app_label = self.model._meta.app_label,
+                    model = self.model._meta.model_name,
+                )
+            )
+
+        change_team = Team.objects.create(
+            team_name = 'change_team',
+            organization = organization,
+        )
+
+        change_team.permissions.set([change_permissions])
+
+
+
+        delete_permissions = Permission.objects.get(
+                codename = 'delete_' + self.model._meta.model_name,
+                content_type = ContentType.objects.get(
+                    app_label = self.model._meta.app_label,
+                    model = self.model._meta.model_name,
+                )
+            )
+
+        delete_team = Team.objects.create(
+            team_name = 'delete_team',
+            organization = organization,
+        )
+
+        delete_team.permissions.set([delete_permissions])
+
+
+        self.no_permissions_user = User.objects.create_user(username="test_no_permissions", password="password")
+
+
+        self.view_user = User.objects.create_user(username="test_user_view", password="password")
+        teamuser = TeamUsers.objects.create(
+            team = view_team,
+            user = self.view_user
+        )
+
+        self.add_user = User.objects.create_user(username="test_user_add", password="password")
+        teamuser = TeamUsers.objects.create(
+            team = add_team,
+            user = self.add_user
+        )
+
+        self.change_user = User.objects.create_user(username="test_user_change", password="password")
+        teamuser = TeamUsers.objects.create(
+            team = change_team,
+            user = self.change_user
+        )
+
+        self.delete_user = User.objects.create_user(username="test_user_delete", password="password")
+        teamuser = TeamUsers.objects.create(
+            team = delete_team,
+            user = self.delete_user
+        )
+
+
+        self.different_organization_user = User.objects.create_user(username="test_different_organization_user", password="password")
+
+
+        different_organization_team = Team.objects.create(
+            team_name = 'different_organization_team',
+            organization = different_organization,
+        )
+
+        different_organization_team.permissions.set([
+            view_permissions,
+            add_permissions,
+            change_permissions,
+            delete_permissions,
+        ])
+
+        TeamUsers.objects.create(
+            team = different_organization_team,
+            user = self.different_organization_user
+        )

app/itim/tests/unit/service/test_service_views.py

@@ -0,0 +1,29 @@
+import pytest
+import unittest
+import requests
+
+from django.test import TestCase
+
+from app.tests.abstract.models import PrimaryModel
+
+
+
+class ServiceViews(
+    TestCase,
+    PrimaryModel
+):
+
+    add_module = 'itim.views.services'
+    add_view = 'Add'
+
+    change_module = add_module
+    change_view = 'Change'
+
+    delete_module = add_module
+    delete_view = 'Delete'
+
+    display_module = add_module
+    display_view = 'View'
+
+    index_module = add_module
+    index_view = 'Index'

app/itim/urls.py

@@ -1,12 +1,15 @@
 from django.urls import path
 
-from itam import views
-from itam.views import device, device_type, software, software_category, software_version, operating_system, operating_system_version
+
+from itim.views import services
 
 app_name = "ITIM"
 urlpatterns = [
 
-    # path("clusters", device.IndexView.as_view(), name="Clusters"),
-    # path("services", device.IndexView.as_view(), name="Services"),
+    path("services", services.Index.as_view(), name="Services"),
+    path("service/add", services.Add.as_view(), name="_service_add"),
+    path("service/<int:pk>/edit", services.Change.as_view(), name="_service_change"),
+    path("service/<int:pk>/delete", services.Delete.as_view(), name="_service_delete"),
+    path("service/<int:pk>", services.View.as_view(), name="_service_view"),
 
 ]

app/itim/views/ports.py

@@ -0,0 +1,188 @@
+from django.contrib.auth import decorators as auth_decorator
+from django.urls import reverse
+from django.utils.decorators import method_decorator
+
+from core.forms.comment import AddNoteForm
+from core.models.notes import Notes
+from core.views.common import AddView, ChangeView, DeleteView, IndexView
+
+from itim.forms.ports import PortForm
+from itim.models.services import Port, Service
+
+from settings.models.user_settings import UserSettings
+
+
+
+class Add(AddView):
+
+    form_class = PortForm
+
+    model = Port
+
+    permission_required = [
+        'itim.add_port',
+    ]
+
+
+    def get_initial(self):
+
+        initial: dict = {
+            'organization': UserSettings.objects.get(user = self.request.user).default_organization
+        }
+
+        if 'pk' in self.kwargs:
+
+            if self.kwargs['pk']:
+
+                initial.update({'parent': self.kwargs['pk']})
+
+                self.model.parent.field.hidden = True
+
+        return initial
+
+
+    def get_success_url(self, **kwargs):
+
+        return reverse('Settings:_ports')
+
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+
+        context['content_title'] = 'New Port'
+
+        return context
+
+
+
+class Change(ChangeView):
+
+    context_object_name = "item"
+
+    form_class = PortForm
+
+    model = Port
+
+    permission_required = [
+        'itim.change_port',
+    ]
+
+
+    def get_context_data(self, **kwargs):
+
+        context = super().get_context_data(**kwargs)
+
+        context['content_title'] = str(self.object)
+
+        return context
+
+
+    def get_success_url(self, **kwargs):
+
+        return reverse('Settings:_port_view', args=(self.kwargs['pk'],))
+
+
+
+class Delete(DeleteView):
+
+    model = Port
+
+    permission_required = [
+        'itim.delete_port',
+    ]
+
+
+    def get_context_data(self, **kwargs):
+
+        context = super().get_context_data(**kwargs)
+
+        context['content_title'] = 'Delete ' + str(self.object)
+
+        return context
+
+
+    def get_success_url(self, **kwargs):
+
+        return reverse('Settings:_ports')
+
+
+
+class Index(IndexView):
+
+    context_object_name = "items"
+
+    model = Port
+
+    paginate_by = 10
+
+    permission_required = [
+        'itim.view_port'
+    ]
+
+    template_name = 'itim/port_index.html.j2'
+
+
+    def get_context_data(self, **kwargs):
+
+        context = super().get_context_data(**kwargs)
+
+        context['model_docs_path'] = self.model._meta.app_label + self.model._meta.model_name
+
+        context['content_title'] = 'Ports'
+
+        return context
+
+
+
+class View(ChangeView):
+
+    context_object_name = "item"
+
+    form_class = PortForm
+
+    model = Port
+
+    permission_required = [
+        'itim.view_port',
+    ]
+
+    template_name = 'itim/port.html.j2'
+
+
+    def get_context_data(self, **kwargs):
+
+        context = super().get_context_data(**kwargs)
+
+        context['services'] = Service.objects.filter(port=self.kwargs['pk']).order_by('name', 'organization')
+
+        context['notes_form'] = AddNoteForm(prefix='note')
+        context['notes'] = Notes.objects.filter(config_group=self.kwargs['pk'])
+
+        context['model_pk'] = self.kwargs['pk']
+        context['model_name'] = self.model._meta.model_name
+
+        context['model_delete_url'] = reverse('Settings:_port_delete', args=(self.kwargs['pk'],))
+
+
+        context['content_title'] = self.object
+
+        return context
+
+
+    @method_decorator(auth_decorator.permission_required("itim.change_service", raise_exception=True))
+    def post(self, request, *args, **kwargs):
+
+        item = Port.objects.get(pk=self.kwargs['pk'])
+
+        notes = AddNoteForm(request.POST, prefix='note')
+
+        if notes.is_bound and notes.is_valid() and notes.instance.note != '':
+
+            notes.instance.organization = item.organization
+
+            notes.save()
+
+
+    def get_success_url(self, **kwargs):
+
+        return reverse('Settings:_port_view', args=(self.kwargs['pk'],))

app/itim/views/services.py

@@ -0,0 +1,186 @@
+from django.contrib.auth import decorators as auth_decorator
+from django.urls import reverse
+from django.utils.decorators import method_decorator
+
+from core.forms.comment import AddNoteForm
+from core.models.notes import Notes
+from core.views.common import AddView, ChangeView, DeleteView, IndexView
+
+from itim.forms.services import ServiceForm, DetailForm
+from itim.models.services import Service
+
+from settings.models.user_settings import UserSettings
+
+
+
+class Add(AddView):
+
+    form_class = ServiceForm
+
+    model = Service
+
+    permission_required = [
+        'itim.add_service',
+    ]
+
+
+    def get_initial(self):
+
+        initial: dict = {
+            'organization': UserSettings.objects.get(user = self.request.user).default_organization
+        }
+
+        if 'pk' in self.kwargs:
+
+            if self.kwargs['pk']:
+
+                initial.update({'parent': self.kwargs['pk']})
+
+                self.model.parent.field.hidden = True
+
+        return initial
+
+
+    def get_success_url(self, **kwargs):
+
+        return reverse('ITIM:Services')
+
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+
+        context['content_title'] = 'New Service'
+
+        return context
+
+
+
+class Change(ChangeView):
+
+    form_class = ServiceForm
+
+    model = Service
+
+    permission_required = [
+        'itim.change_service',
+    ]
+
+
+    def get_context_data(self, **kwargs):
+
+        context = super().get_context_data(**kwargs)
+
+        context['content_title'] = str(self.object)
+
+        return context
+
+
+    def get_success_url(self, **kwargs):
+
+        return reverse('ITIM:_service_view', args=(self.kwargs['pk'],))
+
+
+
+class Delete(DeleteView):
+
+    model = Service
+
+    permission_required = [
+        'itim.delete_service',
+    ]
+
+
+    def get_context_data(self, **kwargs):
+
+        context = super().get_context_data(**kwargs)
+
+        context['content_title'] = 'Delete ' + str(self.object)
+
+        return context
+
+
+    def get_success_url(self, **kwargs):
+
+        return reverse('ITIM:Services')
+
+
+
+class Index(IndexView):
+
+    context_object_name = "items"
+
+    model = Service
+
+    paginate_by = 10
+
+    permission_required = [
+        'itim.view_service'
+    ]
+
+    template_name = 'itim/service_index.html.j2'
+
+
+    def get_context_data(self, **kwargs):
+
+        context = super().get_context_data(**kwargs)
+
+        context['model_docs_path'] = self.model._meta.app_label + '/' + self.model._meta.model_name
+
+        context['content_title'] = 'Services'
+
+        return context
+
+
+
+class View(ChangeView):
+
+    context_object_name = "item"
+
+    form_class = DetailForm
+
+    model = Service
+
+    permission_required = [
+        'itim.view_service',
+    ]
+
+    template_name = 'itim/service.html.j2'
+
+
+    def get_context_data(self, **kwargs):
+
+        context = super().get_context_data(**kwargs)
+
+        context['notes_form'] = AddNoteForm(prefix='note')
+        context['notes'] = Notes.objects.filter(service=self.kwargs['pk'])
+
+        context['model_pk'] = self.kwargs['pk']
+        context['model_name'] = self.model._meta.model_name
+
+        context['model_delete_url'] = reverse('ITIM:_service_delete', args=(self.kwargs['pk'],))
+
+
+        context['content_title'] = self.object.name
+
+        return context
+
+
+    @method_decorator(auth_decorator.permission_required("itim.change_service", raise_exception=True))
+    def post(self, request, *args, **kwargs):
+
+        item = Service.objects.get(pk=self.kwargs['pk'])
+
+        notes = AddNoteForm(request.POST, prefix='note')
+
+        if notes.is_bound and notes.is_valid() and notes.instance.note != '':
+
+            notes.instance.service = item
+
+            notes.instance.organization = item.organization
+
+            notes.save()
+
+
+    def get_success_url(self, **kwargs):
+
+        return reverse('ITIM:_service_view', args=(self.kwargs['pk'],))

app/project-static/base.css

@@ -31,6 +31,10 @@ h2 {
   padding-left: 50px
 }
 
+.codehilite {
+  display: inline;
+}
+
 span#content_header_icon {
   float: right;
   width: 30px;
@@ -52,6 +56,7 @@ span.icon-text {
   padding-right: 10px;
   height: 30px;
   display: inline-block;
+  margin-left: 5px;
 }
 
 span.icon-text a {
@@ -142,6 +147,16 @@ span.icon-issue {
   display: inline-block;
 }
 
+span.icon-external-link {
+  height: 30px;
+  line-height: 30px;
+  margin: 0px;
+  padding: 0px;
+  vertical-align: middle;
+  display: inline-block;
+  width: 25px;
+}
+
 /* .icon {
   display: block;
   content: none;

app/project-static/code.css

@@ -0,0 +1,75 @@
+pre { line-height: 125%; }
+td.linenos .normal { color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px; }
+span.linenos { color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px; }
+td.linenos .special { color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px; }
+span.linenos.special { color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px; }
+.codehilite .hll { background-color: #ffffcc }
+.codehilite { background: #f8f8f8; }
+.codehilite .c { color: #3D7B7B; font-style: italic } /* Comment */
+.codehilite .err { border: 1px solid #FF0000 } /* Error */
+.codehilite .k { color: #008000; font-weight: bold } /* Keyword */
+.codehilite .o { color: #666666 } /* Operator */
+.codehilite .ch { color: #3D7B7B; font-style: italic } /* Comment.Hashbang */
+.codehilite .cm { color: #3D7B7B; font-style: italic } /* Comment.Multiline */
+.codehilite .cp { color: #9C6500 } /* Comment.Preproc */
+.codehilite .cpf { color: #3D7B7B; font-style: italic } /* Comment.PreprocFile */
+.codehilite .c1 { color: #3D7B7B; font-style: italic } /* Comment.Single */
+.codehilite .cs { color: #3D7B7B; font-style: italic } /* Comment.Special */
+.codehilite .gd { color: #A00000 } /* Generic.Deleted */
+.codehilite .ge { font-style: italic } /* Generic.Emph */
+.codehilite .ges { font-weight: bold; font-style: italic } /* Generic.EmphStrong */
+.codehilite .gr { color: #E40000 } /* Generic.Error */
+.codehilite .gh { color: #000080; font-weight: bold } /* Generic.Heading */
+.codehilite .gi { color: #008400 } /* Generic.Inserted */
+.codehilite .go { color: #717171 } /* Generic.Output */
+.codehilite .gp { color: #000080; font-weight: bold } /* Generic.Prompt */
+.codehilite .gs { font-weight: bold } /* Generic.Strong */
+.codehilite .gu { color: #800080; font-weight: bold } /* Generic.Subheading */
+.codehilite .gt { color: #0044DD } /* Generic.Traceback */
+.codehilite .kc { color: #008000; font-weight: bold } /* Keyword.Constant */
+.codehilite .kd { color: #008000; font-weight: bold } /* Keyword.Declaration */
+.codehilite .kn { color: #008000; font-weight: bold } /* Keyword.Namespace */
+.codehilite .kp { color: #008000 } /* Keyword.Pseudo */
+.codehilite .kr { color: #008000; font-weight: bold } /* Keyword.Reserved */
+.codehilite .kt { color: #B00040 } /* Keyword.Type */
+.codehilite .m { color: #666666 } /* Literal.Number */
+.codehilite .s { color: #BA2121 } /* Literal.String */
+.codehilite .na { color: #687822 } /* Name.Attribute */
+.codehilite .nb { color: #008000 } /* Name.Builtin */
+.codehilite .nc { color: #0000FF; font-weight: bold } /* Name.Class */
+.codehilite .no { color: #880000 } /* Name.Constant */
+.codehilite .nd { color: #AA22FF } /* Name.Decorator */
+.codehilite .ni { color: #717171; font-weight: bold } /* Name.Entity */
+.codehilite .ne { color: #CB3F38; font-weight: bold } /* Name.Exception */
+.codehilite .nf { color: #0000FF } /* Name.Function */
+.codehilite .nl { color: #767600 } /* Name.Label */
+.codehilite .nn { color: #0000FF; font-weight: bold } /* Name.Namespace */
+.codehilite .nt { color: #008000; font-weight: bold } /* Name.Tag */
+.codehilite .nv { color: #19177C } /* Name.Variable */
+.codehilite .ow { color: #AA22FF; font-weight: bold } /* Operator.Word */
+.codehilite .w { color: #bbbbbb } /* Text.Whitespace */
+.codehilite .mb { color: #666666 } /* Literal.Number.Bin */
+.codehilite .mf { color: #666666 } /* Literal.Number.Float */
+.codehilite .mh { color: #666666 } /* Literal.Number.Hex */
+.codehilite .mi { color: #666666 } /* Literal.Number.Integer */
+.codehilite .mo { color: #666666 } /* Literal.Number.Oct */
+.codehilite .sa { color: #BA2121 } /* Literal.String.Affix */
+.codehilite .sb { color: #BA2121 } /* Literal.String.Backtick */
+.codehilite .sc { color: #BA2121 } /* Literal.String.Char */
+.codehilite .dl { color: #BA2121 } /* Literal.String.Delimiter */
+.codehilite .sd { color: #BA2121; font-style: italic } /* Literal.String.Doc */
+.codehilite .s2 { color: #BA2121 } /* Literal.String.Double */
+.codehilite .se { color: #AA5D1F; font-weight: bold } /* Literal.String.Escape */
+.codehilite .sh { color: #BA2121 } /* Literal.String.Heredoc */
+.codehilite .si { color: #A45A77; font-weight: bold } /* Literal.String.Interpol */
+.codehilite .sx { color: #008000 } /* Literal.String.Other */
+.codehilite .sr { color: #A45A77 } /* Literal.String.Regex */
+.codehilite .s1 { color: #BA2121 } /* Literal.String.Single */
+.codehilite .ss { color: #19177C } /* Literal.String.Symbol */
+.codehilite .bp { color: #008000 } /* Name.Builtin.Pseudo */
+.codehilite .fm { color: #0000FF } /* Name.Function.Magic */
+.codehilite .vc { color: #19177C } /* Name.Variable.Class */
+.codehilite .vg { color: #19177C } /* Name.Variable.Global */
+.codehilite .vi { color: #19177C } /* Name.Variable.Instance */
+.codehilite .vm { color: #19177C } /* Name.Variable.Magic */
+.codehilite .il { color: #666666 } /* Literal.Number.Integer.Long */

app/project-static/content.css

@@ -65,6 +65,119 @@ input[type=submit] {
   height: 30px;
   margin: 10px;
 }
+
+
+
+
+/* Style the navigation tabs at the top of a content page */
+.content-navigation-tabs {
+  display: block;
+  overflow: hidden;
+  border-bottom: 1px solid #ccc;
+  /* background-color: #f1f1f1; */
+  width: 100%;
+  text-align: left;
+  padding: 0px;
+  margin: 0px
+}
+
+
+.content-navigation-tabs-link {
+  border: 0px;
+  margin: none;
+  padding: none;
+}
+
+/* Style the buttons that are used to open the tab content */
+.content-navigation-tabs button {
+  display: inline;
+  background-color: inherit;
+  float: left;
+  border: none;
+  outline: none;
+  cursor: pointer;
+  margin: 0px;
+  padding: 0px;
+  padding: 14px 16px;
+  transition: 0.3s;
+  font-size: inherit;
+  color: #6a6e73;
+}
+
+
+/* Change background color of buttons on hover */
+.content-navigation-tabs button:hover {
+  /* background-color: #ddd; */
+  border-bottom: 3px solid #ccc;
+}
+
+
+/* Create an active/current tablink class */
+.content-navigation-tabs button.active {
+  /* background-color: #ccc; */
+  border-bottom: 3px solid #177ee6;
+}
+
+
+
+/* Style content for each tab */
+.content-tab {
+  width: 100%;
+  display: none;
+  padding-bottom: 0px;
+  border: none;
+  border-top: none;
+}
+
+.content-tab hr {
+  border: none;
+  border-top: 1px solid #ccc;
+}
+
+.content-tab pre {
+  word-wrap: break-word;
+  white-space: pre-wrap;
+}
+
+/* Style for section fields on details page */
+.detail-view-field {
+  display: unset;
+  height: 30px;
+  line-height: 30px;
+  padding: 0px 20px 40px 20px;
+
+}
+
+.detail-view-field label {
+  display: inline-block;
+  font-weight: bold;
+  width: 200px;
+  margin: 10px;
+  height: 30px;
+  line-height: 30px;
+
+}
+
+.detail-view-field span {
+  display: inline-block;
+  width: 340px;
+  margin: 10px;
+  border-bottom: 1px solid #ccc;
+  height: 30px;
+  line-height: 30px;
+
+}
+
+
+
+
+
+
+
+
+
+
+
 /*******************************************************************************
 
 EoF refactored
@@ -124,61 +237,6 @@ input[type=checkbox]:checked::after {
 
 
 
-/* Style the tab */
-.tab {
-  display: block;
-  overflow: hidden;
-  border-bottom: 1px solid #ccc;
-  /* background-color: #f1f1f1; */
-  width: 100%;
-  text-align: left;
-  padding: 0px;
-  margin: 0px
-}
-
-.tablinks {
-  border: 0px;
-  margin: none;
-  padding: none;
-}
-
-/* Style the buttons that are used to open the tab content */
-.tab button {
-  display: inline;
-  background-color: inherit;
-  float: left;
-  border: none;
-  outline: none;
-  cursor: pointer;
-  margin: 0px;
-  padding: 0px;
-  padding: 14px 16px;
-  transition: 0.3s;
-  font-size: inherit;
-  color: #6a6e73;
-}
-
-/* Change background color of buttons on hover */
-.tab button:hover {
-  /* background-color: #ddd; */
-  border-bottom: 3px solid #ccc;
-}
-
-/* Create an active/current tablink class */
-.tab button.active {
-  /* background-color: #ccc; */
-  border-bottom: 3px solid #177ee6;
-}
-
-/* Style the tab content */
-.tabcontent {
-  width: 100%;
-  display: none;
-  /* padding: 6px 12px; */
-  padding-bottom: 0px;
-  border: none;
-  border-top: none;
-}
 
 table {
   width: 100%;

app/project-static/functions.js

@@ -0,0 +1,16 @@
+function openContentNavigationTab(evt, TabName) {
+    var i, tabcontent, tablinks;
+
+    tabcontent = document.getElementsByClassName("content-tab");
+    for (i = 0; i < tabcontent.length; i++) {
+        tabcontent[i].style.display = "none";
+    }
+
+    tablinks = document.getElementsByClassName("content-navigation-tabs-link");
+    for (i = 0; i < tablinks.length; i++) {
+        tablinks[i].className = tablinks[i].className.replace(" active", "");
+    }
+
+    document.getElementById(TabName).style.display = "block";
+    evt.currentTarget.className += " active";
+}

app/settings/forms/external_links.py

@@ -0,0 +1,21 @@
+from django import forms
+from django.db.models import Q
+
+from django.contrib.auth.models import User
+
+from access.models import Organization, TeamUsers
+
+from core.forms.common import CommonModelForm
+
+from settings.models.external_link import ExternalLink
+
+
+class ExternalLinksForm(CommonModelForm):
+
+    prefix = 'external_links'
+
+    class Meta:
+
+        fields = '__all__'
+
+        model = ExternalLink

app/settings/migrations/0002_externallink.py

@@ -0,0 +1,37 @@
+# Generated by Django 5.0.7 on 2024-07-17 05:02
+
+import access.fields
+import access.models
+import django.db.models.deletion
+import django.utils.timezone
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('access', '0001_initial'),
+        ('settings', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='ExternalLink',
+            fields=[
+                ('is_global', models.BooleanField(default=False)),
+                ('model_notes', models.TextField(blank=True, default=None, null=True, verbose_name='Notes')),
+                ('id', models.AutoField(primary_key=True, serialize=False, unique=True)),
+                ('name', models.CharField(help_text='Name to display on link button', max_length=30, unique=True, verbose_name='Button Name')),
+                ('template', models.CharField(help_text='External Link template', max_length=180, verbose_name='Link Template')),
+                ('colour', models.CharField(blank=True, default=None, help_text='Colour to render the link button. Use HTML colour code', max_length=80, null=True, verbose_name='Button Colour')),
+                ('devices', models.BooleanField(default=False, help_text='Render link for devices', verbose_name='Devices')),
+                ('software', models.BooleanField(default=False, help_text='Render link for software', verbose_name='Software')),
+                ('created', access.fields.AutoCreatedField(default=django.utils.timezone.now, editable=False)),
+                ('modified', access.fields.AutoLastModifiedField(default=django.utils.timezone.now, editable=False)),
+                ('organization', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='access.organization', validators=[access.models.TenancyObject.validatate_organization_exists])),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+    ]

app/settings/models/external_link.py

@@ -0,0 +1,66 @@
+from django.template import Template
+
+from access.fields import *
+from access.models import TenancyObject
+
+
+
+class ExternalLink(TenancyObject):
+
+    id = models.AutoField(
+        primary_key=True,
+        unique=True,
+        blank=False
+    )
+
+    name = models.CharField(
+        blank = False,
+        max_length = 30,
+        unique = True,
+        help_text = 'Name to display on link button',
+        verbose_name = 'Button Name',
+    )
+
+    slug = None
+
+    template = models.CharField(
+        blank = False,
+        max_length = 180,
+        unique = False,
+        help_text = 'External Link template',
+        verbose_name = 'Link Template',
+    )
+
+    colour = models.CharField(
+        blank = True,
+        null = True,
+        default = None,
+        max_length = 80,
+        unique = False,
+        help_text = 'Colour to render the link button. Use HTML colour code',
+        verbose_name = 'Button Colour',
+    )
+
+    devices = models.BooleanField(
+        default = False,
+        blank = False,
+        help_text = 'Render link for devices',
+        verbose_name = 'Devices',
+    )
+
+    software = models.BooleanField(
+        default = False,
+        blank = False,
+        help_text = 'Render link for software',
+        verbose_name = 'Software',
+    )
+
+    created = AutoCreatedField()
+
+    modified = AutoLastModifiedField()
+
+
+    def __str__(self):
+        """ Return the Template to render """
+
+        return str(self.template)

app/settings/templates/icons/external_link.html.j2

@@ -0,0 +1,18 @@
+<style>
+.inner-text {
+    background-color: #fff;
+    border-top-right-radius: 15px;
+    border-bottom-right-radius: 15px;
+    border-right: 15px;
+    margin-right: -5px;
+    padding: 1px 5px 1px 5px;
+}
+
+</style>
+
+<span class="icon-text external-link" style="background-color: {% if external_link.colour %}{{ external_link.colour }}{% else %}#177ee6{% endif %};">
+    <span class="icon-external-link" style="margin-left: 5px;">
+        {% include 'icons/link.svg' %}
+    </span>
+        <a class="inner-text" href="{{ external_link.link }}" target="_blank"> {{ external_link.name }}</a>
+</span>

app/settings/templates/icons/link.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M10.59,13.41C11,13.8 11,14.44 10.59,14.83C10.2,15.22 9.56,15.22 9.17,14.83C7.22,12.88 7.22,9.71 9.17,7.76V7.76L12.71,4.22C14.66,2.27 17.83,2.27 19.78,4.22C21.73,6.17 21.73,9.34 19.78,11.29L18.29,12.78C18.3,11.96 18.17,11.14 17.89,10.36L18.36,9.88C19.54,8.71 19.54,6.81 18.36,5.64C17.19,4.46 15.29,4.46 14.12,5.64L10.59,9.17C9.41,10.34 9.41,12.24 10.59,13.41M13.41,9.17C13.8,8.78 14.44,8.78 14.83,9.17C16.78,11.12 16.78,14.29 14.83,16.24V16.24L11.29,19.78C9.34,21.73 6.17,21.73 4.22,19.78C2.27,17.83 2.27,14.66 4.22,12.71L5.71,11.22C5.7,12.04 5.83,12.86 6.11,13.65L5.64,14.12C4.46,15.29 4.46,17.19 5.64,18.36C6.81,19.54 8.71,19.54 9.88,18.36L13.41,14.83C14.59,13.66 14.59,11.76 13.41,10.59C13,10.2 13,9.56 13.41,9.17Z" /></svg>

app/settings/templates/settings/external_link.html.j2

@@ -0,0 +1,194 @@
+{% extends 'base.html.j2' %}
+
+{% load markdown %}
+
+{% block title %}{{ externallink.name }}{% endblock %}
+
+{% block content %}
+
+<script>
+
+  function openCity(evt, cityName) {
+    // Declare all variables
+    var i, tabcontent, tablinks;
+
+    // Get all elements with class="tabcontent" and hide them
+    tabcontent = document.getElementsByClassName("tabcontent");
+    for (i = 0; i < tabcontent.length; i++) {
+      tabcontent[i].style.display = "none";
+    }
+
+    // Get all elements with class="tablinks" and remove the class "active"
+    tablinks = document.getElementsByClassName("tablinks");
+    for (i = 0; i < tablinks.length; i++) {
+      tablinks[i].className = tablinks[i].className.replace(" active", "");
+    }
+
+    // Show the current tab, and add an "active" class to the button that opened the tab
+    document.getElementById(cityName).style.display = "block";
+    evt.currentTarget.className += " active";
+  }
+
+</script>
+
+<div class="tab">
+  <button onclick="window.location='{% url 'Settings:External Links' %}';"
+    style="vertical-align: middle; padding: auto; margin: 0px">
+    <svg xmlns="http://www.w3.org/2000/svg" height="25px" viewBox="0 -960 960 960" width="25px"
+      style="vertical-align: middle; margin: 0px; padding: 0px border: none; " fill="#6a6e73">
+      <path d="m313-480 155 156q11 11 11.5 27.5T468-268q-11 11-28 11t-28-11L228-452q-6-6-8.5-13t-2.5-15q0-8 2.5-15t8.5-13l184-184q11-11 27.5-11.5T468-692q11 11 11 28t-11 28L313-480Zm264 0 155 156q11 11 11.5 27.5T732-268q-11 11-28 11t-28-11L492-452q-6-6-8.5-13t-2.5-15q0-8 2.5-15t8.5-13l184-184q11-11 27.5-11.5T732-692q11 11 11 28t-11 28L577-480Z" />
+    </svg> Back to External Links</button>
+  <button id="defaultOpen" class="tablinks" onclick="openCity(event, 'Details')">Details</button>
+  <button id="NotesOpen" class="tablinks" onclick="openCity(event, 'Notes')">Notes</button>
+</div>
+<style>
+
+.detail-view-field {
+  display:unset;
+  height: 30px;
+  line-height: 30px;
+  padding: 0px 20px 40px 20px;
+
+}
+
+.detail-view-field label {
+  display: inline-block;
+  font-weight: bold;
+  width: 200px;
+  margin: 10px;
+  /*padding: 10px;*/
+  height: 30px;
+  line-height: 30px;
+
+}
+
+.detail-view-field span {
+  display: inline-block;
+  width: 340px;
+  margin: 10px;
+  border-bottom: 1px solid #ccc;
+  height: 30px;
+  line-height: 30px;
+
+}
+</style>
+<form action="" method="post">
+  {% csrf_token %}
+
+
+  <div id="Details" class="tabcontent">
+    <h3>
+      Details
+      {% for external_link in external_links %}
+        <span style="font-weight: normal; float: right;">{% include 'icons/external_link.html.j2' with external_link=external_link %}</span>
+      {% endfor %}
+    </h3>
+    <div style="align-items:flex-start; align-content: center; display: flexbox; width: 100%">
+
+      <div style="display: inline; width: 40%; margin: 30px;">
+
+        <div class="detail-view-field">
+          <label>{{ form.organization.label }}</label>
+          <span>{{ externallink.organization }}</span>
+        </div>
+
+        <div class="detail-view-field">
+          <label>{{ form.name.label }}</label>
+          <span>{{ form.name.value }}</span>
+        </div>
+
+        <div class="detail-view-field">
+          <label>{{ form.template.label }}</label>
+          <span>{{ externallink.template }}</span>
+        </div>
+
+        <div class="detail-view-field">
+          <label>{{ form.colour.label }}</label>
+          <span>
+          {% if form.colour.value %}
+            {{ form.colour.value }}
+          {% else %}
+            &nbsp;
+          {% endif %}
+          </span>
+        </div>
+
+        <div class="detail-view-field">
+          <label>{{ form.devices.label }}</label>
+          <span> {{ form.devices.value }}</span>
+        </div>
+
+        <div class="detail-view-field">
+          <label>{{ form.software.label }}</label>
+          <span>{{ externallink.software }}</span>
+        </div>
+
+        <div class="detail-view-field">
+          <label>Created</label>
+          <span>{{ externallink.created }}</span>
+        </div>
+
+        <div class="detail-view-field">
+          <label>Modified</label>
+          <span>{{ externallink.modified }}</span>
+        </div>
+
+      </div>
+
+      <div style="display: inline; width: 40%; margin: 30px; text-align: left;">
+        <div>
+          <label style="font-weight: bold; width: 100%; border-bottom: 1px solid #ccc; display: block; text-align: inherit;">{{ form.model_notes.label }}</label>
+          
+          <div style="display: inline-block; text-align: left;">
+          {% if form.model_notes.value  %} 
+            {{ form.model_notes.value | markdown | safe }}
+          {% else %}
+            &nbsp;
+          {% endif %}
+          </div>
+        </div>
+      </div>
+      </div>
+
+ 
+
+    <input type="button" value="Edit" onclick="window.location='{% url 'Settings:_external_link_change' externallink.id %}';">
+
+
+    {% if not tab %}
+    <script>
+      // Get the element with id="defaultOpen" and click on it
+      document.getElementById("defaultOpen").click();
+    </script>
+    {% endif %}
+
+  </div>
+
+
+
+
+  <div id="Notes" class="tabcontent">
+    <h3>
+      Notes
+    </h3>
+    {{ notes_form }}
+    <input type="submit" name="{{notes_form.prefix}}" value="Submit" />
+    <div class="comments">
+      {% if notes %}
+      {% for note in notes%}
+      {% include 'note.html.j2' %}
+      {% endfor %}
+      {% endif %}
+    </div>
+
+    {% if tab == 'notes' %}
+    <script>
+      // Get the element with id="defaultOpen" and click on it
+      document.getElementById("NotesOpen").click();
+    </script>
+    {% endif %}
+  </div>
+
+
+</form>
+{% endblock %}

app/settings/templates/settings/external_links.html.j2

@@ -0,0 +1,42 @@
+{% extends 'base.html.j2' %}
+
+
+{% block content_header_icon %}{% endblock %}
+
+{% block content %}
+
+<input type="button" value="New External Link" onclick="window.location='{% url 'Settings:_external_link_add' %}';">
+<table class="data">
+    <tr>
+        <th>Name</th>
+        <th>Organization</th>
+        <th>&nbsp;</th>
+    </tr>
+    {% for item in list %}
+    <tr>
+        <td><a href="{% url 'Settings:_external_link_view' pk=item.id %}">{{ item.name }}</a></td>
+        <td>{% if item.is_global %}Global{% else %}{{ item.organization }}{% endif %}</td>
+        <td>&nbsp;</td>
+    </tr>
+    {% endfor %}
+
+</table>
+
+<div class="pagination">
+    <span class="step-links">
+        {% if page_obj.has_previous %}
+            <a href="?page=1">&laquo; first</a>
+            <a href="?page={{ page_obj.previous_page_number }}">previous</a>
+        {% endif %}
+
+        <span class="current">
+            Page {{ page_obj.number }} of {{ page_obj.paginator.num_pages }}.
+        </span>
+
+        {% if page_obj.has_next %}
+            <a href="?page={{ page_obj.next_page_number }}">next</a>
+            <a href="?page={{ page_obj.paginator.num_pages }}">last &raquo;</a>
+        {% endif %}
+    </span>
+</div>
+{% endblock %}

app/settings/templates/settings/home.html.j2

@@ -59,6 +59,13 @@ div#content article h3 {
         </ul>
     </article>
 
+    <article style="">
+        <h3>ITIM</h3>
+        <ul>
+            <li><a href="{% url 'Settings:_ports' %}">Service Ports</a></li>
+        </ul>
+    </article>
+
 </div>
 
 

app/settings/tests/unit/external_links/test_external_links.py

@@ -0,0 +1,18 @@
+import pytest
+import unittest
+import requests
+
+from django.test import TestCase, Client
+
+from app.tests.abstract.models import TenancyModel
+
+from settings.models.external_link import ExternalLink
+
+
+
+class ExternalLinkTests(
+    TestCase,
+    TenancyModel,
+):
+
+    model = ExternalLink

app/settings/tests/unit/external_links/test_external_links_core_history.py

@@ -0,0 +1,72 @@
+import pytest
+import unittest
+import requests
+
+from django.test import TestCase, Client
+
+from access.models import Organization
+
+from core.models.history import History
+from core.tests.abstract.history_entry import HistoryEntry
+from core.tests.abstract.history_entry_parent_model import HistoryEntryParentItem
+
+from settings.models.external_link import ExternalLink
+
+
+
+class ExternalLinkHistory(TestCase, HistoryEntry, HistoryEntryParentItem):
+
+    model = ExternalLink
+
+
+    @classmethod
+    def setUpTestData(self):
+        """ Setup Test """
+
+        organization = Organization.objects.create(name='test_org')
+
+        self.organization = organization
+
+        self.item_create = self.model.objects.create(
+            name = 'test_item_' + self.model._meta.model_name ,
+            organization = self.organization
+        )
+
+
+        self.history_create = History.objects.get(
+            action = History.Actions.ADD[0],
+            item_pk = self.item_create.pk,
+            item_class = self.model._meta.model_name,
+        )
+
+
+        self.item_change = self.item_create
+        self.item_change.name = 'test_item_' + self.model._meta.model_name  + '_changed'
+        self.item_change.save()
+
+        self.field_after_expected_value = '{"name": "test_item_' + self.model._meta.model_name + '_changed"}'
+
+        self.history_change = History.objects.get(
+            action = History.Actions.UPDATE[0],
+            item_pk = self.item_change.pk,
+            item_class = self.model._meta.model_name,
+        )
+
+        self.item_delete = self.model.objects.create(
+            name = 'test_item_delete_' + self.model._meta.model_name ,
+            organization = self.organization
+        )
+
+        self.deleted_pk = self.item_delete.pk
+
+        self.item_delete.delete()
+
+        self.history_delete = History.objects.filter(
+            item_pk = self.deleted_pk,
+            item_class = self.model._meta.model_name,
+        )
+
+        self.history_delete_children = History.objects.filter(
+            item_parent_pk = self.deleted_pk,
+            item_parent_class = self.model._meta.model_name,
+        )

app/settings/tests/unit/external_links/test_external_links_history_permission.py

@@ -0,0 +1,92 @@
+import pytest
+import unittest
+import requests
+
+from django.contrib.auth.models import AnonymousUser, User
+from django.contrib.contenttypes.models import ContentType
+from django.test import TestCase
+
+from access.models import Organization, Team, TeamUsers, Permission
+
+from core.tests.abstract.history_permissions import HistoryPermissions
+
+from settings.models.external_link import ExternalLink
+
+
+
+class ExternalLinkHistoryPermissions(TestCase, HistoryPermissions):
+
+
+    item_model = ExternalLink
+
+
+    @classmethod
+    def setUpTestData(self):
+        """Setup Test
+
+        1. Create an organization for user and item
+        2. create an organization that is different to item
+        3. Create a device
+        4. Add history device history entry as item
+        5. create a user
+        6. create user in different organization (with the required permission)
+        """
+
+        organization = Organization.objects.create(name='test_org')
+
+        self.organization = organization
+
+        different_organization = Organization.objects.create(name='test_different_organization')
+
+        self.item = self.item_model.objects.create(
+            organization=organization,
+            name = 'deviceone'
+        )
+
+        self.history = self.model.objects.get(
+            item_pk = self.item.id,
+            item_class = self.item._meta.model_name,
+            action = self.model.Actions.ADD,
+        )
+
+        view_permissions = Permission.objects.get(
+                codename = 'view_' + self.model._meta.model_name,
+                content_type = ContentType.objects.get(
+                    app_label = self.model._meta.app_label,
+                    model = self.model._meta.model_name,
+                )
+            )
+
+        view_team = Team.objects.create(
+            team_name = 'view_team',
+            organization = organization,
+        )
+
+        view_team.permissions.set([view_permissions])
+
+
+        self.no_permissions_user = User.objects.create_user(username="test_no_permissions", password="password")
+
+
+        self.view_user = User.objects.create_user(username="test_user_view", password="password")
+        teamuser = TeamUsers.objects.create(
+            team = view_team,
+            user = self.view_user
+        )
+
+        self.different_organization_user = User.objects.create_user(username="test_different_organization_user", password="password")
+
+
+        different_organization_team = Team.objects.create(
+            team_name = 'different_organization_team',
+            organization = different_organization,
+        )
+
+        different_organization_team.permissions.set([
+            view_permissions,
+        ])
+
+        TeamUsers.objects.create(
+            team = different_organization_team,
+            user = self.different_organization_user
+        )

app/settings/tests/unit/external_links/test_external_links_permission.py

@@ -0,0 +1,188 @@
+import pytest
+import unittest
+import requests
+
+from django.contrib.auth.models import AnonymousUser, User
+from django.contrib.contenttypes.models import ContentType
+from django.shortcuts import reverse
+from django.test import TestCase
+
+from access.models import Organization, Team, TeamUsers, Permission
+
+from app.tests.abstract.model_permissions import ModelPermissions
+
+from settings.models.external_link import ExternalLink
+
+
+
+class ExternalLinkPermissions(TestCase, ModelPermissions):
+
+
+    model = ExternalLink
+
+    app_label = 'settings'
+
+    app_namespace = 'Settings'
+
+    url_name_view = '_external_link_view'
+
+    url_name_add = '_external_link_add'
+
+    url_name_change = '_external_link_change'
+
+    url_name_delete = '_external_link_delete'
+
+    url_delete_response = reverse('Settings:External Links')
+
+
+    @classmethod
+    def setUpTestData(self):
+        """Setup Test
+
+        1. Create an organization for user and item
+        . create an organization that is different to item
+        2. Create a device
+        3. create teams with each permission: view, add, change, delete
+        4. create a user per team
+        """
+
+        organization = Organization.objects.create(name='test_org')
+
+        self.organization = organization
+
+        different_organization = Organization.objects.create(name='test_different_organization')
+
+
+        self.item = self.model.objects.create(
+            organization=organization,
+            name = 'deviceone'
+        )
+
+
+        self.url_view_kwargs = {'pk': self.item.id}
+
+        self.add_data = {'device': 'device', 'organization': self.organization.id}
+
+        self.url_change_kwargs = {'pk': self.item.id}
+
+        self.change_data = {'device': 'device'}
+
+        self.url_delete_kwargs = {'pk': self.item.id}
+
+        self.delete_data = {'device': 'device'}
+
+
+        view_permissions = Permission.objects.get(
+                codename = 'view_' + self.model._meta.model_name,
+                content_type = ContentType.objects.get(
+                    app_label = self.model._meta.app_label,
+                    model = self.model._meta.model_name,
+                )
+            )
+
+        view_team = Team.objects.create(
+            team_name = 'view_team',
+            organization = organization,
+        )
+
+        view_team.permissions.set([view_permissions])
+
+
+
+        add_permissions = Permission.objects.get(
+                codename = 'add_' + self.model._meta.model_name,
+                content_type = ContentType.objects.get(
+                    app_label = self.model._meta.app_label,
+                    model = self.model._meta.model_name,
+                )
+            )
+
+        add_team = Team.objects.create(
+            team_name = 'add_team',
+            organization = organization,
+        )
+
+        add_team.permissions.set([add_permissions])
+
+
+
+        change_permissions = Permission.objects.get(
+                codename = 'change_' + self.model._meta.model_name,
+                content_type = ContentType.objects.get(
+                    app_label = self.model._meta.app_label,
+                    model = self.model._meta.model_name,
+                )
+            )
+
+        change_team = Team.objects.create(
+            team_name = 'change_team',
+            organization = organization,
+        )
+
+        change_team.permissions.set([change_permissions])
+
+
+
+        delete_permissions = Permission.objects.get(
+                codename = 'delete_' + self.model._meta.model_name,
+                content_type = ContentType.objects.get(
+                    app_label = self.model._meta.app_label,
+                    model = self.model._meta.model_name,
+                )
+            )
+
+        delete_team = Team.objects.create(
+            team_name = 'delete_team',
+            organization = organization,
+        )
+
+        delete_team.permissions.set([delete_permissions])
+
+
+        self.no_permissions_user = User.objects.create_user(username="test_no_permissions", password="password")
+
+
+        self.view_user = User.objects.create_user(username="test_user_view", password="password")
+        teamuser = TeamUsers.objects.create(
+            team = view_team,
+            user = self.view_user
+        )
+
+        self.add_user = User.objects.create_user(username="test_user_add", password="password")
+        teamuser = TeamUsers.objects.create(
+            team = add_team,
+            user = self.add_user
+        )
+
+        self.change_user = User.objects.create_user(username="test_user_change", password="password")
+        teamuser = TeamUsers.objects.create(
+            team = change_team,
+            user = self.change_user
+        )
+
+        self.delete_user = User.objects.create_user(username="test_user_delete", password="password")
+        teamuser = TeamUsers.objects.create(
+            team = delete_team,
+            user = self.delete_user
+        )
+
+
+        self.different_organization_user = User.objects.create_user(username="test_different_organization_user", password="password")
+
+
+        different_organization_team = Team.objects.create(
+            team_name = 'different_organization_team',
+            organization = different_organization,
+        )
+
+        different_organization_team.permissions.set([
+            view_permissions,
+            add_permissions,
+            change_permissions,
+            delete_permissions,
+        ])
+
+        TeamUsers.objects.create(
+            team = different_organization_team,
+            user = self.different_organization_user
+        )

app/settings/tests/unit/external_links/test_external_links_views.py

@@ -0,0 +1,29 @@
+import pytest
+import unittest
+import requests
+
+from django.test import TestCase
+
+from app.tests.abstract.models import PrimaryModel
+
+
+class ExternalLinkViews(
+    TestCase,
+    PrimaryModel
+):
+
+    add_module = 'settings.views.external_link'
+    add_view = 'Add'
+
+    change_module = add_module
+    change_view = 'Change'
+
+    delete_module = add_module
+    delete_view = 'Delete'
+
+    display_module = add_module
+    display_view = 'View'
+
+    index_module = add_module
+    index_view = 'Index'
+6

app/settings/urls.py

@@ -1,16 +1,27 @@
 from django.urls import path
 
+from assistance.views import knowledge_base_category
+
 from core.views import celery_log
 
-from .views import app_settings, home, device_models, device_types, manufacturer, software_categories
+from settings.views import app_settings, home, device_models, device_types, external_link, manufacturer, software_categories
 
 from itam.views import device_type, device_model, software_category
 
+from itim.views import ports
+
 app_name = "Settings"
 urlpatterns = [
 
     path("", home.View.as_view(), name="Settings"),
 
+    path("external_links", external_link.Index.as_view(), name="External Links"),
+    path("external_links/add", external_link.Add.as_view(), name="_external_link_add"),
+    path("external_links/<int:pk>", external_link.View.as_view(), name="_external_link_view"),
+    path("external_links/<int:pk>/edit", external_link.Change.as_view(), name="_external_link_change"),
+    path("external_links/<int:pk>/delete", external_link.Delete.as_view(), name="_external_link_delete"),
+
+
     path('application', app_settings.View.as_view(), name="_settings_application"),
     
     path("task_results", celery_log.Index.as_view(), name="_task_results"),
@@ -26,6 +37,12 @@ urlpatterns = [
     path("device_type/add/", device_type.Add.as_view(), name="_device_type_add"),
     path("device_type/<int:pk>/delete", device_type.Delete.as_view(), name="_device_type_delete"),
 
+    path("kb/category", knowledge_base_category.Index.as_view(), name="KB Categories"),
+    path("kb/category/add", knowledge_base_category.Add.as_view(), name="_knowledge_base_category_add"),
+    path("kb/category/<int:pk>/edit", knowledge_base_category.Change.as_view(), name="_knowledge_base_category_change"),
+    path("kb/category/<int:pk>/delete", knowledge_base_category.Delete.as_view(), name="_knowledge_base_category_delete"),
+    path("kb/category/<int:pk>", knowledge_base_category.View.as_view(), name="_knowledge_base_category_view"),
+
     path("software_category", software_categories.Index.as_view(), name="_software_categories"),
     path("software_category/<int:pk>", software_category.View.as_view(), name="_software_category_view"),
     path("software_category/add/", software_category.Add.as_view(), name="_software_category_add"),
@@ -36,4 +53,10 @@ urlpatterns = [
     path("manufacturer/add/", manufacturer.Add.as_view(), name="_manufacturer_add"),
     path("manufacturer/<int:pk>/delete", manufacturer.Delete.as_view(), name="_manufacturer_delete"),
 
+    path("ports", ports.Index.as_view(), name="_ports"),
+    path("port/add", ports.Add.as_view(), name="_port_add"),
+    path("port/<int:pk>/edit", ports.Change.as_view(), name="_port_change"),
+    path("port/<int:pk>/delete", ports.Delete.as_view(), name="_port_delete"),
+    path("port/<int:pk>", ports.View.as_view(), name="_port_view"),
+
 ]

app/settings/views/external_link.py

@@ -0,0 +1,164 @@
+from django.contrib.auth import decorators as auth_decorator
+from django.db.models import Q
+from django.urls import reverse
+from django.utils.decorators import method_decorator
+from django.views import generic
+
+
+from access.mixin import OrganizationPermission
+
+from core.views.common import AddView, ChangeView, DeleteView, DisplayView, IndexView
+
+from settings.forms.external_links import ExternalLinksForm
+from settings.models.external_link import ExternalLink
+
+
+class Index(IndexView):
+
+    context_object_name = "list"
+
+    model = ExternalLink
+
+    paginate_by = 10
+
+    permission_required = [
+        'settings.view_externallink'
+    ]
+
+    template_name = 'settings/external_links.html.j2'
+
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+
+        context['model_docs_path'] = self.model._meta.app_label + '/external_links/'
+
+        context['content_title'] = 'External Links'
+
+        return context
+
+
+
+
+class View(ChangeView):
+
+    context_object_name = "externallink"
+
+    form_class = ExternalLinksForm
+
+    model = ExternalLink
+
+    permission_required = [
+        'settings.view_externallink',
+    ]
+
+    template_name = 'settings/external_link.html.j2'
+
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+
+        context['model_pk'] = self.kwargs['pk']
+        context['model_name'] = self.model._meta.verbose_name.replace(' ', '')
+
+        context['model_delete_url'] = reverse('Settings:_external_link_delete', args=(self.kwargs['pk'],))
+
+        context['content_title'] = self.object.name
+
+        return context
+
+    def get_success_url(self, **kwargs):
+
+        return reverse('Settings:_external_link_view', args={self.kwargs['pk']})
+
+
+    @method_decorator(auth_decorator.permission_required("settings.change_externallink", raise_exception=True))
+    def post(self, request, *args, **kwargs):
+
+        return super().post(request, *args, **kwargs)
+
+
+class Change(ChangeView):
+
+    context_object_name = "externallink"
+
+    form_class = ExternalLinksForm
+
+    model = ExternalLink
+
+    permission_required = [
+        'settings.change_externallink',
+    ]
+
+    template_name = 'form.html.j2'
+
+
+    def get_context_data(self, **kwargs):
+
+        context = super().get_context_data(**kwargs)
+
+        context['content_title'] = self.object.name
+
+        return context
+
+    def get_success_url(self, **kwargs):
+
+        return reverse('Settings:_external_link_view', args={self.kwargs['pk']})
+
+
+    @method_decorator(auth_decorator.permission_required("settings.change_externallink", raise_exception=True))
+    def post(self, request, *args, **kwargs):
+
+        return super().post(request, *args, **kwargs)
+
+
+
+class Add(AddView):
+
+    
+    form_class = ExternalLinksForm
+
+    model = ExternalLink
+
+    permission_required = [
+        'settings.add_externallink',
+    ]
+
+    template_name = 'form.html.j2'
+
+
+    def get_success_url(self, **kwargs):
+
+        return reverse(viewname = 'Settings:External Links')
+
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+
+        context['content_title'] = 'Add External Link'
+
+        return context
+
+
+class Delete(DeleteView):
+
+    model = ExternalLink
+
+    permission_required = [
+        'settings.delete_externallink',
+    ]
+
+    template_name = 'form.html.j2'
+
+    def get_success_url(self, **kwargs):
+
+        return reverse('Settings:External Links')
+
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+
+        context['content_title'] = 'Delete ' + self.object.name
+
+        return context
+

app/templates/base.html.j2

@@ -12,7 +12,9 @@
   <meta http-equiv="refresh" content="0; url=/{{ settings.LOGIN_URL }}" />
   {% else %}
   <link rel="stylesheet" href="{% static 'base.css' %}">
+  <link rel="stylesheet" href="{% static 'code.css' %}">
   <link rel="stylesheet" href="{% static 'content.css' %}">
+  <script src="{% static 'functions.js' %}"></script>
   {% endif %}
 
 </head>

app/templates/content/field.html.j2

@@ -0,0 +1,72 @@
+{% load json %}
+{% load markdown %}
+
+{% if field.widget_type == 'textarea' or field.label == 'Notes' %}
+
+    {% if field.name in section.json and field.value %}
+
+    <pre style="width: 80%; text-align: left; display:inline; border: 1px solid #ccc; padding: 22px;">{{ field.value.strip | json_pretty | safe }}</pre>
+
+    {% elif field.name in section.markdown or field.label == 'Notes' %}
+
+        {% if field.label == 'Notes' %}
+
+            <div>
+                <label style="font-weight: bold; width: 100%; border-bottom: 1px solid #ccc; display: block; text-align: inherit;">
+                {{ field.label }}
+                </label>
+
+                <div style="display: inline-block; text-align: left;">
+                    {% if field.value %}
+                    {{ field.value | markdown | safe }}
+                    {% else %}
+                    &nbsp;
+                    {% endif %}
+                </div>
+            </div>
+
+        {% else %}
+
+            {% if field.value %}
+
+                {{ field.value | markdown | safe }}
+
+            {% else %}
+
+                &nbsp;
+
+            {% endif %}
+
+        {% endif %}
+
+    {% elif not field.value %}
+
+        &nbsp;
+
+    {% endif %}
+
+
+{% else %}
+
+
+    <div class="detail-view-field">
+        <label>{{ field.label }}</label>
+        <span>
+        {% if field.field.choices %} {# Display the selected choice text value #}
+            {% for id, value in field.field.choices %}
+
+                {% if field.value == id %}
+
+                    {{ value }}
+
+                {% endif %}
+
+            {%endfor%}
+
+        {% else %}
+            {{ field.value }}
+        {% endif %}
+        </span>
+    </div>
+
+{% endif %}

app/templates/content/section.html.j2

@@ -0,0 +1,93 @@
+{% load json %}
+{% load markdown %}
+
+{% for section in tab.sections %}
+
+
+    {% if forloop.first %}
+
+        <h3>{{ tab.name }}</h3>
+
+    {% else %}
+
+        <hr />
+        <h3>{{ section.name }}</h3>
+
+    {% endif %}
+
+<div style="align-items:flex-start; align-content: center; display: flexbox; width: 100%">
+
+    {% if section.layout == 'single' %}
+
+        {% for section_field in section.fields %}
+        {% for field in form %}
+
+            {% if field.name in section_field %}
+
+                {% include 'content/field.html.j2' %}
+
+            {% endif %}
+
+        {% endfor %}
+        {% endfor %}
+
+    {% elif section.layout == 'double' %}
+
+        {% if section.left  %}
+
+        <div style="display: inline; width: 40%; margin: 30px;">
+
+            {% for section_field in section.left %}
+            {% for field in form %}
+
+                {% if field.name in section_field %}
+                
+                    {% include 'content/field.html.j2' %}
+
+                {% endif %}
+
+            {% endfor %}
+            {% endfor %}
+
+        </div>
+
+        {% endif %}
+
+
+        {% if section.right %}
+
+        <div style="display: inline; width: 40%; margin: 30px; text-align: left;">
+
+            {% for section_field in section.right %}
+            {% for field in form %}
+
+                {% if field.name in section_field %}
+                
+                    {% include 'content/field.html.j2' %}
+
+                {% endif %}
+
+            {% endfor %}
+            {% endfor %}
+
+        </div>
+
+        {% endif %}
+
+    {% endif %}
+
+    {% if forloop.first %}
+
+        {% if tab.edit_url %}
+
+            <div style="display:block;">
+                <input type="button" value="Edit" onclick="window.location='{{ tab.edit_url }}';">
+            </div>
+
+        {% endif %}
+
+    {% endif %}
+
+</div>
+
+{% endfor %}

app/templates/detail.html.j2

@@ -0,0 +1,47 @@
+{% extends 'base.html.j2' %}
+
+{% block content %}
+
+<div class="content-navigation-tabs">
+
+    <button onclick="window.location='{% url 'ITIM:Services' %}';" style="vertical-align: middle; padding: auto; margin: 0px">
+        <svg xmlns="http://www.w3.org/2000/svg" height="25px" viewBox="0 -960 960 960" width="25px"
+            style="vertical-align: middle; margin: 0px; padding: 0px border: none; " fill="#6a6e73">
+            <path d="m313-480 155 156q11 11 11.5 27.5T468-268q-11 11-28 11t-28-11L228-452q-6-6-8.5-13t-2.5-15q0-8 2.5-15t8.5-13l184-184q11-11 27.5-11.5T468-692q11 11 11 28t-11 28L313-480Zm264 0 155 156q11 11 11.5 27.5T732-268q-11 11-28 11t-28-11L492-452q-6-6-8.5-13t-2.5-15q0-8 2.5-15t8.5-13l184-184q11-11 27.5-11.5T732-692q11 11 11 28t-11 28L577-480Z" />
+        </svg>
+        Back to Services
+    </button>
+
+    {% for key, tab in form.tabs.items %}
+
+        {% if forloop.first %}
+
+            <button id="defaultOpen" class="content-navigation-tabs-link" onclick="openContentNavigationTab(event, '{{ tab.slug }}')">{{ tab.name }}</button>
+
+        {% else %}
+
+            <button id="tab-{{ tab.slug }}" class="content-navigation-tabs-link" onclick="openContentNavigationTab(event, '{{ tab.slug }}')">{{ tab.name }}</button>
+
+        {% endif %}
+
+    {% endfor %}
+
+</div>
+
+{% block tabs %}{% endblock %}
+
+{% if open_tab %}
+
+    <script>
+      document.getElementById("tab-{{ open_tab }}").click();
+    </script>
+
+{% else %}
+
+    <script>
+        document.getElementById("defaultOpen").click();
+    </script>
+
+{% endif %}
+
+{% endblock %}

app/templates/icons/assistance.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M20 16V4H8V16H20M22 16C22 17.1 21.1 18 20 18H8C6.9 18 6 17.1 6 16V4C6 2.9 6.9 2 8 2H20C21.1 2 22 2.9 22 4V16M16 20V22H4C2.9 22 2 21.1 2 20V7H4V20H16M14.2 5C13.3 5 12.6 5.2 12.1 5.6C11.6 6 11.3 6.6 11.3 7.4H13.2C13.2 7.1 13.3 6.9 13.5 6.7C13.7 6.6 13.9 6.5 14.2 6.5C14.5 6.5 14.8 6.6 15 6.8C15.2 7 15.3 7.2 15.3 7.6C15.3 7.9 15.2 8.2 15.1 8.4C15 8.6 14.7 8.8 14.5 9C14 9.3 13.6 9.6 13.5 9.9C13.1 10.1 13 10.5 13 11H15C15 10.7 15 10.4 15.1 10.3C15.2 10.1 15.4 9.9 15.6 9.8C16 9.6 16.4 9.3 16.7 8.9C17 8.4 17.2 8 17.2 7.5C17.2 6.7 16.9 6.1 16.4 5.7C15.9 5.2 15.1 5 14.2 5M13 12V14H15V12H13Z" /></svg>

app/templates/icons/information.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -960 960 960"><path d="M480-60q-72-68-165-104t-195-36v-440q101 0 194 36.5T480-498q73-69 166-105.5T840-640v440q-103 0-195.5 36T480-60Zm0-104q63-47 134-75t146-37v-276q-73 13-143.5 52.5T480-394q-66-66-136.5-105.5T200-552v276q75 9 146 37t134 75Zm0-436q-66 0-113-47t-47-113q0-66 47-113t113-47q66 0 113 47t47 113q0 66-47 113t-113 47Zm0-80q33 0 56.5-23.5T560-760q0-33-23.5-56.5T480-840q-33 0-56.5 23.5T400-760q0 33 23.5 56.5T480-680Zm0-80Zm0 366Z"/></svg>

app/templates/icons/itim.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M2 4.6V9.4C2 10.3 2.5 11 3.2 11H20.9C21.5 11 22.1 10.3 22.1 9.4V4.6C22 3.7 21.5 3 20.8 3H3.2C2.5 3 2 3.7 2 4.6M10 8V6H9V8H10M5 8H7V6H5V8M20 9H4V5H20V9M2 14.6V19.4C2 20.3 2.5 21 3.2 21H20.9C21.5 21 22.1 20.3 22.1 19.4V14.6C22.1 13.7 21.6 13 20.9 13H3.2C2.5 13 2 13.7 2 14.6M10 18V16H9V18H10M5 18H7V16H5V18M20 19H4V15H20V19Z" /></svg>

app/templates/icons/service.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M21.7 18.6V17.6L22.8 16.8C22.9 16.7 23 16.6 22.9 16.5L21.9 14.8C21.9 14.7 21.7 14.7 21.6 14.7L20.4 15.2C20.1 15 19.8 14.8 19.5 14.7L19.3 13.4C19.3 13.3 19.2 13.2 19.1 13.2H17.1C16.9 13.2 16.8 13.3 16.8 13.4L16.6 14.7C16.3 14.9 16.1 15 15.8 15.2L14.6 14.7C14.5 14.7 14.4 14.7 14.3 14.8L13.3 16.5C13.3 16.6 13.3 16.7 13.4 16.8L14.5 17.6V18.6L13.4 19.4C13.3 19.5 13.2 19.6 13.3 19.7L14.3 21.4C14.4 21.5 14.5 21.5 14.6 21.5L15.8 21C16 21.2 16.3 21.4 16.6 21.5L16.8 22.8C16.9 22.9 17 23 17.1 23H19.1C19.2 23 19.3 22.9 19.3 22.8L19.5 21.5C19.8 21.3 20 21.2 20.3 21L21.5 21.4C21.6 21.4 21.7 21.4 21.8 21.3L22.8 19.6C22.9 19.5 22.9 19.4 22.8 19.4L21.7 18.6M18 19.5C17.2 19.5 16.5 18.8 16.5 18S17.2 16.5 18 16.5 19.5 17.2 19.5 18 18.8 19.5 18 19.5M12.3 22H3C1.9 22 1 21.1 1 20V4C1 2.9 1.9 2 3 2H21C22.1 2 23 2.9 23 4V13.1C22.4 12.5 21.7 12 21 11.7V6H3V20H11.3C11.5 20.7 11.8 21.4 12.3 22Z" /></svg>