Kobe/VerpotJeLot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update app.py

Browse Source
This commit is contained in:
Kobe
2025-06-08 17:10:58 +02:00
parent 3a4e7bf41b
commit e63fecab5d
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app.py
View File

@@ -73,7 +73,11 @@ class Plant(db.Model):
size_id = db.Column(db.Integer, db.ForeignKey('size.id'), nullable=True) size_id = db.Column(db.Integer, db.ForeignKey('size.id'), nullable=True)
care_difficulty_id = db.Column(db.Integer, db.ForeignKey('care_difficulty.id'), nullable=True) care_difficulty_id = db.Column(db.Integer, db.ForeignKey('care_difficulty.id'), nullable=True)
growth_rate_id = db.Column(db.Integer, db.ForeignKey('growth_rate.id'), nullable=True) growth_rate_id = db.Column(db.Integer, db.ForeignKey('growth_rate.id'), nullable=True)
# Make section_id nullable and handle missing column
try:
section_id = db.Column(db.Integer, db.ForeignKey('section.id'), nullable=True) section_id = db.Column(db.Integer, db.ForeignKey('section.id'), nullable=True)
except Exception:
section_id = None
products = db.Column(db.Text, nullable=True) # Will store product IDs as comma-separated values products = db.Column(db.Text, nullable=True) # Will store product IDs as comma-separated values
description = db.Column(db.Text, nullable=True) description = db.Column(db.Text, nullable=True)
date_added = db.Column(db.DateTime, nullable=False, default=datetime.utcnow) date_added = db.Column(db.DateTime, nullable=False, default=datetime.utcnow)
@@ -86,7 +90,11 @@ class Plant(db.Model):
size = db.relationship('Size', backref='plant_size') size = db.relationship('Size', backref='plant_size')
care_difficulty = db.relationship('CareDifficulty', backref='plant_care_difficulty') care_difficulty = db.relationship('CareDifficulty', backref='plant_care_difficulty')
growth_rate = db.relationship('GrowthRate', backref='plant_growth_rate') growth_rate = db.relationship('GrowthRate', backref='plant_growth_rate')
# Make section relationship optional
try:
section = db.relationship('Section', backref='plants') section = db.relationship('Section', backref='plants')
except Exception:
section = None
def __repr__(self): def __repr__(self):
return f"Plant('{self.name}', '{self.date_added}')" return f"Plant('{self.name}', '{self.date_added}')"
@@ -176,6 +184,7 @@ def home():
size_id = request.args.get('size') size_id = request.args.get('size')
care_difficulty_id = request.args.get('care_difficulty') care_difficulty_id = request.args.get('care_difficulty')
growth_rate_id = request.args.get('growth_rate') growth_rate_id = request.args.get('growth_rate')
section_id = request.args.get('section')
query = Plant.query query = Plant.query
if search: if search:
@@ -194,6 +203,8 @@ def home():
query = query.filter(Plant.care_difficulty_id == care_difficulty_id) query = query.filter(Plant.care_difficulty_id == care_difficulty_id)
if growth_rate_id: if growth_rate_id:
query = query.filter(Plant.growth_rate_id == growth_rate_id) query = query.filter(Plant.growth_rate_id == growth_rate_id)
if section_id and hasattr(Plant, 'section_id'):
query = query.filter(Plant.section_id == section_id)
plants = query.order_by(Plant.date_added.desc()).all() plants = query.order_by(Plant.date_added.desc()).all()
climates_dict = {c.id: {'name': c.name, 'icon': c.icon, 'description': c.description} for c in Climate.query.all()} climates_dict = {c.id: {'name': c.name, 'icon': c.icon, 'description': c.description} for c in Climate.query.all()}