Changeset 142c0f8

Timestamp:

05/05/25 12:37:27 (12 days ago)

Author:

Aleksandar Panovski <apano77@…>

Branches:

main

Children:

b67dfd3

Parents:

c44c5ed

Message:

Final version done Bazi

Files:

• my-react-app/src/components/MenuList.js (modified) (1 diff)
• my-react-app/src/components/ReadOnlyMenuList.js (modified) (1 diff)
• src/main/java/com/example/rezevirajmasa/demo/model/TableEntity.java (modified) (1 diff)

my-react-app/src/components/MenuList.js

@@ -67 +67 @@
                                 <p className="card-text">{item.description}</p>
                                 <h6 className="card-subtitle mb-2 text-muted">${item.price.toFixed(2)}</h6>
+
+                                {item.tags && item.tags.length > 0 && (
+                                    <div className="mb-2">
+                                        {item.tags.map((tag) => (
+                                            <span key={tag.id} className="badge bg-secondary me-1">
+                                        {tag.tagName}: {tag.tagValue}
+                                    </span>
+                                        ))}
+                                    </div>
+                                )}
+
                                 <button
                                     className="btn btn-outline-success mt-auto"

my-react-app/src/components/ReadOnlyMenuList.js

@@ -45 +45 @@
                                 <p className="card-text">{item.description}</p>
                                 <h6 className="card-subtitle mb-2 text-muted">${item.price.toFixed(2)}</h6>
+
+                                {item.tags && item.tags.length > 0 && (
+                                    <div className="mb-2">
+                                        {item.tags.map((tag) => (
+                                            <span key={tag.id} className="badge bg-secondary me-1">
+                                        {tag.tagName}: {tag.tagValue}
+                                    </span>
+                                        ))}
+                                    </div>
+                                )}
                             </div>
                         </div>

src/main/java/com/example/rezevirajmasa/demo/model/TableEntity.java

@@ -50 +50 @@
     @OneToMany(mappedBy = "table", cascade = CascadeType.ALL, fetch = FetchType.LAZY)
     @JsonIgnore
-    private List<Reservation> reservations = new ArrayList<>(); // Store reservations, not time slots
+    private List<Reservation> reservations = new ArrayList<>();
 
     public void cleanUnusedTimeSlots(LocalDate threeDaysAgo) {