Compare commits
14 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 87472039be | |||
| c1089c349f | |||
| 3f6af51a43 | |||
| bc3cc176ef | |||
| 4a1a265fa8 | |||
| 7c95583345 | |||
| 65f23c1f12 | |||
| aa6c969a6b | |||
| 0bff20215c | |||
| d0147b8061 | |||
| ca0de215ab | |||
| 05b259e494 | |||
| f03fd82be1 | |||
| a769e5464b |
+10
@@ -134,6 +134,10 @@
|
|||||||
# Default: false
|
# Default: false
|
||||||
# BK_HIDE_TABLE_MISSING_PARTS=true
|
# BK_HIDE_TABLE_MISSING_PARTS=true
|
||||||
|
|
||||||
|
# Optional: Hide the 'Checked' column from the parts table.
|
||||||
|
# Default: false
|
||||||
|
# BK_HIDE_TABLE_CHECKED_PARTS=true
|
||||||
|
|
||||||
# Optional: Hide the 'Wishlist' entry from the menu. Does not disable the route.
|
# Optional: Hide the 'Wishlist' entry from the menu. Does not disable the route.
|
||||||
# Default: false
|
# Default: false
|
||||||
# BK_HIDE_WISHES=true
|
# BK_HIDE_WISHES=true
|
||||||
@@ -328,6 +332,12 @@
|
|||||||
# Default: sets
|
# Default: sets
|
||||||
# BK_SETS_FOLDER=sets
|
# BK_SETS_FOLDER=sets
|
||||||
|
|
||||||
|
# Optional: Enable set consolidation/grouping on the main sets page
|
||||||
|
# When enabled, multiple copies of the same set are grouped together showing instance count
|
||||||
|
# When disabled, each set copy is displayed individually (original behavior)
|
||||||
|
# Default: false
|
||||||
|
# BK_SETS_CONSOLIDATION=true
|
||||||
|
|
||||||
# Optional: Make the grid filters displayed by default, rather than collapsed
|
# Optional: Make the grid filters displayed by default, rather than collapsed
|
||||||
# Default: false
|
# Default: false
|
||||||
# BK_SHOW_GRID_FILTERS=true
|
# BK_SHOW_GRID_FILTERS=true
|
||||||
|
|||||||
@@ -23,6 +23,28 @@
|
|||||||
- Preserves selection state during dropdown consolidation
|
- Preserves selection state during dropdown consolidation
|
||||||
- Consistent search behavior (instant for client-side, Enter key for server-side)
|
- Consistent search behavior (instant for client-side, Enter key for server-side)
|
||||||
- Mobile-friendly pagination navigation
|
- Mobile-friendly pagination navigation
|
||||||
|
- Add Peeron instructions integration
|
||||||
|
- Full image caching system with automatic thumbnail generation
|
||||||
|
- Optimized HTTP calls by downloading full images once and generating thumbnails locally
|
||||||
|
- Automatic cache cleanup after PDF generation to save disk space
|
||||||
|
- Add parts checking/inventory system
|
||||||
|
- New "Checked" column in parts tables for tracking inventory progress
|
||||||
|
- Checkboxes to mark parts as verified during set walkthrough
|
||||||
|
- `BK_HIDE_TABLE_CHECKED_PARTS`: Environment variable to hide checked column
|
||||||
|
- Add set consolidation/grouping functionality
|
||||||
|
- Automatic grouping of duplicate sets on main sets page
|
||||||
|
- Shows instance count with stack icon badge (e.g., "3 copies")
|
||||||
|
- Expandable drawer interface to view all set copies individually
|
||||||
|
- Full set cards for each instance with all badges, statuses, and functionality
|
||||||
|
- `BK_SETS_CONSOLIDATION`: Environment variable to enable/disable consolidation (default: false)
|
||||||
|
- Backwards compatible - when disabled, behaves exactly like original individual view
|
||||||
|
- Improved theme filtering: handles duplicate theme names correctly
|
||||||
|
- Fixed set number sorting: proper numeric sorting in both ascending and descending order
|
||||||
|
- Mixed status indicators for consolidated sets: three-state checkboxes (unchecked/partial/checked) with count badges
|
||||||
|
- Enhanced SQL aggregation with `IFNULL(SUM())` for accurate count statistics
|
||||||
|
- Template logic handles three states: none (0/2), all (2/2), partial (1/2) with visual indicators
|
||||||
|
- Purple overlay styling for partial states, disabled checkboxes for read-only consolidated status display
|
||||||
|
- Individual sets maintain full interactive checkbox functionality
|
||||||
|
|
||||||
### 1.2.4
|
### 1.2.4
|
||||||
|
|
||||||
|
|||||||
@@ -34,6 +34,7 @@ CONFIG: Final[list[dict[str, Any]]] = [
|
|||||||
{'n': 'HIDE_SET_INSTRUCTIONS', 'c': bool},
|
{'n': 'HIDE_SET_INSTRUCTIONS', 'c': bool},
|
||||||
{'n': 'HIDE_TABLE_DAMAGED_PARTS', 'c': bool},
|
{'n': 'HIDE_TABLE_DAMAGED_PARTS', 'c': bool},
|
||||||
{'n': 'HIDE_TABLE_MISSING_PARTS', 'c': bool},
|
{'n': 'HIDE_TABLE_MISSING_PARTS', 'c': bool},
|
||||||
|
{'n': 'HIDE_TABLE_CHECKED_PARTS', 'c': bool},
|
||||||
{'n': 'HIDE_WISHES', 'c': bool},
|
{'n': 'HIDE_WISHES', 'c': bool},
|
||||||
{'n': 'MINIFIGURES_DEFAULT_ORDER', 'd': '"rebrickable_minifigures"."name" ASC'}, # noqa: E501
|
{'n': 'MINIFIGURES_DEFAULT_ORDER', 'd': '"rebrickable_minifigures"."name" ASC'}, # noqa: E501
|
||||||
{'n': 'MINIFIGURES_FOLDER', 'd': 'minifigs', 's': True},
|
{'n': 'MINIFIGURES_FOLDER', 'd': 'minifigs', 's': True},
|
||||||
@@ -76,6 +77,7 @@ CONFIG: Final[list[dict[str, Any]]] = [
|
|||||||
{'n': 'RETIRED_SETS_PATH', 'd': './retired_sets.csv'},
|
{'n': 'RETIRED_SETS_PATH', 'd': './retired_sets.csv'},
|
||||||
{'n': 'SETS_DEFAULT_ORDER', 'd': '"rebrickable_sets"."number" DESC, "rebrickable_sets"."version" ASC'}, # noqa: E501
|
{'n': 'SETS_DEFAULT_ORDER', 'd': '"rebrickable_sets"."number" DESC, "rebrickable_sets"."version" ASC'}, # noqa: E501
|
||||||
{'n': 'SETS_FOLDER', 'd': 'sets', 's': True},
|
{'n': 'SETS_FOLDER', 'd': 'sets', 's': True},
|
||||||
|
{'n': 'SETS_CONSOLIDATION', 'd': False, 'c': bool},
|
||||||
{'n': 'SHOW_GRID_FILTERS', 'c': bool},
|
{'n': 'SHOW_GRID_FILTERS', 'c': bool},
|
||||||
{'n': 'SHOW_GRID_SORT', 'c': bool},
|
{'n': 'SHOW_GRID_SORT', 'c': bool},
|
||||||
{'n': 'SKIP_SPARE_PARTS', 'c': bool},
|
{'n': 'SKIP_SPARE_PARTS', 'c': bool},
|
||||||
|
|||||||
@@ -111,6 +111,16 @@ class BrickMetadataList(BrickRecordList[T]):
|
|||||||
in new.filter(**kwargs)
|
in new.filter(**kwargs)
|
||||||
])
|
])
|
||||||
|
|
||||||
|
# Return the items as a dictionary mapping column names to UUIDs
|
||||||
|
@classmethod
|
||||||
|
def as_column_mapping(cls, /, **kwargs) -> dict:
|
||||||
|
new = cls.new()
|
||||||
|
|
||||||
|
return {
|
||||||
|
record.as_column(): record.fields.id
|
||||||
|
for record in new.filter(**kwargs)
|
||||||
|
}
|
||||||
|
|
||||||
# Grab a specific status
|
# Grab a specific status
|
||||||
@classmethod
|
@classmethod
|
||||||
def get(cls, id: str | None, /, *, allow_none: bool = False) -> T:
|
def get(cls, id: str | None, /, *, allow_none: bool = False) -> T:
|
||||||
|
|||||||
@@ -159,6 +159,43 @@ class BrickPart(RebrickablePart):
|
|||||||
|
|
||||||
return self
|
return self
|
||||||
|
|
||||||
|
# Update checked state for part walkthrough
|
||||||
|
def update_checked(self, json: Any | None, /) -> bool:
|
||||||
|
# Handle both direct 'checked' key and changer.js 'value' key format
|
||||||
|
if json:
|
||||||
|
checked = json.get('checked', json.get('value', False))
|
||||||
|
else:
|
||||||
|
checked = False
|
||||||
|
|
||||||
|
checked = bool(checked)
|
||||||
|
|
||||||
|
# Update the field
|
||||||
|
self.fields.checked = checked
|
||||||
|
|
||||||
|
BrickSQL().execute_and_commit(
|
||||||
|
'part/update/checked',
|
||||||
|
parameters=self.sql_parameters()
|
||||||
|
)
|
||||||
|
|
||||||
|
return checked
|
||||||
|
|
||||||
|
# Compute the url for updating checked state
|
||||||
|
def url_for_checked(self, /) -> str:
|
||||||
|
# Different URL for a minifigure part
|
||||||
|
if self.minifigure is not None:
|
||||||
|
figure = self.minifigure.fields.figure
|
||||||
|
else:
|
||||||
|
figure = None
|
||||||
|
|
||||||
|
return url_for(
|
||||||
|
'set.checked_part',
|
||||||
|
id=self.fields.id,
|
||||||
|
figure=figure,
|
||||||
|
part=self.fields.part,
|
||||||
|
color=self.fields.color,
|
||||||
|
spare=self.fields.spare,
|
||||||
|
)
|
||||||
|
|
||||||
# Update a problematic part
|
# Update a problematic part
|
||||||
def update_problem(self, problem: str, json: Any | None, /) -> int:
|
def update_problem(self, problem: str, json: Any | None, /) -> int:
|
||||||
amount: str | int = json.get('value', '') # type: ignore
|
amount: str | int = json.get('value', '') # type: ignore
|
||||||
|
|||||||
+162
-31
@@ -24,6 +24,7 @@ class BrickSetList(BrickRecordList[BrickSet]):
|
|||||||
|
|
||||||
# Queries
|
# Queries
|
||||||
all_query: str = 'set/list/all'
|
all_query: str = 'set/list/all'
|
||||||
|
consolidated_query: str = 'set/list/consolidated'
|
||||||
damaged_minifigure_query: str = 'set/list/damaged_minifigure'
|
damaged_minifigure_query: str = 'set/list/damaged_minifigure'
|
||||||
damaged_part_query: str = 'set/list/damaged_part'
|
damaged_part_query: str = 'set/list/damaged_part'
|
||||||
generic_query: str = 'set/list/generic'
|
generic_query: str = 'set/list/generic'
|
||||||
@@ -46,8 +47,25 @@ class BrickSetList(BrickRecordList[BrickSet]):
|
|||||||
|
|
||||||
# All the sets
|
# All the sets
|
||||||
def all(self, /) -> Self:
|
def all(self, /) -> Self:
|
||||||
# Load the sets from the database
|
# Load the sets from the database with metadata context for filtering
|
||||||
self.list(do_theme=True)
|
filter_context = {
|
||||||
|
'owners': BrickSetOwnerList.as_columns(),
|
||||||
|
'statuses': BrickSetStatusList.as_columns(),
|
||||||
|
'tags': BrickSetTagList.as_columns(),
|
||||||
|
}
|
||||||
|
self.list(do_theme=True, **filter_context)
|
||||||
|
|
||||||
|
return self
|
||||||
|
|
||||||
|
# All sets in consolidated/grouped view
|
||||||
|
def all_consolidated(self, /) -> Self:
|
||||||
|
# Load the sets from the database using consolidated query with metadata context
|
||||||
|
filter_context = {
|
||||||
|
'owners_dict': BrickSetOwnerList.as_column_mapping(),
|
||||||
|
'statuses_dict': BrickSetStatusList.as_column_mapping(),
|
||||||
|
'tags_dict': BrickSetTagList.as_column_mapping(),
|
||||||
|
}
|
||||||
|
self.list(override_query=self.consolidated_query, do_theme=True, **filter_context)
|
||||||
|
|
||||||
return self
|
return self
|
||||||
|
|
||||||
@@ -64,7 +82,8 @@ class BrickSetList(BrickRecordList[BrickSet]):
|
|||||||
owner_filter: str | None = None,
|
owner_filter: str | None = None,
|
||||||
purchase_location_filter: str | None = None,
|
purchase_location_filter: str | None = None,
|
||||||
storage_filter: str | None = None,
|
storage_filter: str | None = None,
|
||||||
tag_filter: str | None = None
|
tag_filter: str | None = None,
|
||||||
|
use_consolidated: bool = True
|
||||||
) -> tuple[Self, int]:
|
) -> tuple[Self, int]:
|
||||||
# Convert theme name to theme ID for filtering
|
# Convert theme name to theme ID for filtering
|
||||||
theme_id_filter = None
|
theme_id_filter = None
|
||||||
@@ -86,24 +105,51 @@ class BrickSetList(BrickRecordList[BrickSet]):
|
|||||||
'owners': BrickSetOwnerList.as_columns(),
|
'owners': BrickSetOwnerList.as_columns(),
|
||||||
'statuses': BrickSetStatusList.as_columns(),
|
'statuses': BrickSetStatusList.as_columns(),
|
||||||
'tags': BrickSetTagList.as_columns(),
|
'tags': BrickSetTagList.as_columns(),
|
||||||
|
'owners_dict': BrickSetOwnerList.as_column_mapping(),
|
||||||
|
'statuses_dict': BrickSetStatusList.as_column_mapping(),
|
||||||
|
'tags_dict': BrickSetTagList.as_column_mapping(),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# Field mapping for sorting
|
# Field mapping for sorting
|
||||||
field_mapping = {
|
if use_consolidated:
|
||||||
'set': '"rebrickable_sets"."set"',
|
field_mapping = {
|
||||||
'name': '"rebrickable_sets"."name"',
|
'set': '"rebrickable_sets"."number", "rebrickable_sets"."version"',
|
||||||
'year': '"rebrickable_sets"."year"',
|
'name': '"rebrickable_sets"."name"',
|
||||||
'parts': '"rebrickable_sets"."number_of_parts"',
|
'year': '"rebrickable_sets"."year"',
|
||||||
'theme': '"rebrickable_sets"."theme_id"',
|
'parts': '"rebrickable_sets"."number_of_parts"',
|
||||||
'minifigures': '"total_minifigures"', # Use the alias from the SQL query
|
'theme': '"rebrickable_sets"."theme_id"',
|
||||||
'missing': '"total_missing"', # Use the alias from the SQL query
|
'minifigures': '"total_minifigures"',
|
||||||
'damaged': '"total_damaged"', # Use the alias from the SQL query
|
'missing': '"total_missing"',
|
||||||
'purchase-date': '"bricktracker_sets"."purchase_date"',
|
'damaged': '"total_damaged"',
|
||||||
'purchase-price': '"bricktracker_sets"."purchase_price"'
|
'instances': '"instance_count"', # New field for consolidated view
|
||||||
}
|
'purchase-date': '"purchase_date"', # Use the MIN aggregated value
|
||||||
|
'purchase-price': '"purchase_price"' # Use the MIN aggregated value
|
||||||
|
}
|
||||||
|
else:
|
||||||
|
field_mapping = {
|
||||||
|
'set': '"rebrickable_sets"."number", "rebrickable_sets"."version"',
|
||||||
|
'name': '"rebrickable_sets"."name"',
|
||||||
|
'year': '"rebrickable_sets"."year"',
|
||||||
|
'parts': '"rebrickable_sets"."number_of_parts"',
|
||||||
|
'theme': '"rebrickable_sets"."theme_id"',
|
||||||
|
'minifigures': '"total_minifigures"', # Use the alias from the SQL query
|
||||||
|
'missing': '"total_missing"', # Use the alias from the SQL query
|
||||||
|
'damaged': '"total_damaged"', # Use the alias from the SQL query
|
||||||
|
'purchase-date': '"bricktracker_sets"."purchase_date"',
|
||||||
|
'purchase-price': '"bricktracker_sets"."purchase_price"'
|
||||||
|
}
|
||||||
|
|
||||||
# Choose query based on whether filters are applied
|
# Choose query based on consolidation preference and filter complexity
|
||||||
query_to_use = 'set/list/all_filtered' if has_filters else self.all_query
|
# Owner/tag filters still need to fall back to non-consolidated for now
|
||||||
|
# due to complex aggregation requirements
|
||||||
|
complex_filters = [owner_filter, tag_filter]
|
||||||
|
if use_consolidated and not any(complex_filters):
|
||||||
|
query_to_use = self.consolidated_query
|
||||||
|
else:
|
||||||
|
# Use filtered query when consolidation is disabled or complex filters applied
|
||||||
|
query_to_use = 'set/list/all_filtered'
|
||||||
|
|
||||||
# Handle instructions filtering
|
# Handle instructions filtering
|
||||||
if status_filter in ['has-missing-instructions', '-has-missing-instructions']:
|
if status_filter in ['has-missing-instructions', '-has-missing-instructions']:
|
||||||
@@ -114,6 +160,18 @@ class BrickSetList(BrickRecordList[BrickSet]):
|
|||||||
purchase_location_filter, storage_filter, tag_filter
|
purchase_location_filter, storage_filter, tag_filter
|
||||||
)
|
)
|
||||||
|
|
||||||
|
# Handle special case for set sorting with multiple columns
|
||||||
|
if sort_field == 'set' and field_mapping:
|
||||||
|
# Create custom order clause for set sorting
|
||||||
|
direction = 'DESC' if sort_order.lower() == 'desc' else 'ASC'
|
||||||
|
custom_order = f'"rebrickable_sets"."number" {direction}, "rebrickable_sets"."version" {direction}'
|
||||||
|
filter_context['order'] = custom_order
|
||||||
|
# Remove set from field mapping to avoid double-processing
|
||||||
|
field_mapping_copy = field_mapping.copy()
|
||||||
|
field_mapping_copy.pop('set', None)
|
||||||
|
field_mapping = field_mapping_copy
|
||||||
|
sort_field = None # Disable automatic ORDER BY construction
|
||||||
|
|
||||||
# Normal SQL-based filtering and pagination
|
# Normal SQL-based filtering and pagination
|
||||||
result, total_count = self.paginate(
|
result, total_count = self.paginate(
|
||||||
page=page,
|
page=page,
|
||||||
@@ -125,8 +183,11 @@ class BrickSetList(BrickRecordList[BrickSet]):
|
|||||||
**filter_context
|
**filter_context
|
||||||
)
|
)
|
||||||
|
|
||||||
# Populate themes for filter dropdown from ALL sets, not just current page
|
# Populate themes for filter dropdown from filtered dataset (not just current page)
|
||||||
result._populate_themes_global()
|
result._populate_themes_from_filtered_dataset(
|
||||||
|
query_to_use,
|
||||||
|
**filter_context
|
||||||
|
)
|
||||||
|
|
||||||
return result, total_count
|
return result, total_count
|
||||||
|
|
||||||
@@ -143,11 +204,36 @@ class BrickSetList(BrickRecordList[BrickSet]):
|
|||||||
def _theme_name_to_id(self, theme_name: str) -> str | None:
|
def _theme_name_to_id(self, theme_name: str) -> str | None:
|
||||||
"""Convert a theme name to theme ID for filtering"""
|
"""Convert a theme name to theme ID for filtering"""
|
||||||
try:
|
try:
|
||||||
|
from .sql import BrickSQL
|
||||||
theme_list = BrickThemeList()
|
theme_list = BrickThemeList()
|
||||||
|
|
||||||
|
# Find all theme IDs that match the name
|
||||||
|
matching_theme_ids = []
|
||||||
for theme_id, theme in theme_list.themes.items():
|
for theme_id, theme in theme_list.themes.items():
|
||||||
if theme.name.lower() == theme_name.lower():
|
if theme.name.lower() == theme_name.lower():
|
||||||
return str(theme_id)
|
matching_theme_ids.append(str(theme_id))
|
||||||
return None
|
|
||||||
|
if not matching_theme_ids:
|
||||||
|
return None
|
||||||
|
|
||||||
|
# If only one match, return it
|
||||||
|
if len(matching_theme_ids) == 1:
|
||||||
|
return matching_theme_ids[0]
|
||||||
|
|
||||||
|
# Multiple matches - check which theme ID actually has sets in the user's collection
|
||||||
|
sql = BrickSQL()
|
||||||
|
for theme_id in matching_theme_ids:
|
||||||
|
result = sql.fetchone(
|
||||||
|
'set/check_theme_exists',
|
||||||
|
theme_id=theme_id
|
||||||
|
)
|
||||||
|
count = result['count'] if result else 0
|
||||||
|
if count > 0:
|
||||||
|
return theme_id
|
||||||
|
|
||||||
|
# If none have sets, return the first match (fallback)
|
||||||
|
return matching_theme_ids[0]
|
||||||
|
|
||||||
except Exception:
|
except Exception:
|
||||||
# If themes can't be loaded, return None to disable theme filtering
|
# If themes can't be loaded, return None to disable theme filtering
|
||||||
return None
|
return None
|
||||||
@@ -240,21 +326,53 @@ class BrickSetList(BrickRecordList[BrickSet]):
|
|||||||
purchase_location_filter, storage_filter, tag_filter
|
purchase_location_filter, storage_filter, tag_filter
|
||||||
)
|
)
|
||||||
|
|
||||||
def _populate_themes_global(self) -> None:
|
def _populate_themes_from_filtered_dataset(self, query_name: str, **filter_context) -> None:
|
||||||
"""Populate themes list from ALL sets, not just current page"""
|
"""Populate themes list from filtered dataset (all pages, not just current page)"""
|
||||||
try:
|
try:
|
||||||
# Load all sets to get all possible themes
|
from .theme_list import BrickThemeList
|
||||||
all_sets = BrickSetList().all()
|
|
||||||
|
# Use a simplified query to get just distinct theme_ids
|
||||||
|
theme_context = dict(filter_context)
|
||||||
|
theme_context.pop('limit', None)
|
||||||
|
theme_context.pop('offset', None)
|
||||||
|
|
||||||
|
# Use a special lightweight query for themes
|
||||||
|
theme_records = super().select(
|
||||||
|
override_query='set/list/themes_only',
|
||||||
|
**theme_context
|
||||||
|
)
|
||||||
|
|
||||||
|
# Convert to theme names
|
||||||
|
theme_list = BrickThemeList()
|
||||||
themes = set()
|
themes = set()
|
||||||
for record in all_sets.records:
|
for record in theme_records:
|
||||||
if hasattr(record, 'theme') and hasattr(record.theme, 'name'):
|
theme_id = record.get('theme_id')
|
||||||
themes.add(record.theme.name)
|
if theme_id:
|
||||||
|
theme = theme_list.get(theme_id)
|
||||||
|
if theme and hasattr(theme, 'name'):
|
||||||
|
themes.add(theme.name)
|
||||||
|
|
||||||
self.themes = list(themes)
|
self.themes = list(themes)
|
||||||
self.themes.sort()
|
self.themes.sort()
|
||||||
|
|
||||||
except Exception:
|
except Exception:
|
||||||
# Fall back to current page themes
|
# Fall back to simpler approach: get themes from ALL sets (ignoring filters)
|
||||||
self._populate_themes()
|
# This is better than showing only current page themes
|
||||||
|
try:
|
||||||
|
from .theme_list import BrickThemeList
|
||||||
|
all_sets = BrickSetList()
|
||||||
|
all_sets.list(do_theme=True)
|
||||||
|
|
||||||
|
themes = set()
|
||||||
|
for record in all_sets.records:
|
||||||
|
if hasattr(record, 'theme') and hasattr(record.theme, 'name'):
|
||||||
|
themes.add(record.theme.name)
|
||||||
|
|
||||||
|
self.themes = list(themes)
|
||||||
|
self.themes.sort()
|
||||||
|
except Exception:
|
||||||
|
# Final fallback to current page themes
|
||||||
|
self._populate_themes()
|
||||||
|
|
||||||
def _matches_search(self, record, search_query: str) -> bool:
|
def _matches_search(self, record, search_query: str) -> bool:
|
||||||
"""Check if record matches search query"""
|
"""Check if record matches search query"""
|
||||||
@@ -301,7 +419,7 @@ class BrickSetList(BrickRecordList[BrickSet]):
|
|||||||
reverse = sort_order == 'desc'
|
reverse = sort_order == 'desc'
|
||||||
|
|
||||||
if sort_field == 'set':
|
if sort_field == 'set':
|
||||||
return sorted(records, key=lambda r: r.fields.set, reverse=reverse)
|
return sorted(records, key=lambda r: self._set_sort_key(r.fields.set), reverse=reverse)
|
||||||
elif sort_field == 'name':
|
elif sort_field == 'name':
|
||||||
return sorted(records, key=lambda r: r.fields.name, reverse=reverse)
|
return sorted(records, key=lambda r: r.fields.name, reverse=reverse)
|
||||||
elif sort_field == 'year':
|
elif sort_field == 'year':
|
||||||
@@ -312,6 +430,19 @@ class BrickSetList(BrickRecordList[BrickSet]):
|
|||||||
|
|
||||||
return records
|
return records
|
||||||
|
|
||||||
|
|
||||||
|
def _set_sort_key(self, set_number: str) -> tuple:
|
||||||
|
"""Generate sort key for set numbers like '10121-1' -> (10121, 1)"""
|
||||||
|
try:
|
||||||
|
if '-' in set_number:
|
||||||
|
main_part, version_part = set_number.split('-', 1)
|
||||||
|
return (int(main_part), int(version_part))
|
||||||
|
else:
|
||||||
|
return (int(set_number), 0)
|
||||||
|
except (ValueError, TypeError):
|
||||||
|
# Fallback to string sorting if parsing fails
|
||||||
|
return (float('inf'), set_number)
|
||||||
|
|
||||||
# Sets with a minifigure part damaged
|
# Sets with a minifigure part damaged
|
||||||
def damaged_minifigure(self, figure: str, /) -> Self:
|
def damaged_minifigure(self, figure: str, /) -> Self:
|
||||||
# Save the parameters to the fields
|
# Save the parameters to the fields
|
||||||
|
|||||||
@@ -0,0 +1,9 @@
|
|||||||
|
-- description: Add checked field to bricktracker_parts table for part walkthrough tracking
|
||||||
|
|
||||||
|
BEGIN TRANSACTION;
|
||||||
|
|
||||||
|
-- Add checked field to the bricktracker_parts table
|
||||||
|
-- This allows users to track which parts they have checked during walkthroughs
|
||||||
|
ALTER TABLE "bricktracker_parts" ADD COLUMN "checked" BOOLEAN DEFAULT 0;
|
||||||
|
|
||||||
|
COMMIT;
|
||||||
@@ -9,6 +9,7 @@ SELECT
|
|||||||
--"bricktracker_parts"."rebrickable_inventory",
|
--"bricktracker_parts"."rebrickable_inventory",
|
||||||
"bricktracker_parts"."missing",
|
"bricktracker_parts"."missing",
|
||||||
"bricktracker_parts"."damaged",
|
"bricktracker_parts"."damaged",
|
||||||
|
"bricktracker_parts"."checked",
|
||||||
--"rebrickable_parts"."part",
|
--"rebrickable_parts"."part",
|
||||||
--"rebrickable_parts"."color_id",
|
--"rebrickable_parts"."color_id",
|
||||||
"rebrickable_parts"."color_name",
|
"rebrickable_parts"."color_name",
|
||||||
|
|||||||
@@ -0,0 +1,7 @@
|
|||||||
|
UPDATE "bricktracker_parts"
|
||||||
|
SET "checked" = :checked
|
||||||
|
WHERE "bricktracker_parts"."id" IS NOT DISTINCT FROM :id
|
||||||
|
AND "bricktracker_parts"."figure" IS NOT DISTINCT FROM :figure
|
||||||
|
AND "bricktracker_parts"."part" IS NOT DISTINCT FROM :part
|
||||||
|
AND "bricktracker_parts"."color" IS NOT DISTINCT FROM :color
|
||||||
|
AND "bricktracker_parts"."spare" IS NOT DISTINCT FROM :spare
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
SELECT COUNT(*) as count
|
||||||
|
FROM "bricktracker_sets"
|
||||||
|
INNER JOIN "rebrickable_sets" ON "bricktracker_sets"."set" = "rebrickable_sets"."set"
|
||||||
|
WHERE "rebrickable_sets"."theme_id" = {{ theme_id }}
|
||||||
@@ -8,7 +8,7 @@ AND (LOWER("rebrickable_sets"."name") LIKE LOWER('%{{ search_query }}%')
|
|||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
{% if theme_filter %}
|
{% if theme_filter %}
|
||||||
AND "rebrickable_sets"."theme_id" = '{{ theme_filter }}'
|
AND "rebrickable_sets"."theme_id" = {{ theme_filter }}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
{% if storage_filter %}
|
{% if storage_filter %}
|
||||||
|
|||||||
@@ -0,0 +1,167 @@
|
|||||||
|
SELECT
|
||||||
|
(SELECT MIN("id") FROM "bricktracker_sets" WHERE "set" = "rebrickable_sets"."set") AS "id",
|
||||||
|
"rebrickable_sets"."set",
|
||||||
|
"rebrickable_sets"."number",
|
||||||
|
"rebrickable_sets"."version",
|
||||||
|
"rebrickable_sets"."name",
|
||||||
|
"rebrickable_sets"."year",
|
||||||
|
"rebrickable_sets"."theme_id",
|
||||||
|
"rebrickable_sets"."number_of_parts",
|
||||||
|
"rebrickable_sets"."image",
|
||||||
|
"rebrickable_sets"."url",
|
||||||
|
COUNT("bricktracker_sets"."id") AS "instance_count",
|
||||||
|
IFNULL(SUM("problem_join"."total_missing"), 0) AS "total_missing",
|
||||||
|
IFNULL(SUM("problem_join"."total_damaged"), 0) AS "total_damaged",
|
||||||
|
IFNULL(MAX("minifigures_join"."total"), 0) AS "total_minifigures",
|
||||||
|
-- Keep one representative instance for display purposes
|
||||||
|
GROUP_CONCAT("bricktracker_sets"."id", '|') AS "instance_ids",
|
||||||
|
REPLACE(GROUP_CONCAT(DISTINCT "bricktracker_sets"."storage"), ',', '|') AS "storage",
|
||||||
|
MIN("bricktracker_sets"."purchase_date") AS "purchase_date",
|
||||||
|
REPLACE(GROUP_CONCAT(DISTINCT "bricktracker_sets"."purchase_location"), ',', '|') AS "purchase_location",
|
||||||
|
MIN("bricktracker_sets"."purchase_price") AS "purchase_price"
|
||||||
|
{% block owners %}
|
||||||
|
{% if owners_dict %}
|
||||||
|
{% for column, uuid in owners_dict.items() %}
|
||||||
|
, MAX("bricktracker_set_owners"."{{ column }}") AS "{{ column }}"
|
||||||
|
{% endfor %}
|
||||||
|
{% endif %}
|
||||||
|
{% endblock %}
|
||||||
|
{% block tags %}
|
||||||
|
{% if tags_dict %}
|
||||||
|
{% for column, uuid in tags_dict.items() %}
|
||||||
|
, MAX("bricktracker_set_tags"."{{ column }}") AS "{{ column }}"
|
||||||
|
{% endfor %}
|
||||||
|
{% endif %}
|
||||||
|
{% endblock %}
|
||||||
|
{% block statuses %}
|
||||||
|
{% if statuses_dict %}
|
||||||
|
{% for column, uuid in statuses_dict.items() %}
|
||||||
|
, MAX("bricktracker_set_statuses"."{{ column }}") AS "{{ column }}"
|
||||||
|
, IFNULL(SUM("bricktracker_set_statuses"."{{ column }}"), 0) AS "{{ column }}_count"
|
||||||
|
{% endfor %}
|
||||||
|
{% endif %}
|
||||||
|
{% endblock %}
|
||||||
|
FROM "bricktracker_sets"
|
||||||
|
|
||||||
|
INNER JOIN "rebrickable_sets"
|
||||||
|
ON "bricktracker_sets"."set" IS NOT DISTINCT FROM "rebrickable_sets"."set"
|
||||||
|
|
||||||
|
-- LEFT JOIN + SELECT to avoid messing the total
|
||||||
|
LEFT JOIN (
|
||||||
|
SELECT
|
||||||
|
"bricktracker_parts"."id",
|
||||||
|
SUM("bricktracker_parts"."missing") AS "total_missing",
|
||||||
|
SUM("bricktracker_parts"."damaged") AS "total_damaged"
|
||||||
|
FROM "bricktracker_parts"
|
||||||
|
GROUP BY "bricktracker_parts"."id"
|
||||||
|
) "problem_join"
|
||||||
|
ON "bricktracker_sets"."id" IS NOT DISTINCT FROM "problem_join"."id"
|
||||||
|
|
||||||
|
-- LEFT JOIN + SELECT to avoid messing the total
|
||||||
|
LEFT JOIN (
|
||||||
|
SELECT
|
||||||
|
"bricktracker_minifigures"."id",
|
||||||
|
SUM("bricktracker_minifigures"."quantity") AS "total"
|
||||||
|
FROM "bricktracker_minifigures"
|
||||||
|
GROUP BY "bricktracker_minifigures"."id"
|
||||||
|
) "minifigures_join"
|
||||||
|
ON "bricktracker_sets"."id" IS NOT DISTINCT FROM "minifigures_join"."id"
|
||||||
|
|
||||||
|
{% if owners_dict %}
|
||||||
|
LEFT JOIN "bricktracker_set_owners"
|
||||||
|
ON "bricktracker_sets"."id" IS NOT DISTINCT FROM "bricktracker_set_owners"."id"
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
{% if statuses_dict %}
|
||||||
|
LEFT JOIN "bricktracker_set_statuses"
|
||||||
|
ON "bricktracker_sets"."id" IS NOT DISTINCT FROM "bricktracker_set_statuses"."id"
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
{% if tags_dict %}
|
||||||
|
LEFT JOIN "bricktracker_set_tags"
|
||||||
|
ON "bricktracker_sets"."id" IS NOT DISTINCT FROM "bricktracker_set_tags"."id"
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
{% block where %}
|
||||||
|
WHERE 1=1
|
||||||
|
{% if search_query %}
|
||||||
|
AND (LOWER("rebrickable_sets"."name") LIKE LOWER('%{{ search_query }}%')
|
||||||
|
OR LOWER("rebrickable_sets"."set") LIKE LOWER('%{{ search_query }}%'))
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
{% if theme_filter %}
|
||||||
|
AND "rebrickable_sets"."theme_id" = {{ theme_filter }}
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
{% if storage_filter %}
|
||||||
|
AND EXISTS (
|
||||||
|
SELECT 1 FROM "bricktracker_sets" bs_filter
|
||||||
|
WHERE bs_filter."set" = "rebrickable_sets"."set"
|
||||||
|
AND bs_filter."storage" = '{{ storage_filter }}'
|
||||||
|
)
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
{% if purchase_location_filter %}
|
||||||
|
AND EXISTS (
|
||||||
|
SELECT 1 FROM "bricktracker_sets" bs_filter
|
||||||
|
WHERE bs_filter."set" = "rebrickable_sets"."set"
|
||||||
|
AND bs_filter."purchase_location" = '{{ purchase_location_filter }}'
|
||||||
|
)
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
{% if status_filter %}
|
||||||
|
{% if status_filter == 'has-storage' %}
|
||||||
|
AND EXISTS (
|
||||||
|
SELECT 1 FROM "bricktracker_sets" bs_filter
|
||||||
|
WHERE bs_filter."set" = "rebrickable_sets"."set"
|
||||||
|
AND bs_filter."storage" IS NOT NULL AND bs_filter."storage" != ''
|
||||||
|
)
|
||||||
|
{% elif status_filter == '-has-storage' %}
|
||||||
|
AND NOT EXISTS (
|
||||||
|
SELECT 1 FROM "bricktracker_sets" bs_filter
|
||||||
|
WHERE bs_filter."set" = "rebrickable_sets"."set"
|
||||||
|
AND bs_filter."storage" IS NOT NULL AND bs_filter."storage" != ''
|
||||||
|
)
|
||||||
|
{% elif status_filter.startswith('status-') %}
|
||||||
|
AND EXISTS (
|
||||||
|
SELECT 1 FROM "bricktracker_sets" bs_filter
|
||||||
|
JOIN "bricktracker_set_statuses" ON bs_filter."id" = "bricktracker_set_statuses"."id"
|
||||||
|
WHERE bs_filter."set" = "rebrickable_sets"."set"
|
||||||
|
AND "bricktracker_set_statuses"."{{ status_filter.replace('-', '_') }}" = 1
|
||||||
|
)
|
||||||
|
{% elif status_filter.startswith('-status-') %}
|
||||||
|
AND NOT EXISTS (
|
||||||
|
SELECT 1 FROM "bricktracker_sets" bs_filter
|
||||||
|
JOIN "bricktracker_set_statuses" ON bs_filter."id" = "bricktracker_set_statuses"."id"
|
||||||
|
WHERE bs_filter."set" = "rebrickable_sets"."set"
|
||||||
|
AND "bricktracker_set_statuses"."{{ status_filter[1:].replace('-', '_') }}" = 1
|
||||||
|
)
|
||||||
|
{% endif %}
|
||||||
|
{% endif %}
|
||||||
|
{% endblock %}
|
||||||
|
|
||||||
|
GROUP BY "rebrickable_sets"."set"
|
||||||
|
|
||||||
|
{% if status_filter %}
|
||||||
|
{% if status_filter == 'has-missing' %}
|
||||||
|
HAVING IFNULL(SUM("problem_join"."total_missing"), 0) > 0
|
||||||
|
{% elif status_filter == '-has-missing' %}
|
||||||
|
HAVING IFNULL(SUM("problem_join"."total_missing"), 0) = 0
|
||||||
|
{% elif status_filter == 'has-damaged' %}
|
||||||
|
HAVING IFNULL(SUM("problem_join"."total_damaged"), 0) > 0
|
||||||
|
{% elif status_filter == '-has-damaged' %}
|
||||||
|
HAVING IFNULL(SUM("problem_join"."total_damaged"), 0) = 0
|
||||||
|
{% endif %}
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
{% if order %}
|
||||||
|
ORDER BY {{ order }}
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
{% if limit %}
|
||||||
|
LIMIT {{ limit }}
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
{% if offset %}
|
||||||
|
OFFSET {{ offset }}
|
||||||
|
{% endif %}
|
||||||
@@ -5,7 +5,7 @@ WHERE "bricktracker_sets"."id" IN (
|
|||||||
SELECT "bricktracker_parts"."id"
|
SELECT "bricktracker_parts"."id"
|
||||||
FROM "bricktracker_parts"
|
FROM "bricktracker_parts"
|
||||||
WHERE "bricktracker_parts"."figure" IS NOT DISTINCT FROM :figure
|
WHERE "bricktracker_parts"."figure" IS NOT DISTINCT FROM :figure
|
||||||
AND "bricktracker_parts"."missing" > 0
|
AND "bricktracker_parts"."damaged" > 0
|
||||||
GROUP BY "bricktracker_parts"."id"
|
GROUP BY "bricktracker_parts"."id"
|
||||||
)
|
)
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|||||||
@@ -0,0 +1,87 @@
|
|||||||
|
SELECT DISTINCT "rebrickable_sets"."theme_id"
|
||||||
|
FROM "bricktracker_sets"
|
||||||
|
|
||||||
|
INNER JOIN "rebrickable_sets"
|
||||||
|
ON "bricktracker_sets"."set" IS NOT DISTINCT FROM "rebrickable_sets"."set"
|
||||||
|
|
||||||
|
{% block where %}
|
||||||
|
WHERE 1=1
|
||||||
|
{% if search_query %}
|
||||||
|
AND (LOWER("rebrickable_sets"."name") LIKE LOWER('%{{ search_query }}%')
|
||||||
|
OR LOWER("rebrickable_sets"."set") LIKE LOWER('%{{ search_query }}%'))
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
{% if storage_filter %}
|
||||||
|
AND EXISTS (
|
||||||
|
SELECT 1 FROM "bricktracker_sets" bs_filter
|
||||||
|
WHERE bs_filter."set" = "rebrickable_sets"."set"
|
||||||
|
AND bs_filter."storage" = '{{ storage_filter }}'
|
||||||
|
)
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
{% if purchase_location_filter %}
|
||||||
|
AND EXISTS (
|
||||||
|
SELECT 1 FROM "bricktracker_sets" bs_filter
|
||||||
|
WHERE bs_filter."set" = "rebrickable_sets"."set"
|
||||||
|
AND bs_filter."purchase_location" = '{{ purchase_location_filter }}'
|
||||||
|
)
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
{% if status_filter %}
|
||||||
|
{% if status_filter == 'has-storage' %}
|
||||||
|
AND EXISTS (
|
||||||
|
SELECT 1 FROM "bricktracker_sets" bs_filter
|
||||||
|
WHERE bs_filter."set" = "rebrickable_sets"."set"
|
||||||
|
AND bs_filter."storage" IS NOT NULL AND bs_filter."storage" != ''
|
||||||
|
)
|
||||||
|
{% elif status_filter == '-has-storage' %}
|
||||||
|
AND NOT EXISTS (
|
||||||
|
SELECT 1 FROM "bricktracker_sets" bs_filter
|
||||||
|
WHERE bs_filter."set" = "rebrickable_sets"."set"
|
||||||
|
AND bs_filter."storage" IS NOT NULL AND bs_filter."storage" != ''
|
||||||
|
)
|
||||||
|
{% elif status_filter.startswith('status-') %}
|
||||||
|
AND EXISTS (
|
||||||
|
SELECT 1 FROM "bricktracker_sets" bs_filter
|
||||||
|
JOIN "bricktracker_set_statuses" ON bs_filter."id" = "bricktracker_set_statuses"."id"
|
||||||
|
WHERE bs_filter."set" = "rebrickable_sets"."set"
|
||||||
|
AND "bricktracker_set_statuses"."{{ status_filter.replace('-', '_') }}" = 1
|
||||||
|
)
|
||||||
|
{% elif status_filter.startswith('-status-') %}
|
||||||
|
AND NOT EXISTS (
|
||||||
|
SELECT 1 FROM "bricktracker_sets" bs_filter
|
||||||
|
JOIN "bricktracker_set_statuses" ON bs_filter."id" = "bricktracker_set_statuses"."id"
|
||||||
|
WHERE bs_filter."set" = "rebrickable_sets"."set"
|
||||||
|
AND "bricktracker_set_statuses"."{{ status_filter[1:].replace('-', '_') }}" = 1
|
||||||
|
)
|
||||||
|
{% elif status_filter == 'has-missing' %}
|
||||||
|
AND EXISTS (
|
||||||
|
SELECT 1 FROM "bricktracker_sets" bs_filter
|
||||||
|
JOIN "bricktracker_parts" ON bs_filter."id" = "bricktracker_parts"."id"
|
||||||
|
WHERE bs_filter."set" = "rebrickable_sets"."set"
|
||||||
|
AND "bricktracker_parts"."missing" > 0
|
||||||
|
)
|
||||||
|
{% elif status_filter == '-has-missing' %}
|
||||||
|
AND NOT EXISTS (
|
||||||
|
SELECT 1 FROM "bricktracker_sets" bs_filter
|
||||||
|
JOIN "bricktracker_parts" ON bs_filter."id" = "bricktracker_parts"."id"
|
||||||
|
WHERE bs_filter."set" = "rebrickable_sets"."set"
|
||||||
|
AND "bricktracker_parts"."missing" > 0
|
||||||
|
)
|
||||||
|
{% elif status_filter == 'has-damaged' %}
|
||||||
|
AND EXISTS (
|
||||||
|
SELECT 1 FROM "bricktracker_sets" bs_filter
|
||||||
|
JOIN "bricktracker_parts" ON bs_filter."id" = "bricktracker_parts"."id"
|
||||||
|
WHERE bs_filter."set" = "rebrickable_sets"."set"
|
||||||
|
AND "bricktracker_parts"."damaged" > 0
|
||||||
|
)
|
||||||
|
{% elif status_filter == '-has-damaged' %}
|
||||||
|
AND NOT EXISTS (
|
||||||
|
SELECT 1 FROM "bricktracker_sets" bs_filter
|
||||||
|
JOIN "bricktracker_parts" ON bs_filter."id" = "bricktracker_parts"."id"
|
||||||
|
WHERE bs_filter."set" = "rebrickable_sets"."set"
|
||||||
|
AND "bricktracker_parts"."damaged" > 0
|
||||||
|
)
|
||||||
|
{% endif %}
|
||||||
|
{% endif %}
|
||||||
|
{% endblock %}
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
from typing import Final
|
from typing import Final
|
||||||
|
|
||||||
__version__: Final[str] = '1.2.5'
|
__version__: Final[str] = '1.3.0'
|
||||||
__database_version__: Final[int] = 17
|
__database_version__: Final[int] = 18
|
||||||
|
|||||||
@@ -64,13 +64,17 @@ def list() -> str:
|
|||||||
owner_filter=owner_filter,
|
owner_filter=owner_filter,
|
||||||
purchase_location_filter=purchase_location_filter,
|
purchase_location_filter=purchase_location_filter,
|
||||||
storage_filter=storage_filter,
|
storage_filter=storage_filter,
|
||||||
tag_filter=tag_filter
|
tag_filter=tag_filter,
|
||||||
|
use_consolidated=current_app.config['SETS_CONSOLIDATION']
|
||||||
)
|
)
|
||||||
|
|
||||||
pagination_context = build_pagination_context(page, per_page, total_count, is_mobile)
|
pagination_context = build_pagination_context(page, per_page, total_count, is_mobile)
|
||||||
else:
|
else:
|
||||||
# ORIGINAL MODE - Single page with all data for client-side search
|
# ORIGINAL MODE - Single page with all data for client-side search
|
||||||
sets = BrickSetList().all()
|
if current_app.config['SETS_CONSOLIDATION']:
|
||||||
|
sets = BrickSetList().all_consolidated()
|
||||||
|
else:
|
||||||
|
sets = BrickSetList().all()
|
||||||
pagination_context = None
|
pagination_context = None
|
||||||
|
|
||||||
template_context = {
|
template_context = {
|
||||||
@@ -239,13 +243,44 @@ def deleted(*, id: str) -> str:
|
|||||||
@set_page.route('/<id>/details', methods=['GET'])
|
@set_page.route('/<id>/details', methods=['GET'])
|
||||||
@exception_handler(__file__)
|
@exception_handler(__file__)
|
||||||
def details(*, id: str) -> str:
|
def details(*, id: str) -> str:
|
||||||
return render_template(
|
# Load the specific set
|
||||||
'set.html',
|
item = BrickSet().select_specific(id)
|
||||||
item=BrickSet().select_specific(id),
|
|
||||||
open_instructions=request.args.get('open_instructions'),
|
# Check if there are multiple instances of this set
|
||||||
brickset_statuses=BrickSetStatusList.list(all=True),
|
all_instances = BrickSetList()
|
||||||
**set_metadata_lists(as_class=True)
|
# Load all sets with metadata context for tags, owners, etc.
|
||||||
)
|
filter_context = {
|
||||||
|
'owners': BrickSetOwnerList.as_columns(),
|
||||||
|
'statuses': BrickSetStatusList.as_columns(),
|
||||||
|
'tags': BrickSetTagList.as_columns(),
|
||||||
|
}
|
||||||
|
all_instances.list(do_theme=True, **filter_context)
|
||||||
|
|
||||||
|
# Find all instances with the same set number
|
||||||
|
same_set_instances = [
|
||||||
|
record for record in all_instances.records
|
||||||
|
if record.fields.set == item.fields.set
|
||||||
|
]
|
||||||
|
|
||||||
|
# If consolidation is enabled and multiple instances exist, show consolidated view
|
||||||
|
if current_app.config['SETS_CONSOLIDATION'] and len(same_set_instances) > 1:
|
||||||
|
return render_template(
|
||||||
|
'set.html',
|
||||||
|
item=item,
|
||||||
|
all_instances=same_set_instances,
|
||||||
|
open_instructions=request.args.get('open_instructions'),
|
||||||
|
brickset_statuses=BrickSetStatusList.list(all=True),
|
||||||
|
**set_metadata_lists(as_class=True)
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
# Single instance or consolidation disabled, show normal view
|
||||||
|
return render_template(
|
||||||
|
'set.html',
|
||||||
|
item=item,
|
||||||
|
open_instructions=request.args.get('open_instructions'),
|
||||||
|
brickset_statuses=BrickSetStatusList.list(all=True),
|
||||||
|
**set_metadata_lists(as_class=True)
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
# Update problematic pieces of a set
|
# Update problematic pieces of a set
|
||||||
@@ -294,6 +329,50 @@ def problem_part(
|
|||||||
return jsonify({problem: amount})
|
return jsonify({problem: amount})
|
||||||
|
|
||||||
|
|
||||||
|
# Update checked state of parts during walkthrough
|
||||||
|
@set_page.route('/<id>/parts/<part>/<int:color>/<int:spare>/checked', defaults={'figure': None}, methods=['POST']) # noqa: E501
|
||||||
|
@set_page.route('/<id>/minifigures/<figure>/parts/<part>/<int:color>/<int:spare>/checked', methods=['POST']) # noqa: E501
|
||||||
|
@login_required
|
||||||
|
@exception_handler(__file__, json=True)
|
||||||
|
def checked_part(
|
||||||
|
*,
|
||||||
|
id: str,
|
||||||
|
figure: str | None,
|
||||||
|
part: str,
|
||||||
|
color: int,
|
||||||
|
spare: int,
|
||||||
|
) -> Response:
|
||||||
|
brickset = BrickSet().select_specific(id)
|
||||||
|
|
||||||
|
if figure is not None:
|
||||||
|
brickminifigure = BrickMinifigure().select_specific(brickset, figure)
|
||||||
|
else:
|
||||||
|
brickminifigure = None
|
||||||
|
|
||||||
|
brickpart = BrickPart().select_specific(
|
||||||
|
brickset,
|
||||||
|
part,
|
||||||
|
color,
|
||||||
|
spare,
|
||||||
|
minifigure=brickminifigure,
|
||||||
|
)
|
||||||
|
|
||||||
|
checked = brickpart.update_checked(request.json)
|
||||||
|
|
||||||
|
# Info
|
||||||
|
logger.info('Set {set} ({id}): updated part ({part} color: {color}, spare: {spare}, minifigure: {figure}) checked state to {checked}'.format( # noqa: E501
|
||||||
|
set=brickset.fields.set,
|
||||||
|
id=brickset.fields.id,
|
||||||
|
figure=figure,
|
||||||
|
part=brickpart.fields.part,
|
||||||
|
color=brickpart.fields.color,
|
||||||
|
spare=brickpart.fields.spare,
|
||||||
|
checked=checked
|
||||||
|
))
|
||||||
|
|
||||||
|
return jsonify({'checked': checked})
|
||||||
|
|
||||||
|
|
||||||
# Refresh a set
|
# Refresh a set
|
||||||
@set_page.route('/refresh/<set>/', methods=['GET'])
|
@set_page.route('/refresh/<set>/', methods=['GET'])
|
||||||
@set_page.route('/<id>/refresh', methods=['GET'])
|
@set_page.route('/<id>/refresh', methods=['GET'])
|
||||||
|
|||||||
@@ -91,7 +91,7 @@ class BrickGridFilter {
|
|||||||
attribute: select.value,
|
attribute: select.value,
|
||||||
bool: true,
|
bool: true,
|
||||||
value: "1"
|
value: "1"
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -106,19 +106,48 @@ class BrickGridFilter {
|
|||||||
const attribute = current.getAttribute(`data-${filter.attribute}`);
|
const attribute = current.getAttribute(`data-${filter.attribute}`);
|
||||||
|
|
||||||
// Bool check
|
// Bool check
|
||||||
// Attribute not equal value, or undefined and value is truthy
|
// For boolean attributes (like owner/tag filtering)
|
||||||
if (filter.bool) {
|
if (filter.bool) {
|
||||||
if ((attribute != null && attribute != filter.value) || (attribute == null && filter.value == "1")) {
|
if (filter.value == "1") {
|
||||||
current.parentElement.classList.add("d-none");
|
// Looking for sets WITH this attribute
|
||||||
return;
|
// Hide if attribute is missing (null) or explicitly "0"
|
||||||
|
// For owner/tag attributes: missing = doesn't have this owner/tag
|
||||||
|
if (attribute == null || attribute == "0") {
|
||||||
|
current.parentElement.classList.add("d-none");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
} else if (filter.value == "0") {
|
||||||
|
// Looking for sets WITHOUT this attribute
|
||||||
|
// Hide if attribute is present and "1"
|
||||||
|
// For owner/tag attributes: present and "1" = has this owner/tag
|
||||||
|
if (attribute == "1") {
|
||||||
|
current.parentElement.classList.add("d-none");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
// Note: null (missing) is treated as "doesn't have" which is what we want for value="0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Value check
|
// Value check
|
||||||
// Attribute not equal value, or attribute undefined
|
// For consolidated cards, attributes may be comma or pipe-separated (e.g., "storage1,storage2" or "storage1|storage2")
|
||||||
else if ((attribute != null && attribute != filter.value) || attribute == null) {
|
else if (attribute == null) {
|
||||||
|
// Hide if attribute is missing
|
||||||
current.parentElement.classList.add("d-none");
|
current.parentElement.classList.add("d-none");
|
||||||
return;
|
return;
|
||||||
|
} else if (attribute.includes(',') || attribute.includes('|')) {
|
||||||
|
// Handle comma or pipe-separated values (consolidated cards)
|
||||||
|
const separator = attribute.includes('|') ? '|' : ',';
|
||||||
|
const values = attribute.split(separator).map(v => v.trim());
|
||||||
|
if (!values.includes(filter.value)) {
|
||||||
|
current.parentElement.classList.add("d-none");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// Handle single values (regular cards)
|
||||||
|
if (attribute != filter.value) {
|
||||||
|
current.parentElement.classList.add("d-none");
|
||||||
|
return;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,182 @@
|
|||||||
|
// Bulk operations for parts in set details page
|
||||||
|
class PartsBulkOperations {
|
||||||
|
constructor(accordionId) {
|
||||||
|
this.accordionId = accordionId;
|
||||||
|
this.setupModal();
|
||||||
|
this.setupEventListeners();
|
||||||
|
}
|
||||||
|
|
||||||
|
setupModal() {
|
||||||
|
// Create Bootstrap modal if it doesn't exist
|
||||||
|
if (!document.getElementById('partsConfirmModal')) {
|
||||||
|
const modalHTML = `
|
||||||
|
<div class="modal fade" id="partsConfirmModal" tabindex="-1" aria-labelledby="partsConfirmModalLabel" aria-hidden="true">
|
||||||
|
<div class="modal-dialog">
|
||||||
|
<div class="modal-content">
|
||||||
|
<div class="modal-header">
|
||||||
|
<h5 class="modal-title" id="partsConfirmModalLabel">Confirm Action</h5>
|
||||||
|
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
|
||||||
|
</div>
|
||||||
|
<div class="modal-body">
|
||||||
|
<p id="partsConfirmModalMessage"></p>
|
||||||
|
</div>
|
||||||
|
<div class="modal-footer">
|
||||||
|
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>
|
||||||
|
<button type="button" class="btn btn-primary" id="partsConfirmModalConfirm">Confirm</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
`;
|
||||||
|
document.body.insertAdjacentHTML('beforeend', modalHTML);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
setupEventListeners() {
|
||||||
|
// Mark all as missing (only if missing parts are not hidden)
|
||||||
|
const markAllMissingBtn = document.getElementById(`mark-all-missing-${this.accordionId}`);
|
||||||
|
if (markAllMissingBtn) {
|
||||||
|
markAllMissingBtn.addEventListener('click', (e) => {
|
||||||
|
e.preventDefault();
|
||||||
|
this.confirmAndExecute(
|
||||||
|
'Mark all parts as missing?',
|
||||||
|
'This will set the missing count to the maximum quantity for all parts in this section.',
|
||||||
|
() => this.markAllMissing()
|
||||||
|
);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// Clear all missing (only if missing parts are not hidden)
|
||||||
|
const clearAllMissingBtn = document.getElementById(`clear-all-missing-${this.accordionId}`);
|
||||||
|
if (clearAllMissingBtn) {
|
||||||
|
clearAllMissingBtn.addEventListener('click', (e) => {
|
||||||
|
e.preventDefault();
|
||||||
|
this.confirmAndExecute(
|
||||||
|
'Clear all missing parts?',
|
||||||
|
'This will clear the missing field for all parts in this section.',
|
||||||
|
() => this.clearAllMissing()
|
||||||
|
);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check all checkboxes (only if checked parts are not hidden)
|
||||||
|
const checkAllBtn = document.getElementById(`check-all-${this.accordionId}`);
|
||||||
|
if (checkAllBtn) {
|
||||||
|
checkAllBtn.addEventListener('click', (e) => {
|
||||||
|
e.preventDefault();
|
||||||
|
this.checkAll();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// Uncheck all checkboxes (only if checked parts are not hidden)
|
||||||
|
const uncheckAllBtn = document.getElementById(`uncheck-all-${this.accordionId}`);
|
||||||
|
if (uncheckAllBtn) {
|
||||||
|
uncheckAllBtn.addEventListener('click', (e) => {
|
||||||
|
e.preventDefault();
|
||||||
|
this.uncheckAll();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
confirmAndExecute(title, message, callback) {
|
||||||
|
const modal = document.getElementById('partsConfirmModal');
|
||||||
|
const modalTitle = document.getElementById('partsConfirmModalLabel');
|
||||||
|
const modalMessage = document.getElementById('partsConfirmModalMessage');
|
||||||
|
const confirmBtn = document.getElementById('partsConfirmModalConfirm');
|
||||||
|
|
||||||
|
// Set modal content
|
||||||
|
modalTitle.textContent = title;
|
||||||
|
modalMessage.textContent = message;
|
||||||
|
|
||||||
|
// Remove any existing event listeners and add new one
|
||||||
|
const newConfirmBtn = confirmBtn.cloneNode(true);
|
||||||
|
confirmBtn.parentNode.replaceChild(newConfirmBtn, confirmBtn);
|
||||||
|
|
||||||
|
newConfirmBtn.addEventListener('click', () => {
|
||||||
|
const modalInstance = bootstrap.Modal.getInstance(modal);
|
||||||
|
modalInstance.hide();
|
||||||
|
callback();
|
||||||
|
});
|
||||||
|
|
||||||
|
// Show modal
|
||||||
|
const modalInstance = new bootstrap.Modal(modal);
|
||||||
|
modalInstance.show();
|
||||||
|
}
|
||||||
|
|
||||||
|
markAllMissing() {
|
||||||
|
const accordionElement = document.getElementById(this.accordionId);
|
||||||
|
if (!accordionElement) return;
|
||||||
|
|
||||||
|
// Find all rows in this accordion
|
||||||
|
const rows = accordionElement.querySelectorAll('tbody tr');
|
||||||
|
rows.forEach(row => {
|
||||||
|
// Find the quantity cell (usually 4th column)
|
||||||
|
const quantityCell = row.cells[3]; // Index 3 for quantity column
|
||||||
|
const missingInput = row.querySelector('input[id*="-missing-"]');
|
||||||
|
|
||||||
|
if (quantityCell && missingInput) {
|
||||||
|
// Extract quantity from cell text content
|
||||||
|
const quantityText = quantityCell.textContent.trim();
|
||||||
|
const quantity = parseInt(quantityText) || 1; // Default to 1 if can't parse
|
||||||
|
|
||||||
|
if (missingInput.value !== quantity.toString()) {
|
||||||
|
missingInput.value = quantity.toString();
|
||||||
|
// Trigger change event to activate BrickChanger
|
||||||
|
missingInput.dispatchEvent(new Event('change', { bubbles: true }));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
clearAllMissing() {
|
||||||
|
const accordionElement = document.getElementById(this.accordionId);
|
||||||
|
if (!accordionElement) return;
|
||||||
|
|
||||||
|
const missingInputs = accordionElement.querySelectorAll('input[id*="-missing-"]');
|
||||||
|
missingInputs.forEach(input => {
|
||||||
|
if (input.value !== '') {
|
||||||
|
input.value = '';
|
||||||
|
// Trigger change event to activate BrickChanger
|
||||||
|
input.dispatchEvent(new Event('change', { bubbles: true }));
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
checkAll() {
|
||||||
|
const accordionElement = document.getElementById(this.accordionId);
|
||||||
|
if (!accordionElement) return;
|
||||||
|
|
||||||
|
const checkboxes = accordionElement.querySelectorAll('input[id*="-checked-"][type="checkbox"]');
|
||||||
|
checkboxes.forEach(checkbox => {
|
||||||
|
if (!checkbox.checked) {
|
||||||
|
checkbox.checked = true;
|
||||||
|
// Trigger change event to activate BrickChanger
|
||||||
|
checkbox.dispatchEvent(new Event('change', { bubbles: true }));
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
uncheckAll() {
|
||||||
|
const accordionElement = document.getElementById(this.accordionId);
|
||||||
|
if (!accordionElement) return;
|
||||||
|
|
||||||
|
const checkboxes = accordionElement.querySelectorAll('input[id*="-checked-"][type="checkbox"]');
|
||||||
|
checkboxes.forEach(checkbox => {
|
||||||
|
if (checkbox.checked) {
|
||||||
|
checkbox.checked = false;
|
||||||
|
// Trigger change event to activate BrickChanger
|
||||||
|
checkbox.dispatchEvent(new Event('change', { bubbles: true }));
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Initialize bulk operations for all part accordions when DOM is ready
|
||||||
|
document.addEventListener('DOMContentLoaded', () => {
|
||||||
|
// Find all hamburger menus and initialize bulk operations
|
||||||
|
const hamburgerMenus = document.querySelectorAll('button[id^="hamburger-"]');
|
||||||
|
hamburgerMenus.forEach(button => {
|
||||||
|
const accordionId = button.id.replace('hamburger-', '');
|
||||||
|
new PartsBulkOperations(accordionId);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
// Set details page functionality
|
||||||
|
document.addEventListener('DOMContentLoaded', function() {
|
||||||
|
const collapseElement = document.getElementById('all-instances');
|
||||||
|
const toggleIcon = document.getElementById('copies-toggle-icon');
|
||||||
|
|
||||||
|
if (collapseElement && toggleIcon) {
|
||||||
|
collapseElement.addEventListener('shown.bs.collapse', function() {
|
||||||
|
toggleIcon.className = 'ri-arrow-up-s-line fs-4';
|
||||||
|
});
|
||||||
|
|
||||||
|
collapseElement.addEventListener('hidden.bs.collapse', function() {
|
||||||
|
toggleIcon.className = 'ri-arrow-down-s-line fs-4';
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
@@ -194,3 +194,169 @@ function setupPaginationFilterDropdowns() {
|
|||||||
window.location.href = currentUrl.toString();
|
window.location.href = currentUrl.toString();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Set grouping functionality
|
||||||
|
function initializeSetGrouping() {
|
||||||
|
const groupToggle = document.getElementById('group-identical-sets');
|
||||||
|
if (!groupToggle) return;
|
||||||
|
|
||||||
|
// Load saved state from localStorage
|
||||||
|
const savedState = localStorage.getItem('groupIdenticalSets') === 'true';
|
||||||
|
groupToggle.checked = savedState;
|
||||||
|
|
||||||
|
// Apply grouping on page load if enabled
|
||||||
|
if (savedState) {
|
||||||
|
applySetGrouping();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Listen for toggle changes
|
||||||
|
groupToggle.addEventListener('change', function() {
|
||||||
|
// Save state to localStorage
|
||||||
|
localStorage.setItem('groupIdenticalSets', this.checked);
|
||||||
|
|
||||||
|
if (this.checked) {
|
||||||
|
applySetGrouping();
|
||||||
|
} else {
|
||||||
|
removeSetGrouping();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function applySetGrouping() {
|
||||||
|
const grid = document.getElementById('grid');
|
||||||
|
if (!grid) return;
|
||||||
|
|
||||||
|
const setCards = Array.from(grid.children);
|
||||||
|
const groupedSets = {};
|
||||||
|
|
||||||
|
// Group sets by rebrickable_set_id
|
||||||
|
setCards.forEach(cardCol => {
|
||||||
|
const setCard = cardCol.querySelector('.card[data-set-id]');
|
||||||
|
if (!setCard) return;
|
||||||
|
|
||||||
|
const setId = setCard.getAttribute('data-set-id');
|
||||||
|
const rebrickableId = setCard.getAttribute('data-rebrickable-id');
|
||||||
|
|
||||||
|
if (!rebrickableId) return;
|
||||||
|
|
||||||
|
if (!groupedSets[rebrickableId]) {
|
||||||
|
groupedSets[rebrickableId] = [];
|
||||||
|
}
|
||||||
|
|
||||||
|
groupedSets[rebrickableId].push({
|
||||||
|
cardCol: cardCol,
|
||||||
|
setId: setId,
|
||||||
|
rebrickableId: rebrickableId
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
// Process each group
|
||||||
|
Object.keys(groupedSets).forEach(rebrickableId => {
|
||||||
|
const group = groupedSets[rebrickableId];
|
||||||
|
|
||||||
|
if (group.length > 1) {
|
||||||
|
createGroupedSetDisplay(group);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function createGroupedSetDisplay(setGroup) {
|
||||||
|
const firstSet = setGroup[0];
|
||||||
|
const firstCard = firstSet.cardCol.querySelector('.card');
|
||||||
|
|
||||||
|
if (!firstCard) return;
|
||||||
|
|
||||||
|
// Calculate aggregate stats
|
||||||
|
let totalMissing = 0;
|
||||||
|
let totalDamaged = 0;
|
||||||
|
let allSetIds = [];
|
||||||
|
|
||||||
|
setGroup.forEach(set => {
|
||||||
|
const card = set.cardCol.querySelector('.card');
|
||||||
|
|
||||||
|
// Get missing and damaged counts from existing data attributes
|
||||||
|
const missingCount = parseInt(card.getAttribute('data-missing') || '0');
|
||||||
|
const damagedCount = parseInt(card.getAttribute('data-damaged') || '0');
|
||||||
|
|
||||||
|
totalMissing += missingCount;
|
||||||
|
totalDamaged += damagedCount;
|
||||||
|
allSetIds.push(set.setId);
|
||||||
|
});
|
||||||
|
|
||||||
|
// Create grouped card container
|
||||||
|
const groupContainer = document.createElement('div');
|
||||||
|
groupContainer.className = firstSet.cardCol.className + ' set-group-container';
|
||||||
|
groupContainer.innerHTML = `
|
||||||
|
<div class="card set-group-card">
|
||||||
|
<div class="card-header d-flex justify-content-between align-items-center">
|
||||||
|
<div class="d-flex align-items-center">
|
||||||
|
<button class="btn btn-sm btn-outline-primary me-2 group-toggle-btn"
|
||||||
|
type="button" data-bs-toggle="collapse"
|
||||||
|
data-bs-target="#group-${setGroup[0].rebrickableId}"
|
||||||
|
aria-expanded="false">
|
||||||
|
<i class="ri-arrow-right-line"></i>
|
||||||
|
</button>
|
||||||
|
<span class="fw-bold">${firstCard.querySelector('.card-title')?.textContent || 'Set'}</span>
|
||||||
|
<span class="badge bg-secondary ms-2">${setGroup.length} sets</span>
|
||||||
|
</div>
|
||||||
|
<div class="d-flex gap-1">
|
||||||
|
${totalMissing > 0 ? `<span class="badge bg-warning text-dark">${totalMissing} missing</span>` : ''}
|
||||||
|
${totalDamaged > 0 ? `<span class="badge bg-danger">${totalDamaged} damaged</span>` : ''}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="collapse" id="group-${setGroup[0].rebrickableId}">
|
||||||
|
<div class="card-body">
|
||||||
|
<div class="row set-group-items"></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
`;
|
||||||
|
|
||||||
|
// Add individual set cards to the group
|
||||||
|
const groupItems = groupContainer.querySelector('.set-group-items');
|
||||||
|
setGroup.forEach(set => {
|
||||||
|
const itemContainer = document.createElement('div');
|
||||||
|
itemContainer.className = 'col-12 mb-2';
|
||||||
|
|
||||||
|
// Clone the original card but make it smaller
|
||||||
|
const clonedCard = set.cardCol.querySelector('.card').cloneNode(true);
|
||||||
|
clonedCard.classList.add('set-group-item');
|
||||||
|
|
||||||
|
itemContainer.appendChild(clonedCard);
|
||||||
|
groupItems.appendChild(itemContainer);
|
||||||
|
|
||||||
|
// Hide the original card
|
||||||
|
set.cardCol.style.display = 'none';
|
||||||
|
set.cardCol.classList.add('grouped-set-hidden');
|
||||||
|
});
|
||||||
|
|
||||||
|
// Insert the grouped container before the first hidden set
|
||||||
|
firstSet.cardCol.parentNode.insertBefore(groupContainer, firstSet.cardCol);
|
||||||
|
|
||||||
|
// Add event listener to toggle arrow icon
|
||||||
|
const toggleBtn = groupContainer.querySelector('.group-toggle-btn');
|
||||||
|
const collapseElement = groupContainer.querySelector('.collapse');
|
||||||
|
|
||||||
|
collapseElement.addEventListener('shown.bs.collapse', () => {
|
||||||
|
toggleBtn.querySelector('i').className = 'ri-arrow-down-line';
|
||||||
|
});
|
||||||
|
|
||||||
|
collapseElement.addEventListener('hidden.bs.collapse', () => {
|
||||||
|
toggleBtn.querySelector('i').className = 'ri-arrow-right-line';
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function removeSetGrouping() {
|
||||||
|
// Show all hidden sets
|
||||||
|
const hiddenSets = document.querySelectorAll('.grouped-set-hidden');
|
||||||
|
hiddenSets.forEach(setCol => {
|
||||||
|
setCol.style.display = '';
|
||||||
|
setCol.classList.remove('grouped-set-hidden');
|
||||||
|
});
|
||||||
|
|
||||||
|
// Remove all group containers
|
||||||
|
const groupContainers = document.querySelectorAll('.set-group-container');
|
||||||
|
groupContainers.forEach(container => {
|
||||||
|
container.remove();
|
||||||
|
});
|
||||||
|
}
|
||||||
@@ -50,6 +50,67 @@
|
|||||||
max-width: 150px;
|
max-width: 150px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Checkbox column width constraint */
|
||||||
|
.table-td-input:has(.form-check-input[type="checkbox"]) {
|
||||||
|
width: 120px;
|
||||||
|
max-width: 120px;
|
||||||
|
min-width: 120px;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Reserve space for status icon to prevent layout shift */
|
||||||
|
.form-check-label i[id^="status-"] {
|
||||||
|
display: inline-block;
|
||||||
|
width: 1.2em;
|
||||||
|
text-align: center;
|
||||||
|
margin-left: 0.25rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Hamburger menu styling */
|
||||||
|
.table th .dropdown {
|
||||||
|
position: relative;
|
||||||
|
}
|
||||||
|
|
||||||
|
.table th .dropdown-toggle {
|
||||||
|
border-radius: 0.375rem;
|
||||||
|
padding: 0.25rem 0.5rem;
|
||||||
|
font-size: 0.875rem;
|
||||||
|
line-height: 1.25rem;
|
||||||
|
border-color: #6c757d;
|
||||||
|
}
|
||||||
|
|
||||||
|
.table th .dropdown-toggle:focus {
|
||||||
|
box-shadow: 0 0 0 0.25rem rgba(13, 110, 253, 0.25);
|
||||||
|
}
|
||||||
|
|
||||||
|
.table th .dropdown-toggle:hover {
|
||||||
|
background-color: #f8f9fa;
|
||||||
|
border-color: #6c757d;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Style dropdown items */
|
||||||
|
.dropdown-menu .dropdown-header {
|
||||||
|
font-size: 0.75rem;
|
||||||
|
font-weight: 600;
|
||||||
|
text-transform: uppercase;
|
||||||
|
color: #6c757d;
|
||||||
|
padding: 0.25rem 1rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.dropdown-menu .dropdown-item {
|
||||||
|
font-size: 0.875rem;
|
||||||
|
padding: 0.5rem 1rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.dropdown-menu .dropdown-item:hover {
|
||||||
|
background-color: #f8f9fa;
|
||||||
|
color: #212529;
|
||||||
|
}
|
||||||
|
|
||||||
|
.dropdown-menu .dropdown-item i {
|
||||||
|
width: 1.25rem;
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
|
|
||||||
/* Fixes for sortable.js */
|
/* Fixes for sortable.js */
|
||||||
.sortable {
|
.sortable {
|
||||||
--th-color: #000 !important;
|
--th-color: #000 !important;
|
||||||
@@ -100,3 +161,21 @@
|
|||||||
text-overflow: ellipsis;
|
text-overflow: ellipsis;
|
||||||
min-width: 0;
|
min-width: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Partial Status Checkbox Styling */
|
||||||
|
.partial-status {
|
||||||
|
position: relative;
|
||||||
|
}
|
||||||
|
|
||||||
|
.partial-status::after {
|
||||||
|
content: '';
|
||||||
|
position: absolute;
|
||||||
|
top: 2px;
|
||||||
|
left: 2px;
|
||||||
|
right: 2px;
|
||||||
|
bottom: 2px;
|
||||||
|
background: #6f42c1;
|
||||||
|
border-radius: 2px;
|
||||||
|
opacity: 0.8;
|
||||||
|
pointer-events: none;
|
||||||
|
}
|
||||||
@@ -105,6 +105,10 @@
|
|||||||
{% if request.endpoint == 'set.list' %}
|
{% if request.endpoint == 'set.list' %}
|
||||||
<script src="{{ url_for('static', filename='scripts/sets.js') }}"></script>
|
<script src="{{ url_for('static', filename='scripts/sets.js') }}"></script>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
{% if request.endpoint == 'set.details' %}
|
||||||
|
<script src="{{ url_for('static', filename='scripts/parts-bulk-operations.js') }}"></script>
|
||||||
|
<script src="{{ url_for('static', filename='scripts/set-details.js') }}"></script>
|
||||||
|
{% endif %}
|
||||||
{% if request.endpoint == 'instructions.download' or request.endpoint == 'instructions.do_download' %}
|
{% if request.endpoint == 'instructions.download' or request.endpoint == 'instructions.do_download' %}
|
||||||
<script src="{{ url_for('static', filename='scripts/socket/peeron.js') }}"></script>
|
<script src="{{ url_for('static', filename='scripts/socket/peeron.js') }}"></script>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
{% macro header(title, id, parent, quantity=none, expanded=false, icon=none, class=none, danger=none, image=none, alt=none) %}
|
{% macro header(title, id, parent, quantity=none, expanded=false, icon=none, class=none, danger=none, image=none, alt=none, hamburger_menu=none) %}
|
||||||
{% if danger %}
|
{% if danger %}
|
||||||
{% set icon='alert-fill' %}
|
{% set icon='alert-fill' %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
@@ -43,10 +43,10 @@
|
|||||||
{% endif %}
|
{% endif %}
|
||||||
{% endmacro %}
|
{% endmacro %}
|
||||||
|
|
||||||
{% macro table(table_collection, title, id, parent, target, quantity=none, icon=none, image=none, alt=none, details=none, read_only=none) %}
|
{% macro table(table_collection, title, id, parent, target, quantity=none, icon=none, image=none, alt=none, details=none, read_only=none, hamburger_menu=none) %}
|
||||||
{% set size=table_collection | length %}
|
{% set size=table_collection | length %}
|
||||||
{% if size %}
|
{% if size %}
|
||||||
{{ header(title, id, parent, quantity=quantity, icon=icon, class='p-0', image=image, alt=alt) }}
|
{{ header(title, id, parent, quantity=quantity, icon=icon, class='p-0', image=image, alt=alt, hamburger_menu=hamburger_menu) }}
|
||||||
{% if details %}
|
{% if details %}
|
||||||
<p class="border-top border-bottom p-2 text-center">
|
<p class="border-top border-bottom p-2 text-center">
|
||||||
{% if image %}
|
{% if image %}
|
||||||
@@ -57,7 +57,7 @@
|
|||||||
<a class="btn border bg-secondary-text" href="{{ details }}">{% if icon %}<i class="ri-{{ icon }}"></i>{% endif %} Details</a>
|
<a class="btn border bg-secondary-text" href="{{ details }}">{% if icon %}<i class="ri-{{ icon }}"></i>{% endif %} Details</a>
|
||||||
</p>
|
</p>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% with solo=true, all=false %}
|
{% with solo=true, all=false, accordion_id=id %}
|
||||||
{% include target %}
|
{% include target %}
|
||||||
{% endwith %}
|
{% endwith %}
|
||||||
{{ footer() }}
|
{{ footer() }}
|
||||||
|
|||||||
+52
-12
@@ -75,14 +75,34 @@
|
|||||||
{% endmacro %}
|
{% endmacro %}
|
||||||
|
|
||||||
{% macro purchase_location(item, purchase_locations, solo=false, last=false) %}
|
{% macro purchase_location(item, purchase_locations, solo=false, last=false) %}
|
||||||
{% if purchase_locations and item.fields.purchase_location in purchase_locations.mapping %}
|
{% if purchase_locations and item.fields.purchase_location %}
|
||||||
{% set purchase_location = purchase_locations.mapping[item.fields.purchase_location] %}
|
{% if '|' in item.fields.purchase_location or ',' in item.fields.purchase_location %}
|
||||||
{% if last %}
|
{# Consolidated mode - multiple purchase locations #}
|
||||||
{% set tooltip=purchase_location.fields.name %}
|
{% set separator = '|' if '|' in item.fields.purchase_location else ',' %}
|
||||||
|
{% set location_list = item.fields.purchase_location.split(separator) %}
|
||||||
|
{% for location_id in location_list %}
|
||||||
|
{% if location_id and location_id.strip() and location_id.strip() in purchase_locations.mapping %}
|
||||||
|
{% set purchase_location = purchase_locations.mapping[location_id.strip()] %}
|
||||||
|
{% if last %}
|
||||||
|
{% set tooltip=purchase_location.fields.name %}
|
||||||
|
{% else %}
|
||||||
|
{% set text=purchase_location.fields.name %}
|
||||||
|
{% endif %}
|
||||||
|
{{ badge(check=purchase_location, solo=solo, last=last, color='light border', icon='building-line', text=text, tooltip=tooltip, collapsible='Location:') }}
|
||||||
|
{% endif %}
|
||||||
|
{% endfor %}
|
||||||
{% else %}
|
{% else %}
|
||||||
{% set text=purchase_location.fields.name %}
|
{# Single purchase location #}
|
||||||
|
{% if item.fields.purchase_location.strip() and item.fields.purchase_location.strip() in purchase_locations.mapping %}
|
||||||
|
{% set purchase_location = purchase_locations.mapping[item.fields.purchase_location.strip()] %}
|
||||||
|
{% if last %}
|
||||||
|
{% set tooltip=purchase_location.fields.name %}
|
||||||
|
{% else %}
|
||||||
|
{% set text=purchase_location.fields.name %}
|
||||||
|
{% endif %}
|
||||||
|
{{ badge(check=purchase_location, solo=solo, last=last, color='light border', icon='building-line', text=text, tooltip=tooltip, collapsible='Location:') }}
|
||||||
|
{% endif %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{{ badge(check=purchase_location, solo=solo, last=last, color='light border', icon='building-line', text=text, tooltip=tooltip, collapsible='Location:') }}
|
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% endmacro %}
|
{% endmacro %}
|
||||||
|
|
||||||
@@ -103,14 +123,34 @@
|
|||||||
{% endmacro %}
|
{% endmacro %}
|
||||||
|
|
||||||
{% macro storage(item, storages, solo=false, last=false) %}
|
{% macro storage(item, storages, solo=false, last=false) %}
|
||||||
{% if storages and item.fields.storage in storages.mapping %}
|
{% if storages and item.fields.storage %}
|
||||||
{% set storage = storages.mapping[item.fields.storage] %}
|
{% if '|' in item.fields.storage or ',' in item.fields.storage %}
|
||||||
{% if last %}
|
{# Consolidated mode - multiple storage locations #}
|
||||||
{% set tooltip=storage.fields.name %}
|
{% set separator = '|' if '|' in item.fields.storage else ',' %}
|
||||||
|
{% set storage_list = item.fields.storage.split(separator) %}
|
||||||
|
{% for storage_id in storage_list %}
|
||||||
|
{% if storage_id and storage_id.strip() and storage_id.strip() in storages.mapping %}
|
||||||
|
{% set storage = storages.mapping[storage_id.strip()] %}
|
||||||
|
{% if last %}
|
||||||
|
{% set tooltip=storage.fields.name %}
|
||||||
|
{% else %}
|
||||||
|
{% set text=storage.fields.name %}
|
||||||
|
{% endif %}
|
||||||
|
{{ badge(url=storage.url(), solo=solo, last=last, color='light text-warning-emphasis bg-warning-subtle border border-warning-subtle', icon='archive-2-line', text=text, alt='Storage', tooltip=tooltip) }}
|
||||||
|
{% endif %}
|
||||||
|
{% endfor %}
|
||||||
{% else %}
|
{% else %}
|
||||||
{% set text=storage.fields.name %}
|
{# Single storage location #}
|
||||||
|
{% if item.fields.storage.strip() and item.fields.storage.strip() in storages.mapping %}
|
||||||
|
{% set storage = storages.mapping[item.fields.storage.strip()] %}
|
||||||
|
{% if last %}
|
||||||
|
{% set tooltip=storage.fields.name %}
|
||||||
|
{% else %}
|
||||||
|
{% set text=storage.fields.name %}
|
||||||
|
{% endif %}
|
||||||
|
{{ badge(url=storage.url(), solo=solo, last=last, color='light text-warning-emphasis bg-warning-subtle border border-warning-subtle', icon='archive-2-line', text=text, alt='Storage', tooltip=tooltip) }}
|
||||||
|
{% endif %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{{ badge(url=item.url_for_storage(), solo=solo, last=last, color='light text-warning-emphasis bg-warning-subtle border border-warning-subtle', icon='archive-2-line', text=text, alt='Storage', tooltip=tooltip) }}
|
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% endmacro %}
|
{% endmacro %}
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
{% macro header(image=true, color=false, parts=false, quantity=false, missing=true, missing_parts=false, damaged=true, damaged_parts=false, sets=false, minifigures=false) %}
|
{% macro header(image=true, color=false, parts=false, quantity=false, missing=true, missing_parts=false, damaged=true, damaged_parts=false, sets=false, minifigures=false, checked=false, hamburger_menu=false, accordion_id='') %}
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
{% if image %}
|
{% if image %}
|
||||||
@@ -26,6 +26,37 @@
|
|||||||
{% if minifigures %}
|
{% if minifigures %}
|
||||||
<th data-table-number="true" scope="col"><i class="ri-group-line fw-normal"></i> Minifigures</th>
|
<th data-table-number="true" scope="col"><i class="ri-group-line fw-normal"></i> Minifigures</th>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
{% if checked and not config['HIDE_TABLE_CHECKED_PARTS'] %}
|
||||||
|
<th data-table-no-sort-and-search="true" class="no-sort" scope="col"><i class="ri-checkbox-line fw-normal"></i> Checked</th>
|
||||||
|
{% endif %}
|
||||||
|
{% if hamburger_menu and g.login.is_authenticated() %}
|
||||||
|
{% set show_missing_menu = not config['HIDE_TABLE_MISSING_PARTS'] %}
|
||||||
|
{% set show_checked_menu = not config['HIDE_TABLE_CHECKED_PARTS'] %}
|
||||||
|
{% if show_missing_menu or show_checked_menu %}
|
||||||
|
<th data-table-no-sort-and-search="true" class="no-sort text-end" scope="col">
|
||||||
|
<div class="dropdown">
|
||||||
|
<button class="btn btn-sm btn-outline-secondary dropdown-toggle" type="button" id="hamburger-{{ accordion_id }}" data-bs-toggle="dropdown" aria-expanded="false">
|
||||||
|
<i class="ri-menu-line"></i>
|
||||||
|
</button>
|
||||||
|
<ul class="dropdown-menu dropdown-menu-end" aria-labelledby="hamburger-{{ accordion_id }}">
|
||||||
|
{% if show_missing_menu %}
|
||||||
|
<li><h6 class="dropdown-header">Missing Parts</h6></li>
|
||||||
|
<li><a class="dropdown-item" href="#" id="mark-all-missing-{{ accordion_id }}"><i class="ri-question-line me-2"></i>Mark all as missing</a></li>
|
||||||
|
<li><a class="dropdown-item" href="#" id="clear-all-missing-{{ accordion_id }}"><i class="ri-close-circle-line me-2"></i>Clear all missing</a></li>
|
||||||
|
{% endif %}
|
||||||
|
{% if show_missing_menu and show_checked_menu %}
|
||||||
|
<li><hr class="dropdown-divider"></li>
|
||||||
|
{% endif %}
|
||||||
|
{% if show_checked_menu %}
|
||||||
|
<li><h6 class="dropdown-header">Checked Status</h6></li>
|
||||||
|
<li><a class="dropdown-item" href="#" id="check-all-{{ accordion_id }}"><i class="ri-checkbox-line me-2"></i>Check all</a></li>
|
||||||
|
<li><a class="dropdown-item" href="#" id="uncheck-all-{{ accordion_id }}"><i class="ri-checkbox-blank-line me-2"></i>Uncheck all</a></li>
|
||||||
|
{% endif %}
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
</th>
|
||||||
|
{% endif %}
|
||||||
|
{% endif %}
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
{% endmacro %}
|
{% endmacro %}
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
<div class="table-responsive-sm">
|
<div class="table-responsive-sm">
|
||||||
<table data-table="{% if all %}true{% endif %}" class="table table-striped align-middle {% if not all %}sortable mb-0{% endif %}" {% if all %}id="parts"{% endif %}>
|
<table data-table="{% if all %}true{% endif %}" class="table table-striped align-middle {% if not all %}sortable mb-0{% endif %}" {% if all %}id="parts"{% endif %}>
|
||||||
{{ table.header(color=true, quantity=not no_quantity, sets=all, minifigures=all) }}
|
{{ table.header(color=true, quantity=not no_quantity, sets=all, minifigures=all, checked=not all and not read_only, hamburger_menu=not all and not read_only, accordion_id=accordion_id|default('')) }}
|
||||||
<tbody>
|
<tbody>
|
||||||
{% for item in table_collection %}
|
{% for item in table_collection %}
|
||||||
<tr>
|
<tr>
|
||||||
@@ -40,6 +40,19 @@
|
|||||||
{% if all %}
|
{% if all %}
|
||||||
<td>{{ item.fields.total_sets }}</td>
|
<td>{{ item.fields.total_sets }}</td>
|
||||||
<td>{{ item.fields.total_minifigures }}</td>
|
<td>{{ item.fields.total_minifigures }}</td>
|
||||||
|
{% else %}
|
||||||
|
{% if not config['HIDE_TABLE_CHECKED_PARTS'] and not read_only %}
|
||||||
|
<td class="table-td-input">
|
||||||
|
<center>{{ form.checkbox('', item.fields.id, item.html_id('checked'), item.url_for_checked(), item.fields.checked | default(false), parent='part', delete=read_only) }}</center>
|
||||||
|
</td>
|
||||||
|
{% endif %}
|
||||||
|
{% if g.login.is_authenticated() and not read_only %}
|
||||||
|
{% set show_missing_menu = not config['HIDE_TABLE_MISSING_PARTS'] %}
|
||||||
|
{% set show_checked_menu = not config['HIDE_TABLE_CHECKED_PARTS'] %}
|
||||||
|
{% if show_missing_menu or show_checked_menu %}
|
||||||
|
<td></td>
|
||||||
|
{% endif %}
|
||||||
|
{% endif %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</tr>
|
</tr>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
|
|||||||
+45
-3
@@ -6,9 +6,51 @@
|
|||||||
<div class="container">
|
<div class="container">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-12">
|
<div class="col-12">
|
||||||
{% with solo=true, delete=delete %}
|
{% if all_instances and all_instances | length > 1 %}
|
||||||
{% include 'set/card.html' %}
|
<!-- Multiple instances view with drawer-style header -->
|
||||||
{% endwith %}
|
<div class="alert alert-info mb-3">
|
||||||
|
<!-- Clickable drawer header -->
|
||||||
|
<div class="d-flex justify-content-between align-items-center" style="cursor: pointer;" data-bs-toggle="collapse"
|
||||||
|
data-bs-target="#all-instances" aria-expanded="false" aria-controls="all-instances">
|
||||||
|
<div>
|
||||||
|
<h4 class="mb-1">
|
||||||
|
<i class="ri-stack-line me-2"></i>Multiple Copies Available
|
||||||
|
<span class="badge bg-primary ms-2">{{ all_instances | length }}</span>
|
||||||
|
</h4>
|
||||||
|
<p class="mb-0">This set has {{ all_instances | length }} copies in your collection. Click to view all copies individually.</p>
|
||||||
|
</div>
|
||||||
|
<i class="ri-arrow-down-s-line fs-4" id="copies-toggle-icon"></i>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Collapsible instances section -->
|
||||||
|
<div class="collapse mt-3" id="all-instances">
|
||||||
|
<div class="border-top pt-3">
|
||||||
|
<div class="row">
|
||||||
|
{% set current_item_id = item.fields.id %}
|
||||||
|
{% for instance in all_instances %}
|
||||||
|
<div class="col-md-6 col-xl-4 d-flex align-items-stretch mb-3">
|
||||||
|
{% with item=instance, index=loop.index0, tiny=false, current_viewing=(instance.fields.id == current_item_id) %}
|
||||||
|
<div class="position-relative w-100">
|
||||||
|
{% include 'set/card.html' %}
|
||||||
|
</div>
|
||||||
|
{% endwith %}
|
||||||
|
</div>
|
||||||
|
{% endfor %}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
{% with solo=true, delete=delete %}
|
||||||
|
{% include 'set/card.html' %}
|
||||||
|
{% endwith %}
|
||||||
|
{% else %}
|
||||||
|
<!-- Single instance view -->
|
||||||
|
{% with solo=true, delete=delete %}
|
||||||
|
{% include 'set/card.html' %}
|
||||||
|
{% endwith %}
|
||||||
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
+45
-9
@@ -3,9 +3,11 @@
|
|||||||
{% import 'macro/card.html' as card %}
|
{% import 'macro/card.html' as card %}
|
||||||
{% import 'macro/form.html' as form %}
|
{% import 'macro/form.html' as form %}
|
||||||
|
|
||||||
<div {% if not solo %}id="set-{{ item.fields.id }}"{% endif %} class="card mb-3 flex-fill {% if solo %}card-solo{% endif %}"
|
<div {% if not solo %}id="set-{{ item.fields.consolidated_id or item.fields.id }}"{% endif %} class="card mb-3 flex-fill {% if solo %}card-solo{% endif %}{% if current_viewing %} border-secondary{% endif %}"{% if current_viewing %} style="border-width: 3px !important;"{% endif %}
|
||||||
|
data-set-id="{{ item.fields.consolidated_id or item.fields.id }}" data-rebrickable-id="{{ item.fields.set }}"
|
||||||
|
{% if item.fields.instance_count is defined %}data-instance-count="{{ item.fields.instance_count }}" data-instance-ids="{{ item.fields.instance_ids }}"{% endif %}
|
||||||
{% if not solo and not tiny %}
|
{% if not solo and not tiny %}
|
||||||
data-index="{{ index }}" data-number="{{ item.fields.set }}" data-name="{{ item.fields.name | lower }}" data-parts="{{ item.fields.number_of_parts }}"
|
data-index="{{ index }}" data-number="{{ item.fields.set }}" data-set="{{ item.fields.set.split('-')[0] | int }}{{ '%05d' | format(item.fields.set.split('-')[1] | int) }}" data-name="{{ item.fields.name | lower }}" data-parts="{{ item.fields.number_of_parts }}"
|
||||||
data-year="{{ item.fields.year }}" data-theme="{{ item.theme.name | lower }}"
|
data-year="{{ item.fields.year }}" data-theme="{{ item.theme.name | lower }}"
|
||||||
{% if not config['HIDE_SET_INSTRUCTIONS'] %}
|
{% if not config['HIDE_SET_INSTRUCTIONS'] %}
|
||||||
data-has-missing-instructions="{{ (item.instructions | length == 0) | int }}"
|
data-has-missing-instructions="{{ (item.instructions | length == 0) | int }}"
|
||||||
@@ -54,7 +56,7 @@
|
|||||||
>
|
>
|
||||||
{{ card.header(item, item.fields.name, solo=solo, identifier=item.fields.set) }}
|
{{ card.header(item, item.fields.name, solo=solo, identifier=item.fields.set) }}
|
||||||
{{ card.image(item, solo=solo, last=last, caption=item.fields.name, alt=item.fields.set) }}
|
{{ card.image(item, solo=solo, last=last, caption=item.fields.name, alt=item.fields.set) }}
|
||||||
<div class="card-body border-bottom-0 {% if not solo %}p-1{% endif %}">
|
<div class="card-body border-bottom-0 {% if not solo %}p-1{% endif %}"{% if current_viewing %} style="border-color: var(--bs-border-color) !important; border-width: 1px !important;"{% endif %}>
|
||||||
{{ badge.theme(item.theme.name, solo=solo, last=last) }}
|
{{ badge.theme(item.theme.name, solo=solo, last=last) }}
|
||||||
{% for tag in brickset_tags %}
|
{% for tag in brickset_tags %}
|
||||||
{{ badge.tag(item, tag, solo=solo, last=last) }}
|
{{ badge.tag(item, tag, solo=solo, last=last) }}
|
||||||
@@ -63,6 +65,9 @@
|
|||||||
{{ badge.year(item.fields.year, solo=solo, last=last) }}
|
{{ badge.year(item.fields.year, solo=solo, last=last) }}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{{ badge.parts(item.fields.number_of_parts, solo=solo, last=last) }}
|
{{ badge.parts(item.fields.number_of_parts, solo=solo, last=last) }}
|
||||||
|
{% if item.fields.instance_count is defined and item.fields.instance_count > 1 %}
|
||||||
|
<span class="badge bg-primary"><i class="ri-stack-line"></i> {{ item.fields.instance_count }} copies</span>
|
||||||
|
{% endif %}
|
||||||
{{ badge.total_minifigures(item.fields.total_minifigures, solo=solo, last=last) }}
|
{{ badge.total_minifigures(item.fields.total_minifigures, solo=solo, last=last) }}
|
||||||
{{ badge.total_missing(item.fields.total_missing, solo=solo, last=last) }}
|
{{ badge.total_missing(item.fields.total_missing, solo=solo, last=last) }}
|
||||||
{{ badge.total_damaged(item.fields.total_damaged, solo=solo, last=last) }}
|
{{ badge.total_damaged(item.fields.total_damaged, solo=solo, last=last) }}
|
||||||
@@ -81,14 +86,45 @@
|
|||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
{% if not tiny and brickset_statuses | length %}
|
{% if not tiny and brickset_statuses | length %}
|
||||||
<ul class="list-group list-group-flush card-check border-bottom-0">
|
<ul class="list-group list-group-flush card-check border-bottom-0"{% if current_viewing %} style="border-color: var(--bs-border-color) !important; border-width: 1px !important;"{% endif %}>
|
||||||
{% for status in brickset_statuses %}
|
{% for status in brickset_statuses %}
|
||||||
<li class="d-flex list-group-item {% if not solo %}p-1{% endif %} text-nowrap">{{ form.checkbox(status.fields.name, item.fields.id, status.as_dataset(), status.url_for_set_state(item.fields.id), item.fields[status.as_column()], parent='set', delete=delete) }}</li>
|
<li class="d-flex list-group-item {% if not solo %}p-1{% endif %} text-nowrap">
|
||||||
|
{% if item.fields.instance_count is defined and item.fields.instance_count > 1 %}
|
||||||
|
{# Consolidated set - show mixed status indicator #}
|
||||||
|
{% set status_count = item.fields[status.as_column() + '_count'] %}
|
||||||
|
{% set total_count = item.fields.instance_count %}
|
||||||
|
{% if status_count == 0 %}
|
||||||
|
{# None checked #}
|
||||||
|
<input class="form-check-input px-1" type="checkbox" disabled>
|
||||||
|
<label class="form-check-label">
|
||||||
|
{{ status.fields.name }}
|
||||||
|
<small class="text-muted ms-1">(0/{{ total_count }})</small>
|
||||||
|
</label>
|
||||||
|
{% elif status_count == total_count %}
|
||||||
|
{# All checked #}
|
||||||
|
<input class="form-check-input px-1" type="checkbox" checked disabled>
|
||||||
|
<label class="form-check-label">
|
||||||
|
{{ status.fields.name }}
|
||||||
|
<small class="text-muted ms-1">({{ total_count }}/{{ total_count }})</small>
|
||||||
|
</label>
|
||||||
|
{% else %}
|
||||||
|
{# Partial - some checked #}
|
||||||
|
<input class="form-check-input px-1 partial-status" type="checkbox" disabled>
|
||||||
|
<label class="form-check-label">
|
||||||
|
{{ status.fields.name }}
|
||||||
|
<small class="text-muted ms-1">({{ status_count }}/{{ total_count }})</small>
|
||||||
|
</label>
|
||||||
|
{% endif %}
|
||||||
|
{% else %}
|
||||||
|
{# Individual set - use normal checkbox #}
|
||||||
|
{{ form.checkbox(status.fields.name, item.fields.id, status.as_dataset(), status.url_for_set_state(item.fields.id), item.fields[status.as_column()], parent='set', delete=delete) }}
|
||||||
|
{% endif %}
|
||||||
|
</li>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</ul>
|
</ul>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% if solo %}
|
{% if solo %}
|
||||||
<div class="accordion accordion-flush border-top" id="set-details">
|
<div class="accordion accordion-flush border-top" id="set-details"{% if current_viewing %} style="border-color: var(--bs-border-color) !important; border-width: 1px !important;"{% endif %}>
|
||||||
{% if not delete %}
|
{% if not delete %}
|
||||||
{% if not config['HIDE_SET_INSTRUCTIONS'] %}
|
{% if not config['HIDE_SET_INSTRUCTIONS'] %}
|
||||||
{{ accordion.header('Instructions', 'instructions', 'set-details', expanded=open_instructions, quantity=item.instructions | length, icon='file-line', class='p-0') }}
|
{{ accordion.header('Instructions', 'instructions', 'set-details', expanded=open_instructions, quantity=item.instructions | length, icon='file-line', class='p-0') }}
|
||||||
@@ -104,14 +140,14 @@
|
|||||||
{% endif %}
|
{% endif %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% if g.login.is_authenticated() %}
|
{% if g.login.is_authenticated() %}
|
||||||
<a class="list-group-item list-group-item-action" href="{{ url_for('instructions.download', set=item.fields.set) }}"><i class="ri-download-line"></i> Download instructions from Rebrickable</a>
|
<a class="list-group-item list-group-item-action" href="{{ url_for('instructions.download', set=item.fields.set) }}"><i class="ri-download-line"></i> Download instructions</a>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
{{ accordion.footer() }}
|
{{ accordion.footer() }}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{{ accordion.table(item.parts(), 'Parts', 'parts-inventory', 'set-details', 'part/table.html', icon='shapes-line')}}
|
{{ accordion.table(item.parts(), 'Parts', 'parts-inventory', 'set-details', 'part/table.html', icon='shapes-line', hamburger_menu=g.login.is_authenticated())}}
|
||||||
{% for minifigure in item.minifigures() %}
|
{% for minifigure in item.minifigures() %}
|
||||||
{{ accordion.table(minifigure.parts(), minifigure.fields.name, minifigure.fields.figure, 'set-details', 'part/table.html', quantity=minifigure.fields.quantity, icon='group-line', image=minifigure.url_for_image(), alt=minifigure.fields.figure, details=minifigure.url())}}
|
{{ accordion.table(minifigure.parts(), minifigure.fields.name, minifigure.fields.figure, 'set-details', 'part/table.html', quantity=minifigure.fields.quantity, icon='group-line', image=minifigure.url_for_image(), alt=minifigure.fields.figure, details=minifigure.url(), hamburger_menu=g.login.is_authenticated())}}
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
{% include 'set/management.html' %}
|
{% include 'set/management.html' %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|||||||
Reference in New Issue
Block a user