Skip to content

Commit

Permalink
source object message now considers index classes when all of the obj…
Browse files Browse the repository at this point in the history 
…ects are selected; long range filter parameter can now be humanized #1373
  • Loading branch information
@nuno-vieira-deel
nuno-vieira-deel committed Oct 10, 2018
1 parent 8aadf9d commit 1ba8a09
Show file tree
Hide file tree
Showing 4 changed files with 59 additions and 39 deletions.
2 changes: 2 additions & 0 deletions roda-ui/roda-wui/src/main/java/config/i18n/client/ClientMessages.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -919,6 +919,8 @@ public interface ClientMessages extends Messages {

SafeHtml searchPreFilterEmptyKeyFilterParameter(String searchPreFilterName);

SafeHtml searchPreFilterLongRangeFilterParameter(String searchPreFilterName, long searchPreFilterFromValue, long searchPreFilterToValue);

SafeHtml searchPreFilterOneOfManyFilterParameterSingle(String searchPreFilterName, String item);

SafeHtml searchPreFilterOneOfManyFilterParameterWithSize(String searchPreFilterName, int listSize);
Expand Down
5 changes: 5 additions & 0 deletions roda-ui/roda-wui/src/main/java/org/roda/wui/client/common/search/SearchPreFilterUtils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import org.roda.core.data.v2.index.filter.EmptyKeyFilterParameter;
import org.roda.core.data.v2.index.filter.Filter;
import org.roda.core.data.v2.index.filter.FilterParameter;
import org.roda.core.data.v2.index.filter.LongRangeFilterParameter;
import org.roda.core.data.v2.index.filter.NotSimpleFilterParameter;
import org.roda.core.data.v2.index.filter.OneOfManyFilterParameter;
import org.roda.core.data.v2.index.filter.OrFiltersParameters;
Expand Down Expand Up @@ -59,6 +60,10 @@ public static SafeHtml getFilterParameterHTML(FilterParameter parameter) {
} else if (parameter instanceof EmptyKeyFilterParameter) {
EmptyKeyFilterParameter p = (EmptyKeyFilterParameter) parameter;
return messages.searchPreFilterEmptyKeyFilterParameter(messages.searchPreFilterName(p.getName()));
} else if (parameter instanceof LongRangeFilterParameter) {
LongRangeFilterParameter p = (LongRangeFilterParameter) parameter;
return messages.searchPreFilterLongRangeFilterParameter(messages.searchPreFilterName(p.getName()),
p.getFromValue(), p.getToValue());
} else if (parameter instanceof OneOfManyFilterParameter) {
OneOfManyFilterParameter p = (OneOfManyFilterParameter) parameter;
int listSize = p.getValues().size();
Expand Down
42 changes: 24 additions & 18 deletions roda-ui/roda-wui/src/main/resources/config/i18n/client/ClientMessages.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,23 +134,29 @@ allRepresentations: All representations
allFiles: All files

allOfAObject: {0}
allOfAObject[org.roda.core.data.v2.ip.AIP]:All intellectual entities
allOfAObject[org.roda.core.data.v2.ip.Representation]:All representations
allOfAObject[org.roda.core.data.v2.ip.File]:All files
allOfAObject[org.roda.core.data.v2.ip.TransferredResource]:All transferred resources
allOfAObject[org.roda.core.data.v2.ip.DIP]:All disseminations
allOfAObject[org.roda.core.data.v2.ip.DIPFile]:All dissemination files
allOfAObject[org.roda.core.data.v2.risks.Risk]:All risks
allOfAObject[org.roda.core.data.v2.risks.RiskIncidence]:All incidences
allOfAObject[org.roda.core.data.v2.ri.RepresentationInformation]:All representation information
allOfAObject[org.roda.core.data.v2.jobs.Job]:All jobs
allOfAObject[org.roda.core.data.v2.jobs.Report]:All reports
allOfAObject[org.roda.core.data.v2.notifications.Notification]:All notifications
allOfAObject[org.roda.core.data.v2.log.LogEntry]:All log entries
allOfAObject[org.roda.core.data.v2.user.RODAMember]:All users and groups
allOfAObject[org.roda.core.data.v2.ip.metadata.DescriptiveMetadata]:All descriptive metadata
allOfAObject[org.roda.core.data.v2.ip.metadata.PreservationMetadata]:All preservation metadata
allOfAObject[org.roda.core.data.v2.formats.Format]:All formats
allOfAObject[org.roda.core.data.v2.ip.AIP]: All intellectual entities
allOfAObject[org.roda.core.data.v2.ip.IndexedAIP]: All intellectual entities
allOfAObject[org.roda.core.data.v2.ip.Representation]: All representations
allOfAObject[org.roda.core.data.v2.ip.IndexedRepresentation]: All representations
allOfAObject[org.roda.core.data.v2.ip.File]: All files
allOfAObject[org.roda.core.data.v2.ip.IndexedFile]: All files
allOfAObject[org.roda.core.data.v2.ip.TransferredResource]: All transferred resources
allOfAObject[org.roda.core.data.v2.ip.DIP]: All disseminations
allOfAObject[org.roda.core.data.v2.ip.IndexedDIP]: All disseminations
allOfAObject[org.roda.core.data.v2.ip.DIPFile]: All dissemination files
allOfAObject[org.roda.core.data.v2.risks.Risk]: All risks
allOfAObject[org.roda.core.data.v2.risks.IndexedRisk]: All risks
allOfAObject[org.roda.core.data.v2.risks.RiskIncidence]: All incidences
allOfAObject[org.roda.core.data.v2.ri.RepresentationInformation]: All representation information
allOfAObject[org.roda.core.data.v2.jobs.Job]: All jobs
allOfAObject[org.roda.core.data.v2.jobs.Report]: All reports
allOfAObject[org.roda.core.data.v2.jobs.IndexedReport]: All reports
allOfAObject[org.roda.core.data.v2.notifications.Notification]: All notifications
allOfAObject[org.roda.core.data.v2.log.LogEntry]: All log entries
allOfAObject[org.roda.core.data.v2.user.RODAMember]: All users and groups
allOfAObject[org.roda.core.data.v2.ip.metadata.DescriptiveMetadata]: All descriptive metadata
allOfAObject[org.roda.core.data.v2.ip.metadata.PreservationMetadata]: All preservation metadata
allOfAObject[org.roda.core.data.v2.formats.Format]: All formats
allOfAObject[org.roda.core.data.v2.ip.metadata.IndexedPreservationEvent]: All preservation events
allOfAObject[org.roda.core.data.v2.ip.metadata.IndexedPreservationAgent]: All preservation agents
allOfAObject[org.roda.core.data.v2.Void]: No input objects
Expand Down Expand Up @@ -179,7 +185,6 @@ someOfAObject[org.roda.core.data.v2.user.RODAMember]: users and groups
someOfAObject[org.roda.core.data.v2.ip.metadata.DescriptiveMetadata]: descriptive metadata
someOfAObject[org.roda.core.data.v2.ip.metadata.PreservationMetadata]: preservation metadata
someOfAObject[org.roda.core.data.v2.formats.Format]: formats
someOfAObject[org.roda.core.data.v2.formats.Format]: formats
someOfAObject[org.roda.core.data.v2.ip.metadata.IndexedPreservationEvent]: preservation events
someOfAObject[org.roda.core.data.v2.ip.metadata.IndexedPreservationAgent]: preservation agents
someOfAObject[org.roda.core.data.v2.Void]: No input objects
Expand Down Expand Up @@ -611,6 +616,7 @@ searchPreFilterSimpleFilterParameter:<span class="search-prefilter-field">{0}</s
searchPreFilterBasicSearchFilterParameter:<span class="search-prefilter-field">{0}</span> is <span class="search-prefilter-value">{1}</span>
searchPreFilterNotSimpleFilterParameter:<span class="search-prefilter-field">{0}</span> is not <span class="search-prefilter-value">{1}</span>
searchPreFilterEmptyKeyFilterParameter:No <span class="search-prefilter-field">{0}</span>
searchPreFilterLongRangeFilterParameter:<span class="search-prefilter-field">{0}</span> is between <span class="search-prefilter-value">{1}</span> and <span class="search-prefilter-value">{2}</span>
searchPreFilterOneOfManyFilterParameterWithSize:<span class="search-prefilter-field">{0}</span> is one of <span class="search-prefilter-value">one of {1} possible values</span>
searchPreFilterOneOfManyFilterParameterSingle:<span class="search-prefilter-field">{0}</span> is <span class="search-prefilter-value">{1}</span>
searchPreFilterOneOfManyFilterParameterWithList:<span class="search-prefilter-field">{0}</span> is one of <span class="search-prefilter-value">{1,list}</span>
Expand Down
49 changes: 28 additions & 21 deletions roda-ui/roda-wui/src/main/resources/config/i18n/client/ClientMessages_pt_PT.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,23 +134,29 @@ allRepresentations: Todas as representações
allFiles: Todos os ficheiros

allOfAObject: {0}
allOfAObject[org.roda.core.data.v2.ip.AIP]:Todas as entidades intelectuais
allOfAObject[org.roda.core.data.v2.ip.Representation]:Todas as representações
allOfAObject[org.roda.core.data.v2.ip.File]:Todos os ficheiros
allOfAObject[org.roda.core.data.v2.ip.TransferredResource]:Todos os recursos transferidos
allOfAObject[org.roda.core.data.v2.ip.DIP]:Todas as disseminações
allOfAObject[org.roda.core.data.v2.ip.DIPFile]:Todos os ficheiros de disseminação
allOfAObject[org.roda.core.data.v2.risks.Risk]:Todos os riscos
allOfAObject[org.roda.core.data.v2.risks.RiskIncidence]:Todas as incidências
allOfAObject[org.roda.core.data.v2.ri.RepresentationInformation]:Todas as informações de representação
allOfAObject[org.roda.core.data.v2.jobs.Job]:Todos os processos
allOfAObject[org.roda.core.data.v2.jobs.Report]:Todos os relatórios
allOfAObject[org.roda.core.data.v2.notifications.Notification]:Todas as notificações
allOfAObject[org.roda.core.data.v2.log.LogEntry]:Todos os registos de atividade
allOfAObject[org.roda.core.data.v2.user.RODAMember]:Todos os utilizadores e grupos
allOfAObject[org.roda.core.data.v2.ip.metadata.DescriptiveMetadata]:Todos os metadados descritivos
allOfAObject[org.roda.core.data.v2.ip.metadata.PreservationMetadata]:Todos os metadados de preservação
allOfAObject[org.roda.core.data.v2.formats.Format]:Todos os formatos
allOfAObject[org.roda.core.data.v2.ip.AIP]: Todas as entidades intelectuais
allOfAObject[org.roda.core.data.v2.ip.IndexedAIP]: Todas as entidades intelectuais
allOfAObject[org.roda.core.data.v2.ip.Representation]: Todas as representações
allOfAObject[org.roda.core.data.v2.ip.IndexedRepresentation]: Todas as representações
allOfAObject[org.roda.core.data.v2.ip.File]: Todos os ficheiros
allOfAObject[org.roda.core.data.v2.ip.IndexedFile]: Todos os ficheiros
allOfAObject[org.roda.core.data.v2.ip.TransferredResource]: Todos os recursos transferidos
allOfAObject[org.roda.core.data.v2.ip.DIP]: Todas as disseminações
allOfAObject[org.roda.core.data.v2.ip.IndexedDIP]: Todas as disseminações
allOfAObject[org.roda.core.data.v2.ip.DIPFile]: Todos os ficheiros de disseminação
allOfAObject[org.roda.core.data.v2.risks.Risk]: Todos os riscos
allOfAObject[org.roda.core.data.v2.risks.IndexedRisk]: Todos os riscos
allOfAObject[org.roda.core.data.v2.risks.RiskIncidence]: Todas as incidências
allOfAObject[org.roda.core.data.v2.ri.RepresentationInformation]: Todas as informações de representação
allOfAObject[org.roda.core.data.v2.jobs.Job]: Todos os processos
allOfAObject[org.roda.core.data.v2.jobs.Report]: Todos os relatórios
allOfAObject[org.roda.core.data.v2.jobs.IndexedReport]: Todos os relatórios
allOfAObject[org.roda.core.data.v2.notifications.Notification]: Todas as notificações
allOfAObject[org.roda.core.data.v2.log.LogEntry]: Todos os registos de atividade
allOfAObject[org.roda.core.data.v2.user.RODAMember]: Todos os utilizadores e grupos
allOfAObject[org.roda.core.data.v2.ip.metadata.DescriptiveMetadata]: Todos os metadados descritivos
allOfAObject[org.roda.core.data.v2.ip.metadata.PreservationMetadata]: Todos os metadados de preservação
allOfAObject[org.roda.core.data.v2.formats.Format]: Todos os formatos
allOfAObject[org.roda.core.data.v2.ip.metadata.IndexedPreservationEvent]: Todos os eventos de preservação
allOfAObject[org.roda.core.data.v2.ip.metadata.IndexedPreservationAgent]: Todos os agentes de preservação
allOfAObject[org.roda.core.data.v2.Void]: Sem objetos de entrada
Expand Down Expand Up @@ -582,10 +588,11 @@ aipState[INGEST_PROCESSING]: Em ingestão
aipState[UNDER_APPRAISAL]: Em validação

# Search pre-filters
searchPreFilterSimpleFilterParameter:{0} é {1}
searchPreFilterBasicSearchFilterParameter:{0} é {1}
searchPreFilterNotSimpleFilterParameter:{0} não é {1}
searchPreFilterEmptyKeyFilterParameter: Sem {0}
searchPreFilterSimpleFilterParameter:<span class="search-prefilter-field">{0}</span> é <span class="search-prefilter-value">{1}</span>
searchPreFilterBasicSearchFilterParameter:<span class="search-prefilter-field">{0}</span> é <span class="search-prefilter-value">{1}</span>
searchPreFilterNotSimpleFilterParameter:<span class="search-prefilter-field">{0}</span> não é <span class="search-prefilter-value">{1}</span>
searchPreFilterEmptyKeyFilterParameter: Sem <span class="search-prefilter-field">{0}</span>
searchPreFilterLongRangeFilterParameter:<span class="search-prefilter-field">{0}</span> está entre <span class="search-prefilter-value">{1}</span> e <span class="search-prefilter-value">{2}</span>
searchPreFilterOneOfManyFilterParameterWithSize:<span class="search-prefilter-field">{0}</span> pode ser <span class="search-prefilter-value">um de {1} possíveis valores</span>
searchPreFilterOneOfManyFilterParameterSingle:<span class="search-prefilter-field">{0}</span> é <span class="search-prefilter-value">{1}</span>
searchPreFilterOneOfManyFilterParameterWithList:<span class="search-prefilter-field">{0}</span> pode ser <span class="search-prefilter-value">{1,list}</span>
Expand Down

0 comments on commit 1ba8a09

Please sign in to comment.