From 82626d8bcfe2ae340e919aaa369ef3c3de63d346 Mon Sep 17 00:00:00 2001
From: Julian B <jeriox@users.noreply.github.com>
Date: Mon, 2 Jan 2023 22:51:09 +0100
Subject: [PATCH 1/3] add selectable icon to simpleresource plugin

---
 ephios/plugins/simpleresource/forms.py         |  2 +-
 .../migrations/0002_resourcecategory_icon.py   | 18 ++++++++++++++++++
 ephios/plugins/simpleresource/models.py        |  1 +
 .../simpleresource/resource_allocations.html   |  2 +-
 .../resourcecategories_form.html               | 10 ++++++++--
 5 files changed, 29 insertions(+), 4 deletions(-)
 create mode 100644 ephios/plugins/simpleresource/migrations/0002_resourcecategory_icon.py

diff --git a/ephios/plugins/simpleresource/forms.py b/ephios/plugins/simpleresource/forms.py
index 82c6f0cff..b9fd4b24f 100644
--- a/ephios/plugins/simpleresource/forms.py
+++ b/ephios/plugins/simpleresource/forms.py
@@ -56,5 +56,5 @@ def add_fields(self, form, index):
     formset=BaseResourceCategoryFormset,
     can_delete=True,
     extra=0,
-    fields=["name"],
+    fields=["name", "icon"],
 )
diff --git a/ephios/plugins/simpleresource/migrations/0002_resourcecategory_icon.py b/ephios/plugins/simpleresource/migrations/0002_resourcecategory_icon.py
new file mode 100644
index 000000000..b1774c738
--- /dev/null
+++ b/ephios/plugins/simpleresource/migrations/0002_resourcecategory_icon.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.1.5 on 2023-01-02 21:41
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("simpleresource", "0001_initial"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="resourcecategory",
+            name="icon",
+            field=models.CharField(default="box", max_length=50),
+        ),
+    ]
diff --git a/ephios/plugins/simpleresource/models.py b/ephios/plugins/simpleresource/models.py
index 0e0fa7781..a3c329f63 100644
--- a/ephios/plugins/simpleresource/models.py
+++ b/ephios/plugins/simpleresource/models.py
@@ -5,6 +5,7 @@
 
 class ResourceCategory(models.Model):
     name = models.CharField(max_length=50)
+    icon = models.CharField(max_length=50, default="box")
 
     def __str__(self):
         # pylint: disable=invalid-str-returned
diff --git a/ephios/plugins/simpleresource/templates/simpleresource/resource_allocations.html b/ephios/plugins/simpleresource/templates/simpleresource/resource_allocations.html
index a4f01e436..a09f42e13 100644
--- a/ephios/plugins/simpleresource/templates/simpleresource/resource_allocations.html
+++ b/ephios/plugins/simpleresource/templates/simpleresource/resource_allocations.html
@@ -1,5 +1,5 @@
 <div id="resource-allocation-shift-{{ allocation.shift.id }}">
     {% for resource in allocation.resources.all %}
-        <span class="badge bg-light text-dark"><i class="fas fa-box"></i> {{ resource.title }}</span>
+        <span class="badge bg-light text-dark"><i class="fas fa-{{ resource.category.icon }}"></i> {{ resource.title }}</span>
     {% endfor %}
 </div>
diff --git a/ephios/plugins/simpleresource/templates/simpleresource/resourcecategories_form.html b/ephios/plugins/simpleresource/templates/simpleresource/resourcecategories_form.html
index 18a4b691e..9ae73893c 100644
--- a/ephios/plugins/simpleresource/templates/simpleresource/resourcecategories_form.html
+++ b/ephios/plugins/simpleresource/templates/simpleresource/resourcecategories_form.html
@@ -27,9 +27,12 @@ <h1>{% trans "Edit resource categories" %}</h1>
                             <div class="list-group-item" data-formset-form>
                                 {{ category_form.id }}
                                 <div class="row align-items-center">
-                                    <div class="col-lg-10">
+                                    <div class="col-lg-6">
                                         {% crispy_field category_form.name label_class="col-lg-3" field_class="col-lg-9" wrapper_class="row" %}
                                     </div>
+                                    <div class="col-lg-4">
+                                        {% crispy_field category_form.icon label_class="col-lg-3" field_class="col-lg-9" wrapper_class="row" %}
+                                    </div>
                                     <div class="col-lg-2">
                                         {% if not category_form.fields.DELETE.disabled %}
                                             <button class="btn btn-link" type="button"
@@ -61,9 +64,12 @@ <h1>{% trans "Edit resource categories" %}</h1>
                         <div class="list-group-item" data-formset-form>
                             {{ category_form.id }}
                             <div class="row align-items-center">
-                                <div class="col-lg-10">
+                                <div class="col-lg-6">
                                     {% crispy_field category_form.name label_class="col-lg-3" field_class="col-lg-9" wrapper_class="row" %}
                                 </div>
+                                <div class="col-lg-4">
+                                    {% crispy_field category_form.icon label_class="col-lg-3" field_class="col-lg-9" wrapper_class="row" %}
+                                </div>
                                 <div class="col-lg-1">
                                     <button class="btn btn-link" type="button"
                                             data-formset-delete-button><span

From 9021301741b169ddbd3bc043e86981cb8e9f1ccf Mon Sep 17 00:00:00 2001
From: Julian B <jeriox@users.noreply.github.com>
Date: Mon, 2 Jan 2023 23:45:03 +0100
Subject: [PATCH 2/3] add helptext

---
 ephios/plugins/simpleresource/models.py          |  4 ++--
 .../simpleresource/resourcecategories_form.html  | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/ephios/plugins/simpleresource/models.py b/ephios/plugins/simpleresource/models.py
index a3c329f63..076a565a2 100644
--- a/ephios/plugins/simpleresource/models.py
+++ b/ephios/plugins/simpleresource/models.py
@@ -4,8 +4,8 @@
 
 
 class ResourceCategory(models.Model):
-    name = models.CharField(max_length=50)
-    icon = models.CharField(max_length=50, default="box")
+    name = models.CharField(max_length=50, help_text=" ")
+    icon = models.CharField(max_length=50, default="box", help_text="FontAwesome icon name")
 
     def __str__(self):
         # pylint: disable=invalid-str-returned
diff --git a/ephios/plugins/simpleresource/templates/simpleresource/resourcecategories_form.html b/ephios/plugins/simpleresource/templates/simpleresource/resourcecategories_form.html
index 9ae73893c..aca4a4ace 100644
--- a/ephios/plugins/simpleresource/templates/simpleresource/resourcecategories_form.html
+++ b/ephios/plugins/simpleresource/templates/simpleresource/resourcecategories_form.html
@@ -26,14 +26,14 @@ <h1>{% trans "Edit resource categories" %}</h1>
                         {% for category_form in form %}
                             <div class="list-group-item" data-formset-form>
                                 {{ category_form.id }}
-                                <div class="row align-items-center">
-                                    <div class="col-lg-6">
+                                <div class="row align-items-start">
+                                    <div class="col-lg-6 pt-3">
                                         {% crispy_field category_form.name label_class="col-lg-3" field_class="col-lg-9" wrapper_class="row" %}
                                     </div>
-                                    <div class="col-lg-4">
+                                    <div class="col-lg-4 pt-3">
                                         {% crispy_field category_form.icon label_class="col-lg-3" field_class="col-lg-9" wrapper_class="row" %}
                                     </div>
-                                    <div class="col-lg-2">
+                                    <div class="col-lg-2 pt-2">
                                         {% if not category_form.fields.DELETE.disabled %}
                                             <button class="btn btn-link" type="button"
                                                     data-formset-delete-button><span
@@ -63,14 +63,14 @@ <h1>{% trans "Edit resource categories" %}</h1>
                     {% escapescript %}
                         <div class="list-group-item" data-formset-form>
                             {{ category_form.id }}
-                            <div class="row align-items-center">
-                                <div class="col-lg-6">
+                            <div class="row align-items-start">
+                                <div class="col-lg-6 pt-3">
                                     {% crispy_field category_form.name label_class="col-lg-3" field_class="col-lg-9" wrapper_class="row" %}
                                 </div>
-                                <div class="col-lg-4">
+                                <div class="col-lg-4 pt-3">
                                     {% crispy_field category_form.icon label_class="col-lg-3" field_class="col-lg-9" wrapper_class="row" %}
                                 </div>
-                                <div class="col-lg-1">
+                                <div class="col-lg-1 pt-2">
                                     <button class="btn btn-link" type="button"
                                             data-formset-delete-button><span
                                             class="fas fa-trash-alt"></span> {% trans "Delete" %}</button>

From 788d274f7a43d42c5e781a1e1825d36e20957ed2 Mon Sep 17 00:00:00 2001
From: Julian B <jeriox@users.noreply.github.com>
Date: Mon, 2 Jan 2023 23:49:19 +0100
Subject: [PATCH 3/3] add helptext

---
 ephios/plugins/simpleresource/models.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/ephios/plugins/simpleresource/models.py b/ephios/plugins/simpleresource/models.py
index ca1b70ffd..82b084249 100644
--- a/ephios/plugins/simpleresource/models.py
+++ b/ephios/plugins/simpleresource/models.py
@@ -5,10 +5,8 @@
 
 
 class ResourceCategory(models.Model):
-    name = models.CharField(max_length=50)
-    icon = models.CharField(
-        max_length=50, default="box", verbose_name=_("Name"), help_text="FontAwesome icon name"
-    )
+    name = models.CharField(max_length=50, verbose_name=_("Name"))
+    icon = models.CharField(max_length=50, default="box", help_text="FontAwesome icon name")
 
     def __str__(self):
         # pylint: disable=invalid-str-returned