From 848661856a44de31ee2116c1b5c4445fe6daf654 Mon Sep 17 00:00:00 2001
From: Jon <jonathon.lockwood@networkedweb.com>
Date: Mon, 17 Jun 2024 19:40:46 +0930
Subject: [PATCH] feat(access): add notes field to organization

!28 #39 #13
---
 app/access/forms/organization.py              |  2 +-
 app/access/models.py                          |  6 ++
 .../templates/access/organization.html.j2     | 84 +++++++++++++++++--
 app/itam/templates/itam/device.html.j2        |  2 +-
 4 files changed, 86 insertions(+), 8 deletions(-)

diff --git a/app/access/forms/organization.py b/app/access/forms/organization.py
index dce1d221..8499012f 100644
--- a/app/access/forms/organization.py
+++ b/app/access/forms/organization.py
@@ -12,8 +12,8 @@ class OrganizationForm(forms.ModelForm):
         model = Organization
         fields = [
             'name',
-            'slug',
             'manager',
+            'model_notes',
         ]
 
 
diff --git a/app/access/models.py b/app/access/models.py
index 81da2ee4..d3b63af5 100644
--- a/app/access/models.py
+++ b/app/access/models.py
@@ -45,6 +45,12 @@ class Organization(SaveHistory):
         help_text = 'Organization Manager'
     )
 
+    model_notes = models.TextField(
+        blank = True,
+        default = None,
+        null= True,
+    )
+
     slug = AutoSlugField()
 
     created = AutoCreatedField()
diff --git a/app/access/templates/access/organization.html.j2 b/app/access/templates/access/organization.html.j2
index 3f5686b3..4ce66df3 100644
--- a/app/access/templates/access/organization.html.j2
+++ b/app/access/templates/access/organization.html.j2
@@ -1,17 +1,89 @@
 {% extends 'base.html.j2' %}
 
+{% load markdown %}
+
 {% block title %}Organization - {{ organization.name }}{% endblock %}
 
 {% block content %}
+<style>
+form div .helptext {
+  background-color: rgb(0, 140, 255);
+  display: block;
+}
 
-<form>
-  <div>{{ form.as_p }}</div>
-</form>
 
-{% include 'icons/issue_link.html.j2' with issue=13 %}<br>
 
-<input type="button" value="<< Back" onclick="window.location='{% url 'Access:Organizations' %}';">
-<input type="button" value="New Team" onclick="window.location='{% url 'Access:_team_add' organization.id %}';">
+
+.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;
+
+}
+
+
+</style>
+
+<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.manager.label }}</label>
+      <span>{{ form.manager.value }}</span>
+    </div>
+
+    <div class="detail-view-field">
+      <label>{{ form.created.label }}</label>
+      <span>{{ form.created.value }}</span>
+    </div>
+
+    <div class="detail-view-field">
+      <label>{{ form.modified.label }}</label>
+      <span>{{ form.modified.value }}</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;">{{ form.model_notes.value | markdown | safe }}</div>
+  </div>
+</div>
+
+<div style="display: block;">
+  <input type="button" value="<< Back" onclick="window.location='{% url 'Access:Organizations' %}';">
+  <input type="button" value="New Team" onclick="window.location='{% url 'Access:_team_add' organization.id %}';">
+</div>
 
 <hr />
 <table>
diff --git a/app/itam/templates/itam/device.html.j2 b/app/itam/templates/itam/device.html.j2
index 76bf2cb2..06212d5e 100644
--- a/app/itam/templates/itam/device.html.j2
+++ b/app/itam/templates/itam/device.html.j2
@@ -85,7 +85,7 @@
       Details
       <span style="font-weight: normal; float: right;">{% include 'icons/issue_link.html.j2' with issue=6 %}</span>
     </h3>
-    <div align-items:flex-start; align-content: center; display: flexbox; width: 100%">
+    <div style="align-items:flex-start; align-content: center; display: flexbox; width: 100%">
 
       <div style="display: inline; width: 40%; margin: 30px;">