- {filteredDogs.map(dog => (
+ {dogs.map(dog => (
)}
+ {/* Pagination */}
+ {totalPages > 1 && (
+
+
+
+ Page {page} of {totalPages}
+
+
+
+ )}
+
{/* Add Dog Modal */}
{showAddModal && (
{
try {
- const res = await axios.get('/api/dogs')
+ const res = await axios.get('/api/dogs/all')
setAllDogs(res.data)
} catch (err) { console.error('Error fetching dogs:', err) }
}
diff --git a/client/src/pages/LitterList.jsx b/client/src/pages/LitterList.jsx
index 5d3c709..ec6f324 100644
--- a/client/src/pages/LitterList.jsx
+++ b/client/src/pages/LitterList.jsx
@@ -4,8 +4,12 @@ import { useNavigate } from 'react-router-dom'
import axios from 'axios'
import LitterForm from '../components/LitterForm'
+const LIMIT = 50
+
function LitterList() {
const [litters, setLitters] = useState([])
+ const [total, setTotal] = useState(0)
+ const [page, setPage] = useState(1)
const [loading, setLoading] = useState(true)
const [showForm, setShowForm] = useState(false)
const [editingLitter, setEditingLitter] = useState(null)
@@ -13,7 +17,7 @@ function LitterList() {
const navigate = useNavigate()
useEffect(() => {
- fetchLitters()
+ fetchLitters(1)
// Auto-open form with prefill from BreedingCalendar "Record Litter" CTA
const stored = sessionStorage.getItem('prefillLitter')
if (stored) {
@@ -27,10 +31,12 @@ function LitterList() {
}
}, [])
- const fetchLitters = async () => {
+ const fetchLitters = async (p = page) => {
try {
- const res = await axios.get('/api/litters')
- setLitters(res.data)
+ const res = await axios.get('/api/litters', { params: { page: p, limit: LIMIT } })
+ setLitters(res.data.data)
+ setTotal(res.data.total)
+ setPage(p)
} catch (error) {
console.error('Error fetching litters:', error)
} finally {
@@ -38,6 +44,8 @@ function LitterList() {
}
}
+ const totalPages = Math.ceil(total / LIMIT)
+
const handleCreate = () => {
setEditingLitter(null)
setPrefill(null)
@@ -56,14 +64,14 @@ function LitterList() {
if (!window.confirm('Delete this litter record? Puppies will be unlinked but not deleted.')) return
try {
await axios.delete(`/api/litters/${id}`)
- fetchLitters()
+ fetchLitters(page)
} catch (error) {
console.error('Error deleting litter:', error)
}
}
const handleSave = () => {
- fetchLitters()
+ fetchLitters(page)
}
if (loading) {
@@ -80,7 +88,7 @@ function LitterList() {
- {litters.length === 0 ? (
+ {total === 0 ? (
No litters recorded yet
@@ -143,6 +151,31 @@ function LitterList() {
)}
+ {/* Pagination */}
+ {totalPages > 1 && (
+
+
+
+ Page {page} of {totalPages}
+
+
+
+ )}
+
{showForm && (
{
try {
const db = getDatabase();
const includeExternal = req.query.include_external === '1' || req.query.include_external === 'true';
const externalOnly = req.query.external_only === '1' || req.query.external_only === 'true';
+ const search = (req.query.search || '').trim();
+ const sex = req.query.sex === 'male' || req.query.sex === 'female' ? req.query.sex : '';
+ const page = Math.max(1, parseInt(req.query.page, 10) || 1);
+ const limit = Math.min(200, Math.max(1, parseInt(req.query.limit, 10) || 50));
+ const offset = (page - 1) * limit;
- let whereClause;
+ let baseWhere;
if (externalOnly) {
- whereClause = 'WHERE is_active = 1 AND is_external = 1';
+ baseWhere = 'is_active = 1 AND is_external = 1';
} else if (includeExternal) {
- whereClause = 'WHERE is_active = 1';
+ baseWhere = 'is_active = 1';
} else {
- whereClause = 'WHERE is_active = 1 AND is_external = 0';
+ baseWhere = 'is_active = 1 AND is_external = 0';
}
+ const filters = [];
+ const params = [];
+ if (search) {
+ filters.push('(name LIKE ? OR registration_number LIKE ?)');
+ params.push(`%${search}%`, `%${search}%`);
+ }
+ if (sex) {
+ filters.push('sex = ?');
+ params.push(sex);
+ }
+
+ const whereClause = 'WHERE ' + [baseWhere, ...filters].join(' AND ');
+
+ const total = db.prepare(`SELECT COUNT(*) as count FROM dogs ${whereClause}`).get(...params).count;
+
+ const statsWhere = externalOnly
+ ? 'WHERE is_active = 1 AND is_external = 1'
+ : includeExternal
+ ? 'WHERE is_active = 1'
+ : 'WHERE is_active = 1 AND is_external = 0';
+ const stats = db.prepare(`
+ SELECT
+ COUNT(*) as total,
+ SUM(CASE WHEN sex = 'male' THEN 1 ELSE 0 END) as males,
+ SUM(CASE WHEN sex = 'female' THEN 1 ELSE 0 END) as females
+ FROM dogs ${statsWhere}
+ `).get();
+
const dogs = db.prepare(`
SELECT ${DOG_COLS}
FROM dogs
${whereClause}
ORDER BY name
- `).all();
+ LIMIT ? OFFSET ?
+ `).all(...params, limit, offset);
- res.json(attachParents(db, dogs));
+ res.json({ data: attachParents(db, dogs), total, page, limit, stats });
} catch (error) {
console.error('Error fetching dogs:', error);
res.status(500).json({ error: error.message });
diff --git a/server/routes/litters.js b/server/routes/litters.js
index c400be3..a53dc44 100644
--- a/server/routes/litters.js
+++ b/server/routes/litters.js
@@ -2,31 +2,50 @@ const express = require('express');
const router = express.Router();
const { getDatabase } = require('../db/init');
-// GET all litters
+// GET all litters (paginated)
+// ?page=1&limit=50
+// Response: { data, total, page, limit }
router.get('/', (req, res) => {
try {
const db = getDatabase();
+ const page = Math.max(1, parseInt(req.query.page, 10) || 1);
+ const limit = Math.min(200, Math.max(1, parseInt(req.query.limit, 10) || 50));
+ const offset = (page - 1) * limit;
+
+ const total = db.prepare('SELECT COUNT(*) as count FROM litters').get().count;
+
const litters = db.prepare(`
- SELECT l.*,
+ SELECT l.*,
s.name as sire_name, s.registration_number as sire_reg,
d.name as dam_name, d.registration_number as dam_reg
FROM litters l
JOIN dogs s ON l.sire_id = s.id
JOIN dogs d ON l.dam_id = d.id
ORDER BY l.breeding_date DESC
- `).all();
-
- litters.forEach(litter => {
- litter.puppies = db.prepare(`
- SELECT * FROM dogs WHERE litter_id = ? AND is_active = 1
- `).all(litter.id);
- litter.puppies.forEach(puppy => {
- puppy.photo_urls = puppy.photo_urls ? JSON.parse(puppy.photo_urls) : [];
+ LIMIT ? OFFSET ?
+ `).all(limit, offset);
+
+ if (litters.length > 0) {
+ const litterIds = litters.map(l => l.id);
+ const placeholders = litterIds.map(() => '?').join(',');
+ const allPuppies = db.prepare(`
+ SELECT * FROM dogs WHERE litter_id IN (${placeholders}) AND is_active = 1
+ `).all(...litterIds);
+
+ const puppiesByLitter = {};
+ allPuppies.forEach(p => {
+ p.photo_urls = p.photo_urls ? JSON.parse(p.photo_urls) : [];
+ if (!puppiesByLitter[p.litter_id]) puppiesByLitter[p.litter_id] = [];
+ puppiesByLitter[p.litter_id].push(p);
});
- litter.actual_puppy_count = litter.puppies.length;
- });
-
- res.json(litters);
+
+ litters.forEach(l => {
+ l.puppies = puppiesByLitter[l.id] || [];
+ l.actual_puppy_count = l.puppies.length;
+ });
+ }
+
+ res.json({ data: litters, total, page, limit });
} catch (error) {
res.status(500).json({ error: error.message });
}