Skip to content

Added the ability to edit a cattle's status #3

New issue

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

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

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions src/controllers/CattleController.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,19 @@ export class CattleController {
'Brahman'
];
}

updateCattle(id, updates) {
for (let i = 0; i < this.cattle.length; i++) {
if (this.cattle[i].id === id) {
this.cattle[i].status = updates.status;
}
}

const index = this.cattle.findIndex(cow => cow.id === id);
if (index === -1) {
throw new Error('Cattle not found');
}
const cattle = this.cattle[index];
return cattle;
}
}
85 changes: 85 additions & 0 deletions src/views/CattleCard.css
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,91 @@
color: #cc6600;
}

.status-section {
display: flex;
align-items: center;
gap: 1rem;
margin-top: 0.5rem;
}

.edit-status-button {
background-color: #4CAF50;
color: white;
border: none;
padding: 0.25rem 0.5rem;
border-radius: 4px;
cursor: pointer;
font-size: 0.8rem;
transition: background-color 0.3s ease;
}

.edit-status-button:hover {
background-color: #45a049;
}

.edit-status-form {
margin-top: 1rem;
padding: 1rem;
background-color: #f5f5f5;
border-radius: 4px;
}

.edit-status-form h3 {
margin: 0 0 1rem 0;
font-size: 1rem;
color: #333;
}

.edit-status-form .form-group {
margin-bottom: 1rem;
}

.edit-status-form label {
display: block;
margin-bottom: 0.5rem;
color: #666;
}

.edit-status-form select {
width: 100%;
padding: 0.5rem;
border: 1px solid #ddd;
border-radius: 4px;
background-color: white;
}

.edit-status-form .form-actions {
display: flex;
gap: 0.5rem;
}

.edit-status-form .submit-button,
.edit-status-form .cancel-button {
padding: 0.5rem 1rem;
border: none;
border-radius: 4px;
cursor: pointer;
font-size: 0.9rem;
}

.edit-status-form .submit-button {
background-color: #4CAF50;
color: #FFF;
}

.edit-status-form .cancel-button {
background-color: #f44336;
color: white;
}

.edit-status-form .submit-button:hover {
background-color: #45a049;
}

.edit-status-form .cancel-button:hover {
background-color: #da190b;
}

.pregnancy-status {
padding: 0.25rem 0.5rem;
border-radius: 4px;
Expand Down
30 changes: 26 additions & 4 deletions src/views/CattleCard.jsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,15 @@
import React, { useState } from 'react';
import { EditStatusForm } from './EditStatusForm';
import './CattleCard.css';

export function CattleCard({ cattle }) {
export function CattleCard({ cattle, onStatusUpdate }) {
const [imageError, setImageError] = useState(false);
const [showEditForm, setShowEditForm] = useState(false);

const handleStatusUpdate = (updates) => {
onStatusUpdate(cattle.id, updates);
setShowEditForm(false);
};

return (
<div className="cattle-card">
Expand Down Expand Up @@ -33,9 +40,24 @@ export function CattleCard({ cattle }) {
)}
</p>
)}
<p className={`status ${cattle.getStatusClass()}`}>
Status: {cattle.status}
</p>
<div className="status-section">
<p className={`status ${cattle.getStatusClass()}`}>
Status: {cattle.status}
</p>
<button
className="edit-status-button"
onClick={() => setShowEditForm(true)}
>
Edit Status
</button>
</div>
{showEditForm && (
<EditStatusForm
cattle={cattle}
onSubmit={handleStatusUpdate}
onCancel={() => setShowEditForm(false)}
/>
)}
</div>
);
}
14 changes: 13 additions & 1 deletion src/views/CattleList.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,14 @@ function CattleList({ cattle = [], controller, onCattleUpdate }) {
setShowAddForm(false)
}

let handleStatusUpdate = (id, updates) => {
let updatedCow = controller.updateCattle(id, updates)
onCattleUpdate(cattle.map(
cow =>
cow.id === id ? updatedCow : cow
))
}

const handleLocationChange = (location) => {
setCurrentLocation(location)
}
Expand Down Expand Up @@ -55,7 +63,11 @@ function CattleList({ cattle = [], controller, onCattleUpdate }) {

<div className="cattle-grid">
{(filteredCattle || []).map((cow) => (
<CattleCard key={cow.id} cattle={cow} />
<CattleCard
key={cow.id}
cattle={cow}
onStatusUpdate={handleStatusUpdate}
/>
))}
</div>
</div>
Expand Down
28 changes: 28 additions & 0 deletions src/views/EditStatusForm.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
import React from 'react';

export function EditStatusForm({ cattle, onSubmit, onCancel }) {
const handleSubmit = (e) => {
e.preventDefault();
const formData = new FormData(e.target);
onSubmit({
status: formData.get('status')
});
};

return (
<form onSubmit={handleSubmit} className="edit-status-form">
<h3>Edit Status</h3>
<div className="form-group">
<label htmlFor="status">Status:</label>
<select id="status" name="status" required defaultValue={cattle.status}>
<option value="Healthy">Healthy</option>
<option value="Vet Check Needed">Vet Check Needed</option>
</select>
</div>
<div className="form-actions">
<button type="submit" className="submit-button">Save Status</button>
<button type="button" onClick={onCancel} className="cancel-button">Cancel</button>
</div>
</form>
);
}