fix int test (#7173)

Hack23 · Feb 10, 2025 · 90ba435 · 90ba435
1 parent 7cf906c
commit 90ba435
Show file tree

Hide file tree

Showing 20 changed files with 165 additions and 172 deletions.
diff --git a/...i/application/views/common/menufactory/api/pagecommands/PageCommandMinistryConstants.java b/...i/application/views/common/menufactory/api/pagecommands/PageCommandMinistryConstants.java
@@ -1,7 +1,6 @@
 package com.hack23.cia.web.impl.ui.application.views.common.menufactory.api.pagecommands;
 
 import com.hack23.cia.web.impl.ui.application.views.common.pagelinks.api.PageModeMenuCommand;
-import com.hack23.cia.web.impl.ui.application.views.common.viewnames.ChartIndicators;
 import com.hack23.cia.web.impl.ui.application.views.common.viewnames.MinistryPageMode;
 import com.hack23.cia.web.impl.ui.application.views.common.viewnames.PageMode;
 import com.hack23.cia.web.impl.ui.application.views.common.viewnames.UserViews;
@@ -11,10 +10,6 @@
  */
 public interface PageCommandMinistryConstants {
 
-	/** The ministry command charts all by headcount. */
-	PageModeMenuCommand MINISTRY_COMMAND_CHARTS_ALL_BY_HEADCOUNT = new PageModeMenuCommand(UserViews.MINISTRY_VIEW_NAME,
-			PageMode.CHARTS, ChartIndicators.ALLMINISTRIESBYHEADCOUNT.toString());
-
 	/** The ministry command pagevisithistory. */
 	PageModeMenuCommand MINISTRY_COMMAND_PAGEVISITHISTORY = new PageModeMenuCommand(UserViews.MINISTRY_VIEW_NAME,
 			PageMode.PAGEVISITHISTORY);

diff --git a/...3/cia/web/impl/ui/application/views/user/committee/pagemode/CommitteeActionConstants.java b/...3/cia/web/impl/ui/application/views/user/committee/pagemode/CommitteeActionConstants.java
@@ -11,7 +11,7 @@ public interface CommitteeActionConstants {
 
     /** The dd title header. */
     // Decision Data
-    String DD_TITLE_HEADER = "Daily Committee Decisions ";
+    String DD_TITLE_HEADER = "Daily Committee Decisions";
 
     /** The dd title. */
     String DD_TITLE = "Summary of Decision Types";
@@ -31,7 +31,7 @@ public interface CommitteeActionConstants {
 
     /** The bd title header. */
     // Ballot Decision
-    String BD_TITLE_HEADER = "Committee Ballot Decision Summary  ";
+    String BD_TITLE_HEADER = "Committee Ballot Decision Summary";
 
     /** The bd title. */
     String BD_TITLE = "Ballot Decision Summary";

diff --git a/...views/user/goverment/pagemode/MinistryGovernmentBodiesHeadcountModContentFactoryImpl.java b/...views/user/goverment/pagemode/MinistryGovernmentBodiesHeadcountModContentFactoryImpl.java
@@ -37,7 +37,8 @@
  * The Class MinistryGovernmentBodiesHeadcountModContentFactoryImpl.
  */
 @Component
-public final class MinistryGovernmentBodiesHeadcountModContentFactoryImpl extends AbstractMinistryPageModContentFactoryImpl {
+public final class MinistryGovernmentBodiesHeadcountModContentFactoryImpl
+		extends AbstractMinistryPageModContentFactoryImpl {
 
 	/** The government body chart data manager. */
 	@Autowired
@@ -61,7 +62,9 @@ public Layout createContent(final String parameters, final MenuBar menuBar, fina
 		final ViewRiksdagenMinistry viewRiksdagenMinistry = getItem(parameters);
 		getMinistryMenuItemFactory().createMinistryMenuBar(menuBar, pageId);
 
-		CardInfoRowUtil.createPageHeader(panel, panelContent, "Ministry Government Bodies Headcount " + viewRiksdagenMinistry.getNameId(), "Government Bodies Headcount", "Provides detailed headcount data for government bodies under ministries.");
+		CardInfoRowUtil.createPageHeader(panel, panelContent,
+				MinistryViewConstants.HEADCOUNT_TITLE + viewRiksdagenMinistry.getNameId(),
+				MinistryViewConstants.HEADCOUNT_SUBTITLE, MinistryViewConstants.HEADCOUNT_DESC);
 
 		governmentBodyChartDataManager.createMinistryGovernmentBodyHeadcountSummaryChart(panelContent,
 				viewRiksdagenMinistry.getNameId());

diff --git a/...on/views/user/goverment/pagemode/MinistryGovernmentBodiesIncomeModContentFactoryImpl.java b/...on/views/user/goverment/pagemode/MinistryGovernmentBodiesIncomeModContentFactoryImpl.java
@@ -61,7 +61,7 @@ public Layout createContent(final String parameters, final MenuBar menuBar, fina
 		final ViewRiksdagenMinistry viewRiksdagenMinistry = getItem(parameters);
 		getMinistryMenuItemFactory().createMinistryMenuBar(menuBar, pageId);
 
-		CardInfoRowUtil.createPageHeader(panel, panelContent, "Government Bodies Income " + viewRiksdagenMinistry.getNameId(), "Government Bodies Income", "Provides detailed income data for government bodies under ministries.");
+		CardInfoRowUtil.createPageHeader(panel, panelContent, MinistryViewConstants.INCOME_TITLE + viewRiksdagenMinistry.getNameId(), MinistryViewConstants.INCOME_SUBTITLE,  MinistryViewConstants.INCOME_DESC);
 
 		governmentBodyChartDataManager.createMinistryGovernmentBodyIncomeSummaryChart(panelContent,
 				viewRiksdagenMinistry.getNameId());

diff --git a/...tion/views/user/goverment/pagemode/MinistryPageVisitHistoryPageModContentFactoryImpl.java b/...tion/views/user/goverment/pagemode/MinistryPageVisitHistoryPageModContentFactoryImpl.java
@@ -38,8 +38,7 @@
 public final class MinistryPageVisitHistoryPageModContentFactoryImpl extends AbstractMinistryPageModContentFactoryImpl {
 
 	/**
-	 * Instantiates a new ministry page visit history page mod content factory
-	 * impl.
+	 * Instantiates a new ministry page visit history page mod content factory impl.
 	 */
 	public MinistryPageVisitHistoryPageModContentFactoryImpl() {
 		super();
@@ -55,7 +54,9 @@ public Layout createContent(final String parameters, final MenuBar menuBar, fina
 		final ViewRiksdagenMinistry viewRiksdagenMinistry = getItem(parameters);
 		getMinistryMenuItemFactory().createMinistryMenuBar(menuBar, pageId);
 
-		CardInfoRowUtil.createPageHeader(panel, panelContent, "Ministry Page Visit History " + viewRiksdagenMinistry.getNameId(), "Page Visit History", "Tracks and visualizes the history of page visits for ministries.");
+		CardInfoRowUtil.createPageHeader(panel, panelContent,
+				MinistryViewConstants.PAGEVISIT_TITLE + viewRiksdagenMinistry.getNameId(),
+				MinistryViewConstants.PAGEVISIT_SUBTITLE, MinistryViewConstants.PAGEVISIT_DESC);
 
 		createPageVisitHistory(NAME, pageId, panelContent);
 

diff --git a/...ck23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryViewConstants.java b/...ck23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryViewConstants.java
@@ -29,7 +29,7 @@ public interface MinistryViewConstants extends
     String EXPENDITURE_TITLE = "Expenditure Analysis";
 
     /** The ministry service stats title. */
-    String MINISTRY_SERVICE_STATS_TITLE = "Ministry Service Statistics";
+    String MINISTRY_SERVICE_STATS_TITLE = "Government Bodies Income ";
 
     /** The ministry document stats title. */
     String MINISTRY_DOCUMENT_STATS_TITLE = "Document Statistics";
@@ -128,4 +128,8 @@ public interface MinistryViewConstants extends
 
     /** The ministry government bills label. */
     String MINISTRY_GOVERNMENT_BILLS_LABEL = "Government Bills:";
+
+	String INCOME_TITLE = "Government Bodies Income ";
+
+	String HEADCOUNT_TITLE = "Ministry Government Bodies Headcount ";
 }
diff --git a/...application/views/user/party/pagemode/PartyDocumentActivityPageModContentFactoryImpl.java b/...application/views/user/party/pagemode/PartyDocumentActivityPageModContentFactoryImpl.java
@@ -55,11 +55,11 @@ public PartyDocumentActivityPageModContentFactoryImpl() {
 	public Layout createContent(final String parameters, final MenuBar menuBar, final Panel panel) {
 		final VerticalLayout panelContent = createPanelContent();
 		final ViewRiksdagenParty viewRiksdagenParty = getItem(parameters);
-		
+
 		getPartyMenuItemFactory().createPartyMenuBar(menuBar, getPageId(parameters));
 
 		CardInfoRowUtil.createPageHeader(panel, panelContent,
-			PartyViewConstants.DOCUMENT_ACTIVITY_HEADER + " " + viewRiksdagenParty.getPartyName(),
+			PartyViewConstants.DOCUMENT_ACTIVITY_HEADER + viewRiksdagenParty.getPartyName(),
 			PartyViewConstants.DOCUMENT_ACTIVITY_SUBTITLE,
 			PartyViewConstants.DOCUMENT_ACTIVITY_DESC);
 

diff --git a/.../application/views/user/party/pagemode/PartyDocumentHistoryPageModContentFactoryImpl.java b/.../application/views/user/party/pagemode/PartyDocumentHistoryPageModContentFactoryImpl.java
@@ -71,7 +71,7 @@ public Layout createContent(final String parameters, final MenuBar menuBar, fina
 		final VerticalLayout panelContent = createPanelContent();
 		final ViewRiksdagenParty viewRiksdagenParty = getItem(parameters);
 		final String pageId = getPageId(parameters);
-		
+
 		getPartyMenuItemFactory().createPartyMenuBar(menuBar, pageId);
 
 		CardInfoRowUtil.createPageHeader(panel, panelContent,

diff --git a/...ui/application/views/user/party/pagemode/PartyLeaderHistoryPageModContentFactoryImpl.java b/...ui/application/views/user/party/pagemode/PartyLeaderHistoryPageModContentFactoryImpl.java
@@ -72,7 +72,7 @@ public Layout createContent(final String parameters, final MenuBar menuBar, fina
 		final ViewRiksdagenParty viewRiksdagenParty = getItem(parameters);
 		getPartyMenuItemFactory().createPartyMenuBar(menuBar, pageId);
 
-		CardInfoRowUtil.createPageHeader(panel, panelContent, "Leader History " + viewRiksdagenParty.getPartyName(), "Party Leaders", "Explore the history of party leaders and their roles.");
+		CardInfoRowUtil.createPageHeader(panel, panelContent, PartyViewConstants.LEADER_HISTORY_HEADER + viewRiksdagenParty.getPartyName(), PartyViewConstants.LEADER_HISTORY_TITLE , PartyViewConstants.LEADER_HISTORY_DESC);
 
 		final DataContainer<ViewRiksdagenPartyRoleMember, String> partyRoleMemberDataContainer = getApplicationManager()
 				.getDataContainer(ViewRiksdagenPartyRoleMember.class);

diff --git a/...ui/application/views/user/party/pagemode/PartyMemberHistoryPageModContentFactoryImpl.java b/...ui/application/views/user/party/pagemode/PartyMemberHistoryPageModContentFactoryImpl.java
@@ -59,8 +59,6 @@ public final class PartyMemberHistoryPageModContentFactoryImpl extends AbstractP
 	/** The Constant POLITICIANS. */
 	private static final String POLITICIANS = "Politicians";
 
-	private static final String MEMBER_HISTORY = PartyViewConstants.GRID_LABEL_MEMBER_HISTORY;
-
 	/**
 	 * Instantiates a new party member history page mod content factory impl.
 	 */

diff --git a/...application/views/user/party/pagemode/PartyPageVisitHistoryPageModContentFactoryImpl.java b/...application/views/user/party/pagemode/PartyPageVisitHistoryPageModContentFactoryImpl.java
@@ -50,7 +50,7 @@ public PartyPageVisitHistoryPageModContentFactoryImpl() {
 	public Layout createContent(final String parameters, final MenuBar menuBar, final Panel panel) {
 		final VerticalLayout panelContent = createPanelContent();
 		final ViewRiksdagenParty viewRiksdagenParty = getItem(parameters);
-		
+
 		getPartyMenuItemFactory().createPartyMenuBar(menuBar, getPageId(parameters));
 
 		CardInfoRowUtil.createPageHeader(panel, panelContent,

diff --git a/...mpl/ui/application/views/user/party/pagemode/PartyRoleGhantPageModContentFactoryImpl.java b/...mpl/ui/application/views/user/party/pagemode/PartyRoleGhantPageModContentFactoryImpl.java
@@ -69,7 +69,7 @@ public Layout createContent(final String parameters, final MenuBar menuBar, fina
 		getPartyMenuItemFactory().createPartyMenuBar(menuBar, pageId);
 
 		CardInfoRowUtil.createPageHeader(panel, panelContent,
-			PartyViewConstants.ROLE_GHANT_HEADER + " " + viewRiksdagenParty.getPartyName(),
+			PartyViewConstants.ROLE_GHANT_HEADER  + viewRiksdagenParty.getPartyName(),
 			PartyViewConstants.ROLE_GHANT_TITLE,
 			PartyViewConstants.ROLE_GHANT_DESC);
 		CardInfoRowUtil.createPageHeader(panel, panelContent, viewRiksdagenParty.getPartyName(), viewRiksdagenParty.getPartyId(), ROLE_GHANT);

diff --git a/...on/views/user/party/pagemode/PartySupportAnnualSummaryChartPageModContentFactoryImpl.java b/...on/views/user/party/pagemode/PartySupportAnnualSummaryChartPageModContentFactoryImpl.java
@@ -22,7 +22,6 @@
 import org.springframework.security.access.annotation.Secured;
 import org.springframework.stereotype.Component;
 
-import com.hack23.cia.model.internal.application.data.party.impl.ViewRiksdagenParty;
 import com.hack23.cia.model.internal.application.system.impl.ApplicationEventGroup;
 import com.hack23.cia.web.impl.ui.application.action.ViewAction;
 import com.hack23.cia.web.impl.ui.application.views.common.chartfactory.api.PartySupportsChartDataManager;
@@ -58,11 +57,10 @@ public Layout createContent(final String parameters, final MenuBar menuBar, fina
 
 		final String pageId = getPageId(parameters);
 
-		final ViewRiksdagenParty viewRiksdagenParty = getItem(parameters);
 		getPartyMenuItemFactory().createPartyMenuBar(menuBar, pageId);
 		CardInfoRowUtil.createPageHeader(panel, panelContent,
             PartyViewConstants.SUPPORT_SUMMARY_HEADER,
-            PartyViewConstants.SUPPORT_SUMMARY_TITLE, 
+            PartyViewConstants.SUPPORT_SUMMARY_TITLE,
             PartyViewConstants.SUPPORT_SUMMARY_DESC);
 		chartDataManager.createPartyChart(panelContent,pageId);
 

diff --git a/.../com/hack23/cia/web/impl/ui/application/views/user/party/pagemode/PartyViewConstants.java b/.../com/hack23/cia/web/impl/ui/application/views/user/party/pagemode/PartyViewConstants.java
@@ -92,7 +92,7 @@ public interface PartyViewConstants {
 
     // Grid Labels
     String GRID_LABEL_CURRENT_LEADERS = "Current Leaders";
-    String GRID_LABEL_COMMITTEE_BALLOT_SUMMARY = "Committee Ballot Decision Party Summary"; 
+    String GRID_LABEL_COMMITTEE_BALLOT_SUMMARY = "Committee Ballot Decision Party Summary";
     String GRID_LABEL_ROLE_CHART = "Role chart";
     String GRID_LABEL_DOCUMENT_HISTORY = "Member Document history";
     String GRID_LABEL_CURRENT_POLITICIANS = "Politicians";
@@ -117,7 +117,7 @@ public interface PartyViewConstants {
     String DOCUMENT_HISTORY_SUBTITLE = "Historical Documents";
     String ROLES_SUBTITLE = "Committee and Government Role Details";
 
-    // View Subtitles 
+    // View Subtitles
     String VOTE_HISTORY_SUBTITLE = "Historical Voting Records";
     String CURRENT_MEMBER_SUBTITLE = "Active Party Members";
     String LEADER_HISTORY_SUBTITLE = "Historical Leadership";
@@ -127,7 +127,7 @@ public interface PartyViewConstants {
     String VISIT_HISTORY_SUBTITLE = "Page Visit Analysis";
     String GENERAL_SUBTITLE = "Party Information";
     String ACTIVITY_SUBTITLE = "Activity Summary";
-    
+
     // Chart Labels
     String CHART_SUPPORT_LABEL = "Party Support Trends";
     String CHART_VOTES_LABEL = "Voting Patterns";

diff --git a/...ication/views/user/party/pagemode/PartyWonDailySummaryChartPageModContentFactoryImpl.java b/...ication/views/user/party/pagemode/PartyWonDailySummaryChartPageModContentFactoryImpl.java
@@ -56,7 +56,7 @@ public PartyWonDailySummaryChartPageModContentFactoryImpl() {
 	public Layout createContent(final String parameters, final MenuBar menuBar, final Panel panel) {
 		final VerticalLayout panelContent = createPanelContent();
 		final ViewRiksdagenParty viewRiksdagenParty = getItem(parameters);
-		
+
 		getPartyMenuItemFactory().createPartyMenuBar(menuBar, getPageId(parameters));
 
 		CardInfoRowUtil.createPageHeader(panel, panelContent,

diff --git a/...ation/views/user/politician/pagemode/PoliticianVisitHistoryPageModContentFactoryImpl.java b/...ation/views/user/politician/pagemode/PoliticianVisitHistoryPageModContentFactoryImpl.java
@@ -36,7 +36,7 @@ public Layout createContent(final String parameters, final MenuBar menuBar, fina
 
         getPoliticianMenuItemFactory().createPoliticianMenuBar(menuBar, pageId);
 
-        CardInfoRowUtil.createPageHeader(panel, panelContent,
+        CardInfoRowUtil.createPageHeader(panel, panelContent,PoliticianPageTitleConstants.PAGEVISIT_TITLE +
             PoliticianTitleFormatter.formatTitle(viewRiksdagenPolitician),
             PoliticianDescriptionConstants.VISIT_TRENDS_TITLE,
             PoliticianDescriptionConstants.VISIT_HISTORY_DESC);