refactor(jsp): rename to Word#letterSounds

refs #1677
elimu-ai · Jul 12, 2024 · 071901b · 071901b
1 parent 780a1cd
commit 071901b
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 19 deletions.
diff --git a/src/main/webapp/WEB-INF/jsp/content/contributor/contributor-words.jsp b/src/main/webapp/WEB-INF/jsp/content/contributor/contributor-words.jsp
@@ -20,7 +20,7 @@
                     <tr>
                         <td>
                             <a href="<spring:url value='/content/word/edit/${word.id}#contribution-events' />" target="_blank">"<c:out value="${word.text}" />"</a><br />
-                            /<c:forEach var="lsc" items="${word.letterSoundCorrespondences}">&nbsp;<a href="<spring:url value='/content/letter-sound/edit/${lsc.id}' />"><c:forEach var="sound" items="${lsc.sounds}">${sound.valueIpa}</c:forEach></a>&nbsp;</c:forEach>/
+                            /<c:forEach var="lsc" items="${word.letterSounds}">&nbsp;<a href="<spring:url value='/content/letter-sound/edit/${lsc.id}' />"><c:forEach var="sound" items="${lsc.sounds}">${sound.valueIpa}</c:forEach></a>&nbsp;</c:forEach>/
                         </td>
                         <td>
                             #${wordContributionEvent.revisionNumber}<br />
@@ -157,7 +157,7 @@
                         </td>
                         <td>
                             <a href="<spring:url value='/content/word/edit/${word.id}#contribution-event_${wordPeerReviewEvent.wordContributionEvent.id}' />" target="_blank">"<c:out value="${word.text}" />"</a><br />
-                            /<c:forEach var="lsc" items="${word.letterSoundCorrespondences}">&nbsp;<a href="<spring:url value='/content/letter-sound/edit/${lsc.id}' />"><c:forEach var="sound" items="${lsc.sounds}">${sound.valueIpa}</c:forEach></a>&nbsp;</c:forEach>/
+                            /<c:forEach var="lsc" items="${word.letterSounds}">&nbsp;<a href="<spring:url value='/content/letter-sound/edit/${lsc.id}' />"><c:forEach var="sound" items="${lsc.sounds}">${sound.valueIpa}</c:forEach></a>&nbsp;</c:forEach>/
                         </td>
                         <td>
                             <a href="<spring:url value='/content/contributor/${wordPeerReviewEvent.wordContributionEvent.contributor.id}' />">

diff --git a/src/main/webapp/WEB-INF/jsp/content/letter-sound/edit.jsp b/src/main/webapp/WEB-INF/jsp/content/letter-sound/edit.jsp
@@ -339,7 +339,7 @@
             <c:forEach var="word" items="${words}">
                 <%-- Check if the current letter-sound correspondence is used by the word. --%>
                 <c:set var="isUsedByWord" value="false" />
-                <c:forEach var="lsc" items="${word.letterSoundCorrespondences}">
+                <c:forEach var="lsc" items="${word.letterSounds}">
                     <c:if test="${lsc.id == letterSound.id}">
                         <c:set var="isUsedByWord" value="true" />
                     </c:if>
@@ -350,9 +350,9 @@
                             <a href="<spring:url value='/content/word/edit/${word.id}' />">
                                 "<c:out value="${word.text}" />"
                             </a><br />
-                            "<c:forEach var="lsc" items="${word.letterSoundCorrespondences}">&nbsp;<a href="<spring:url value='/content/letter-sound/edit/${lsc.id}' />"><c:if test="${lsc.id == letterSound.id}"><span class='diff-highlight'></c:if><c:forEach var="letter" items="${lsc.letters}">${letter.text}<c:out value=" " /></c:forEach><c:if test="${lsc.id == letterSound.id}"></span></c:if></a>&nbsp;</c:forEach>"<br />
+                            "<c:forEach var="lsc" items="${word.letterSounds}">&nbsp;<a href="<spring:url value='/content/letter-sound/edit/${lsc.id}' />"><c:if test="${lsc.id == letterSound.id}"><span class='diff-highlight'></c:if><c:forEach var="letter" items="${lsc.letters}">${letter.text}<c:out value=" " /></c:forEach><c:if test="${lsc.id == letterSound.id}"></span></c:if></a>&nbsp;</c:forEach>"<br />
                             <span class="grey-text">
-                                /<c:forEach var="lsc" items="${word.letterSoundCorrespondences}">&nbsp;<a href="<spring:url value='/content/letter-sound/edit/${lsc.id}' />"><c:if test="${lsc.id == letterSound.id}"><span class='diff-highlight'></c:if><c:forEach var="sound" items="${lsc.sounds}">${sound.valueIpa}</c:forEach><c:if test="${lsc.id == letterSound.id}"></span></c:if></a>&nbsp;</c:forEach>/
+                                /<c:forEach var="lsc" items="${word.letterSounds}">&nbsp;<a href="<spring:url value='/content/letter-sound/edit/${lsc.id}' />"><c:if test="${lsc.id == letterSound.id}"><span class='diff-highlight'></c:if><c:forEach var="sound" items="${lsc.sounds}">${sound.valueIpa}</c:forEach><c:if test="${lsc.id == letterSound.id}"></span></c:if></a>&nbsp;</c:forEach>/
                             </span>
                         </td>
                         <td>${word.usageCount}</td>

diff --git a/src/main/webapp/WEB-INF/jsp/content/number/list.jsp b/src/main/webapp/WEB-INF/jsp/content/number/list.jsp
@@ -47,7 +47,7 @@
 
                         <td style="font-size: 2em;">
                             <c:forEach var="word" items="${number.words}">
-                                /<c:forEach var="lsc" items="${word.letterSoundCorrespondences}">&nbsp;<a href="<spring:url value='/content/letter-sound/edit/${lsc.id}' />"><c:forEach var="sound" items="${lsc.sounds}">${sound.valueIpa}</c:forEach></a>&nbsp;</c:forEach>/
+                                /<c:forEach var="lsc" items="${word.letterSounds}">&nbsp;<a href="<spring:url value='/content/letter-sound/edit/${lsc.id}' />"><c:forEach var="sound" items="${lsc.sounds}">${sound.valueIpa}</c:forEach></a>&nbsp;</c:forEach>/
                             </c:forEach>
                         </td>
                         <td>

diff --git a/src/main/webapp/WEB-INF/jsp/content/number/peer-reviews/pending.jsp b/src/main/webapp/WEB-INF/jsp/content/number/peer-reviews/pending.jsp
@@ -42,7 +42,7 @@
 
                         <td style="font-size: 2em;">
                             <c:forEach var="word" items="${number.words}">
-                                /<c:forEach var="lsc" items="${word.letterSoundCorrespondences}">&nbsp;<a href="<spring:url value='/content/letter-sound/edit/${lsc.id}' />"><c:forEach var="sound" items="${lsc.sounds}">${sound.valueIpa}</c:forEach></a>&nbsp;</c:forEach>/
+                                /<c:forEach var="lsc" items="${word.letterSounds}">&nbsp;<a href="<spring:url value='/content/letter-sound/edit/${lsc.id}' />"><c:forEach var="sound" items="${lsc.sounds}">${sound.valueIpa}</c:forEach></a>&nbsp;</c:forEach>/
                             </c:forEach>
                         </td>
                             <td>

diff --git a/src/main/webapp/WEB-INF/jsp/content/storybook/edit.jsp b/src/main/webapp/WEB-INF/jsp/content/storybook/edit.jsp
@@ -334,7 +334,7 @@
                                     <c:out value="${word.text}" />
                                 </a><c:if test="${not empty word.wordType}"> (${word.wordType})</c:if><c:out value=" ${emojisByWordId[word.id]}" /><br />
                                 <span class="grey-text">
-                                    /<c:forEach var="lsc" items="${word.letterSoundCorrespondences}">&nbsp;<a href="<spring:url value='/content/letter-sound/edit/${lsc.id}' />"><c:forEach var="sound" items="${lsc.sounds}">${sound.valueIpa}</c:forEach></a>&nbsp;</c:forEach>/
+                                    /<c:forEach var="lsc" items="${word.letterSounds}">&nbsp;<a href="<spring:url value='/content/letter-sound/edit/${lsc.id}' />"><c:forEach var="sound" items="${lsc.sounds}">${sound.valueIpa}</c:forEach></a>&nbsp;</c:forEach>/
                                 </span>
                             </c:otherwise>
                         </c:choose>

diff --git a/src/main/webapp/WEB-INF/jsp/content/word/create.jsp b/src/main/webapp/WEB-INF/jsp/content/word/create.jsp
@@ -36,8 +36,8 @@
                     <label><fmt:message key="letter.sound.correspondences" /></label><br />
 
                     <div id="letterSoundCorrespondencesContainer">
-                        <c:forEach var="letterSoundCorrespondence" items="${word.letterSoundCorrespondences}">
-                            <input name="letterSoundCorrespondences" type="hidden" value="${letterSoundCorrespondence.id}" />
+                        <c:forEach var="letterSoundCorrespondence" items="${word.letterSounds}">
+                            <input name="letterSounds" type="hidden" value="${letterSoundCorrespondence.id}" />
                             <div class="chip">
                                 <a href="#" class="letterSoundCorrespondenceDeleteLink" data-letter-sound-correspondence-id="${letterSoundCorrespondence.id}">
                                     <i class="close material-icons">clear</i>
@@ -63,7 +63,7 @@
                                     
                                     $(this).parent().remove();
                                     
-                                    var $hiddenInput = $('input[name="letterSoundCorrespondences"][value="' + letterSoundCorrespondenceId + '"]');
+                                    var $hiddenInput = $('input[name="letterSounds"][value="' + letterSoundCorrespondenceId + '"]');
                                     $hiddenInput.remove();
                                 });
                             });
@@ -89,7 +89,7 @@
                                 var letterSoundCorrespondenceSounds = selectedOption.attr('data-sounds');
                                 console.log('letterSoundCorrespondenceSounds: "' + letterSoundCorrespondenceSounds + '"');
                                 if (letterSoundCorrespondenceId != "") {
-                                    $('#letterSoundCorrespondencesContainer').append('<input name="letterSoundCorrespondences" type="hidden" value="' + letterSoundCorrespondenceId + '" />');
+                                    $('#letterSoundCorrespondencesContainer').append('<input name="letterSounds" type="hidden" value="' + letterSoundCorrespondenceId + '" />');
                                     $('#letterSoundCorrespondencesContainer').append('<div class="chip">"' + letterSoundCorrespondenceLetters + '"<br />↓<br />/' + letterSoundCorrespondenceSounds + '/</div>');
                                     $(this).val("");
                                 }

diff --git a/src/main/webapp/WEB-INF/jsp/content/word/edit.jsp b/src/main/webapp/WEB-INF/jsp/content/word/edit.jsp
@@ -55,8 +55,8 @@
                     <label><fmt:message key="letter.sound.correspondences" /></label><br />
 
                     <div id="letterSoundCorrespondencesContainer">
-                        <c:forEach var="letterSoundCorrespondence" items="${word.letterSoundCorrespondences}">
-                            <input name="letterSoundCorrespondences" type="hidden" value="${letterSoundCorrespondence.id}" />
+                        <c:forEach var="letterSoundCorrespondence" items="${word.letterSounds}">
+                            <input name="letterSounds" type="hidden" value="${letterSoundCorrespondence.id}" />
                             <div class="chip">
                                 <a href="#" class="letterSoundCorrespondenceDeleteLink" data-letter-sound-correspondence-id="${letterSoundCorrespondence.id}">
                                     <i class="close material-icons">clear</i>
@@ -82,7 +82,7 @@
                                     
                                     $(this).parent().remove();
                                     
-                                    var $hiddenInput = $('input[name="letterSoundCorrespondences"][value="' + letterSoundCorrespondenceId + '"]');
+                                    var $hiddenInput = $('input[name="letterSounds"][value="' + letterSoundCorrespondenceId + '"]');
                                     $hiddenInput.remove();
                                 });
                             });
@@ -108,7 +108,7 @@
                                 var letterSoundCorrespondenceSounds = selectedOption.attr('data-sounds');
                                 console.log('letterSoundCorrespondenceSounds: "' + letterSoundCorrespondenceSounds + '"');
                                 if (letterSoundCorrespondenceId != "") {
-                                    $('#letterSoundCorrespondencesContainer').append('<input name="letterSoundCorrespondences" type="hidden" value="' + letterSoundCorrespondenceId + '" />');
+                                    $('#letterSoundCorrespondencesContainer').append('<input name="letterSounds" type="hidden" value="' + letterSoundCorrespondenceId + '" />');
                                     $('#letterSoundCorrespondencesContainer').append('<div class="chip">"' + letterSoundCorrespondenceLetters + '"<br />↓<br />/' + letterSoundCorrespondenceSounds + '/</div>');
                                     $(this).val("");
                                 }

diff --git a/src/main/webapp/WEB-INF/jsp/content/word/list.jsp b/src/main/webapp/WEB-INF/jsp/content/word/list.jsp
@@ -47,7 +47,7 @@
                             </td>
                             <td style="font-size: 2em;">
                                 <div id="letterSoundCorrespondencesContainer">
-                                    <c:forEach var="letterSoundCorrespondence" items="${word.letterSoundCorrespondences}">
+                                    <c:forEach var="letterSoundCorrespondence" items="${word.letterSounds}">
                                         <input name="letterSoundCorrespondences" type="hidden" value="${letterSoundCorrespondence.id}" />
                                         <div class="chip">
                                             <a href="<spring:url value='/content/letter-sound/edit/${letterSoundCorrespondence.id}' />">

diff --git a/src/main/webapp/WEB-INF/jsp/content/word/peer-reviews/pending.jsp b/src/main/webapp/WEB-INF/jsp/content/word/peer-reviews/pending.jsp
@@ -30,7 +30,7 @@
                                 <a href="<spring:url value='/content/word/edit/${word.id}#peer-review' />" target="_blank">"<c:out value="${word.text}" />"</a>
                             </td>
                             <td style="font-size: 2em;">
-                                /<c:forEach var="lsc" items="${word.letterSoundCorrespondences}">&nbsp;<a href="<spring:url value='/content/letter-sound/edit/${lsc.id}' />"><c:forEach var="sound" items="${lsc.sounds}">${sound.valueIpa}</c:forEach></a>&nbsp;</c:forEach>/
+                                /<c:forEach var="lsc" items="${word.letterSounds}">&nbsp;<a href="<spring:url value='/content/letter-sound/edit/${lsc.id}' />"><c:forEach var="sound" items="${lsc.sounds}">${sound.valueIpa}</c:forEach></a>&nbsp;</c:forEach>/
                             </td>
                             <td>
                                 ${word.wordType}<br />

diff --git a/src/main/webapp/WEB-INF/jsp/contributions/most-recent.jsp b/src/main/webapp/WEB-INF/jsp/contributions/most-recent.jsp
@@ -49,7 +49,7 @@
                             <a class="editLink" href="<spring:url value='/content/word/edit/${word.id}' />">"${word.text}"</a>
                         </td>
                         <td>
-                            /<c:forEach var="lsc" items="${word.letterSoundCorrespondences}">&nbsp;<a href="<spring:url value='/content/letter-sound/edit/${lsc.id}' />"><c:forEach var="sound" items="${lsc.sounds}">${sound.valueIpa}</c:forEach></a>&nbsp;</c:forEach>/
+                            /<c:forEach var="lsc" items="${word.letterSounds}">&nbsp;<a href="<spring:url value='/content/letter-sound/edit/${lsc.id}' />"><c:forEach var="sound" items="${lsc.sounds}">${sound.valueIpa}</c:forEach></a>&nbsp;</c:forEach>/
                         </td>
                         <td>
                             ${word.wordType}<br />