diff --git a/providers/userdetail/src/java/org/sakaiproject/user/detail/CandidateDetailProviderImpl.java b/providers/userdetail/src/java/org/sakaiproject/user/detail/CandidateDetailProviderImpl.java index a77bc107aad..fa2d28bf292 100644 --- a/providers/userdetail/src/java/org/sakaiproject/user/detail/CandidateDetailProviderImpl.java +++ b/providers/userdetail/src/java/org/sakaiproject/user/detail/CandidateDetailProviderImpl.java @@ -15,6 +15,7 @@ */ package org.sakaiproject.user.detail; +import java.util.Arrays; import java.util.List; import java.util.Objects; import java.util.Optional; @@ -109,9 +110,9 @@ private List getI18nPropertyList(String propName, User user, Site site) if (StringUtils.isNotEmpty(siteLanguage)) { siteLanguage = "_" + StringUtils.substring(siteLanguage, 0, 2); - List propList = user.getProperties().getPropertyList(propName + siteLanguage); - if (propList != null) { - return propList; + String prop = user.getProperties().getProperty(propName + siteLanguage); + if (prop != null) { + return propertyToList(prop); } } @@ -119,13 +120,17 @@ private List getI18nPropertyList(String propName, User user, Site site) if (StringUtils.isNotEmpty(userLanguage)) { userLanguage = "_" + userLanguage; - List propList = user.getProperties().getPropertyList(propName + userLanguage); - if (propList != null) { - return propList; + String prop = user.getProperties().getProperty(propName + userLanguage); + if (prop != null) { + return propertyToList(prop); } } - return user.getProperties().getPropertyList(propName); + return propertyToList(user.getProperties().getProperty(propName)); + } + + private List propertyToList(String prop) { + return Arrays.asList(StringUtils.split(prop, "\n")); } public Optional> getAdditionalNotes(User user, Site site) { diff --git a/roster2/bundle/src/bundle/roster.properties b/roster2/bundle/src/bundle/roster.properties index 5109e75c58e..51e457a9a47 100644 --- a/roster2/bundle/src/bundle/roster.properties +++ b/roster2/bundle/src/bundle/roster.properties @@ -63,8 +63,8 @@ profile_email = Email profile_picture_alt = Photo of # Additional info -additionalInfo_button_text=View additional information -additionalInfo_modal_title=Additional information of user {0} +additionalInfo_button_text=View special needs +additionalInfo_modal_title=Special needs of user: {0} # Modal roster_modal_close=Close @@ -77,9 +77,9 @@ facet_pronouns = Pronouns facet_user_name_pronunciation = Pronunciation facet_userProperties = User Properties facet_specialNeeds=Special Needs -facet_additionalNotes=Notes +facet_additionalNotes=Study plan facet_studentNumber=Student Number -facet_additionalInfo=Additional information +facet_additionalInfo=Special needs facet_email = Email facet_role = Role facet_status = Status diff --git a/roster2/bundle/src/bundle/roster_ca.properties b/roster2/bundle/src/bundle/roster_ca.properties index e54c512b69b..6100dc27078 100644 --- a/roster2/bundle/src/bundle/roster_ca.properties +++ b/roster2/bundle/src/bundle/roster_ca.properties @@ -63,8 +63,8 @@ profile_email=Correu electr\u00f2nic profile_picture_alt=Fotografia de # Additional info -additionalInfo_button_text=Veure informaci\u00f3 addicional -additionalInfo_modal_title=Informaci\u00f3 addicional de l\u2019usuari {0} +additionalInfo_button_text=Veure mesures de necessitats especials +additionalInfo_modal_title=MESURES DE NECESSITATS ESPECIALS DE L\u2019USUARI: {0} # Modal roster_modal_close=Tancar @@ -77,10 +77,10 @@ facet_pronouns=Pronoms facet_dni= DNI facet_user_name_pronunciation=Com es pronuncia facet_userProperties=Propietats de l\u2019usuari -facet_specialNeeds=Mesures de suport a l\u2019avaluaci\u00f3 -facet_additionalNotes=Anotacions addicionals +facet_specialNeeds=Mesures de necessitats especials +facet_additionalNotes=Pla d\u2019estudis facet_studentNumber=N\u00famero d\u2019expedient -facet_additionalInfo=Informaci\u00f3 addicional +facet_additionalInfo=Mesures de necessitats especials facet_email=Correu electr\u00f2nic facet_role=Rol facet_status=Estat diff --git a/roster2/bundle/src/bundle/roster_es.properties b/roster2/bundle/src/bundle/roster_es.properties index da0232c6c13..72dc3f32ba2 100644 --- a/roster2/bundle/src/bundle/roster_es.properties +++ b/roster2/bundle/src/bundle/roster_es.properties @@ -63,8 +63,8 @@ profile_email=Correo profile_picture_alt=Foto de # Additional info -additionalInfo_button_text=Ver informaci\u00f3n adicional -additionalInfo_modal_title=Informaci\u00f3n adicional del usuario {0} +additionalInfo_button_text=Ver medidas de necesidades especiales +additionalInfo_modal_title=MEDIDAS DE NECESIDADES ESPECIALES DEL USUARIO: {0} # Modal roster_modal_close=Cerrar @@ -76,10 +76,10 @@ facet_userId=ID facet_pronouns=Pronombres facet_user_name_pronunciation=Pronunciaci\u00f3n facet_userProperties=Propiedades de usuario -facet_specialNeeds=Necesidades especiales del estudiante -facet_additionalNotes=Anotaciones adicionales +facet_specialNeeds=Medidas de necesidades especiales +facet_additionalNotes=Plan de estudios facet_studentNumber=N\u00famero de estudiante -facet_additionalInfo=Informaci\u00f3n Adicional +facet_additionalInfo=Medidas de necesidades especiales facet_email=Correo facet_role=Rol facet_status=Estado diff --git a/roster2/tool/src/handlebars/additional_info_modal_content.handlebars b/roster2/tool/src/handlebars/additional_info_modal_content.handlebars index 4290cd693e8..fe30d4ac6b1 100644 --- a/roster2/tool/src/handlebars/additional_info_modal_content.handlebars +++ b/roster2/tool/src/handlebars/additional_info_modal_content.handlebars @@ -1,6 +1,8 @@ {{#if hasSpecialNeeds}} +{{!-- Hide special needs, since its in the modal title already
{{tr 'facet_specialNeeds'}}
+--}}
    {{#each specialNeeds}} diff --git a/roster2/tool/src/handlebars/members_table.handlebars b/roster2/tool/src/handlebars/members_table.handlebars index 1b8d6976480..92b2d105650 100644 --- a/roster2/tool/src/handlebars/members_table.handlebars +++ b/roster2/tool/src/handlebars/members_table.handlebars @@ -145,7 +145,9 @@ {{#if ../anyAdditionalInfoPresent}} {{#if hasSpecialNeeds}} + {{!-- Hide special needs, since its in the title already
    {{tr 'facet_specialNeeds'}}
    + --}}
      {{#each specialNeeds}}
    • {{this}}
    • diff --git a/roster2/tool/src/webapp/js/roster.js b/roster2/tool/src/webapp/js/roster.js index cded9c32736..f354b08dbb3 100644 --- a/roster2/tool/src/webapp/js/roster.js +++ b/roster2/tool/src/webapp/js/roster.js @@ -475,8 +475,12 @@ roster.renderMembership = function (options) { m.hasProperties = m.userProperties && Object.keys(m.userProperties).length > 0; + //Hide student number in UI for UDL + m.studentNumber = null; + m.hasSpecialNeeds = m.specialNeeds && m.specialNeeds.length > 0; - m.hasAdditionalNotes = m.additionalNotes && m.additionalNotes.length > 0; + //Hide additional notes in UI for UDL + m.hasAdditionalNotes = false && m.additionalNotes && m.additionalNotes.length > 0; m.hasAdditionalInfo = m.hasSpecialNeeds || m.hasAdditionalNotes;