uppercase age groups

bobivk · Oct 7, 2024 · d16a33b · d16a33b
1 parent 7df0631
commit d16a33b
Show file tree

Hide file tree

Showing 14 changed files with 30 additions and 28 deletions.
diff --git a/backend/src/main/java/bg/kidsground/domain/AgeGroup.java b/backend/src/main/java/bg/kidsground/domain/AgeGroup.java
@@ -4,10 +4,10 @@
 
 public enum AgeGroup {
 
-    ZERO_TO_THREE("zero_to_three"),
-    THREE_TO_SIX("three_to_six"),
-    THREE_TO_TWELVE("three_to_twelve"),
-    SIX_TO_TWELVE("six_to_twelve");
+    ZERO_TO_THREE("ZERO_TO_THREE"),
+    THREE_TO_SIX("THREE_TO_SIX"),
+    THREE_TO_TWELVE("THREE_TO_TWELVE"),
+    SIX_TO_TWELVE("SIX_TO_TWELVE");
 
     public final String value;
 

diff --git a/backend/src/test/java/bg/kidsground/service/PlaygroundServiceTest.java b/backend/src/test/java/bg/kidsground/service/PlaygroundServiceTest.java
@@ -125,6 +125,7 @@ public void testGetById_NotFound() {
     public void testFindAllApproved() {
         // Given
         Playground playground = new Playground();
+        playground.setAgeGroups(List.of(AgeGroup.SIX_TO_TWELVE));
         playground.setCreatedByUser(user);
         playground.setNew(false);
         when(playgroundRepository.findByIsNewFalse()).thenReturn(Collections.singletonList(playground));
@@ -134,6 +135,7 @@ public void testFindAllApproved() {
 
         // Then
         assertEquals(1, result.size());
+        assertEquals(result.get(0).getAgeGroups(), List.of(AgeGroup.SIX_TO_TWELVE));
         verify(playgroundRepository, times(1)).findByIsNewFalse();
     }
 

diff --git a/frontend/public/SIX_TO_TWELVE.png b/frontend/public/SIX_TO_TWELVE.png
diff --git a/frontend/public/THREE_TO_SIX.png b/frontend/public/THREE_TO_SIX.png
diff --git a/frontend/public/THREE_TO_TWELVE.png b/frontend/public/THREE_TO_TWELVE.png
diff --git a/frontend/public/ZERO_TO_THREE.png b/frontend/public/ZERO_TO_THREE.png
diff --git a/frontend/src/Components/Common/InfoCard.jsx b/frontend/src/Components/Common/InfoCard.jsx
@@ -27,10 +27,10 @@ export const InfoCard = (props) => {
 
     const hasFenceResults = props.hasFence ? "Оградена" : "Неоградена"
     const ageGroups = Object.freeze({
-        zero_to_three: "0 и 3",
-        three_to_six: "3 и 6",
-        three_to_twelve: "3 и 12",
-        six_to_twelve: "6 и 12"
+        ZERO_TO_THREE: "0 и 3",
+        THREE_TO_SIX: "3 и 6",
+        THREE_TO_TWELVE: "3 и 12",
+        SIX_TO_TWELVE: "6 и 12"
     })
 
     const shades = Object.freeze({

diff --git a/frontend/src/Components/Pages/EditPage.jsx b/frontend/src/Components/Pages/EditPage.jsx
@@ -337,23 +337,23 @@ export const EditPage = () => {
                             <br />
                             <br />
                             <div className="choice">
-                                <input type="checkbox" onChange={changeAgeGroup} className="playground-input playground-input-radio" id="zero_to_three" name="age_group" value="zero_to_three" checked={age_group.includes('zero_to_three')} />
-                                <label for="zero_to_three">0-3г. (С придружител)</label>
+                                <input type="checkbox" onChange={changeAgeGroup} className="playground-input playground-input-radio" id="ZERO_TO_THREE" name="age_group" value="ZERO_TO_THREE" checked={age_group.includes('ZERO_TO_THREE')} />
+                                <label for="ZERO_TO_THREE">0-3г. (С придружител)</label>
                             </div>
                             <br />
                             <div className="choice">
-                                <input type="checkbox" onChange={changeAgeGroup} className="playground-input playground-input-radio" id="three_to_six" name="age_group" value="three_to_six" checked={age_group.includes('three_to_six')} />
-                                <label for="three_to_six">3-6г.</label>
+                                <input type="checkbox" onChange={changeAgeGroup} className="playground-input playground-input-radio" id="THREE_TO_SIX" name="age_group" value="THREE_TO_SIX" checked={age_group.includes('THREE_TO_SIX')} />
+                                <label for="THREE_TO_SIX">3-6г.</label>
                             </div>
                             <br />
                             <div className="choice">
-                                <input type="checkbox" onChange={changeAgeGroup} className="playground-input playground-input-radio" id="three_to_twelve" name="age_group" value="three_to_twelve" checked={age_group.includes('three_to_twelve')} />
-                                <label for="three_to_twelve">3-12г.</label>
+                                <input type="checkbox" onChange={changeAgeGroup} className="playground-input playground-input-radio" id="THREE_TO_TWELVE" name="age_group" value="THREE_TO_TWELVE" checked={age_group.includes('THREE_TO_TWELVE')} />
+                                <label for="THREE_TO_TWELVE">3-12г.</label>
                             </div>
                             <br />
                             <div className="choice">
-                                <input type="checkbox" onChange={changeAgeGroup} className="playground-input playground-input-radio" id="six_to_twelve" name="age_group" value="six_to_twelve" checked={age_group.includes('six_to_twelve')} />
-                                <label for="six_to_twelve">6-12г.</label>
+                                <input type="checkbox" onChange={changeAgeGroup} className="playground-input playground-input-radio" id="SIX_TO_TWELVE" name="age_group" value="SIX_TO_TWELVE" checked={age_group.includes('SIX_TO_TWELVE')} />
+                                <label for="SIX_TO_TWELVE">6-12г.</label>
                             </div>
                             <br />
                         </div>

diff --git a/frontend/src/Components/Pages/PlaygroundFormPage.jsx b/frontend/src/Components/Pages/PlaygroundFormPage.jsx
@@ -314,23 +314,23 @@ export const PlaygroundFormPage = () => {
                             <br />
                             <br />
                             <div className="choice">
-                                <input type="checkbox" onChange={changeAgeGroup} className="playground-input playground-input-radio" id="zero_to_three" name="age_group" value="zero_to_three" />
-                                <label for="zero_to_three">0-3г. (С придружител)</label>
+                                <input type="checkbox" onChange={changeAgeGroup} className="playground-input playground-input-radio" id="ZERO_TO_THREE" name="age_group" value="ZERO_TO_THREE" />
+                                <label for="ZERO_TO_THREE">0-3г. (С придружител)</label>
                             </div>
                             <br />
                             <div className="choice">
-                                <input type="checkbox" onChange={changeAgeGroup} className="playground-input playground-input-radio" id="three_to_six" name="age_group" value="three_to_six" />
-                                <label for="three_to_six">3-6г.</label>
+                                <input type="checkbox" onChange={changeAgeGroup} className="playground-input playground-input-radio" id="THREE_TO_SIX" name="age_group" value="THREE_TO_SIX" />
+                                <label for="THREE_TO_SIX">3-6г.</label>
                             </div>
                             <br />
                             <div className="choice">
-                                <input type="checkbox" onChange={changeAgeGroup} className="playground-input playground-input-radio" id="three_to_twelve" name="age_group" value="three_to_twelve" />
-                                <label for="three_to_twelve">3-12г.</label>
+                                <input type="checkbox" onChange={changeAgeGroup} className="playground-input playground-input-radio" id="THREE_TO_TWELVE" name="age_group" value="THREE_TO_TWELVE" />
+                                <label for="THREE_TO_TWELVE">3-12г.</label>
                             </div>
                             <br />
                             <div className="choice">
-                                <input type="checkbox" onChange={changeAgeGroup} className="playground-input playground-input-radio" id="six_to_twelve" name="age_group" value="six_to_twelve" />
-                                <label for="six_to_twelve">6-12г.</label>
+                                <input type="checkbox" onChange={changeAgeGroup} className="playground-input playground-input-radio" id="SIX_TO_TWELVE" name="age_group" value="SIX_TO_TWELVE" />
+                                <label for="SIX_TO_TWELVE">6-12г.</label>
                             </div>
                             <br />
                         </div>

diff --git a/frontend/src/Components/Pages/ProfilePage.jsx b/frontend/src/Components/Pages/ProfilePage.jsx
@@ -12,10 +12,10 @@ export const ProfilePage = () => {
     const navigate = useNavigate();
 
     const ageGroups = Object.freeze({
-        zero_to_three: "от 0 до 3",
-        three_to_six: "от 3 до 6",
-        three_to_twelve: "от 3 до 12",
-        six_to_twelve: "от 6 до 12"
+        ZERO_TO_THREE: "0 и 3",
+        THREE_TO_SIX: "3 и 6",
+        THREE_TO_TWELVE: "3 и 12",
+        SIX_TO_TWELVE: "6 и 12"
     })
 
     const shades = Object.freeze({

diff --git a/frontend/src/static/SIX_TO_TWELVE.png b/frontend/src/static/SIX_TO_TWELVE.png
diff --git a/frontend/src/static/THREE_TO_SIX.png b/frontend/src/static/THREE_TO_SIX.png
diff --git a/frontend/src/static/THREE_TO_TWELVE.png b/frontend/src/static/THREE_TO_TWELVE.png
diff --git a/frontend/src/static/ZERO_TO_THREE.png b/frontend/src/static/ZERO_TO_THREE.png