Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

72 hr #47

Merged
merged 5 commits into from
Nov 18, 2024
Merged

72 hr #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cd97da4
Add support for 72 hr vs go-bag
brent-is-still-here Nov 18, 2024
468d0c4
Update item cards to improve clarity on item importance
brent-is-still-here Nov 18, 2024
cf0b1b2
Clean up the Companies admin while I'm at it
brent-is-still-here Nov 18, 2024
99319f8
Add in conservative / liberal % on alternative matching
brent-is-still-here Nov 18, 2024
79f75a6
Clean up safety_at_home page
brent-is-still-here Nov 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 21 additions & 1 deletion companies/admin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
Expand Down
70 changes: 63 additions & 7 deletions companies/templates/companies/business_detail.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
107 changes: 92 additions & 15 deletions pack_planner/admin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -37,11 +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',
'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')
search_fields = ('name', 'description', 'uses', 'special_considerations')
ordering = ('category', 'order', 'name')
inlines = [ProductInline]
Expand All @@ -58,21 +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'
),
'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',)
})
Expand Down Expand Up @@ -102,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'
)
Expand All @@ -117,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
Expand Down
8 changes: 7 additions & 1 deletion pack_planner/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down Expand Up @@ -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:
Expand All @@ -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)
15 changes: 13 additions & 2 deletions pack_planner/services/data_processor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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)
}
)

Expand All @@ -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:
Expand Down
Loading