Add menu item ranking constants and update implementations

citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/api/CountryRankingMenuItemFactory.java

@@ -0,0 +1,9 @@
+package com.hack23.cia.web.impl.ui.application.views.common.menufactory.api;
+
+import com.vaadin.ui.MenuBar.MenuItem;
+import com.vaadin.ui.VerticalLayout;
+
+public interface CountryRankingMenuItemFactory {
+    void createOverviewPage(VerticalLayout panelContent);
+    void createCountryRankingTopics(MenuItem countryMenuItem);
+}

citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/api/MenuItemConstants.java

@@ -21,7 +21,10 @@ public interface MenuItemConstants extends
     MenuItemLeadershipConstants,
     MenuItemParliamentConstants,
     MenuItemRiskConstants,
-    MenuItemPageVisitConstants {
+    MenuItemPageVisitConstants,
+    MenuItemRankingPageVisitHistoryConstants,
+    PageCommandCountryRankingConstants,
+    RankingNavigationConstants {
 
     /** The dashboard. */
     // Core navigation constants
@@ -33,9 +36,6 @@ public interface MenuItemConstants extends
     /** The start text. */
     String START_TEXT = "Start";
 
-    /** The overview text. */
-    String OVERVIEW_TEXT = "Overview";
-
     /** The ranking text. */
     String RANKING_TEXT = "Ranking";
 
@@ -93,9 +93,6 @@ public interface MenuItemConstants extends
     /** The Constant MENU_BAR_WIDTH. */
     String MENU_BAR_WIDTH = "80%";
 
-    /** The Constant PAGE_VISIT_HISTORY_TEXT. */
-    String PAGE_VISIT_HISTORY_TEXT = "Page Visit History";
-
     /** The Constant PORTAL. */
     String PORTAL = "Portal";
 
@@ -225,9 +222,6 @@ public interface MenuItemConstants extends
     /** The Constant COUNTRY_INDICATORS_SWEDEN. */
     String COUNTRY_INDICATORS_SWEDEN = "Country Indicators Sweden";
 
-    /** The Constant COUNTRY_PAGE_VISIT_HISTORY_TEXT. */
-    String COUNTRY_PAGE_VISIT_HISTORY_TEXT = "Country Page Visit History";
-
     /** The Constant DATA_POINTS_FOR_YEAR_ABOVE. */
     int DATA_POINTS_FOR_YEAR_ABOVE = 2000;
 
@@ -258,9 +252,6 @@ public interface MenuItemConstants extends
     /** The Constant DOCUMENT_ATTACHEMENTS. */
     String DOCUMENT_ATTACHEMENTS = "Document Attachments";
 
-    /** The Constant DOCUMENT_PAGE_VISIT_HISTORY_TEXT. */
-    String DOCUMENT_PAGE_VISIT_HISTORY_TEXT = "Document Page Visit History";
-
     /** The Constant DOCUMENT_ACTIVITIES_AND_UPDATES. */
     String DOCUMENT_ACTIVITIES_AND_UPDATES = "Document activities and updates";
 
@@ -294,9 +285,6 @@ public interface MenuItemConstants extends
     /** The Constant EXPENDITURE. */
     String EXPENDITURE = "Expenditure";
 
-    /** The Constant GOVERNMENT_BODY_PAGE_VISIT_HISTORY_TEXT. */
-    String GOVERNMENT_BODY_PAGE_VISIT_HISTORY_TEXT = "Government Body Page Visit History";
-
     /** The Constant HEADCOUNT_DESCRIPTION. */
     String HEADCOUNT_DESCRIPTION = "Headcount description";
 
@@ -306,9 +294,6 @@ public interface MenuItemConstants extends
     /** The Constant EXPENDITURE_DESCRIPTION. */
     String EXPENDITURE_DESCRIPTION = "Expenditure description";
 
-    /** The Constant GOVERNMENT_BODY_PAGE_VISIT_HISTORY_DESCRIPTION. */
-    String GOVERNMENT_BODY_PAGE_VISIT_HISTORY_DESCRIPTION = "Government body page visit history description";
-
     /** The Constant GOVERNMENT_BODIES_HEADCOUNT. */
     String GOVERNMENT_BODIES_HEADCOUNT = "Government Bodies Headcount";
 

citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/api/MenuItemRankingPageVisitHistoryConstants.java

@@ -0,0 +1,7 @@
+package com.hack23.cia.web.impl.ui.application.views.common.menufactory.api;
+
+
+public interface MenuItemRankingPageVisitHistoryConstants {
+    String PAGE_VISIT_HISTORY_TEXT = "Page Visit History";
+    String PAGE_VISIT_HISTORY_DESCRIPTION = "View visit history and statistics";
+}

citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/api/PageCommandBallotConstants.java

@@ -0,0 +1,16 @@
+package com.hack23.cia.web.impl.ui.application.views.common.menufactory.api;
+
+import com.hack23.cia.web.impl.ui.application.views.common.pagelinks.api.PageModeMenuCommand;
+import com.hack23.cia.web.impl.ui.application.views.common.viewnames.PageMode;
+import com.hack23.cia.web.impl.ui.application.views.common.viewnames.UserViews;
+
+public interface PageCommandBallotConstants {
+    PageModeMenuCommand COMMAND_BALLOT_OVERVIEW = new PageModeMenuCommand(
+                     UserViews.BALLOT_VIEW_NAME, PageMode.OVERVIEW);
+
+    PageModeMenuCommand COMMAND_BALLOT_DECISION_SUMMARY = new PageModeMenuCommand(
+                     UserViews.BALLOT_VIEW_NAME, "decisionsummary");
+
+    PageModeMenuCommand COMMAND_BALLOT_PAGEVISIT_HISTORY = new PageModeMenuCommand(
+                     UserViews.BALLOT_VIEW_NAME, PageMode.PAGEVISITHISTORY);
+}

citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/api/PageCommandCommitteeConstants.java

@@ -0,0 +1,20 @@
+package com.hack23.cia.web.impl.ui.application.views.common.menufactory.api;
+
+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.PageMode;
+import com.hack23.cia.web.impl.ui.application.views.common.viewnames.UserViews;
+
+public interface PageCommandCommitteeConstants {
+    PageModeMenuCommand COMMAND_COMMITTEES_BY_PARTY = new PageModeMenuCommand(
+                     UserViews.COMMITTEE_RANKING_VIEW_NAME,
+                     PageMode.CHARTS, ChartIndicators.COMMITTEESBYPARTY.toString());
+
+    PageModeMenuCommand COMMAND_CURRENT_COMMITTEES_BY_PARTY_DAYS_SERVED = new PageModeMenuCommand(
+                     UserViews.COMMITTEE_RANKING_VIEW_NAME,
+                     PageMode.CHARTS, ChartIndicators.CURRENTCOMMITTEESBYPARTYDAYSSERVED.toString());
+
+    PageModeMenuCommand COMMAND_CHARTS_CURRENT_COMMITTEES = new PageModeMenuCommand(
+                     UserViews.PARTY_RANKING_VIEW_NAME, PageMode.CHARTS,
+                     ChartIndicators.CURRENTCOMMITTEES.toString());
+}

citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/api/PageCommandCommitteeRankingConstants.java

@@ -0,0 +1,28 @@
+package com.hack23.cia.web.impl.ui.application.views.common.menufactory.api;
+
+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.PageMode;
+import com.hack23.cia.web.impl.ui.application.views.common.viewnames.UserViews;
+
+public interface PageCommandCommitteeRankingConstants {
+    PageModeMenuCommand COMMAND_COMMITTEE_RANKING_DATAGRID = new PageModeMenuCommand(
+                     UserViews.COMMITTEE_RANKING_VIEW_NAME, PageMode.DATAGRID);
+
+    PageModeMenuCommand COMMAND_COMMITTEE_RANKING_OVERVIEW = new PageModeMenuCommand(
+                     UserViews.COMMITTEE_RANKING_VIEW_NAME, PageMode.OVERVIEW);
+
+    PageModeMenuCommand COMMAND_ALL_COMMITTEES_BY_HEADCOUNT = new PageModeMenuCommand(
+                     UserViews.COMMITTEE_RANKING_VIEW_NAME,
+                     PageMode.CHARTS, ChartIndicators.ALLCOMMITTEESBYHEADCOUNT.toString());
+
+    PageModeMenuCommand COMMAND_CURRENT_COMMITTEES_BY_HEADCOUNT = new PageModeMenuCommand(
+                     UserViews.COMMITTEE_RANKING_VIEW_NAME,
+                     PageMode.CHARTS, ChartIndicators.CURRENTCOMMITTEESBYHEADCOUNT.toString());
+
+    PageModeMenuCommand COMMITTEE_RANKING_COMMAND_PAGEVISIT_HISTORY = new PageModeMenuCommand(
+                     UserViews.COMMITTEE_RANKING_VIEW_NAME, PageMode.PAGEVISITHISTORY);
+
+    // Remove this line to avoid ambiguity
+    // PageModeMenuCommand COMMAND_PAGEVISIT_HISTORY = COMMITTEE_RANKING_COMMAND_PAGEVISIT_HISTORY;
+}

citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/api/PageCommandCountryRankingConstants.java

@@ -0,0 +1,18 @@
+package com.hack23.cia.web.impl.ui.application.views.common.menufactory.api;
+
+import com.hack23.cia.web.impl.ui.application.views.common.pagelinks.api.PageModeMenuCommand;
+import com.hack23.cia.web.impl.ui.application.views.common.viewnames.PageMode;
+import com.hack23.cia.web.impl.ui.application.views.common.viewnames.UserViews;
+
+public interface PageCommandCountryRankingConstants {
+    // Standardize to: COMMAND_[VIEW]_[ACTION]
+    PageModeMenuCommand COMMAND_COUNTRY_RANKING_OVERVIEW = new PageModeMenuCommand(
+                     UserViews.COUNTRY_RANKING_VIEW_NAME, PageMode.OVERVIEW);
+
+    // Should be: COMMAND_COUNTRY_RANKING_PAGEVISIT_HISTORY for consistency
+    PageModeMenuCommand COMMAND_COUNTRY_RANKING_PAGEVISIT_HISTORY = new PageModeMenuCommand(
+                     UserViews.COUNTRY_RANKING_VIEW_NAME, PageMode.PAGEVISITHISTORY);
+
+    // Generic command reference
+    PageModeMenuCommand COMMAND_OVERVIEW = COMMAND_COUNTRY_RANKING_OVERVIEW;
+}

citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/api/PageCommandDocumentConstants.java

@@ -0,0 +1,25 @@
+package com.hack23.cia.web.impl.ui.application.views.common.menufactory.api;
+
+import com.hack23.cia.web.impl.ui.application.views.common.pagelinks.api.PageModeMenuCommand;
+import com.hack23.cia.web.impl.ui.application.views.common.viewnames.PageMode;
+import com.hack23.cia.web.impl.ui.application.views.common.viewnames.UserViews;
+
+public interface PageCommandDocumentConstants {
+    PageModeMenuCommand COMMAND_DOCUMENT_ACTIVITY = new PageModeMenuCommand(
+                     UserViews.DOCUMENT_VIEW_NAME, PageMode.OVERVIEW);
+
+    PageModeMenuCommand COMMAND_DOCUMENT_DETAILS = new PageModeMenuCommand(
+                     UserViews.DOCUMENT_VIEW_NAME, "details");
+
+    PageModeMenuCommand COMMAND_DOCUMENT_REFERENCES = new PageModeMenuCommand(
+                     UserViews.DOCUMENT_VIEW_NAME, "references");
+
+    PageModeMenuCommand COMMAND_DOCUMENTS = new PageModeMenuCommand(
+                     UserViews.DOCUMENTS_VIEW_NAME, PageMode.OVERVIEW);
+
+    PageModeMenuCommand COMMAND_SEARCH_DOCUMENT = new PageModeMenuCommand(
+                     UserViews.SEARCH_DOCUMENT_VIEW_NAME, "");
+
+    PageModeMenuCommand COMMAND_DOCUMENT_PAGEVISIT_HISTORY = new PageModeMenuCommand(
+                     UserViews.DOCUMENT_VIEW_NAME, PageMode.PAGEVISITHISTORY);
+}

citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/api/PageCommandGovernmentBodyConstants.java

@@ -0,0 +1,24 @@
+package com.hack23.cia.web.impl.ui.application.views.common.menufactory.api;
+
+import com.hack23.cia.web.impl.ui.application.views.common.pagelinks.api.PageModeMenuCommand;
+import com.hack23.cia.web.impl.ui.application.views.common.viewnames.GovernmentBodyPageMode;
+import com.hack23.cia.web.impl.ui.application.views.common.viewnames.PageMode;
+import com.hack23.cia.web.impl.ui.application.views.common.viewnames.UserViews;
+
+public interface PageCommandGovernmentBodyConstants {
+    PageModeMenuCommand GOVERNMENT_BODY_COMMAND_EXPENDITURE = new PageModeMenuCommand(
+                     UserViews.GOVERNMENT_BODY_VIEW_NAME,
+                     GovernmentBodyPageMode.EXPENDITURE.toString());
+
+    PageModeMenuCommand GOVERNMENT_BODY_COMMAND_HEADCOUNT = new PageModeMenuCommand(
+                     UserViews.GOVERNMENT_BODY_VIEW_NAME,
+                     GovernmentBodyPageMode.HEADCOUNT.toString());
+
+    PageModeMenuCommand GOVERNMENT_BODY_COMMAND_INCOME = new PageModeMenuCommand(
+                     UserViews.GOVERNMENT_BODY_VIEW_NAME,
+                     GovernmentBodyPageMode.INCOME.toString());
+
+    PageModeMenuCommand GOVERNMENT_BODY_COMMAND_OVERVIEW = new PageModeMenuCommand(
+                     UserViews.GOVERNMENT_BODY_VIEW_NAME,
+                     PageMode.OVERVIEW);
+}

citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/api/PageCommandGovernmentBodyRankingConstants.java

@@ -0,0 +1,44 @@
+package com.hack23.cia.web.impl.ui.application.views.common.menufactory.api;
+
+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.PageMode;
+import com.hack23.cia.web.impl.ui.application.views.common.viewnames.UserViews;
+
+public interface PageCommandGovernmentBodyRankingConstants {
+    PageModeMenuCommand GOVERNMENT_BODY_COMMAN_OVERVIEW = new PageModeMenuCommand(
+                     UserViews.GOVERNMENT_BODY_RANKING_VIEW_NAME,
+                     PageMode.OVERVIEW);
+
+    PageModeMenuCommand COMMAND_GOVERNMENT_BODY_RANKING_DATAGRID = new PageModeMenuCommand(
+                     UserViews.GOVERNMENT_BODY_RANKING_VIEW_NAME, PageMode.DATAGRID);
+
+    PageModeMenuCommand COMMAND_GOVERNMENT_BODY_RANKING_OVERVIEW = new PageModeMenuCommand(
+                     UserViews.GOVERNMENT_BODY_RANKING_VIEW_NAME, PageMode.OVERVIEW);
+
+    PageModeMenuCommand COMMAND_GOVERNMENT_BODIES_HEADCOUNT = new PageModeMenuCommand(
+                     UserViews.GOVERNMENT_BODY_RANKING_VIEW_NAME,
+                     PageMode.CHARTS, ChartIndicators.GOVERNMENTBODIESHEADCOUNT.toString());
+
+    PageModeMenuCommand COMMAND_GOVERNMENT_BODIES_INCOME = new PageModeMenuCommand(
+                     UserViews.GOVERNMENT_BODY_RANKING_VIEW_NAME,
+                     PageMode.CHARTS, ChartIndicators.GOVERNMENTBODIESINCOME.toString());
+
+    PageModeMenuCommand COMMAND_GOVERNMENT_BODIES_EXPENDITURE = new PageModeMenuCommand(
+                     UserViews.GOVERNMENT_BODY_RANKING_VIEW_NAME,
+                     PageMode.CHARTS, ChartIndicators.GOVERNMENTBODIESEXPENDITURE.toString());
+
+    PageModeMenuCommand COMMAND_GOVERNMENT_OUTCOME = new PageModeMenuCommand(
+                     UserViews.GOVERNMENT_BODY_RANKING_VIEW_NAME,
+                     PageMode.CHARTS, ChartIndicators.GOVERNMENTOUTCOME.toString());
+
+    PageModeMenuCommand COMMAND_CHARTS_ALL_GOVERNMENT_ROLE_GANTT = new PageModeMenuCommand(
+                     UserViews.GOVERNMENT_BODY_RANKING_VIEW_NAME,
+                     PageMode.CHARTS, ChartIndicators.ALLGOVERNMENTROLEGANTT.toString());
+
+    PageModeMenuCommand GOVERNMENT_RANKING_COMMAND_PAGEVISIT_HISTORY = new PageModeMenuCommand(
+                     UserViews.GOVERNMENT_BODY_RANKING_VIEW_NAME, PageMode.PAGEVISITHISTORY);
+
+    // Remove this line to avoid ambiguity
+    // PageModeMenuCommand COMMAND_PAGEVISITHISTORY = GOVERNMENT_RANKING_COMMAND_PAGEVISIT_HISTORY;
+}

citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/api/PageCommandMainViewConstants.java

@@ -0,0 +1,26 @@
+package com.hack23.cia.web.impl.ui.application.views.common.menufactory.api;
+
+import com.hack23.cia.web.impl.ui.application.views.common.pagelinks.api.PageModeMenuCommand;
+import com.hack23.cia.web.impl.ui.application.views.common.viewnames.ApplicationPageMode;
+import com.hack23.cia.web.impl.ui.application.views.common.viewnames.CommonsViews;
+import com.hack23.cia.web.impl.ui.application.views.common.viewnames.PageMode;
+
+public interface PageCommandMainViewConstants {
+    PageModeMenuCommand COMMAND_MAINVIEW_OVERVIEW = new PageModeMenuCommand(CommonsViews.MAIN_VIEW_NAME,
+                     PageMode.OVERVIEW);
+
+    PageModeMenuCommand COMMAND_DASHBOARDVIEW_OVERVIEW = new PageModeMenuCommand(CommonsViews.DASHBOARD_VIEW_NAME,
+                     PageMode.OVERVIEW);
+
+    PageModeMenuCommand COMMAND_MAINVIEW_PAGEVISITHISTORY = new PageModeMenuCommand(CommonsViews.MAIN_VIEW_NAME,
+                     PageMode.PAGEVISITHISTORY);
+
+    PageModeMenuCommand COMMAND_LOGIN = new PageModeMenuCommand(CommonsViews.MAIN_VIEW_NAME,
+                     ApplicationPageMode.LOGIN.toString());
+
+    PageModeMenuCommand COMMAND_LOGOUT = new PageModeMenuCommand(CommonsViews.MAIN_VIEW_NAME,
+                     ApplicationPageMode.LOGOUT.toString());
+
+    PageModeMenuCommand COMMAND_REGISTER = new PageModeMenuCommand(CommonsViews.MAIN_VIEW_NAME,
+                     ApplicationPageMode.REGISTER.toString());
+}

citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/api/PageCommandMinistryConstants.java

@@ -0,0 +1,19 @@
+package com.hack23.cia.web.impl.ui.application.views.common.menufactory.api;
+
+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.PageMode;
+import com.hack23.cia.web.impl.ui.application.views.common.viewnames.UserViews;
+
+public interface PageCommandMinistryConstants {
+    PageModeMenuCommand MINISTRY_COMMAND_CHARTS_CURRENT_BY_HEADCOUNT = new PageModeMenuCommand(
+                     UserViews.MINISTRY_VIEW_NAME,
+                     PageMode.CHARTS, ChartIndicators.CURRENTMINISTRIESBYHEADCOUNT.toString());
+
+    PageModeMenuCommand MINISTRY_COMMAND_CHARTS_ALL_BY_HEADCOUNT = new PageModeMenuCommand(
+                     UserViews.MINISTRY_VIEW_NAME,
+                     PageMode.CHARTS, ChartIndicators.ALLMINISTRIESBYHEADCOUNT.toString());
+
+    PageModeMenuCommand MINISTRY_COMMAND_PAGEVISITHISTORY = new PageModeMenuCommand(
+                     UserViews.MINISTRY_VIEW_NAME, PageMode.PAGEVISITHISTORY);
+}

citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/api/PageCommandMinistryRankingConstants.java

@@ -0,0 +1,40 @@
+package com.hack23.cia.web.impl.ui.application.views.common.menufactory.api;
+
+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.PageMode;
+import com.hack23.cia.web.impl.ui.application.views.common.viewnames.UserViews;
+
+public interface PageCommandMinistryRankingConstants {
+    PageModeMenuCommand COMMAND_MINISTRY_RANKING_DATAGRID = new PageModeMenuCommand(
+                     UserViews.MINISTRY_RANKING_VIEW_NAME, PageMode.DATAGRID);
+
+    PageModeMenuCommand COMMAND_MINISTRY_RANKING_OVERVIEW = new PageModeMenuCommand(
+                     UserViews.MINISTRY_RANKING_VIEW_NAME, PageMode.OVERVIEW);
+
+    PageModeMenuCommand COMMAND_CHARTS_CURRENT_MINISTRIES_LEADER_SCOREBOARD = new PageModeMenuCommand(
+                     UserViews.MINISTRY_RANKING_VIEW_NAME,
+                     PageMode.CHARTS, ChartIndicators.CURRENTMINISTRIESLEADERSCORECARD.toString());
+
+    PageModeMenuCommand COMMAND_CHARTS_CURRENT_MINISTRIES_BY_HEADCOUNT = new PageModeMenuCommand(
+                     UserViews.MINISTRY_RANKING_VIEW_NAME,
+                     PageMode.CHARTS, ChartIndicators.CURRENTMINISTRIESBYHEADCOUNT.toString());
+
+    PageModeMenuCommand COMMAND_CHARTS_ALL_MINISTRIES_BY_HEADCOUNT = new PageModeMenuCommand(
+                     UserViews.MINISTRY_RANKING_VIEW_NAME,
+                     PageMode.CHARTS, ChartIndicators.ALLMINISTRIESBYHEADCOUNT.toString());
+
+    PageModeMenuCommand COMMAND_CHARTS_ALLMINISTRIES_BY_TOTAL_DAYS = new PageModeMenuCommand(
+                     UserViews.MINISTRY_RANKING_VIEW_NAME,
+                     PageMode.CHARTS, ChartIndicators.ALLMINISTRIESBYTOTALDAYS.toString());
+
+    PageModeMenuCommand COMMAND_CHARTS_CURRENT_PARTIES_BY_HEADCOUNT = new PageModeMenuCommand(
+                     UserViews.MINISTRY_RANKING_VIEW_NAME,
+                     PageMode.CHARTS, ChartIndicators.CURRENTPARTIESBYHEADCOUNT.toString());
+
+    PageModeMenuCommand MINISTRY_RANKING_COMMAND_PAGEVISIT_HISTORY = new PageModeMenuCommand(
+                     UserViews.MINISTRY_RANKING_VIEW_NAME, PageMode.PAGEVISITHISTORY);
+
+    // Remove ambiguous constant
+    // PageModeMenuCommand COMMAND_PAGEVISITHISTORY
+}

citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/api/PageCommandPageModeConstants.java

@@ -0,0 +1,27 @@
+package com.hack23.cia.web.impl.ui.application.views.common.menufactory.api;
+
+import com.hack23.cia.web.impl.ui.application.views.common.pagelinks.api.PageModeMenuCommand;
+import com.hack23.cia.web.impl.ui.application.views.common.viewnames.PageMode;
+import com.hack23.cia.web.impl.ui.application.views.common.viewnames.UserViews;
+
+public interface PageCommandPageModeConstants extends RankingNavigationConstants {
+    // Generic base commands without view context - define these first
+    PageModeMenuCommand COMMAND_GENERIC_OVERVIEW = new PageModeMenuCommand("", PageMode.OVERVIEW);
+    PageModeMenuCommand COMMAND_GENERIC_PAGEVISIT = new PageModeMenuCommand("", PageMode.PAGEVISITHISTORY);
+    PageModeMenuCommand COMMAND_GENERIC_DATAGRID = new PageModeMenuCommand("", PageMode.DATAGRID);
+    PageModeMenuCommand COMMAND_GENERIC_CHARTS = new PageModeMenuCommand("", PageMode.CHARTS);
+
+    // Base commands that reference the generic ones - these must come after
+    PageModeMenuCommand COMMAND_OVERVIEW = COMMAND_GENERIC_OVERVIEW;
+    PageModeMenuCommand COMMAND_PAGEVISIT = COMMAND_GENERIC_PAGEVISIT;
+    PageModeMenuCommand COMMAND_DATAGRID = COMMAND_GENERIC_DATAGRID;
+    PageModeMenuCommand COMMAND_CHARTS = COMMAND_GENERIC_CHARTS;
+
+    // Party ranking commands
+    PageModeMenuCommand COMMAND_CHARTS_CURRENT_PARTIES_LEADER_SCOREBOARD =
+        new PageModeMenuCommand(UserViews.PARTY_RANKING_VIEW_NAME, PageMode.CHARTS);
+    PageModeMenuCommand COMMAND_PARTY_RANKING_OVERVIEW =
+        new PageModeMenuCommand(UserViews.PARTY_RANKING_VIEW_NAME, PageMode.OVERVIEW);
+    PageModeMenuCommand COMMAND_PARTY_RANKING_DATAGRID =
+        new PageModeMenuCommand(UserViews.PARTY_RANKING_VIEW_NAME, PageMode.DATAGRID);
+}