Issue SORMAS-Foundation#2907: Requested changes

- fix i18n
- rename class and method
- remove unused comment

Author: xavier-calland

sormas-api/src/main/resources/descriptions.properties

@@ -46,7 +46,7 @@ Contact.region = Users associated to the responsible region/district/community w
 Contact.relationToCase = Select the person's relation to the case
 
 # General
-descCommunityFilter = Select an community in the district
+descCommunityFilter = Select a community in the district
 descDistrictFilter = Select an district in the region
 descFacilityFilter = Select a facility in the district
 descPointOfEntryFilter = Select a point of entry in the district

sormas-api/src/main/resources/strings.properties

@@ -754,9 +754,9 @@ numberTwelve = twelve
 numberTwo = two
 
 # Prompts
-promptActionDateFrom = Date of actionvent from epi week
+promptActionDateFrom = Date of action from...
 promptActionDateTo = ... to
-promptActionEpiWeekFrom = Date of action from epi week
+promptActionEpiWeekFrom = Date of action from epi week...
 promptActionEpiWeekTo = ... to epi week
 promptCampaignSearch = ID, name
 promptCasesDateFrom = New cases from...

sormas-backend/src/main/java/de/symeda/sormas/backend/action/ActionFacadeEjb.java

@@ -202,7 +202,7 @@ public List<EventActionIndexDto> getEventActionList(EventCriteria criteria, Inte
 
 	@Override
 	public long countEventAction(EventCriteria criteria) {
-		return actionService.countEventAction(criteria);
+		return actionService.countEventActions(criteria);
 	}
 
 	@LocalBean

sormas-backend/src/main/java/de/symeda/sormas/backend/action/ActionService.java

@@ -31,7 +31,6 @@
 import javax.persistence.criteria.Join;
 import javax.persistence.criteria.JoinType;
 import javax.persistence.criteria.Order;
-import javax.persistence.criteria.Path;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 
@@ -219,10 +218,8 @@ public Predicate buildEventCriteriaFilter(EventCriteria criteria, CriteriaBuilde
 
 		From<Action, Action> action = joins.getRoot();
 		From<Action, Event> event = joins.getEvent(JoinType.INNER);
-		Path<Location> location = event.get(Event.EVENT_LOCATION);
 
 		Predicate filter = eventService.buildCriteriaFilter(criteria, cb, event);
-		// TODO xca: EventService : filtre community
 
 		if (criteria.getActionChangeDateFrom() != null && criteria.getActionChangeDateTo() != null) {
 			filter =
@@ -347,7 +344,7 @@ public List<EventActionIndexDto> getEventActionIndexList(EventCriteria criteria,
 		return actions;
 	}
 
-	public long countEventAction(EventCriteria criteria) {
+	public long countEventActions(EventCriteria criteria) {
 		CriteriaBuilder cb = em.getCriteriaBuilder();
 		CriteriaQuery<Long> cq = cb.createQuery(Long.class);
 		Root<Action> action = cq.from(getElementClass());

…rmas/ui/events/EventWithActionsGrid.java …a/sormas/ui/events/EventActionsGrid.javasormas-ui/src/main/java/de/symeda/sormas/ui/events/EventWithActionsGrid.java renamed to sormas-ui/src/main/java/de/symeda/sormas/ui/events/EventActionsGrid.java sormas-ui/src/main/java/de/symeda/sormas/ui/events/EventWithActionsGrid.java renamed to sormas-ui/src/main/java/de/symeda/sormas/ui/events/EventActionsGrid.java

@@ -44,12 +44,12 @@
 import de.symeda.sormas.ui.utils.ViewConfiguration;
 
 @SuppressWarnings("serial")
-public class EventWithActionsGrid extends FilteredGrid<EventActionIndexDto, EventCriteria> {
+public class EventActionsGrid extends FilteredGrid<EventActionIndexDto, EventCriteria> {
 
 	public static final String EVENT_DATE = Captions.singleDayEventDate;
 
 	@SuppressWarnings("unchecked")
-	public <V extends View> EventWithActionsGrid(EventCriteria eventCriteria, Class<V> viewClass) {
+	public <V extends View> EventActionsGrid(EventCriteria eventCriteria, Class<V> viewClass) {
 
 		super(EventActionIndexDto.class);
 		setSizeFull();

sormas-ui/src/main/java/de/symeda/sormas/ui/events/EventsView.java

@@ -110,7 +110,7 @@ public EventsView() {
 			grid = new EventGrid(criteria, getClass());
 			grid.getDataProvider().addDataProviderListener(e -> updateStatusButtons());
 		} else {
-			grid = new EventWithActionsGrid(criteria, getClass());
+			grid = new EventActionsGrid(criteria, getClass());
 			grid.getDataProvider().addDataProviderListener(e -> updateStatusButtons());
 		}
 		gridLayout = new VerticalLayout();
@@ -434,7 +434,7 @@ public void enter(ViewChangeEvent event) {
 		if (isDefaultViewType()) {
 			((EventGrid) grid).reload();
 		} else {
-			((EventWithActionsGrid) grid).reload();
+			((EventActionsGrid) grid).reload();
 		}
 	}