From cd97da4ece01ace7c00f91fe4fc7caad2df59c24 Mon Sep 17 00:00:00 2001
From: Brent Mills <brent.c.mills@gmail.com>
Date: Mon, 18 Nov 2024 13:37:47 -0500
Subject: [PATCH 1/5] Add support for 72 hr vs go-bag

---
 pack_planner/admin.py                         |   8 +-
 pack_planner/models.py                        |   8 +-
 pack_planner/services/data_processor.py       |  15 +-
 .../pack_planner/assessment_results.html      | 145 +++++++++++++++++-
 pack_planner/validators.py                    |  20 +++
 pack_planner/views.py                         |   6 +-
 6 files changed, 194 insertions(+), 8 deletions(-)

diff --git a/pack_planner/admin.py b/pack_planner/admin.py
index 7a1e56c..05306d4 100644
--- a/pack_planner/admin.py
+++ b/pack_planner/admin.py
@@ -40,8 +40,10 @@ class ItemAdmin(admin.ModelAdmin):
         'for_adults',
         'for_children',
         'for_pets',
+        'go_bag',
+        'seventy_two_hr_bag'
     )
-    list_filter = ('importance', 'category', 'for_adults', 'for_children', 'for_pets', 'for_disabled', 'for_elderly')
+    list_filter = ('importance', 'category', 'for_adults', 'for_children', 'for_pets', 'for_disabled', 'for_elderly', 'go_bag', 'seventy_two_hr_bag')
     search_fields = ('name', 'description', 'uses', 'special_considerations')
     ordering = ('category', 'order', 'name')
     inlines = [ProductInline]
@@ -72,7 +74,9 @@ class ItemAdmin(admin.ModelAdmin):
                 'for_on_foot', 
                 'for_bicycle', 
                 'for_vehicle', 
-                'for_public_transit'
+                'for_public_transit',
+                'go_bag',
+                'seventy_two_hr_bag'
             ),
             'classes': ('collapse',)
         })
diff --git a/pack_planner/models.py b/pack_planner/models.py
index f9bd98e..61e9444 100644
--- a/pack_planner/models.py
+++ b/pack_planner/models.py
@@ -25,6 +25,7 @@ class Category(models.Model):
             ('optional', 'Optional')
         ]
     )
+    go_bag = models.BooleanField(default=True)
     seventy_two_hr_bag = models.BooleanField(default=True)
     order = models.IntegerField(default=0)
 
@@ -63,12 +64,16 @@ class Item(models.Model):
     for_adults = models.BooleanField(default=True)
     for_children = models.BooleanField(default=False)
     for_pets = models.BooleanField(default=False)
+    for_cats = models.BooleanField(default=False)
+    for_dogs = models.BooleanField(default=False)
+    for_small_animals = models.BooleanField(default=False)
     for_disabled = models.BooleanField(default=False)
     for_elderly = models.BooleanField(default=False)
     for_on_foot = models.BooleanField(default=True)
     for_bicycle = models.BooleanField(default=True)
     for_vehicle = models.BooleanField(default=True)
     for_public_transit = models.BooleanField(default=True)
+    go_bag = models.BooleanField(default=True)
     seventy_two_hr_bag = models.BooleanField(default=True)
 
     class Meta:
@@ -82,5 +87,6 @@ class Product(models.Model):
     notes = models.TextField(blank=True)
     is_available = models.BooleanField(default=True)
     last_verified = models.DateTimeField(auto_now=True)
-
+    
+    go_bag = models.BooleanField(default=True)
     seventy_two_hr_bag = models.BooleanField(default=True)
\ No newline at end of file
diff --git a/pack_planner/services/data_processor.py b/pack_planner/services/data_processor.py
index 780391d..a160b53 100644
--- a/pack_planner/services/data_processor.py
+++ b/pack_planner/services/data_processor.py
@@ -30,7 +30,9 @@ def _process_categories(self, categories):
                 defaults={
                     'description': cat_data['description'],
                     'importance': cat_data['importance'],
-                    'order': cat_data.get('order', 0)
+                    'order': cat_data.get('order', 0),
+                    'go_bag': cat_data.get('go_bag', True),
+                    'seventy_two_hr_bag': cat_data.get('seventy_two_hr_bag', True)
                 }
             )
             if created:
@@ -50,15 +52,22 @@ def _process_items(self, items):
                         'weight_note': item_data.get('weight_note', ''),
                         'special_considerations': item_data.get('special_considerations', ''),
                         'order': item_data.get('order', 0),
+                        # All boolean fields with their defaults
+                        'conditional_applicability': item_data.get('conditional_applicability', False),
                         'for_adults': item_data.get('for_adults', True),
                         'for_children': item_data.get('for_children', False),
                         'for_pets': item_data.get('for_pets', False),
+                        'for_cats': item_data.get('for_cats', False),
+                        'for_dogs': item_data.get('for_dogs', False),
+                        'for_small_animals': item_data.get('for_small_animals', False),
                         'for_disabled': item_data.get('for_disabled', False),
                         'for_elderly': item_data.get('for_elderly', False),
                         'for_on_foot': item_data.get('for_on_foot', True),
                         'for_bicycle': item_data.get('for_bicycle', True),
                         'for_vehicle': item_data.get('for_vehicle', True),
                         'for_public_transit': item_data.get('for_public_transit', True),
+                        'go_bag': item_data.get('go_bag', True),
+                        'seventy_two_hr_bag': item_data.get('seventy_two_hr_bag', True)
                     }
                 )
                 
@@ -84,7 +93,9 @@ def _process_products(self, products):
                         'description': prod_data['description'],
                         'url': prod_data.get('url', ''),
                         'notes': prod_data.get('notes', ''),
-                        'is_available': prod_data.get('is_available', True)
+                        'is_available': prod_data.get('is_available', True),
+                        'go_bag': prod_data.get('go_bag', True),
+                        'seventy_two_hr_bag': prod_data.get('seventy_two_hr_bag', True)
                     }
                 )
                 if created:
diff --git a/pack_planner/templates/pack_planner/assessment_results.html b/pack_planner/templates/pack_planner/assessment_results.html
index f95ff85..9e2fb5d 100644
--- a/pack_planner/templates/pack_planner/assessment_results.html
+++ b/pack_planner/templates/pack_planner/assessment_results.html
@@ -65,6 +65,89 @@ <h2 class="text-xl font-semibold text-gray-900">Quick Navigation</h2>
             </div>
         </div>
 
+        <!-- Go-Bag vs 72-hr Bag -->
+        <div class="bg-white shadow rounded-lg p-4 mb-8">
+            <div class="flex items-center justify-between">
+                <div>
+                    <div class="flex items-center space-x-2">
+                        <h3 class="text-lg font-medium text-gray-900">Pack Type</h3>
+                        <button id="showPackInfo" class="text-indigo-500 hover:text-indigo-600" aria-label="Pack type information">
+                            <svg class="h-5 w-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" 
+                                      d="M9.879 7.519c1.171-1.025 3.071-1.025 4.242 0 1.172 1.025 1.172 2.687 0 3.712-.203.179-.43.326-.67.442-.745.361-1.45.999-1.45 1.827v.75M12 18h.01M12 3a9 9 0 110 18 9 9 0 010-18z" />
+                            </svg>
+                        </button>
+                    </div>
+                    <p class="text-sm text-gray-500" id="packTypeDescription">
+                        Currently showing Go-Bag items only
+                    </p>
+                </div>
+                <div class="flex items-center space-x-4">
+                    <label class="inline-flex items-center cursor-pointer">
+                        <span class="mr-3 text-sm font-medium text-gray-900">Go-Bag</span>
+                        <div class="relative">
+                            <input type="checkbox" 
+                                   class="sr-only peer" 
+                                   id="packTypeToggle"
+                                   {% if show_extended %}checked{% endif %}>
+                            <div class="w-11 h-6 bg-gray-200 rounded-full peer peer-focus:ring-4 
+                                        peer-focus:ring-blue-300 peer-checked:after:translate-x-full 
+                                        peer-checked:bg-blue-600 after:content-[''] after:absolute 
+                                        after:top-0.5 after:left-[2px] after:bg-white after:rounded-full 
+                                        after:h-5 after:w-5 after:transition-all"></div>
+                        </div>
+                        <span class="ml-3 text-sm font-medium text-gray-900">72-Hour Kit</span>
+                    </label>
+                </div>
+            </div>
+        </div>
+
+        <!-- Pack Type Info Modal -->
+        <div id="packTypeModal" class="hidden fixed inset-0 bg-gray-600 bg-opacity-50 flex items-center justify-center z-50">
+            <div class="bg-white rounded-lg max-w-2xl mx-4 p-6 shadow-xl" role="dialog" aria-labelledby="modalTitle">
+                <div class="flex justify-between items-start mb-4">
+                    <h3 id="modalTitle" class="text-xl font-semibold text-gray-900">
+                        Choosing Your Pack Type
+                    </h3>
+                    <button id="closeModal" class="text-gray-400 hover:text-gray-500">
+                        <span class="sr-only">Close</span>
+                        <svg class="h-6 w-6" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12" />
+                        </svg>
+                    </button>
+                </div>
+                
+                <div class="space-y-4">
+                    <div>
+                        <h4 class="font-medium text-gray-900 mb-2">Go-Bag</h4>
+                        <p class="text-gray-600">A “go-bag” is just as it sounds, the bag you will pick up when you are ready to leave your home.  You can have a go-bag prepacked or you can print a list of items for packing your bag just before you leave. Each member of the family should have a bag that is manageable for them to transport. A go-bag contains only the bare essentials needed to escape a dangerous situation with 10 minutes or less of lead time. Choose a go-bag if:</p>
+                        <ul class="list-disc ml-5 mt-2 text-gray-600">
+                            <li>You live close to a safe destination</li>
+                            <li>You have reliable transportation</li>
+                            <li>You need maximum mobility</li>
+                            <li>You're operating on a limited budget</li>
+                        </ul>
+                    </div>
+                    
+                    <div>
+                        <h4 class="font-medium text-gray-900 mb-2">72-Hour Kit</h4>
+                        <p class="text-gray-600">A 72-hour kit includes everything in a go-bag plus additional supplies to keep you safe for 72 hours while escaping an emergency. 72-hour kits are not necessarily for travel and can be beneficial during natural disasters, supply chain disruptions, etc. Choose a 72-hour kit if:</p>
+                        <ul class="list-disc ml-5 mt-2 text-gray-600">
+                            <li>You live far from safe destinations</li>
+                            <li>You rely on public transportation</li>
+                            <li>You live in an area prone to natural disasters</li>
+                            <li>You have mobility limitations</li>
+                            <li>You need to be self-sufficient for several days</li>
+                        </ul>
+                    </div>
+                </div>
+                
+                <div class="mt-6 bg-gray-50 -mx-6 -mb-6 px-6 py-4 rounded-b-lg">
+                    <p class="text-sm text-gray-500">Remember: The best pack is the one you can actually carry and maintain. Consider your specific situation, capabilities, and resources when choosing.</p>
+                </div>
+            </div>
+        </div>
+
         {% csrf_token %}
 
         <!-- Packs -->
@@ -103,8 +186,12 @@ <h3 class="text-lg font-bold text-gray-900">{{ category.name }}</h3>
                             <!-- Collapsible Items Section -->
                             <div id="category-content-{{ category.id }}" class="pl-8 pr-6 py-4 sm:pl-12 sm:pr-8 space-y-4 hidden">
                                 {% for item in items %}
-                                    <div class="flex items-center justify-between p-4 rounded hover:bg-gray-50 {% if item.id|slugify in checklist and checklist|get_item:item.id == 'packed' %}bg-green-50 item-packed{% endif %} {% if item.id|slugify in checklist and checklist|get_item:item.id == 'not_applicable' %}hidden{% endif %}"
-                                        data-item-id="{{ item.id }}">
+                                <div class="flex items-center justify-between p-4 rounded hover:bg-gray-50 
+                                    {% if item.id|slugify in checklist and checklist|get_item:item.id == 'packed' %}bg-green-50 item-packed{% endif %}
+                                    {% if item.id|slugify in checklist and checklist|get_item:item.id == 'not_applicable' %}hidden{% endif %}"
+                                    data-pack-type="{% if item.seventy_two_hr_bag and not item.go_bag %}extended{% endif %}"
+                                    style="{% if not item.go_bag and not show_extended %}display: none;{% endif %}"
+                                    item-id="{{ item.id }}">
                                         
                                         <!-- Indented Item Details -->
                                         <div class="flex-grow max-w-2xl pl-4">
@@ -158,6 +245,60 @@ <h3 class="text-lg font-bold text-gray-900">{{ category.name }}</h3>
 
 <script>
     document.addEventListener('DOMContentLoaded', function() {
+        // Show and hide items based on go-bag vs 72 hour bag
+        const toggle = document.getElementById('packTypeToggle');
+        const description = document.getElementById('packTypeDescription');
+        const modal = document.getElementById('packTypeModal');
+        const showModalBtn = document.getElementById('showPackInfo');
+        const closeModalBtn = document.getElementById('closeModal');
+        
+        function toggleModal(show) {
+            modal.classList.toggle('hidden', !show);
+            if (show) {
+                // Trap focus in modal
+                const focusableElements = modal.querySelectorAll('button, [href], input, select, textarea, [tabindex]:not([tabindex="-1"])');
+                const firstFocusable = focusableElements[0];
+                const lastFocusable = focusableElements[focusableElements.length - 1];
+                firstFocusable.focus();
+
+                // Handle tab key navigation
+                modal.addEventListener('keydown', function(e) {
+                    if (e.key === 'Tab') {
+                        if (e.shiftKey && document.activeElement === firstFocusable) {
+                            e.preventDefault();
+                            lastFocusable.focus();
+                        } else if (!e.shiftKey && document.activeElement === lastFocusable) {
+                            e.preventDefault();
+                            firstFocusable.focus();
+                        }
+                    }
+                });
+            }
+        }
+
+        showModalBtn.addEventListener('click', () => toggleModal(true));
+        closeModalBtn.addEventListener('click', () => toggleModal(false));
+
+        if (toggle) {
+            toggle.addEventListener('change', function() {
+                const extendedItems = document.querySelectorAll('[data-pack-type="extended"]');
+                const isExtended = this.checked;
+                
+                extendedItems.forEach(item => {
+                    item.style.display = isExtended ? 'flex' : 'none';
+                });
+                
+                description.textContent = isExtended ? 
+                    'Showing all items (72-Hour Kit)' : 
+                    'Showing Go-Bag items only';
+                    
+                // Update URL without page refresh
+                const url = new URL(window.location.href);
+                url.searchParams.set('show_extended', isExtended);
+                window.history.pushState({}, '', url);
+            });
+        }
+        
         // Initialize collapsible states
         document.querySelectorAll('[id^="pack-content-"]').forEach(pack => {
             pack.style.display = 'block';
diff --git a/pack_planner/validators.py b/pack_planner/validators.py
index ebb6b42..0722a12 100644
--- a/pack_planner/validators.py
+++ b/pack_planner/validators.py
@@ -15,13 +15,33 @@ def validate_json_structure(data):
     for category in data.get('categories', []):
         if not all(key in category for key in {'name', 'description', 'importance'}):
             raise ValidationError("Invalid category structure")
+        # New fields are optional but must be boolean if present
+        boolean_fields = {'go_bag', 'seventy_two_hr_bag'}
+        for field in boolean_fields:
+            if field in category and not isinstance(category[field], bool):
+                raise ValidationError(f"Category {field} must be a boolean value")
 
     # Validate items
     for item in data.get('items', []):
         if not all(key in item for key in {'name', 'description', 'category', 'importance'}):
             raise ValidationError("Invalid item structure")
+        # New fields are optional but must be boolean if present
+        boolean_fields = {
+            'go_bag', 'seventy_two_hr_bag', 'conditional_applicability',
+            'for_adults', 'for_children', 'for_pets', 'for_cats', 'for_dogs',
+            'for_small_animals', 'for_disabled', 'for_elderly', 'for_on_foot',
+            'for_bicycle', 'for_vehicle', 'for_public_transit'
+        }
+        for field in boolean_fields:
+            if field in item and not isinstance(item[field], bool):
+                raise ValidationError(f"Item {field} must be a boolean value")
 
     # Validate products
     for product in data.get('products', []):
         if not all(key in product for key in {'name', 'description', 'item'}):
             raise ValidationError("Invalid product structure")
+        # New fields are optional but must be boolean if present
+        boolean_fields = {'go_bag', 'seventy_two_hr_bag', 'is_available'}
+        for field in boolean_fields:
+            if field in product and not isinstance(product[field], bool):
+                raise ValidationError(f"Product {field} must be a boolean value")
\ No newline at end of file
diff --git a/pack_planner/views.py b/pack_planner/views.py
index f622b1f..4d7b4b4 100644
--- a/pack_planner/views.py
+++ b/pack_planner/views.py
@@ -106,10 +106,14 @@ def pack_assessment_results(request):
 
     # Generate recommendations
     recommendations = generate_packs(assessment_data)
+
+    # Get pack type from query parameter, default to go-bag only
+    show_extended = request.GET.get('show_extended', 'false').lower() == 'true'
     
     context = {
         'assessment': assessment_data,
-        'recommendations': recommendations
+        'recommendations': recommendations,
+        'show_extended': show_extended
     }
     
     return render(request, 'pack_planner/assessment_results.html', context)

From 468d0c4c513222bdfefca5e54ab4e1f3ba1f6078 Mon Sep 17 00:00:00 2001
From: Brent Mills <brent.c.mills@gmail.com>
Date: Mon, 18 Nov 2024 13:56:43 -0500
Subject: [PATCH 2/5] Update item cards to improve clarity on item importance

---
 pack_planner/admin.py                         | 111 +++++++++++++++---
 .../pack_planner/assessment_results.html      |  24 +++-
 .../templatetags/pack_planner_tags.py         |  17 ++-
 3 files changed, 128 insertions(+), 24 deletions(-)

diff --git a/pack_planner/admin.py b/pack_planner/admin.py
index 05306d4..aeed542 100644
--- a/pack_planner/admin.py
+++ b/pack_planner/admin.py
@@ -8,16 +8,34 @@
 class ProductInline(admin.TabularInline):
     model = Product
     extra = 1
-    fields = ('name', 'description', 'url', 'is_available', 'last_verified')
+    fields = ('name', 'description', 'url', 'notes', 'is_available', 'go_bag', 'seventy_two_hr_bag', 'last_verified')
     readonly_fields = ('last_verified',)
 
 @admin.register(Category)
 class CategoryAdmin(admin.ModelAdmin):
-    list_display = ('name', 'importance', 'order', 'item_count')
-    list_filter = ('importance',)
+    list_display = ('name', 'importance', 'order', 'go_bag', 'seventy_two_hr_bag', 'item_count')
+    list_filter = ('importance', 'go_bag', 'seventy_two_hr_bag')
     search_fields = ('name', 'description')
     ordering = ('order', 'name')
     
+    fieldsets = (
+        (None, {
+            'fields': (
+                'name',
+                'description',
+                'importance',
+                'order',
+            )
+        }),
+        ('Pack Type Applicability', {
+            'fields': (
+                'go_bag',
+                'seventy_two_hr_bag',
+            ),
+            'classes': ('collapse',)
+        })
+    )
+    
     def item_count(self, obj):
         count = obj.items.count()
         return format_html(
@@ -37,13 +55,27 @@ class ItemAdmin(admin.ModelAdmin):
         'weight_note',
         'product_count',
         'has_special_considerations',
+        'go_bag',
+        'seventy_two_hr_bag'
+    )
+    list_filter = (
+        'importance', 
+        'category',
+        'go_bag',
+        'seventy_two_hr_bag',
         'for_adults',
         'for_children',
         'for_pets',
-        'go_bag',
-        'seventy_two_hr_bag'
+        'for_cats',
+        'for_dogs',
+        'for_small_animals',
+        'for_disabled',
+        'for_elderly',
+        'for_on_foot',
+        'for_bicycle',
+        'for_vehicle',
+        'for_public_transit'
     )
-    list_filter = ('importance', 'category', 'for_adults', 'for_children', 'for_pets', 'for_disabled', 'for_elderly', 'go_bag', 'seventy_two_hr_bag')
     search_fields = ('name', 'description', 'uses', 'special_considerations')
     ordering = ('category', 'order', 'name')
     inlines = [ProductInline]
@@ -60,23 +92,35 @@ class ItemAdmin(admin.ModelAdmin):
                 'order'
             )
         }),
-        ('Details', {
+        ('Pack Type Applicability', {
+            'fields': (
+                'go_bag',
+                'seventy_two_hr_bag',
+            ),
+            'classes': ('collapse',)
+        }),
+        ('Item Details', {
             'fields': (
                 'weight_note', 
                 'special_considerations', 
                 'alternatives',
                 'conditional_applicability',
-                'for_adults', 
-                'for_children', 
-                'for_pets', 
-                'for_disabled', 
-                'for_elderly',
-                'for_on_foot', 
-                'for_bicycle', 
-                'for_vehicle', 
-                'for_public_transit',
-                'go_bag',
-                'seventy_two_hr_bag'
+            ),
+            'classes': ('collapse',)
+        }),
+        ('User Applicability', {
+            'fields': (
+                ('for_adults', 'for_elderly'),
+                ('for_children', 'for_disabled'),
+                'for_pets',
+                ('for_cats', 'for_dogs', 'for_small_animals'),
+            ),
+            'classes': ('collapse',)
+        }),
+        ('Transportation Methods', {
+            'fields': (
+                ('for_on_foot', 'for_bicycle'),
+                ('for_vehicle', 'for_public_transit'),
             ),
             'classes': ('collapse',)
         })
@@ -106,11 +150,15 @@ class ProductAdmin(admin.ModelAdmin):
         'item',
         'category_name',
         'is_available',
+        'go_bag',
+        'seventy_two_hr_bag',
         'last_verified',
         'url_link'
     )
     list_filter = (
-        'is_available', 
+        'is_available',
+        'go_bag',
+        'seventy_two_hr_bag', 
         'item__category',
         'last_verified'
     )
@@ -121,6 +169,31 @@ class ProductAdmin(admin.ModelAdmin):
         'item__name'
     )
     readonly_fields = ('last_verified',)
+
+    fieldsets = (
+        (None, {
+            'fields': (
+                'name',
+                'description',
+                'item',
+                'url',
+                'notes',
+            )
+        }),
+        ('Availability', {
+            'fields': (
+                'is_available',
+                'last_verified',
+            )
+        }),
+        ('Pack Type Applicability', {
+            'fields': (
+                'go_bag',
+                'seventy_two_hr_bag',
+            ),
+            'classes': ('collapse',)
+        })
+    )
     
     def category_name(self, obj):
         return obj.item.category.name
diff --git a/pack_planner/templates/pack_planner/assessment_results.html b/pack_planner/templates/pack_planner/assessment_results.html
index 9e2fb5d..731234a 100644
--- a/pack_planner/templates/pack_planner/assessment_results.html
+++ b/pack_planner/templates/pack_planner/assessment_results.html
@@ -195,14 +195,30 @@ <h3 class="text-lg font-bold text-gray-900">{{ category.name }}</h3>
                                         
                                         <!-- Indented Item Details -->
                                         <div class="flex-grow max-w-2xl pl-4">
-                                            <div class="flex items-center mb-1">
+                                            <div class="flex items-center mb-1 gap-2">
                                                 <span class="text-base font-medium text-gray-900">{{ item.name }}</span>
+                                                {% if item.importance %}
+                                                    <span class="px-2 py-0.5 text-xs font-medium rounded-full {{ item.importance|importance_class }}">
+                                                        {{ item.importance|display_importance }}
+                                                    </span>
+                                                {% endif %}
                                                 {% if item.weight_note %}
-                                                    <span class="ml-2 text-sm text-gray-500">({{ item.weight_note }})</span>
+                                                    <span class="text-sm text-gray-500 italic">
+                                                        {{ item.weight_note }}
+                                                    </span>
                                                 {% endif %}
                                             </div>
-                                            {% if item.special_considerations %}
-                                                <p class="text-sm text-gray-600">{{ item.special_considerations }}</p>
+                                            {% if item.description or item.special_considerations %}
+                                                <div class="space-y-1">
+                                                    {% if item.description %}
+                                                        <p class="text-sm text-gray-700">{{ item.description }}</p>
+                                                    {% endif %}
+                                                    {% if item.special_considerations %}
+                                                        <p class="text-sm text-gray-600 italic">
+                                                            <span class="font-medium">Note:</span> {{ item.special_considerations }}
+                                                        </p>
+                                                    {% endif %}
+                                                </div>
                                             {% endif %}
                                         </div>
                                         
diff --git a/pack_planner/templatetags/pack_planner_tags.py b/pack_planner/templatetags/pack_planner_tags.py
index f5aa24c..ab96a26 100644
--- a/pack_planner/templatetags/pack_planner_tags.py
+++ b/pack_planner/templatetags/pack_planner_tags.py
@@ -5,4 +5,19 @@
 @register.filter
 def get_item(dictionary, key):
     """Get an item from a dictionary using string key"""
-    return dictionary.get(str(key))
\ No newline at end of file
+    return dictionary.get(str(key))
+
+@register.filter
+def importance_class(importance):
+    """Return appropriate CSS classes for importance level"""
+    classes = {
+        'critical': 'bg-red-100 text-red-800',
+        'recommended': 'bg-blue-100 text-blue-800',
+        'optional': 'bg-gray-100 text-gray-800'
+    }
+    return classes.get(importance.lower(), '')
+
+@register.filter
+def display_importance(importance):
+    """Convert importance to display format"""
+    return importance.title() if importance else ''
\ No newline at end of file

From cf0b1b24a6dc4203d66bf28a626808c2646ffc95 Mon Sep 17 00:00:00 2001
From: Brent Mills <brent.c.mills@gmail.com>
Date: Mon, 18 Nov 2024 14:09:31 -0500
Subject: [PATCH 3/5] Clean up the Companies admin while I'm at it

---
 companies/admin.py | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/companies/admin.py b/companies/admin.py
index 93c1e9d..82e7dd9 100644
--- a/companies/admin.py
+++ b/companies/admin.py
@@ -33,7 +33,6 @@ def import_categories_view(self, request):
         
         return HttpResponseRedirect(reverse('admin:companies_productcategory_changelist'))
 
-
 # Step 1: Add PoliticalDataInline for editing political data within a business
 class PoliticalDataInline(admin.StackedInline):
     model = PoliticalData
@@ -49,6 +48,27 @@ class EditRequestInline(admin.TabularInline):
     fields = ('submitted_by', 'status', 'justification', 'created_at', 'reviewed_at')
     readonly_fields = ('created_at', 'reviewed_at')
 
+@admin.register(ServiceCategory)
+class ServiceCategoryAdmin(CategoryImportMixin, admin.ModelAdmin):
+    list_display = ('name', 'parent', 'slug')
+    search_fields = ('name',)
+    list_filter = ('parent',)
+    prepopulated_fields = {'slug': ('name',)}
+    raw_id_fields = ('parent',)
+    
+    def get_queryset(self, request):
+        return super().get_queryset(request).select_related('parent')
+
+@admin.register(ProductCategory)
+class ProductCategoryAdmin(CategoryImportMixin, admin.ModelAdmin):
+    list_display = ('name', 'parent', 'slug')
+    search_fields = ('name',)
+    list_filter = ('parent',)
+    prepopulated_fields = {'slug': ('name',)}
+    raw_id_fields = ('parent',)
+    
+    def get_queryset(self, request):
+        return super().get_queryset(request).select_related('parent')
 
 # Step 3: Updated BusinessAdmin to include inlines
 @admin.register(Business)

From 99319f825347e51b2842571aa161c4072cafe45f Mon Sep 17 00:00:00 2001
From: Brent Mills <brent.c.mills@gmail.com>
Date: Mon, 18 Nov 2024 14:30:48 -0500
Subject: [PATCH 4/5] Add in conservative / liberal % on alternative matching

---
 .../templates/companies/business_detail.html  | 70 +++++++++++++++++--
 1 file changed, 63 insertions(+), 7 deletions(-)

diff --git a/companies/templates/companies/business_detail.html b/companies/templates/companies/business_detail.html
index 6559a33..0f5c6d7 100644
--- a/companies/templates/companies/business_detail.html
+++ b/companies/templates/companies/business_detail.html
@@ -210,16 +210,72 @@ <h3 class="font-medium text-gray-900">{{ product.name }}</h3>
     {% if alternatives %}
     <div class="bg-white shadow rounded-lg p-6">
         <h2 class="text-xl font-semibold text-gray-900 mb-4">Alternative Businesses</h2>
+        
         <div class="space-y-4">
             {% for alt in alternatives %}
             <div class="border-b border-gray-200 pb-4 last:border-b-0">
-                <h3 class="text-lg font-medium">
-                    <a href="{% url 'business_detail' alt.business.slug %}" class="text-blue-600 hover:text-blue-800">
-                        {{ alt.business.name }}
-                    </a>
-                </h3>
-                <p class="text-gray-600">{{ alt.business.description|truncatewords:30 }}</p>
-                <p class="text-sm text-gray-500 mt-1">Matches {{ alt.overlap_count }} product{{ alt.overlap_count|pluralize:",s" }}/service{{ alt.overlap_count|pluralize:",s" }}</p>
+                <div class="flex justify-between items-start">
+                    <div>
+                        <h3 class="text-lg font-medium">
+                            <a href="{% url 'business_detail' alt.business.slug %}" class="hover:text-blue-600">
+                                {{ alt.business.name }}
+                            </a>
+                        </h3>
+                        
+                        {{ alt.business.description|truncatewords:30 }}
+                        
+                        <div class="text-sm mt-1">
+                            Matches {{ alt.overlap_count }} product{{ alt.overlap_count|pluralize:",s" }}/service{{ alt.overlap_count|pluralize:",s" }}
+                        </div>
+
+                        {% if alt.business.politicaldata %}
+                        <div class="mt-2">
+                            <div class="text-sm">
+                                <span class="text-red-600">
+                                    [ {{ alt.business.politicaldata.overall_conservative_percentage|default:"0" }}% Conservative ]
+                                </span>
+                                /
+                                <span class="text-blue-600">
+                                    [ {{ alt.business.politicaldata.overall_liberal_percentage|default:"0" }}% Liberal ]
+                                </span>
+                                {% if alt.business.inherited_from %}
+                                    <span class="text-sm text-gray-600">*inherited from {{ alt.business.inherited_from.name }}</span>
+                                {% endif %}
+                            </div>
+
+                            <div class="mt-1">
+                                {% if alt.business.politicaldata.direct_america_pac_donor or alt.business.politicaldata.affiliated_pac_america_pac_donor %}
+                                <div class="text-sm text-red-600">⚠️ America PAC Donor</div>
+                                {% endif %}
+                                
+                                {% if alt.business.politicaldata.direct_save_america_pac_donor or alt.business.politicaldata.affiliated_pac_save_america_pac_donor %}
+                                <div class="text-sm text-red-600">⚠️ Save America PAC Donor</div>
+                                {% endif %}
+                                
+                                {% if alt.business.politicaldata.direct_maga_inc_donor or alt.business.politicaldata.affiliated_pac_maga_inc_donor %}
+                                <div class="text-sm text-red-600">⚠️ MAGA Inc Donor</div>
+                                {% endif %}
+                                
+                                {% if alt.business.politicaldata.senior_employee_trump_donor %}
+                                <div class="text-sm text-red-600">⚠️ Senior Employee Trump Donor</div>
+                                {% endif %}
+                                
+                                {% if alt.business.politicaldata.senior_employee_america_pac_donor %}
+                                <div class="text-sm text-red-600">⚠️ Senior Employee America Pac Donor</div>
+                                {% endif %}
+                                
+                                {% if alt.business.politicaldata.senior_employee_save_america_pac_donor %}
+                                <div class="text-sm text-red-600">⚠️ Senior Employee Save America Pac Donor</div>
+                                {% endif %}
+                                
+                                {% if alt.business.politicaldata.senior_employee_maga_inc_donor %}
+                                <div class="text-sm text-red-600">⚠️ Senior Employee MAGA Inc Donor</div>
+                                {% endif %}
+                            </div>
+                        </div>
+                        {% endif %}
+                    </div>
+                </div>
             </div>
             {% endfor %}
         </div>

From 79f75a60abacff9f8cc0bb816190b44ad353d9f7 Mon Sep 17 00:00:00 2001
From: Brent Mills <brent.c.mills@gmail.com>
Date: Mon, 18 Nov 2024 14:33:25 -0500
Subject: [PATCH 5/5] Clean up safety_at_home page

---
 safety_at_home/views.py | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/safety_at_home/views.py b/safety_at_home/views.py
index fcf0829..0270103 100644
--- a/safety_at_home/views.py
+++ b/safety_at_home/views.py
@@ -23,11 +23,6 @@ def safety_at_home_landing(request):
             'description': 'Make your home more self-sufficient and resilient to various challenges.',
             'status': 'coming_soon'
         },
-        {
-            'title': 'Legal & Financial Preparedness',
-            'description': 'Protect your rights and assets with proper legal and financial preparation.',
-            'status': 'coming_soon'
-        },
         {
             'title': 'Mental & Emotional Resilience',
             'description': 'Resources and strategies for maintaining mental and emotional well-being.',
@@ -42,21 +37,22 @@ def safety_at_home_landing(request):
     
     emergency_sections = [
         {
-            'title': 'Go-Bag',
+            'title': 'Go-Bag & 72-Hour Bag',
             'description': 'Essential items for immediate evacuation.',
             'status': 'available',
             'url': '/packplanner/'
         },
         {
-            'title': '72-Hour Bag',
-            'description': 'Comprehensive preparation for extended emergencies.',
+            'title': 'Home Emergency Preparedness',
+            'description': 'Making your home ready for various emergency scenarios.',
             'status': 'coming_soon'
         },
         {
-            'title': 'Home Emergency Preparedness',
-            'description': 'Making your home ready for various emergency scenarios.',
+            'title': 'Legal & Financial Preparedness',
+            'description': 'Protect your rights and assets with proper legal and financial preparation.',
             'status': 'coming_soon'
-        }
+        },
+        
     ]
     
     context = {